[Midnightbsd-cvs] mports: x11-toolkits/gtk20: update to 2.14.7
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Mar 18 00:43:49 EDT 2009
Log Message:
-----------
update to 2.14.7
Modified Files:
--------------
mports/x11-toolkits/gtk20:
Makefile (r1.15 -> r1.16)
distinfo (r1.6 -> r1.7)
pkg-plist (r1.6 -> r1.7)
mports/x11-toolkits/gtk20/files:
patch-ai (r1.1 -> r1.2)
patch-ak (r1.3 -> r1.4)
Removed Files:
-------------
mports/x11-toolkits/gtk20/files:
patch-gtk_xdgmime_xdgmime.c
patch-gtk_xdgmime_xdgmimecache.h
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/pkg-plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -L x11-toolkits/gtk20/pkg-plist -L x11-toolkits/gtk20/pkg-plist -u -r1.6 -r1.7
--- x11-toolkits/gtk20/pkg-plist
+++ x11-toolkits/gtk20/pkg-plist
@@ -7,6 +7,10 @@
@comment etc/gtk-2.0/gdk-pixbuf.loaders
@comment etc/gtk-2.0/gtk.immodules
etc/gtk-2.0/im-multipress.conf
+include/gail-1.0/gail/gailwidget.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -21,7 +25,7 @@
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkalias.h
+include/gtk-2.0/gdk/gdkapplaunchcontext.h
include/gtk-2.0/gdk/gdkcairo.h
include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcursor.h
@@ -48,6 +52,7 @@
include/gtk-2.0/gdk/gdkscreen.h
include/gtk-2.0/gdk/gdkselection.h
include/gtk-2.0/gdk/gdkspawn.h
+include/gtk-2.0/gdk/gdktestutils.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
include/gtk-2.0/gdk/gdkwindow.h
@@ -114,7 +119,6 @@
include/gtk-2.0/gtk/gtkfilechooserwidget.h
include/gtk-2.0/gtk/gtkfilefilter.h
include/gtk-2.0/gtk/gtkfilesel.h
-include/gtk-2.0/gtk/gtkfilesystem.h
include/gtk-2.0/gtk/gtkfixed.h
include/gtk-2.0/gtk/gtkfontbutton.h
include/gtk-2.0/gtk/gtkfontsel.h
@@ -129,6 +133,7 @@
include/gtk-2.0/gtk/gtkhscale.h
include/gtk-2.0/gtk/gtkhscrollbar.h
include/gtk-2.0/gtk/gtkhseparator.h
+include/gtk-2.0/gtk/gtkhsv.h
include/gtk-2.0/gtk/gtkiconfactory.h
include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkiconview.h
@@ -158,6 +163,7 @@
include/gtk-2.0/gtk/gtkmessagedialog.h
include/gtk-2.0/gtk/gtkmisc.h
include/gtk-2.0/gtk/gtkmodules.h
+include/gtk-2.0/gtk/gtkmountoperation.h
include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
@@ -198,6 +204,7 @@
include/gtk-2.0/gtk/gtkseparatormenuitem.h
include/gtk-2.0/gtk/gtkseparatortoolitem.h
include/gtk-2.0/gtk/gtksettings.h
+include/gtk-2.0/gtk/gtkshow.h
include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
@@ -208,6 +215,7 @@
include/gtk-2.0/gtk/gtkstyle.h
include/gtk-2.0/gtk/gtktable.h
include/gtk-2.0/gtk/gtktearoffmenuitem.h
+include/gtk-2.0/gtk/gtktestutils.h
include/gtk-2.0/gtk/gtktext.h
include/gtk-2.0/gtk/gtktextbuffer.h
include/gtk-2.0/gtk/gtktextbufferrichtext.h
@@ -226,6 +234,7 @@
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolshell.h
include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
@@ -258,6 +267,7 @@
include/gtk-unix-print-2.0/gtk/gtkprinter.h
include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkunixprint.h
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
@@ -303,9 +313,15 @@
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
@@ -345,6 +361,16 @@
lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/modules/libferret.a
+lib/gtk-2.0/modules/libferret.la
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.a
+lib/gtk-2.0/modules/libgail.la
+lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
+lib/libgailutil.la
+lib/libgailutil.so
+lib/libgailutil.so.18
lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
@@ -361,6 +387,7 @@
lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.0
+libdata/pkgconfig/gail.pc
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -424,6 +451,8 @@
share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/as/LC_MESSAGES/gtk20-properties.mo
share/locale/as/LC_MESSAGES/gtk20.mo
+share/locale/ast/LC_MESSAGES/gtk20-properties.mo
+share/locale/ast/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20-properties.mo
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo
@@ -518,6 +547,8 @@
share/locale/lt/LC_MESSAGES/gtk20.mo
share/locale/lv/LC_MESSAGES/gtk20-properties.mo
share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mai/LC_MESSAGES/gtk20-properties.mo
+share/locale/mai/LC_MESSAGES/gtk20.mo
share/locale/mi/LC_MESSAGES/gtk20-properties.mo
share/locale/mi/LC_MESSAGES/gtk20.mo
share/locale/mk/LC_MESSAGES/gtk20-properties.mo
@@ -548,6 +579,8 @@
share/locale/pa/LC_MESSAGES/gtk20.mo
share/locale/pl/LC_MESSAGES/gtk20-properties.mo
share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ps/LC_MESSAGES/gtk20-properties.mo
+share/locale/ps/LC_MESSAGES/gtk20.mo
share/locale/pt/LC_MESSAGES/gtk20-properties.mo
share/locale/pt/LC_MESSAGES/gtk20.mo
share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
@@ -568,10 +601,10 @@
share/locale/sq/LC_MESSAGES/gtk20.mo
share/locale/sr/LC_MESSAGES/gtk20-properties.mo
share/locale/sr/LC_MESSAGES/gtk20.mo
-share/locale/sr at Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/sr at Latn/LC_MESSAGES/gtk20.mo
share/locale/sr at ije/LC_MESSAGES/gtk20-properties.mo
share/locale/sr at ije/LC_MESSAGES/gtk20.mo
+share/locale/sr at latin/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr at latin/LC_MESSAGES/gtk20.mo
share/locale/sv/LC_MESSAGES/gtk20-properties.mo
share/locale/sv/LC_MESSAGES/gtk20.mo
share/locale/ta/LC_MESSAGES/gtk20-properties.mo
@@ -627,6 +660,9 @@
@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
+ at dirrm include/gail-1.0/libgail-util
+ at dirrm include/gail-1.0/gail
+ at dirrm include/gail-1.0
@dirrm etc/gtk-2.0
@exec /bin/mkdir -p %D/lib/gtk-2.0/modules
@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
@@ -634,11 +670,14 @@
@dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
+ at dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
@dirrmtry lib/gtk-2.0
+ at exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+ at exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@@ -653,12 +692,16 @@
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+ at dirrmtry share/locale/sr at latin/LC_MESSAGES
+ at dirrmtry share/locale/sr at latin
@dirrmtry share/locale/sr at ije/LC_MESSAGES
@dirrmtry share/locale/sr at ije
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+ at dirrmtry share/locale/ps/LC_MESSAGES
+ at dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@@ -667,6 +710,8 @@
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+ at dirrmtry share/locale/mai/LC_MESSAGES
+ at dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/io/LC_MESSAGES
@@ -685,6 +730,8 @@
@dirrmtry share/locale/be at latin
@dirrmtry share/locale/az_IR/LC_MESSAGES
@dirrmtry share/locale/az_IR
+ at dirrmtry share/locale/ast/LC_MESSAGES
+ at dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrmtry share/locale/ang/LC_MESSAGES
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -L x11-toolkits/gtk20/Makefile -L x11-toolkits/gtk20/Makefile -u -r1.15 -r1.16
--- x11-toolkits/gtk20/Makefile
+++ x11-toolkits/gtk20/Makefile
@@ -9,10 +9,10 @@
PORTNAME= gtk
PKGNAMESUFFIX= 2
-PORTVERSION= 2.12.11
+PORTVERSION= 2.14.7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
- ftp://ftp.gtk.org/pub/gtk/v2.12/ \
+ ftp://ftp.gtk.org/pub/gtk/v2.14/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -23,7 +23,7 @@
DIST_SUBDIR= gnome2
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Gimp Toolkit for X11 GUI (current stable version)
+COMMENT= Gimp Toolkit for X11 GUI
LICENSE= lgpl
USE_BZIP2= yes
@@ -44,14 +44,11 @@
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
-USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
- xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
- xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
- xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
- xxf86vm xcomposite
+USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
+ xcomposite
CONFIGURE_ARGS= --enable-static --with-xinput=yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.1
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -85,8 +82,6 @@
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- ${WRKSRC}/gtk/xdgmime/xdgmime.c
# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/distinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -L x11-toolkits/gtk20/distinfo -L x11-toolkits/gtk20/distinfo -u -r1.6 -r1.7
--- x11-toolkits/gtk20/distinfo
+++ x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad
-SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
-SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428
+MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604
+SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
+SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873
Index: patch-ai
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-ai,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/gtk20/files/patch-ai -L x11-toolkits/gtk20/files/patch-ai -u -r1.1 -r1.2
--- x11-toolkits/gtk20/files/patch-ai
+++ x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003
-+++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003
-@@ -286,7 +286,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500
++++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500
+@@ -372,7 +372,7 @@
+ && DISPLAY=:$$XID && export DISPLAY
--SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS = #gdk-pixbuf gdk gtk
+
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
--- x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
-+++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
-@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
- #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
- #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
- #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
-
- #endif
-
Index: patch-ak
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/gtk20/files/patch-ak,v
retrieving revision 1.3
retrieving revision 1.4
diff -L x11-toolkits/gtk20/files/patch-ak -L x11-toolkits/gtk20/files/patch-ak -u -r1.3 -r1.4
--- x11-toolkits/gtk20/files/patch-ak
+++ x11-toolkits/gtk20/files/patch-ak
@@ -1,7 +1,3 @@
-
-$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.12 2007/12/12 04:29:04 mezz Exp $
- $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $
-
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
@@ -315,7 +315,7 @@
--- x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004
-+++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004
-@@ -204,7 +204,7 @@
-
- xdg_data_dirs = getenv ("XDG_DATA_DIRS");
- if (xdg_data_dirs == NULL)
-- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "/usr/local/share/";
-
- ptr = xdg_data_dirs;
-
More information about the Midnightbsd-cvs
mailing list