aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/files/patch-eel_Makefile.in12
-rw-r--r--x11-toolkits/gdl/Makefile5
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist21
-rw-r--r--x11-toolkits/gtk20-reference/Makefile10
-rw-r--r--x11-toolkits/gtk20/Makefile40
-rw-r--r--x11-toolkits/gtk20/distinfo5
-rw-r--r--x11-toolkits/gtk20/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/gtk20/files/patch-ai10
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in14
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c26
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in18
-rw-r--r--x11-toolkits/gtk20/pkg-plist206
-rw-r--r--x11-toolkits/gtk30-reference/Makefile10
-rw-r--r--x11-toolkits/gtk30/Makefile40
-rw-r--r--x11-toolkits/gtk30/distinfo5
-rw-r--r--x11-toolkits/gtk30/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/gtk30/files/patch-ai10
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in14
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c26
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in18
-rw-r--r--x11-toolkits/gtk30/pkg-plist206
-rw-r--r--x11-toolkits/gtkdatabox/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c43
-rw-r--r--x11-toolkits/gtkglextmm/Makefile7
-rw-r--r--x11-toolkits/gtkmm24/Makefile10
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist103
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist6
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo5
-rw-r--r--x11-toolkits/libwnck/pkg-plist6
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile10
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/Makefile6
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/files/patch-configure11
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist10
-rw-r--r--x11-toolkits/py-vte/Makefile3
-rw-r--r--x11-toolkits/unique/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile5
-rw-r--r--x11-toolkits/vte/distinfo5
-rw-r--r--x11-toolkits/vte/pkg-plist206
57 files changed, 515 insertions, 749 deletions
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 892395d49483..78f15966610c 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.88 2010/05/10 04:21:20 marcus Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.90 2010/09/28 09:15:49 kwm Exp $
#
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/eel/files/patch-eel_Makefile.in b/x11-toolkits/eel/files/patch-eel_Makefile.in
new file mode 100644
index 000000000000..ec753e19eab4
--- /dev/null
+++ b/x11-toolkits/eel/files/patch-eel_Makefile.in
@@ -0,0 +1,12 @@
+--- eel/Makefile.in.orig 2010-09-28 11:12:01.000000000 +0000
++++ eel/Makefile.in 2010-09-28 11:12:37.000000000 +0000
+@@ -290,9 +290,6 @@
+ -DDATADIR=\""$(datadir)"\" \
+ -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+- -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+ $(NULL)
+
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9b695789ef71..a09734c6b512 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.35 2010/03/30 09:44:18 avl Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.40 2010/09/29 08:07:46 kwm Exp $
#
PORTNAME= gdl
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index e67756657d02..fcea5d687a40 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-2.30.0.tar.bz2) = ce4eef03a36bf6abd9f8cbad4806d7b8
-SHA256 (gdl-2.30.0.tar.bz2) = c3ca19831384ae8570f1e6fc0e6be9b2a5ba0f14592b9f2bbb629be113791453
-SIZE (gdl-2.30.0.tar.bz2) = 535941
+MD5 (gdl-2.30.1.tar.bz2) = 4af16be490b47ce4e828a2fb93633856
+SHA256 (gdl-2.30.1.tar.bz2) = 027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1
+SIZE (gdl-2.30.1.tar.bz2) = 569211
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 134610452247..b2ff54f12d70 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -13,14 +13,14 @@ lib/libgdl-1.la
lib/libgdl-1.so
lib/libgdl-1.so.3
libdata/pkgconfig/gdl-1.0.pc
-%%DOCSDIR%%/GdlDock.html
-%%DOCSDIR%%/GdlDockBar.html
-%%DOCSDIR%%/GdlDockItem.html
-%%DOCSDIR%%/GdlDockLayout.html
-%%DOCSDIR%%/GdlDockMaster.html
-%%DOCSDIR%%/GdlDockObject.html
-%%DOCSDIR%%/GdlDockPlaceholder.html
+%%DOCSDIR%%/gdl-gdl-dock-bar.html
+%%DOCSDIR%%/gdl-gdl-dock-item.html
+%%DOCSDIR%%/gdl-gdl-dock-layout.html
+%%DOCSDIR%%/gdl-gdl-dock-master.html
+%%DOCSDIR%%/gdl-gdl-dock-object.html
+%%DOCSDIR%%/gdl-gdl-dock-placeholder.html
%%DOCSDIR%%/gdl-gdl-tools.html
+%%DOCSDIR%%/gdl-gdl-dock.html
%%DOCSDIR%%/gdl-main.html
%%DOCSDIR%%/gdl.devhelp
%%DOCSDIR%%/gdl.devhelp2
@@ -61,6 +61,8 @@ share/locale/he/LC_MESSAGES/gdl-1.mo
share/locale/hi/LC_MESSAGES/gdl-1.mo
share/locale/hr/LC_MESSAGES/gdl-1.mo
share/locale/hu/LC_MESSAGES/gdl-1.mo
+share/locale/hy/LC_MESSAGES/gdl-1.mo
+share/locale/id/LC_MESSAGES/gdl-1.mo
share/locale/it/LC_MESSAGES/gdl-1.mo
share/locale/ja/LC_MESSAGES/gdl-1.mo
share/locale/ko/LC_MESSAGES/gdl-1.mo
@@ -93,6 +95,7 @@ share/locale/sv/LC_MESSAGES/gdl-1.mo
share/locale/te/LC_MESSAGES/gdl-1.mo
share/locale/th/LC_MESSAGES/gdl-1.mo
share/locale/tr/LC_MESSAGES/gdl-1.mo
+share/locale/ug/LC_MESSAGES/gdl-1.mo
share/locale/uk/LC_MESSAGES/gdl-1.mo
share/locale/vi/LC_MESSAGES/gdl-1.mo
share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
@@ -105,6 +108,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrm include/libgdl-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -121,6 +126,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index b1ecb1860630..b7beec30130d 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -5,14 +5,8 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BOOKS= gdk gdk-pixbuf gtk
-
-MAN1= gdk-pixbuf-csource.1
-
-post-install:
- ${INSTALL_MAN} ${MAN1:S|^|${REFERENCE_SRC}/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
+BOOKS= gdk gtk
.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index e38f8935ca4c..83d881b07752 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.20.1
-PORTREVISION?= 2
+PORTVERSION= 2.22.1
+PORTREVISION?= 0
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/%SUBDIR%/ \
@@ -24,24 +24,23 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- jasper.4:${PORTSDIR}/graphics/jasper
RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack atk pango ltverhack
+USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
@@ -49,26 +48,22 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GTK_VERSION= 2.10.0
-PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
-gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
-gtk_MAN= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
-
-MAN1= ${gdk_pixbuf_MAN} ${gtk_MAN}
+MAN1= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=yes
.endif
+OPTIONS= CUPS "Enable cups printing support" on
+
.include <bsd.port.pre.mk>
.if ${ARCH} == powerpc64
-EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
.endif
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
- !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+=--enable-cups=auto
PLIST_SUB+= CUPS:=""
@@ -82,10 +77,6 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
-# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
- @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
- s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
- ${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
${WRKSRC}/gtk/Makefile.in
@@ -97,10 +88,9 @@ post-install:
-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
- @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
- ${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+ ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
${PREFIX}/man/man1
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index cc3c94a0d656..a6827d508561 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
-SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
+SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Aug 3 18:09:32 2005
-+++ Makefile.in Wed Aug 3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig 2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in 2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200
-+++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200
-@@ -359,7 +359,7 @@ XVFB_START = \
+--- docs/reference/Makefile.in.orig 2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in 2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
--SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
GITIGNOREFILES = */*.1
all: all-recursive
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200
-+++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200
-@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
--gdk_pixbuf_csource_LDADD = $(LDADDS)
-+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
--gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-
- #
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
-@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in 2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_LDADD = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = \
- updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ STOCK_ICONS = \
+ stock-icons/16/document-open-recent.png \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 28d34b3b06ac..06e2e8485b92 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,29 +1,13 @@
-bin/gdk-pixbuf-csource
-bin/gdk-pixbuf-query-loaders
bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
-etc/gtk-2.0/gdk-pixbuf.loaders
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
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
-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/gdkapplaunchcontext.h
include/gtk-2.0/gdk/gdkcairo.h
@@ -41,6 +25,7 @@ include/gtk-2.0/gdk/gdki18n.h
include/gtk-2.0/gdk/gdkimage.h
include/gtk-2.0/gdk/gdkinput.h
include/gtk-2.0/gdk/gdkkeys.h
+include/gtk-2.0/gdk/gdkkeysyms-compat.h
include/gtk-2.0/gdk/gdkkeysyms.h
include/gtk-2.0/gdk/gdkpango.h
include/gtk-2.0/gdk/gdkpixbuf.h
@@ -278,104 +263,53 @@ 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/girepository-1.0/Gdk-2.0.typelib
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/GdkX11-2.0.typelib
lib/girepository-1.0/Gtk-2.0.typelib
-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
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-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-qtif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.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
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-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/%%GTK2_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-2.0/%%GTK2_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
@@ -390,29 +324,19 @@ lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
-lib/libgdk_pixbuf-2.0.a
-lib/libgdk_pixbuf-2.0.la
-lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
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
libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/gir-1.0/Gdk-2.0.gir
-share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/GdkX11-2.0.gir
share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
@@ -563,12 +487,18 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
+share/locale/kk/LC_MESSAGES/gtk20-properties.mo
+share/locale/kk/LC_MESSAGES/gtk20.mo
share/locale/kn/LC_MESSAGES/gtk20-properties.mo
share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
share/locale/li/LC_MESSAGES/gtk20-properties.mo
share/locale/li/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -651,6 +581,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/tt/LC_MESSAGES/gtk20-properties.mo
share/locale/tt/LC_MESSAGES/gtk20.mo
+share/locale/ug/LC_MESSAGES/gtk20-properties.mo
+share/locale/ug/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/ur/LC_MESSAGES/gtk20-properties.mo
@@ -688,8 +620,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gtk-unix-print-2.0/gtk
@dirrm include/gtk-unix-print-2.0
@dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk-pixbuf-xlib
-@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm include/gail-1.0/libgail-util
@@ -697,18 +627,18 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@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
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
@dirrmtry share/themes/Default
@dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
-@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/%%GTK2_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/loaders
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/immodules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
@dirrmtry lib/gtk-2.0
-@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
@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
@@ -720,6 +650,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -748,8 +680,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index b1ecb1860630..b7beec30130d 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -5,14 +5,8 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BOOKS= gdk gdk-pixbuf gtk
-
-MAN1= gdk-pixbuf-csource.1
-
-post-install:
- ${INSTALL_MAN} ${MAN1:S|^|${REFERENCE_SRC}/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
+BOOKS= gdk gtk
.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e38f8935ca4c..83d881b07752 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.20.1
-PORTREVISION?= 2
+PORTVERSION= 2.22.1
+PORTREVISION?= 0
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/%SUBDIR%/ \
@@ -24,24 +24,23 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- jasper.4:${PORTSDIR}/graphics/jasper
RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack atk pango ltverhack
+USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
@@ -49,26 +48,22 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GTK_VERSION= 2.10.0
-PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
-gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
-gtk_MAN= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
-
-MAN1= ${gdk_pixbuf_MAN} ${gtk_MAN}
+MAN1= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=yes
.endif
+OPTIONS= CUPS "Enable cups printing support" on
+
.include <bsd.port.pre.mk>
.if ${ARCH} == powerpc64
-EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
.endif
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
- !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+=--enable-cups=auto
PLIST_SUB+= CUPS:=""
@@ -82,10 +77,6 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
-# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
- @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
- s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
- ${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
${WRKSRC}/gtk/Makefile.in
@@ -97,10 +88,9 @@ post-install:
-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
- @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
- ${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+ ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
${PREFIX}/man/man1
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index cc3c94a0d656..a6827d508561 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
-SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
+SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Aug 3 18:09:32 2005
-+++ Makefile.in Wed Aug 3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig 2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in 2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200
-+++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200
-@@ -359,7 +359,7 @@ XVFB_START = \
+--- docs/reference/Makefile.in.orig 2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in 2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
--SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
GITIGNOREFILES = */*.1
all: all-recursive
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200
-+++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200
-@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
--gdk_pixbuf_csource_LDADD = $(LDADDS)
-+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
--gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-
- #
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
-@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in 2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_LDADD = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = \
- updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ STOCK_ICONS = \
+ stock-icons/16/document-open-recent.png \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 28d34b3b06ac..06e2e8485b92 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,29 +1,13 @@
-bin/gdk-pixbuf-csource
-bin/gdk-pixbuf-query-loaders
bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
-etc/gtk-2.0/gdk-pixbuf.loaders
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
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
-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/gdkapplaunchcontext.h
include/gtk-2.0/gdk/gdkcairo.h
@@ -41,6 +25,7 @@ include/gtk-2.0/gdk/gdki18n.h
include/gtk-2.0/gdk/gdkimage.h
include/gtk-2.0/gdk/gdkinput.h
include/gtk-2.0/gdk/gdkkeys.h
+include/gtk-2.0/gdk/gdkkeysyms-compat.h
include/gtk-2.0/gdk/gdkkeysyms.h
include/gtk-2.0/gdk/gdkpango.h
include/gtk-2.0/gdk/gdkpixbuf.h
@@ -278,104 +263,53 @@ 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/girepository-1.0/Gdk-2.0.typelib
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/GdkX11-2.0.typelib
lib/girepository-1.0/Gtk-2.0.typelib
-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
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-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-qtif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.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
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-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/%%GTK2_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-2.0/%%GTK2_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
@@ -390,29 +324,19 @@ lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
-lib/libgdk_pixbuf-2.0.a
-lib/libgdk_pixbuf-2.0.la
-lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
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
libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/gir-1.0/Gdk-2.0.gir
-share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/GdkX11-2.0.gir
share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
@@ -563,12 +487,18 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
+share/locale/kk/LC_MESSAGES/gtk20-properties.mo
+share/locale/kk/LC_MESSAGES/gtk20.mo
share/locale/kn/LC_MESSAGES/gtk20-properties.mo
share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
share/locale/li/LC_MESSAGES/gtk20-properties.mo
share/locale/li/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -651,6 +581,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/tt/LC_MESSAGES/gtk20-properties.mo
share/locale/tt/LC_MESSAGES/gtk20.mo
+share/locale/ug/LC_MESSAGES/gtk20-properties.mo
+share/locale/ug/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/ur/LC_MESSAGES/gtk20-properties.mo
@@ -688,8 +620,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gtk-unix-print-2.0/gtk
@dirrm include/gtk-unix-print-2.0
@dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk-pixbuf-xlib
-@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm include/gail-1.0/libgail-util
@@ -697,18 +627,18 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@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
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
@dirrmtry share/themes/Default
@dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
-@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/%%GTK2_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/loaders
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/immodules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
@dirrmtry lib/gtk-2.0
-@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
@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
@@ -720,6 +650,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -748,8 +680,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index a75e328c58e2..e87c0892892c 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkdatabox
PORTVERSION= 0.9.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= SF http://www.eudoxos.de/gtk/gtkdatabox/download/
DIST_SUBDIR= gnome2
@@ -41,7 +41,7 @@ PLIST_SUB+= GLADE="@comment "
.endif
.if !defined(WITHOUT_GLADEUI)
-LIB_DEPENDS+= gladeui-1.9:${PORTSDIR}/devel/glade3
+LIB_DEPENDS+= gladeui-1.10:${PORTSDIR}/devel/glade3
CONFIGURE_ARGS+= --enable-glade
PLIST_SUB+= GLADEUI=""
.else
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 21c28529d217..529baff2c7fe 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
index 209bf3070e28..d1f4dac111bc 100644
--- a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
+++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
@@ -1,6 +1,14 @@
---- gtkextra/gtkitementry.c.orig 2009-09-26 16:38:37.000000000 +0200
-+++ gtkextra/gtkitementry.c 2009-09-26 16:40:16.000000000 +0200
-@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable
+--- gtkextra/gtkitementry.c.orig 2002-06-27 18:57:19.000000000 +0200
++++ gtkextra/gtkitementry.c 2010-11-02 17:51:07.000000000 +0100
+@@ -131,7 +131,6 @@ static void gtk_entry_draw_curso
+ static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
+ gboolean include_preedit);
+ static void gtk_entry_queue_draw (GtkEntry *entry);
+-static void gtk_entry_reset_im_context (GtkEntry *entry);
+ static void gtk_entry_recompute (GtkEntry *entry);
+ static void gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+@@ -693,23 +692,23 @@ gtk_entry_real_insert_text (GtkEditable
new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
}
@@ -34,7 +42,7 @@
new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
n_chars = g_utf8_strlen (new_text, new_text_length);
}
-@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable
+@@ -718,19 +717,19 @@ gtk_entry_real_insert_text (GtkEditable
}
}
@@ -58,7 +66,7 @@
if (entry->current_pos > *position)
entry->current_pos += n_chars;
-@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable
+@@ -763,9 +762,9 @@ gtk_entry_real_delete_text (GtkEditable
gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
@@ -70,7 +78,7 @@
if (entry->current_pos > start_pos)
entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
-@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
+@@ -1028,7 +1027,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
{
gtk_im_context_set_surrounding (context,
entry->text,
@@ -79,7 +87,7 @@
g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
return TRUE;
-@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1229,7 +1228,7 @@ gtk_entry_create_layout (GtkEntry *entry
if (entry->visible)
{
@@ -88,7 +96,7 @@
g_string_insert (tmp_string, cursor_index, preedit_string);
}
else
-@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1238,7 +1237,7 @@ gtk_entry_create_layout (GtkEntry *entry
gint preedit_len_chars;
gunichar invisible_char;
@@ -97,7 +105,7 @@
preedit_len_chars = g_utf8_strlen (preedit_string, -1);
ch_len += preedit_len_chars;
-@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1272,7 +1271,7 @@ gtk_entry_create_layout (GtkEntry *entry
{
if (entry->visible)
{
@@ -106,3 +114,20 @@
}
else
{
+@@ -1695,16 +1694,6 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
+-{
+- if (entry->need_im_reset)
+- {
+- entry->need_im_reset = 0;
+- gtk_im_context_reset (entry->im_context);
+- }
+-}
+-
+-static void
+ gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+ gint *strong_x,
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index d6491c7b6c3f..5a7b37f2c659 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -24,4 +24,11 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|-DGDK_DISABLE_DEPRECATED||g' \
+ -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \
+ -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/gdkglext/gdkmm/gl/Makefile.in \
+ ${WRKSRC}/gtkglext/gtkmm/gl/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 72279c0ba812..1523301ec74d 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,18 +3,18 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.64 2010/05/04 14:03:00 kwm Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.71 2010/09/27 21:24:09 kwm Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.20.3
-PORTREVISION?= 1
+PORTVERSION= 2.22.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= C++ wrapper for Gtk+, Pango, Atk
+COMMENT= C++ wrapper for Gtk+, Pango
USE_BZIP2= yes
LATEST_LINK= gtkmm24
@@ -23,6 +23,7 @@ LATEST_LINK= gtkmm24
LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
+ atkmm-1.6.2:${PORTSDIR}/accessibility/atkmm \
pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
@@ -32,6 +33,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gtk20 ltverhack:1
+MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-documentation \
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 2e84b722cd80..7e54377a37d1 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.20.3.tar.bz2) = c35f236091b4f96fe45c53b4107400a9
-SHA256 (gnome2/gtkmm-2.20.3.tar.bz2) = 311d2156f15cdbdce22cb2af6e606a3f621d7dfebea6f7b1be0132e81af90585
-SIZE (gnome2/gtkmm-2.20.3.tar.bz2) = 12554334
+MD5 (gnome2/gtkmm-2.22.0.tar.bz2) = 4356dfde44b13f7fb1bfbd97623f37dd
+SHA256 (gnome2/gtkmm-2.22.0.tar.bz2) = 8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
+SIZE (gnome2/gtkmm-2.22.0.tar.bz2) = 11496369
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 52ebe7996fe5..acfb22e4aebe 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,44 +1,3 @@
-include/atkmm-1.6/atkmm.h
-include/atkmm-1.6/atkmm/action.h
-include/atkmm-1.6/atkmm/component.h
-include/atkmm-1.6/atkmm/document.h
-include/atkmm-1.6/atkmm/editabletext.h
-include/atkmm-1.6/atkmm/hyperlink.h
-include/atkmm-1.6/atkmm/hypertext.h
-include/atkmm-1.6/atkmm/image.h
-include/atkmm-1.6/atkmm/implementor.h
-include/atkmm-1.6/atkmm/init.h
-include/atkmm-1.6/atkmm/noopobject.h
-include/atkmm-1.6/atkmm/object.h
-include/atkmm-1.6/atkmm/objectaccessible.h
-include/atkmm-1.6/atkmm/private/action_p.h
-include/atkmm-1.6/atkmm/private/component_p.h
-include/atkmm-1.6/atkmm/private/document_p.h
-include/atkmm-1.6/atkmm/private/editabletext_p.h
-include/atkmm-1.6/atkmm/private/hyperlink_p.h
-include/atkmm-1.6/atkmm/private/hypertext_p.h
-include/atkmm-1.6/atkmm/private/image_p.h
-include/atkmm-1.6/atkmm/private/implementor_p.h
-include/atkmm-1.6/atkmm/private/noopobject_p.h
-include/atkmm-1.6/atkmm/private/object_p.h
-include/atkmm-1.6/atkmm/private/objectaccessible_p.h
-include/atkmm-1.6/atkmm/private/relation_p.h
-include/atkmm-1.6/atkmm/private/relationset_p.h
-include/atkmm-1.6/atkmm/private/selection_p.h
-include/atkmm-1.6/atkmm/private/stateset_p.h
-include/atkmm-1.6/atkmm/private/streamablecontent_p.h
-include/atkmm-1.6/atkmm/private/table_p.h
-include/atkmm-1.6/atkmm/private/text_p.h
-include/atkmm-1.6/atkmm/private/value_p.h
-include/atkmm-1.6/atkmm/relation.h
-include/atkmm-1.6/atkmm/relationset.h
-include/atkmm-1.6/atkmm/selection.h
-include/atkmm-1.6/atkmm/stateset.h
-include/atkmm-1.6/atkmm/streamablecontent.h
-include/atkmm-1.6/atkmm/table.h
-include/atkmm-1.6/atkmm/text.h
-include/atkmm-1.6/atkmm/value.h
-include/atkmm-1.6/atkmm/wrap_init.h
include/gdkmm-%%API_VERSION%%/gdkmm.h
include/gdkmm-%%API_VERSION%%/gdkmm/bitmap.h
include/gdkmm-%%API_VERSION%%/gdkmm/color.h
@@ -53,7 +12,6 @@ include/gdkmm-%%API_VERSION%%/gdkmm/event.h
include/gdkmm-%%API_VERSION%%/gdkmm/gc.h
include/gdkmm-%%API_VERSION%%/gdkmm/general.h
include/gdkmm-%%API_VERSION%%/gdkmm/image.h
-include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
include/gdkmm-%%API_VERSION%%/gdkmm/list.h
include/gdkmm-%%API_VERSION%%/gdkmm/pixbuf.h
include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h
@@ -73,7 +31,6 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/drawable_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/event_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/gc_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/image_p.h
-include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbuf_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimation_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimationiter_p.h
@@ -171,6 +128,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/icontheme.h
include/gtkmm-%%API_VERSION%%/gtkmm/iconview.h
include/gtkmm-%%API_VERSION%%/gtkmm/image.h
include/gtkmm-%%API_VERSION%%/gtkmm/imagemenuitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
include/gtkmm-%%API_VERSION%%/gtkmm/inputdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
include/gtkmm-%%API_VERSION%%/gtkmm/item.h
@@ -272,6 +230,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/icontheme_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/iconview_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/image_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/imagemenuitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/inputdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
@@ -460,10 +419,12 @@ include/gtkmm-%%API_VERSION%%/gtkmm/window.h
include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
-lib/libatkmm-1.6.a
-lib/libatkmm-1.6.la
-lib/libatkmm-1.6.so
-lib/libatkmm-1.6.so.1
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_atk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_pango.m4
lib/libgdkmm-%%VERSION%%.a
lib/libgdkmm-%%VERSION%%.la
lib/libgdkmm-%%VERSION%%.so
@@ -472,51 +433,10 @@ lib/libgtkmm-%%VERSION%%.a
lib/libgtkmm-%%VERSION%%.la
lib/libgtkmm-%%VERSION%%.so
lib/libgtkmm-%%VERSION%%.so.1
-libdata/pkgconfig/atkmm-1.6.pc
libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-share/gtkmm-%%API_VERSION%%/demo/alphatest.png
-share/gtkmm-%%API_VERSION%%/demo/apple-red.png
-share/gtkmm-%%API_VERSION%%/demo/background.jpg
-share/gtkmm-%%API_VERSION%%/demo/demo-common.cc
-share/gtkmm-%%API_VERSION%%/demo/demo-common.h
-share/gtkmm-%%API_VERSION%%/demo/demos.h
-share/gtkmm-%%API_VERSION%%/demo/demowindow.cc
-share/gtkmm-%%API_VERSION%%/demo/demowindow.h
-share/gtkmm-%%API_VERSION%%/demo/example_appwindow.cc
-share/gtkmm-%%API_VERSION%%/demo/example_buttonbox.cc
-share/gtkmm-%%API_VERSION%%/demo/example_change_display.cc
-share/gtkmm-%%API_VERSION%%/demo/example_colorsel.cc
-share/gtkmm-%%API_VERSION%%/demo/example_dialog.cc
-share/gtkmm-%%API_VERSION%%/demo/example_drawingarea.cc
-share/gtkmm-%%API_VERSION%%/demo/example_iconview.cc
-share/gtkmm-%%API_VERSION%%/demo/example_images.cc
-share/gtkmm-%%API_VERSION%%/demo/example_menus.cc
-share/gtkmm-%%API_VERSION%%/demo/example_panes.cc
-share/gtkmm-%%API_VERSION%%/demo/example_pixbufs.cc
-share/gtkmm-%%API_VERSION%%/demo/example_sizegroup.cc
-share/gtkmm-%%API_VERSION%%/demo/example_stockbrowser.cc
-share/gtkmm-%%API_VERSION%%/demo/example_textview.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_editable_cells.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_liststore.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_treestore.cc
-share/gtkmm-%%API_VERSION%%/demo/example_uimanager.cc
-share/gtkmm-%%API_VERSION%%/demo/floppybuddy.gif
-share/gtkmm-%%API_VERSION%%/demo/gnome-applets.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-calendar.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-foot.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-fs-directory.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-fs-regular.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gimp.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gmush.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gsame.png
-share/gtkmm-%%API_VERSION%%/demo/gnu-keys.png
-share/gtkmm-%%API_VERSION%%/demo/gtk-logo-rgb.gif
-share/gtkmm-%%API_VERSION%%/demo/main.cc
-share/gtkmm-%%API_VERSION%%/demo/textwidget.cc
-share/gtkmm-%%API_VERSION%%/demo/textwidget.h
-@dirrm share/gtkmm-%%API_VERSION%%/demo
-@dirrm share/gtkmm-%%API_VERSION%%
+@dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
+@dirrm lib/gtkmm-%%API_VERSION%%/proc
@dirrm lib/gtkmm-%%API_VERSION%%/include
@dirrm lib/gtkmm-%%API_VERSION%%
@dirrm lib/gdkmm-%%API_VERSION%%/include
@@ -527,6 +447,3 @@ share/gtkmm-%%API_VERSION%%/demo/textwidget.h
@dirrm include/gdkmm-%%API_VERSION%%/gdkmm/private
@dirrm include/gdkmm-%%API_VERSION%%/gdkmm
@dirrm include/gdkmm-%%API_VERSION%%
-@dirrm include/atkmm-1.6/atkmm/private
-@dirrm include/atkmm-1.6/atkmm
-@dirrm include/atkmm-1.6
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 640c8d3e7724..8f355d89d70c 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/gtksourceview2/Makefile,v 1.3 2010/06/23 11:44:45 kwm Exp $
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.96 2010/09/29 12:42:49 kwm Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.10.4
+PORTVERSION= 2.10.5
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 37debe302fc4..9e8ddec108c9 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.10.4.tar.bz2) = 342666cba9eb2643e5166a0cb58203d2
-SHA256 (gnome2/gtksourceview-2.10.4.tar.bz2) = 54f243cf6d55f8d75d910b05374c6b33c9bd66b9c05e781ed565275e0bcad741
-SIZE (gnome2/gtksourceview-2.10.4.tar.bz2) = 1232741
+MD5 (gnome2/gtksourceview-2.10.5.tar.bz2) = 1219ad1694df136f126507466aeb41aa
+SHA256 (gnome2/gtksourceview-2.10.5.tar.bz2) = c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+SIZE (gnome2/gtksourceview-2.10.5.tar.bz2) = 1253321
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index fae81cca8442..a0f3624155c1 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.73 2010/04/02 17:56:10 kwm Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.75 2010/09/28 16:03:49 kwm Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.24.4
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 4953d1fe3e2c..f062906028f8 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.24.3.tar.bz2) = 3a754b1df0a4d5fd4836a05020a0bb4a
-SHA256 (gnome/libbonoboui-2.24.3.tar.bz2) = 0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84
-SIZE (gnome/libbonoboui-2.24.3.tar.bz2) = 926983
+MD5 (gnome/libbonoboui-2.24.4.tar.bz2) = cc2fb47b79fb3bcc6816ff07d7496cf9
+SHA256 (gnome/libbonoboui-2.24.4.tar.bz2) = 4b683a4a933392384267a0bf99771a99ef2ceacee22d67efe5648b894f8ba0c7
+SIZE (gnome/libbonoboui-2.24.4.tar.bz2) = 961744
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 34ed3af15609..46a24f14783b 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -67,6 +67,7 @@ share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/dz/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en@shaw/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/eo/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 21937fda7ea8..f7f87008c41a 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.73 2010/04/01 15:43:24 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.75 2010/09/28 16:07:36 kwm Exp $
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.18.5
-PORTREVISION= 1
+PORTVERSION= 2.18.6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index f84fbf9c543d..4848e0004326 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 66c1cf3a9ead428585c2c44e6110ebb7
-SHA256 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f
-SIZE (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 677362
+MD5 (gnome2/libgnomeprintui-2.18.6.tar.bz2) = cbfab252ec7e9dc25bb1fe1610c3270b
+SHA256 (gnome2/libgnomeprintui-2.18.6.tar.bz2) = 156ae5b66e5dcc546efa2449048f792d76c55b30d93a9b67b0c69665e346f46a
+SIZE (gnome2/libgnomeprintui-2.18.6.tar.bz2) = 681125
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 6908a4c37851..10bb032cd73e 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.127 2010/04/01 14:39:51 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.129 2010/09/27 20:16:41 kwm Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.24.3
-PORTREVISION?= 2
+PORTVERSION= 2.24.4
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index f68637521994..eee03bcf8f8f 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.24.3.tar.bz2) = ceab6f4370581d1a03c09f15cc103099
-SHA256 (gnome2/libgnomeui-2.24.3.tar.bz2) = 04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803
-SIZE (gnome2/libgnomeui-2.24.3.tar.bz2) = 1401560
+MD5 (gnome2/libgnomeui-2.24.4.tar.bz2) = f8f68600f26832d3d24b7d7d99d050b9
+SHA256 (gnome2/libgnomeui-2.24.4.tar.bz2) = a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2
+SIZE (gnome2/libgnomeui-2.24.4.tar.bz2) = 1431076
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index a22a6f1b05ff..59ab6d73f2f1 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -103,6 +103,7 @@ share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ka/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/kk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo
@@ -148,6 +149,7 @@ share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tt/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ug/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -171,6 +173,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -203,6 +207,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/fur/LC_MESSAGES
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 5fe55515b04e..b6c4130fe605 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.5 2010/06/23 20:05:15 kwm Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.133 2010/11/17 11:38:29 kwm Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.30.3
+PORTVERSION= 2.30.6
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 0abac33b1cd3..8ba015d70cfd 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libwnck-2.30.3.tar.bz2) = 743276e946b2512ef86246f8e9def6a6
-SHA256 (gnome2/libwnck-2.30.3.tar.bz2) = e3afbeeab591e8f22b32d957e6372bd2f38d0ba33a6a11aa436db840d57a6b04
-SIZE (gnome2/libwnck-2.30.3.tar.bz2) = 708132
+SHA256 (gnome2/libwnck-2.30.6.tar.bz2) = 4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5
+SIZE (gnome2/libwnck-2.30.6.tar.bz2) = 724558
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index d0e7f8ca007d..6e8a07f1d691 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -61,6 +61,7 @@ share/locale/is/LC_MESSAGES/libwnck.mo
share/locale/it/LC_MESSAGES/libwnck.mo
share/locale/ja/LC_MESSAGES/libwnck.mo
share/locale/ka/LC_MESSAGES/libwnck.mo
+share/locale/kk/LC_MESSAGES/libwnck.mo
share/locale/kn/LC_MESSAGES/libwnck.mo
share/locale/ko/LC_MESSAGES/libwnck.mo
share/locale/ku/LC_MESSAGES/libwnck.mo
@@ -99,6 +100,7 @@ share/locale/ta/LC_MESSAGES/libwnck.mo
share/locale/te/LC_MESSAGES/libwnck.mo
share/locale/th/LC_MESSAGES/libwnck.mo
share/locale/tr/LC_MESSAGES/libwnck.mo
+share/locale/ug/LC_MESSAGES/libwnck.mo
share/locale/uk/LC_MESSAGES/libwnck.mo
share/locale/vi/LC_MESSAGES/libwnck.mo
share/locale/wa/LC_MESSAGES/libwnck.mo
@@ -113,6 +115,8 @@ share/gir-1.0/Wnck-1.0.gir
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -133,6 +137,8 @@ share/gir-1.0/Wnck-1.0.gir
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 6ed78214d14e..0dff1f8e402c 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -18,6 +18,8 @@ DISTNAME= lablgtk-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An Objective Caml interface to GTK+ 2.x
+BROKEN= Doesn't build with Glib 2.26
+
USE_GMAKE= yes
USE_GNOME= gtk20
USE_OCAML= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 192c081f6c43..ed65a8023abd 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.9 2010/06/23 22:34:21 kwm Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.161 2010/09/30 06:56:41 kwm Exp $
#
PORTNAME= pango
-PORTVERSION= 1.28.1
+PORTVERSION= 1.28.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 27a809b6fa86..7996f2e92754 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.28.1.tar.bz2) = bab5b4eb3fde6b0a5bfe98d25e668741
-SHA256 (gnome2/pango-1.28.1.tar.bz2) = 8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2
-SIZE (gnome2/pango-1.28.1.tar.bz2) = 1483961
+MD5 (gnome2/pango-1.28.3.tar.bz2) = caa74baea47e7e16bc73c89f9089d522
+SHA256 (gnome2/pango-1.28.3.tar.bz2) = 5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632
+SIZE (gnome2/pango-1.28.3.tar.bz2) = 1509501
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b463e1a77ed1..535d9de6ab1f 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/py-gnome-desktop/Makefile,v 1.2 2010/06/24 10:03:55 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.103 2010/09/30 06:27:40 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,8 +23,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
- brasero-media.2:${PORTSDIR}/sysutils/brasero \
- evdocument.2:${PORTSDIR}/graphics/evince
+ brasero-media.3:${PORTSDIR}/sysutils/brasero \
+ evdocument.3:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
USE_BZIP2= yes
@@ -52,6 +51,7 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-desktop
post-patch:
@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
+ @${REINPLACE_CMD} -e 's|2.30|2.32|g' ${WRKSRC}/configure
.if !defined(NOPORTDOCS)
post-install:
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 15c9456624f9..0f854db68e0c 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = b90f6e96a6321e7bf859f6faff2aa4df
-SHA256 (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 23aa8dbae4bd3d00a5da1eae9500ba3787af4ad0481073ea53e5bff824bbcebb
-SIZE (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 598305
+MD5 (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 0e73fa80ace5c861777e0b523c6ead9d
+SHA256 (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9
+SIZE (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 621277
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index d2bb0c968d7f..700412b5bfe3 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,12 +3,12 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.69 2009/12/27 16:45:09 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.72 2010/09/28 15:45:26 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.17.0
-PORTREVISION= 4
+PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 659add33eae8..e2734ab7cd77 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.17.0.tar.bz2) = 43d704343d7ca04a6e4ddd4fa73a3c55
-SHA256 (gnome2/pygtk-2.17.0.tar.bz2) = 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400
-SIZE (gnome2/pygtk-2.17.0.tar.bz2) = 2260394
+MD5 (gnome2/pygtk-2.22.0.tar.bz2) = e9bba9cd4cdaccb22a7991cc2f7c8373
+SHA256 (gnome2/pygtk-2.22.0.tar.bz2) = 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
+SIZE (gnome2/pygtk-2.22.0.tar.bz2) = 2285379
diff --git a/x11-toolkits/py-gtk2/files/patch-configure b/x11-toolkits/py-gtk2/files/patch-configure
new file mode 100644
index 000000000000..1c766c127109
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-09-26 10:02:15.000000000 +0000
++++ configure 2010-09-26 10:02:33.000000000 +0000
+@@ -12288,7 +12288,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+
+- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++ for am_cv_pathless_PYTHON in python python2 python3 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ test "$am_cv_pathless_PYTHON" = none && break
+ prog="import sys
+ # split strings by '.' and convert to numeric. Append some zeros
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index c48a984657e7..e828ad1ec7f6 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -52,6 +52,9 @@ lib/pygtk/2.0/demos/images/gnome-gmush.png
lib/pygtk/2.0/demos/images/gnome-gsame.png
lib/pygtk/2.0/demos/images/gnu-keys.png
lib/pygtk/2.0/demos/images/gtk-logo-rgb.gif
+lib/pygtk/2.0/demos/infobar.py
+lib/pygtk/2.0/demos/infobar.pyc
+lib/pygtk/2.0/demos/infobar.pyo
lib/pygtk/2.0/demos/list_store.py
lib/pygtk/2.0/demos/list_store.pyc
lib/pygtk/2.0/demos/list_store.pyo
@@ -672,6 +675,7 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gnome-gsame.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gnu-keys.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gtk-logo-rgb.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/infobar.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/list_store.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/menu.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/panes.py
@@ -703,6 +707,8 @@ share/pygtk/2.0/defs/gdk-2.12.defs
share/pygtk/2.0/defs/gdk-2.14.defs
share/pygtk/2.0/defs/gdk-2.16.defs
share/pygtk/2.0/defs/gdk-2.18.defs
+share/pygtk/2.0/defs/gdk-2.20.defs
+share/pygtk/2.0/defs/gdk-2.22.defs
share/pygtk/2.0/defs/gdk-base-types.defs
share/pygtk/2.0/defs/gdk-base.defs
share/pygtk/2.0/defs/gdk-types.defs
@@ -717,6 +723,10 @@ share/pygtk/2.0/defs/gtk-2.16-types.defs
share/pygtk/2.0/defs/gtk-2.16.defs
share/pygtk/2.0/defs/gtk-2.18-types.defs
share/pygtk/2.0/defs/gtk-2.18.defs
+share/pygtk/2.0/defs/gtk-2.20-types.defs
+share/pygtk/2.0/defs/gtk-2.20.defs
+share/pygtk/2.0/defs/gtk-2.22-types.defs
+share/pygtk/2.0/defs/gtk-2.22.defs
share/pygtk/2.0/defs/gtk-base-types.defs
share/pygtk/2.0/defs/gtk-base.defs
share/pygtk/2.0/defs/gtk-extrafuncs.defs
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index 73993810c4bb..9d658bfff731 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $
+# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.5 2010/09/30 09:15:43 kwm Exp $
#
PORTREVISION= 0
@@ -22,6 +22,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomehack gnometarget vte pygtk2
USE_PYTHON= yes
CONFIGURE_ARGS= --enable-python \
+ --disable-Bsymbolic \
--disable-freetypetest
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index d34bc9ac7ddb..29ebe9d3ec63 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/unique/Makefile,v 1.7 2010/01/09 18:22:39 marcus Exp $
+# $MCom: ports/x11-toolkits/unique/Makefile,v 1.9 2010/06/29 21:14:06 kwm Exp $
#
PORTNAME= unique
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index ca0e890497e6..2554756698ad 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/vte/Makefile,v 1.14 2010/07/15 20:43:21 kwm Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $
#
PORTNAME= vte
-PORTVERSION= 0.24.3
+PORTVERSION= 0.26.2
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
@@ -30,6 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS?=--disable-python \
+ --disable-Bsymbolic \
--disable-freetypetest
.if !defined(MASTERDIR)
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 0faf82c3821a..8eb9d3e3ed5a 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/vte-0.24.3.tar.bz2) = 3eba555eab7ccbbe5ca056bb203a14ab
-SHA256 (gnome2/vte-0.24.3.tar.bz2) = fe7d01178976b17ca809e41d0e6dbbcb28e2af5e2f5aa857f9df65affac17d01
-SIZE (gnome2/vte-0.24.3.tar.bz2) = 1287755
+SHA256 (gnome2/vte-0.26.2.tar.bz2) = f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd
+SIZE (gnome2/vte-0.26.2.tar.bz2) = 1310863
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index cd7b59f00ac3..52983e8f0d1a 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -1,114 +1,118 @@
bin/vte
-include/vte/pty.h
-include/vte/reaper.h
-include/vte/vte.h
-include/vte/vteaccess.h
-include/vte/vtetypebuiltins.h
-include/vte/vteversion.h
+include/vte-0.0/vte/pty.h
+include/vte-0.0/vte/reaper.h
+include/vte-0.0/vte/vte.h
+include/vte-0.0/vte/vteaccess.h
+include/vte-0.0/vte/vtedeprecated.h
+include/vte-0.0/vte/vtepty.h
+include/vte-0.0/vte/vtetypebuiltins.h
+include/vte-0.0/vte/vteversion.h
lib/libvte.a
lib/libvte.la
lib/libvte.so
lib/libvte.so.9
-lib/vte/decset
-lib/vte/interpret
-lib/vte/osc
-lib/vte/slowcat
-lib/vte/window
+lib/vte-0.0/decset
+lib/vte-0.0/interpret
+lib/vte-0.0/osc
+lib/vte-0.0/slowcat
+lib/vte-0.0/window
libdata/pkgconfig/vte.pc
libexec/gnome-pty-helper
-share/locale/am/LC_MESSAGES/vte.mo
-share/locale/ang/LC_MESSAGES/vte.mo
-share/locale/ar/LC_MESSAGES/vte.mo
-share/locale/as/LC_MESSAGES/vte.mo
-share/locale/ast/LC_MESSAGES/vte.mo
-share/locale/az/LC_MESSAGES/vte.mo
-share/locale/be/LC_MESSAGES/vte.mo
-share/locale/be@latin/LC_MESSAGES/vte.mo
-share/locale/bg/LC_MESSAGES/vte.mo
-share/locale/bn/LC_MESSAGES/vte.mo
-share/locale/bn_IN/LC_MESSAGES/vte.mo
-share/locale/bs/LC_MESSAGES/vte.mo
-share/locale/ca/LC_MESSAGES/vte.mo
-share/locale/ca@valencia/LC_MESSAGES/vte.mo
-share/locale/cs/LC_MESSAGES/vte.mo
-share/locale/cy/LC_MESSAGES/vte.mo
-share/locale/da/LC_MESSAGES/vte.mo
-share/locale/de/LC_MESSAGES/vte.mo
-share/locale/dz/LC_MESSAGES/vte.mo
-share/locale/el/LC_MESSAGES/vte.mo
-share/locale/en@shaw/LC_MESSAGES/vte.mo
-share/locale/en_CA/LC_MESSAGES/vte.mo
-share/locale/en_GB/LC_MESSAGES/vte.mo
-share/locale/es/LC_MESSAGES/vte.mo
-share/locale/et/LC_MESSAGES/vte.mo
-share/locale/eu/LC_MESSAGES/vte.mo
-share/locale/fa/LC_MESSAGES/vte.mo
-share/locale/fi/LC_MESSAGES/vte.mo
-share/locale/fr/LC_MESSAGES/vte.mo
-share/locale/ga/LC_MESSAGES/vte.mo
-share/locale/gl/LC_MESSAGES/vte.mo
-share/locale/gu/LC_MESSAGES/vte.mo
-share/locale/he/LC_MESSAGES/vte.mo
-share/locale/hi/LC_MESSAGES/vte.mo
-share/locale/hr/LC_MESSAGES/vte.mo
-share/locale/hu/LC_MESSAGES/vte.mo
-share/locale/id/LC_MESSAGES/vte.mo
-share/locale/is/LC_MESSAGES/vte.mo
-share/locale/it/LC_MESSAGES/vte.mo
-share/locale/ja/LC_MESSAGES/vte.mo
-share/locale/ka/LC_MESSAGES/vte.mo
-share/locale/kn/LC_MESSAGES/vte.mo
-share/locale/ko/LC_MESSAGES/vte.mo
-share/locale/ku/LC_MESSAGES/vte.mo
-share/locale/ky/LC_MESSAGES/vte.mo
-share/locale/li/LC_MESSAGES/vte.mo
-share/locale/lt/LC_MESSAGES/vte.mo
-share/locale/lv/LC_MESSAGES/vte.mo
-share/locale/mai/LC_MESSAGES/vte.mo
-share/locale/mi/LC_MESSAGES/vte.mo
-share/locale/mk/LC_MESSAGES/vte.mo
-share/locale/ml/LC_MESSAGES/vte.mo
-share/locale/mn/LC_MESSAGES/vte.mo
-share/locale/mr/LC_MESSAGES/vte.mo
-share/locale/ms/LC_MESSAGES/vte.mo
-share/locale/nb/LC_MESSAGES/vte.mo
-share/locale/ne/LC_MESSAGES/vte.mo
-share/locale/nds/LC_MESSAGES/vte.mo
-share/locale/nl/LC_MESSAGES/vte.mo
-share/locale/nn/LC_MESSAGES/vte.mo
-share/locale/oc/LC_MESSAGES/vte.mo
-share/locale/or/LC_MESSAGES/vte.mo
-share/locale/pa/LC_MESSAGES/vte.mo
-share/locale/pl/LC_MESSAGES/vte.mo
-share/locale/pt/LC_MESSAGES/vte.mo
-share/locale/pt_BR/LC_MESSAGES/vte.mo
-share/locale/ro/LC_MESSAGES/vte.mo
-share/locale/ru/LC_MESSAGES/vte.mo
-share/locale/rw/LC_MESSAGES/vte.mo
-share/locale/si/LC_MESSAGES/vte.mo
-share/locale/sk/LC_MESSAGES/vte.mo
-share/locale/sl/LC_MESSAGES/vte.mo
-share/locale/sq/LC_MESSAGES/vte.mo
-share/locale/sr/LC_MESSAGES/vte.mo
-share/locale/sr@latin/LC_MESSAGES/vte.mo
-share/locale/sv/LC_MESSAGES/vte.mo
-share/locale/ta/LC_MESSAGES/vte.mo
-share/locale/te/LC_MESSAGES/vte.mo
-share/locale/th/LC_MESSAGES/vte.mo
-share/locale/tr/LC_MESSAGES/vte.mo
-share/locale/ug/LC_MESSAGES/vte.mo
-share/locale/uk/LC_MESSAGES/vte.mo
-share/locale/vi/LC_MESSAGES/vte.mo
-share/locale/wa/LC_MESSAGES/vte.mo
-share/locale/xh/LC_MESSAGES/vte.mo
-share/locale/zh_CN/LC_MESSAGES/vte.mo
-share/locale/zh_HK/LC_MESSAGES/vte.mo
-share/locale/zh_TW/LC_MESSAGES/vte.mo
+share/locale/am/LC_MESSAGES/vte-0.0.mo
+share/locale/ang/LC_MESSAGES/vte-0.0.mo
+share/locale/ar/LC_MESSAGES/vte-0.0.mo
+share/locale/as/LC_MESSAGES/vte-0.0.mo
+share/locale/ast/LC_MESSAGES/vte-0.0.mo
+share/locale/az/LC_MESSAGES/vte-0.0.mo
+share/locale/be/LC_MESSAGES/vte-0.0.mo
+share/locale/be@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/bg/LC_MESSAGES/vte-0.0.mo
+share/locale/bn/LC_MESSAGES/vte-0.0.mo
+share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo
+share/locale/bs/LC_MESSAGES/vte-0.0.mo
+share/locale/ca/LC_MESSAGES/vte-0.0.mo
+share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo
+share/locale/cs/LC_MESSAGES/vte-0.0.mo
+share/locale/cy/LC_MESSAGES/vte-0.0.mo
+share/locale/da/LC_MESSAGES/vte-0.0.mo
+share/locale/de/LC_MESSAGES/vte-0.0.mo
+share/locale/dz/LC_MESSAGES/vte-0.0.mo
+share/locale/el/LC_MESSAGES/vte-0.0.mo
+share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo
+share/locale/en_CA/LC_MESSAGES/vte-0.0.mo
+share/locale/en_GB/LC_MESSAGES/vte-0.0.mo
+share/locale/eo/LC_MESSAGES/vte-0.0.mo
+share/locale/es/LC_MESSAGES/vte-0.0.mo
+share/locale/et/LC_MESSAGES/vte-0.0.mo
+share/locale/eu/LC_MESSAGES/vte-0.0.mo
+share/locale/fa/LC_MESSAGES/vte-0.0.mo
+share/locale/fi/LC_MESSAGES/vte-0.0.mo
+share/locale/fr/LC_MESSAGES/vte-0.0.mo
+share/locale/ga/LC_MESSAGES/vte-0.0.mo
+share/locale/gl/LC_MESSAGES/vte-0.0.mo
+share/locale/gu/LC_MESSAGES/vte-0.0.mo
+share/locale/he/LC_MESSAGES/vte-0.0.mo
+share/locale/hi/LC_MESSAGES/vte-0.0.mo
+share/locale/hr/LC_MESSAGES/vte-0.0.mo
+share/locale/hu/LC_MESSAGES/vte-0.0.mo
+share/locale/id/LC_MESSAGES/vte-0.0.mo
+share/locale/is/LC_MESSAGES/vte-0.0.mo
+share/locale/it/LC_MESSAGES/vte-0.0.mo
+share/locale/ja/LC_MESSAGES/vte-0.0.mo
+share/locale/ka/LC_MESSAGES/vte-0.0.mo
+share/locale/kn/LC_MESSAGES/vte-0.0.mo
+share/locale/ko/LC_MESSAGES/vte-0.0.mo
+share/locale/ku/LC_MESSAGES/vte-0.0.mo
+share/locale/ky/LC_MESSAGES/vte-0.0.mo
+share/locale/li/LC_MESSAGES/vte-0.0.mo
+share/locale/lt/LC_MESSAGES/vte-0.0.mo
+share/locale/lv/LC_MESSAGES/vte-0.0.mo
+share/locale/mai/LC_MESSAGES/vte-0.0.mo
+share/locale/mi/LC_MESSAGES/vte-0.0.mo
+share/locale/mk/LC_MESSAGES/vte-0.0.mo
+share/locale/ml/LC_MESSAGES/vte-0.0.mo
+share/locale/mn/LC_MESSAGES/vte-0.0.mo
+share/locale/mr/LC_MESSAGES/vte-0.0.mo
+share/locale/ms/LC_MESSAGES/vte-0.0.mo
+share/locale/nb/LC_MESSAGES/vte-0.0.mo
+share/locale/ne/LC_MESSAGES/vte-0.0.mo
+share/locale/nds/LC_MESSAGES/vte-0.0.mo
+share/locale/nl/LC_MESSAGES/vte-0.0.mo
+share/locale/nn/LC_MESSAGES/vte-0.0.mo
+share/locale/oc/LC_MESSAGES/vte-0.0.mo
+share/locale/or/LC_MESSAGES/vte-0.0.mo
+share/locale/pa/LC_MESSAGES/vte-0.0.mo
+share/locale/pl/LC_MESSAGES/vte-0.0.mo
+share/locale/pt/LC_MESSAGES/vte-0.0.mo
+share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo
+share/locale/ro/LC_MESSAGES/vte-0.0.mo
+share/locale/ru/LC_MESSAGES/vte-0.0.mo
+share/locale/rw/LC_MESSAGES/vte-0.0.mo
+share/locale/si/LC_MESSAGES/vte-0.0.mo
+share/locale/sk/LC_MESSAGES/vte-0.0.mo
+share/locale/sl/LC_MESSAGES/vte-0.0.mo
+share/locale/sq/LC_MESSAGES/vte-0.0.mo
+share/locale/sr/LC_MESSAGES/vte-0.0.mo
+share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/sv/LC_MESSAGES/vte-0.0.mo
+share/locale/ta/LC_MESSAGES/vte-0.0.mo
+share/locale/te/LC_MESSAGES/vte-0.0.mo
+share/locale/th/LC_MESSAGES/vte-0.0.mo
+share/locale/tr/LC_MESSAGES/vte-0.0.mo
+share/locale/ug/LC_MESSAGES/vte-0.0.mo
+share/locale/uk/LC_MESSAGES/vte-0.0.mo
+share/locale/vi/LC_MESSAGES/vte-0.0.mo
+share/locale/wa/LC_MESSAGES/vte-0.0.mo
+share/locale/xh/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo
%%DATADIR%%/termcap/xterm
@dirrm %%DATADIR%%/termcap
@dirrm %%DATADIR%%
-@dirrm lib/vte
-@dirrm include/vte
+@dirrm lib/vte-0.0
+@dirrm include/vte-0.0/vte
+@dirrm include/vte-0.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES