From aa3322163fb47bfa47010c767684a52b506b03c0 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 20 Nov 2000 18:06:10 +0000 Subject: [PATCH] Update to 1.3.2. --- x11-toolkits/gtk13/Makefile | 7 +- x11-toolkits/gtk13/distinfo | 2 +- x11-toolkits/gtk13/files/patch-af | 11 --- x11-toolkits/gtk13/files/patch-ag | 32 ++---- x11-toolkits/gtk13/files/patch-ah | 12 +-- x11-toolkits/gtk13/files/patch-ai | 8 +- x11-toolkits/gtk13/files/patch-aj | 11 +++ x11-toolkits/gtk13/files/patch-ak | 11 +++ x11-toolkits/gtk13/pkg-plist | 158 +++++++++++++----------------- x11-toolkits/gtk20/Makefile | 7 +- x11-toolkits/gtk20/distinfo | 2 +- x11-toolkits/gtk20/files/patch-af | 11 --- x11-toolkits/gtk20/files/patch-ag | 32 ++---- x11-toolkits/gtk20/files/patch-ah | 12 +-- x11-toolkits/gtk20/files/patch-ai | 8 +- x11-toolkits/gtk20/files/patch-aj | 11 +++ x11-toolkits/gtk20/files/patch-ak | 11 +++ x11-toolkits/gtk20/pkg-plist | 158 +++++++++++++----------------- x11-toolkits/gtk30/Makefile | 7 +- x11-toolkits/gtk30/distinfo | 2 +- x11-toolkits/gtk30/files/patch-af | 11 --- x11-toolkits/gtk30/files/patch-ag | 32 ++---- x11-toolkits/gtk30/files/patch-ah | 12 +-- x11-toolkits/gtk30/files/patch-ai | 8 +- x11-toolkits/gtk30/files/patch-aj | 11 +++ x11-toolkits/gtk30/files/patch-ak | 11 +++ x11-toolkits/gtk30/pkg-plist | 158 +++++++++++++----------------- 27 files changed, 336 insertions(+), 420 deletions(-) delete mode 100644 x11-toolkits/gtk13/files/patch-af create mode 100644 x11-toolkits/gtk13/files/patch-aj create mode 100644 x11-toolkits/gtk13/files/patch-ak delete mode 100644 x11-toolkits/gtk20/files/patch-af create mode 100644 x11-toolkits/gtk20/files/patch-aj create mode 100644 x11-toolkits/gtk20/files/patch-ak delete mode 100644 x11-toolkits/gtk30/files/patch-af create mode 100644 x11-toolkits/gtk30/files/patch-aj create mode 100644 x11-toolkits/gtk30/files/patch-ak diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 0bf1478e75f5..988c861bbed1 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.3/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \ @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.org NO_LATEST_LINK= "Unstable, development version." -LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ +LIB_DEPENDS= glib-1.3.2:${PORTSDIR}/devel/glib13 \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -29,8 +29,9 @@ USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= GTK_VERSION="${PORTVERSION}" MAN1= gtk-config-2.0.1 diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index d736c80bf014..79177b300d22 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.1.tar.gz) = 4e790ba91e04bfa2e9967b9b03d882f1 +MD5 (gtk+-1.3.2.tar.gz) = a5d03294104fb4950e93114931209128 diff --git a/x11-toolkits/gtk13/files/patch-af b/x11-toolkits/gtk13/files/patch-af deleted file mode 100644 index 355c5622c3bb..000000000000 --- a/x11-toolkits/gtk13/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/gtkrc.ru.orig Tue Mar 14 21:57:24 2000 -+++ gtk/gtkrc.ru Tue Jul 18 13:32:44 2000 -@@ -12,7 +12,7 @@ - style "gtk-default-ru" { - fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ -- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ -+ -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r" - } - class "GtkWidget" style "gtk-default-ru" diff --git a/x11-toolkits/gtk13/files/patch-ag b/x11-toolkits/gtk13/files/patch-ag index 7f4332a62daa..5ad8703ea846 100644 --- a/x11-toolkits/gtk13/files/patch-ag +++ b/x11-toolkits/gtk13/files/patch-ag @@ -1,29 +1,11 @@ ---- gtk/Makefile.in.orig Sat Jul 15 03:51:11 2000 -+++ gtk/Makefile.in Tue Jul 18 13:38:00 2000 -@@ -156,7 +156,7 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ +--- gtk/Makefile.in.orig Sat Nov 18 03:17:08 2000 ++++ gtk/Makefile.in Mon Nov 20 15:30:40 2000 +@@ -164,7 +164,7 @@ --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ + SUBDIRS = stock-icons + +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ gtarget = @gdktarget@ -@@ -253,7 +253,7 @@ - gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc - CLEANFILES = $(gen_sources) - --gtkconfdir = $(sysconfdir)/gtk-2.0 -+gtkconfdir = $(datadir)/themes/Default/gtk-2.0 - gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 - - -@@ -2900,7 +2900,7 @@ - uninstall-libgtk_nanox_includeHEADERS \ - uninstall-libgtk_x11_includeHEADERS uninstall-local - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11-toolkits/gtk13/files/patch-ah b/x11-toolkits/gtk13/files/patch-ah index 8686c436342a..c1c1d5f4c4ab 100644 --- a/x11-toolkits/gtk13/files/patch-ah +++ b/x11-toolkits/gtk13/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig Sat Jul 15 03:51:14 2000 -+++ docs/Makefile.in Tue Jul 18 13:45:44 2000 -@@ -116,7 +116,7 @@ +--- docs/Makefile.in.orig Sat Nov 18 03:17:12 2000 ++++ docs/Makefile.in Mon Nov 20 15:32:30 2000 +@@ -120,7 +120,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -9,14 +9,14 @@ MATH_LIB = @MATH_LIB@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ -@@ -158,13 +158,13 @@ +@@ -162,13 +162,13 @@ SUBDIRS = tutorial faq reference -man_MANS = gtk-config.1 +man_MANS = gtk-config-2.0.1 - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix + EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -25,7 +25,7 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) -@@ -187,6 +187,9 @@ +@@ -191,6 +191,9 @@ gtk-config.1: $(top_builddir)/config.status gtk-config.1.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/x11-toolkits/gtk13/files/patch-ai b/x11-toolkits/gtk13/files/patch-ai index c2e095e9fb6d..a128c58ffe80 100644 --- a/x11-toolkits/gtk13/files/patch-ai +++ b/x11-toolkits/gtk13/files/patch-ai @@ -1,10 +1,10 @@ ---- docs/reference/Makefile.in.orig Tue Jul 18 18:03:38 2000 -+++ docs/reference/Makefile.in Tue Jul 18 18:03:52 2000 -@@ -156,7 +156,7 @@ +--- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000 ++++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000 +@@ -160,7 +160,7 @@ x_libs = @x_libs@ xinput_progs = @xinput_progs@ --SUBDIRS = gdk-pixbuf +-SUBDIRS = gdk-pixbuf gdk gtk +SUBDIRS = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h diff --git a/x11-toolkits/gtk13/files/patch-aj b/x11-toolkits/gtk13/files/patch-aj new file mode 100644 index 000000000000..d28f0b867d39 --- /dev/null +++ b/x11-toolkits/gtk13/files/patch-aj @@ -0,0 +1,11 @@ +--- Makefile.in 2000/11/20 14:46:22 1.1 ++++ Makefile.in 2000/11/20 14:46:25 +@@ -493,7 +493,7 @@ + install-exec-am: install-binSCRIPTS + install-exec: install-exec-recursive + +-install-data-am: install-m4dataDATA install-pkgconfigDATA ++install-data-am: install-m4dataDATA + install-data: install-data-recursive + + install-am: all-am diff --git a/x11-toolkits/gtk13/files/patch-ak b/x11-toolkits/gtk13/files/patch-ak new file mode 100644 index 000000000000..52ac9374177d --- /dev/null +++ b/x11-toolkits/gtk13/files/patch-ak @@ -0,0 +1,11 @@ +--- gdk/Makefile.in 2000/11/20 14:59:03 1.1 ++++ gdk/Makefile.in 2000/11/20 15:01:41 +@@ -228,7 +228,7 @@ + # + # Rule to install gdkconfig.h header file + # +-configexecincludedir = $(libdir)/gtk-2.0/include ++configexecincludedir = $(prefix)/include/gtk-2.0/gtk + + BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist index 2183339b927c..5bf925ac1a89 100644 --- a/x11-toolkits/gtk13/pkg-plist +++ b/x11-toolkits/gtk13/pkg-plist @@ -1,4 +1,10 @@ bin/gtk-config-2.0 +bin/gtk-demo +bin/gtk-query-immodules-2.0 +bin/make-inline-pixbuf +etc/gtk-2.0/gtk.immodules +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-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk/gdk.h @@ -33,6 +39,7 @@ include/gtk-2.0/gdk/x11/gdkdrawable-x11.h include/gtk-2.0/gdk/x11/gdkpixmap-x11.h include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdk-pixbuf-loader.h +include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h @@ -47,8 +54,14 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertext.h +include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h +include/gtk-2.0/gtk/gtkclipboard.h include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h @@ -81,8 +94,10 @@ include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h include/gtk-2.0/gtk/gtkhsv.h +include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimcontext.h +include/gtk-2.0/gtk/gtkimmodule.h include/gtk-2.0/gtk/gtkimmulticontext.h include/gtk-2.0/gtk/gtkinputdialog.h include/gtk-2.0/gtk/gtkinvisible.h @@ -92,6 +107,7 @@ include/gtk-2.0/gtk/gtklabel.h include/gtk-2.0/gtk/gtklayout.h include/gtk-2.0/gtk/gtklist.h include/gtk-2.0/gtk/gtklistitem.h +include/gtk-2.0/gtk/gtkliststore.h include/gtk-2.0/gtk/gtkmain.h include/gtk-2.0/gtk/gtkmarshal.h include/gtk-2.0/gtk/gtkmenu.h @@ -99,9 +115,12 @@ include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenufactory.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodelsimple.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h @@ -125,29 +144,32 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h include/gtk-2.0/gtk/gtkstatusbar.h +include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h include/gtk-2.0/gtk/gtktext.h -include/gtk-2.0/gtk/gtktextbtree.h include/gtk-2.0/gtk/gtktextbuffer.h include/gtk-2.0/gtk/gtktextchild.h include/gtk-2.0/gtk/gtktextdisplay.h include/gtk-2.0/gtk/gtktextiter.h include/gtk-2.0/gtk/gtktextlayout.h include/gtk-2.0/gtk/gtktextmark.h -include/gtk-2.0/gtk/gtktextsegment.h include/gtk-2.0/gtk/gtktexttag.h include/gtk-2.0/gtk/gtktexttagtable.h -include/gtk-2.0/gtk/gtktexttypes.h include/gtk-2.0/gtk/gtktextview.h -include/gtk-2.0/gtk/gtkthemes.h include/gtk-2.0/gtk/gtktipsquery.h include/gtk-2.0/gtk/gtktogglebutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h include/gtk-2.0/gtk/gtktreeitem.h +include/gtk-2.0/gtk/gtktreemodel.h +include/gtk-2.0/gtk/gtktreemodelsort.h +include/gtk-2.0/gtk/gtktreeselection.h +include/gtk-2.0/gtk/gtktreestore.h +include/gtk-2.0/gtk/gtktreeview.h +include/gtk-2.0/gtk/gtktreeviewcolumn.h include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h @@ -160,58 +182,58 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so.1 -lib/gtk-2.0/include/gdkconfig.h +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.so -lib/libgdk-x11-1.3.so.1 +lib/libgdk-x11-1.3.so.2 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.1 +lib/libgdk_pixbuf-1.3.so.2 +lib/libgdk_pixbuf_xlib-1.3.a +lib/libgdk_pixbuf_xlib-1.3.so +lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.1 +lib/libgtk-x11-1.3.so.2 share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/item_factory.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/textview.c share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo share/locale/da/LC_MESSAGES/gtk20.mo share/locale/de/LC_MESSAGES/gtk20.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en@IPA/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20.mo share/locale/es/LC_MESSAGES/gtk20.mo share/locale/et/LC_MESSAGES/gtk20.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20.mo share/locale/fi/LC_MESSAGES/gtk20.mo share/locale/fr/LC_MESSAGES/gtk20.mo share/locale/ga/LC_MESSAGES/gtk20.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20.mo share/locale/hr/LC_MESSAGES/gtk20.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20.mo share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo @@ -225,71 +247,27 @@ share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sp/LC_MESSAGES/gtk20.mo +share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/gtk20.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0/gtkrc -share/themes/Default/gtk-2.0/gtkrc.be -share/themes/Default/gtk-2.0/gtkrc.bg -share/themes/Default/gtk-2.0/gtkrc.bg_BG.iso88595 -share/themes/Default/gtk-2.0/gtkrc.cp1251 -share/themes/Default/gtk-2.0/gtkrc.cs -share/themes/Default/gtk-2.0/gtkrc.cy -share/themes/Default/gtk-2.0/gtkrc.el -share/themes/Default/gtk-2.0/gtkrc.eo -share/themes/Default/gtk-2.0/gtkrc.et -share/themes/Default/gtk-2.0/gtkrc.ga -share/themes/Default/gtk-2.0/gtkrc.he -share/themes/Default/gtk-2.0/gtkrc.hr -share/themes/Default/gtk-2.0/gtkrc.hu -share/themes/Default/gtk-2.0/gtkrc.hy -share/themes/Default/gtk-2.0/gtkrc.iso-8859-13 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-14 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-15 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-2 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-5 -share/themes/Default/gtk-2.0/gtkrc.ja -share/themes/Default/gtk-2.0/gtkrc.ka -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianacademy -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianps -share/themes/Default/gtk-2.0/gtkrc.ko -share/themes/Default/gtk-2.0/gtkrc.lt -share/themes/Default/gtk-2.0/gtkrc.lv -share/themes/Default/gtk-2.0/gtkrc.mk -share/themes/Default/gtk-2.0/gtkrc.pl -share/themes/Default/gtk-2.0/gtkrc.ro -share/themes/Default/gtk-2.0/gtkrc.ru -share/themes/Default/gtk-2.0/gtkrc.ru_RU.iso88595 -share/themes/Default/gtk-2.0/gtkrc.sk -share/themes/Default/gtk-2.0/gtkrc.sl -share/themes/Default/gtk-2.0/gtkrc.sp -share/themes/Default/gtk-2.0/gtkrc.sq -share/themes/Default/gtk-2.0/gtkrc.sr -share/themes/Default/gtk-2.0/gtkrc.th -share/themes/Default/gtk-2.0/gtkrc.tr -share/themes/Default/gtk-2.0/gtkrc.uk -share/themes/Default/gtk-2.0/gtkrc.vi -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn5712 -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii111 -share/themes/Default/gtk-2.0/gtkrc.zh_CN -share/themes/Default/gtk-2.0/gtkrc.zh_TW.Big5 @dirrm share/themes/Default/gtk-2.0 @dirrm share/themes/Default -@dirrm share/themes -@dirrm lib/gtk-2.0/include -@dirrm lib/gtk-2.0/1.3.1/loaders -@dirrm lib/gtk-2.0/1.3.1 +@dirrm share/gtk-2.0/demo +@dirrm share/gtk-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules +@dirrm lib/gtk-2.0/%%GTK_VERSION%% @dirrm lib/gtk-2.0 @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk/x11 +@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 -@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/* 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true +@dirrm etc/gtk-2.0 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 0bf1478e75f5..988c861bbed1 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.3/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \ @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.org NO_LATEST_LINK= "Unstable, development version." -LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ +LIB_DEPENDS= glib-1.3.2:${PORTSDIR}/devel/glib13 \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -29,8 +29,9 @@ USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= GTK_VERSION="${PORTVERSION}" MAN1= gtk-config-2.0.1 diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index d736c80bf014..79177b300d22 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.1.tar.gz) = 4e790ba91e04bfa2e9967b9b03d882f1 +MD5 (gtk+-1.3.2.tar.gz) = a5d03294104fb4950e93114931209128 diff --git a/x11-toolkits/gtk20/files/patch-af b/x11-toolkits/gtk20/files/patch-af deleted file mode 100644 index 355c5622c3bb..000000000000 --- a/x11-toolkits/gtk20/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/gtkrc.ru.orig Tue Mar 14 21:57:24 2000 -+++ gtk/gtkrc.ru Tue Jul 18 13:32:44 2000 -@@ -12,7 +12,7 @@ - style "gtk-default-ru" { - fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ -- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ -+ -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r" - } - class "GtkWidget" style "gtk-default-ru" diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index 7f4332a62daa..5ad8703ea846 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,29 +1,11 @@ ---- gtk/Makefile.in.orig Sat Jul 15 03:51:11 2000 -+++ gtk/Makefile.in Tue Jul 18 13:38:00 2000 -@@ -156,7 +156,7 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ +--- gtk/Makefile.in.orig Sat Nov 18 03:17:08 2000 ++++ gtk/Makefile.in Mon Nov 20 15:30:40 2000 +@@ -164,7 +164,7 @@ --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ + SUBDIRS = stock-icons + +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ gtarget = @gdktarget@ -@@ -253,7 +253,7 @@ - gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc - CLEANFILES = $(gen_sources) - --gtkconfdir = $(sysconfdir)/gtk-2.0 -+gtkconfdir = $(datadir)/themes/Default/gtk-2.0 - gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 - - -@@ -2900,7 +2900,7 @@ - uninstall-libgtk_nanox_includeHEADERS \ - uninstall-libgtk_x11_includeHEADERS uninstall-local - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 8686c436342a..c1c1d5f4c4ab 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig Sat Jul 15 03:51:14 2000 -+++ docs/Makefile.in Tue Jul 18 13:45:44 2000 -@@ -116,7 +116,7 @@ +--- docs/Makefile.in.orig Sat Nov 18 03:17:12 2000 ++++ docs/Makefile.in Mon Nov 20 15:32:30 2000 +@@ -120,7 +120,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -9,14 +9,14 @@ MATH_LIB = @MATH_LIB@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ -@@ -158,13 +158,13 @@ +@@ -162,13 +162,13 @@ SUBDIRS = tutorial faq reference -man_MANS = gtk-config.1 +man_MANS = gtk-config-2.0.1 - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix + EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -25,7 +25,7 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) -@@ -187,6 +187,9 @@ +@@ -191,6 +191,9 @@ gtk-config.1: $(top_builddir)/config.status gtk-config.1.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai index c2e095e9fb6d..a128c58ffe80 100644 --- a/x11-toolkits/gtk20/files/patch-ai +++ b/x11-toolkits/gtk20/files/patch-ai @@ -1,10 +1,10 @@ ---- docs/reference/Makefile.in.orig Tue Jul 18 18:03:38 2000 -+++ docs/reference/Makefile.in Tue Jul 18 18:03:52 2000 -@@ -156,7 +156,7 @@ +--- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000 ++++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000 +@@ -160,7 +160,7 @@ x_libs = @x_libs@ xinput_progs = @xinput_progs@ --SUBDIRS = gdk-pixbuf +-SUBDIRS = gdk-pixbuf gdk gtk +SUBDIRS = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h diff --git a/x11-toolkits/gtk20/files/patch-aj b/x11-toolkits/gtk20/files/patch-aj new file mode 100644 index 000000000000..d28f0b867d39 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-aj @@ -0,0 +1,11 @@ +--- Makefile.in 2000/11/20 14:46:22 1.1 ++++ Makefile.in 2000/11/20 14:46:25 +@@ -493,7 +493,7 @@ + install-exec-am: install-binSCRIPTS + install-exec: install-exec-recursive + +-install-data-am: install-m4dataDATA install-pkgconfigDATA ++install-data-am: install-m4dataDATA + install-data: install-data-recursive + + install-am: all-am diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak new file mode 100644 index 000000000000..52ac9374177d --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-ak @@ -0,0 +1,11 @@ +--- gdk/Makefile.in 2000/11/20 14:59:03 1.1 ++++ gdk/Makefile.in 2000/11/20 15:01:41 +@@ -228,7 +228,7 @@ + # + # Rule to install gdkconfig.h header file + # +-configexecincludedir = $(libdir)/gtk-2.0/include ++configexecincludedir = $(prefix)/include/gtk-2.0/gtk + + BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 2183339b927c..5bf925ac1a89 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,4 +1,10 @@ bin/gtk-config-2.0 +bin/gtk-demo +bin/gtk-query-immodules-2.0 +bin/make-inline-pixbuf +etc/gtk-2.0/gtk.immodules +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-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk/gdk.h @@ -33,6 +39,7 @@ include/gtk-2.0/gdk/x11/gdkdrawable-x11.h include/gtk-2.0/gdk/x11/gdkpixmap-x11.h include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdk-pixbuf-loader.h +include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h @@ -47,8 +54,14 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertext.h +include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h +include/gtk-2.0/gtk/gtkclipboard.h include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h @@ -81,8 +94,10 @@ include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h include/gtk-2.0/gtk/gtkhsv.h +include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimcontext.h +include/gtk-2.0/gtk/gtkimmodule.h include/gtk-2.0/gtk/gtkimmulticontext.h include/gtk-2.0/gtk/gtkinputdialog.h include/gtk-2.0/gtk/gtkinvisible.h @@ -92,6 +107,7 @@ include/gtk-2.0/gtk/gtklabel.h include/gtk-2.0/gtk/gtklayout.h include/gtk-2.0/gtk/gtklist.h include/gtk-2.0/gtk/gtklistitem.h +include/gtk-2.0/gtk/gtkliststore.h include/gtk-2.0/gtk/gtkmain.h include/gtk-2.0/gtk/gtkmarshal.h include/gtk-2.0/gtk/gtkmenu.h @@ -99,9 +115,12 @@ include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenufactory.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodelsimple.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h @@ -125,29 +144,32 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h include/gtk-2.0/gtk/gtkstatusbar.h +include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h include/gtk-2.0/gtk/gtktext.h -include/gtk-2.0/gtk/gtktextbtree.h include/gtk-2.0/gtk/gtktextbuffer.h include/gtk-2.0/gtk/gtktextchild.h include/gtk-2.0/gtk/gtktextdisplay.h include/gtk-2.0/gtk/gtktextiter.h include/gtk-2.0/gtk/gtktextlayout.h include/gtk-2.0/gtk/gtktextmark.h -include/gtk-2.0/gtk/gtktextsegment.h include/gtk-2.0/gtk/gtktexttag.h include/gtk-2.0/gtk/gtktexttagtable.h -include/gtk-2.0/gtk/gtktexttypes.h include/gtk-2.0/gtk/gtktextview.h -include/gtk-2.0/gtk/gtkthemes.h include/gtk-2.0/gtk/gtktipsquery.h include/gtk-2.0/gtk/gtktogglebutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h include/gtk-2.0/gtk/gtktreeitem.h +include/gtk-2.0/gtk/gtktreemodel.h +include/gtk-2.0/gtk/gtktreemodelsort.h +include/gtk-2.0/gtk/gtktreeselection.h +include/gtk-2.0/gtk/gtktreestore.h +include/gtk-2.0/gtk/gtktreeview.h +include/gtk-2.0/gtk/gtktreeviewcolumn.h include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h @@ -160,58 +182,58 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so.1 -lib/gtk-2.0/include/gdkconfig.h +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.so -lib/libgdk-x11-1.3.so.1 +lib/libgdk-x11-1.3.so.2 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.1 +lib/libgdk_pixbuf-1.3.so.2 +lib/libgdk_pixbuf_xlib-1.3.a +lib/libgdk_pixbuf_xlib-1.3.so +lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.1 +lib/libgtk-x11-1.3.so.2 share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/item_factory.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/textview.c share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo share/locale/da/LC_MESSAGES/gtk20.mo share/locale/de/LC_MESSAGES/gtk20.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en@IPA/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20.mo share/locale/es/LC_MESSAGES/gtk20.mo share/locale/et/LC_MESSAGES/gtk20.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20.mo share/locale/fi/LC_MESSAGES/gtk20.mo share/locale/fr/LC_MESSAGES/gtk20.mo share/locale/ga/LC_MESSAGES/gtk20.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20.mo share/locale/hr/LC_MESSAGES/gtk20.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20.mo share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo @@ -225,71 +247,27 @@ share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sp/LC_MESSAGES/gtk20.mo +share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/gtk20.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0/gtkrc -share/themes/Default/gtk-2.0/gtkrc.be -share/themes/Default/gtk-2.0/gtkrc.bg -share/themes/Default/gtk-2.0/gtkrc.bg_BG.iso88595 -share/themes/Default/gtk-2.0/gtkrc.cp1251 -share/themes/Default/gtk-2.0/gtkrc.cs -share/themes/Default/gtk-2.0/gtkrc.cy -share/themes/Default/gtk-2.0/gtkrc.el -share/themes/Default/gtk-2.0/gtkrc.eo -share/themes/Default/gtk-2.0/gtkrc.et -share/themes/Default/gtk-2.0/gtkrc.ga -share/themes/Default/gtk-2.0/gtkrc.he -share/themes/Default/gtk-2.0/gtkrc.hr -share/themes/Default/gtk-2.0/gtkrc.hu -share/themes/Default/gtk-2.0/gtkrc.hy -share/themes/Default/gtk-2.0/gtkrc.iso-8859-13 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-14 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-15 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-2 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-5 -share/themes/Default/gtk-2.0/gtkrc.ja -share/themes/Default/gtk-2.0/gtkrc.ka -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianacademy -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianps -share/themes/Default/gtk-2.0/gtkrc.ko -share/themes/Default/gtk-2.0/gtkrc.lt -share/themes/Default/gtk-2.0/gtkrc.lv -share/themes/Default/gtk-2.0/gtkrc.mk -share/themes/Default/gtk-2.0/gtkrc.pl -share/themes/Default/gtk-2.0/gtkrc.ro -share/themes/Default/gtk-2.0/gtkrc.ru -share/themes/Default/gtk-2.0/gtkrc.ru_RU.iso88595 -share/themes/Default/gtk-2.0/gtkrc.sk -share/themes/Default/gtk-2.0/gtkrc.sl -share/themes/Default/gtk-2.0/gtkrc.sp -share/themes/Default/gtk-2.0/gtkrc.sq -share/themes/Default/gtk-2.0/gtkrc.sr -share/themes/Default/gtk-2.0/gtkrc.th -share/themes/Default/gtk-2.0/gtkrc.tr -share/themes/Default/gtk-2.0/gtkrc.uk -share/themes/Default/gtk-2.0/gtkrc.vi -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn5712 -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii111 -share/themes/Default/gtk-2.0/gtkrc.zh_CN -share/themes/Default/gtk-2.0/gtkrc.zh_TW.Big5 @dirrm share/themes/Default/gtk-2.0 @dirrm share/themes/Default -@dirrm share/themes -@dirrm lib/gtk-2.0/include -@dirrm lib/gtk-2.0/1.3.1/loaders -@dirrm lib/gtk-2.0/1.3.1 +@dirrm share/gtk-2.0/demo +@dirrm share/gtk-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules +@dirrm lib/gtk-2.0/%%GTK_VERSION%% @dirrm lib/gtk-2.0 @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk/x11 +@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 -@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/* 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true +@dirrm etc/gtk-2.0 diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 0bf1478e75f5..988c861bbed1 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.3/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \ @@ -17,7 +17,7 @@ MAINTAINER= vanilla@FreeBSD.org NO_LATEST_LINK= "Unstable, development version." -LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ +LIB_DEPENDS= glib-1.3.2:${PORTSDIR}/devel/glib13 \ pango.0:${PORTSDIR}/x11-toolkits/pango \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -29,8 +29,9 @@ USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +PLIST_SUB= GTK_VERSION="${PORTVERSION}" MAN1= gtk-config-2.0.1 diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index d736c80bf014..79177b300d22 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.3.1.tar.gz) = 4e790ba91e04bfa2e9967b9b03d882f1 +MD5 (gtk+-1.3.2.tar.gz) = a5d03294104fb4950e93114931209128 diff --git a/x11-toolkits/gtk30/files/patch-af b/x11-toolkits/gtk30/files/patch-af deleted file mode 100644 index 355c5622c3bb..000000000000 --- a/x11-toolkits/gtk30/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/gtkrc.ru.orig Tue Mar 14 21:57:24 2000 -+++ gtk/gtkrc.ru Tue Jul 18 13:32:44 2000 -@@ -12,7 +12,7 @@ - style "gtk-default-ru" { - fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\ -- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ -+ -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\ - -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r" - } - class "GtkWidget" style "gtk-default-ru" diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag index 7f4332a62daa..5ad8703ea846 100644 --- a/x11-toolkits/gtk30/files/patch-ag +++ b/x11-toolkits/gtk30/files/patch-ag @@ -1,29 +1,11 @@ ---- gtk/Makefile.in.orig Sat Jul 15 03:51:11 2000 -+++ gtk/Makefile.in Tue Jul 18 13:38:00 2000 -@@ -156,7 +156,7 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ +--- gtk/Makefile.in.orig Sat Nov 18 03:17:08 2000 ++++ gtk/Makefile.in Mon Nov 20 15:30:40 2000 +@@ -164,7 +164,7 @@ --INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ + SUBDIRS = stock-icons + +-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ ++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ gtarget = @gdktarget@ -@@ -253,7 +253,7 @@ - gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc - CLEANFILES = $(gen_sources) - --gtkconfdir = $(sysconfdir)/gtk-2.0 -+gtkconfdir = $(datadir)/themes/Default/gtk-2.0 - gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 - - -@@ -2900,7 +2900,7 @@ - uninstall-libgtk_nanox_includeHEADERS \ - uninstall-libgtk_x11_includeHEADERS uninstall-local - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah index 8686c436342a..c1c1d5f4c4ab 100644 --- a/x11-toolkits/gtk30/files/patch-ah +++ b/x11-toolkits/gtk30/files/patch-ah @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig Sat Jul 15 03:51:14 2000 -+++ docs/Makefile.in Tue Jul 18 13:45:44 2000 -@@ -116,7 +116,7 @@ +--- docs/Makefile.in.orig Sat Nov 18 03:17:12 2000 ++++ docs/Makefile.in Mon Nov 20 15:32:30 2000 +@@ -120,7 +120,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ @@ -9,14 +9,14 @@ MATH_LIB = @MATH_LIB@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ -@@ -158,13 +158,13 @@ +@@ -162,13 +162,13 @@ SUBDIRS = tutorial faq reference -man_MANS = gtk-config.1 +man_MANS = gtk-config-2.0.1 - EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix + EXTRA_DIST = Changes-1.2.txt Changes-2.0.txt debugging.txt defsformat.txt developers.txt dnd_internals.txt make-todo refcounting.txt styles.txt text_widget.txt widget_system.txt generation.txt gtk-config.txt gtk-config.1.in gtkdocs_fix mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -25,7 +25,7 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) -@@ -187,6 +187,9 @@ +@@ -191,6 +191,9 @@ gtk-config.1: $(top_builddir)/config.status gtk-config.1.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai index c2e095e9fb6d..a128c58ffe80 100644 --- a/x11-toolkits/gtk30/files/patch-ai +++ b/x11-toolkits/gtk30/files/patch-ai @@ -1,10 +1,10 @@ ---- docs/reference/Makefile.in.orig Tue Jul 18 18:03:38 2000 -+++ docs/reference/Makefile.in Tue Jul 18 18:03:52 2000 -@@ -156,7 +156,7 @@ +--- docs/reference/Makefile.in.orig Sat Nov 18 03:17:56 2000 ++++ docs/reference/Makefile.in Mon Nov 20 15:33:25 2000 +@@ -160,7 +160,7 @@ x_libs = @x_libs@ xinput_progs = @xinput_progs@ --SUBDIRS = gdk-pixbuf +-SUBDIRS = gdk-pixbuf gdk gtk +SUBDIRS = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h diff --git a/x11-toolkits/gtk30/files/patch-aj b/x11-toolkits/gtk30/files/patch-aj new file mode 100644 index 000000000000..d28f0b867d39 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-aj @@ -0,0 +1,11 @@ +--- Makefile.in 2000/11/20 14:46:22 1.1 ++++ Makefile.in 2000/11/20 14:46:25 +@@ -493,7 +493,7 @@ + install-exec-am: install-binSCRIPTS + install-exec: install-exec-recursive + +-install-data-am: install-m4dataDATA install-pkgconfigDATA ++install-data-am: install-m4dataDATA + install-data: install-data-recursive + + install-am: all-am diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak new file mode 100644 index 000000000000..52ac9374177d --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-ak @@ -0,0 +1,11 @@ +--- gdk/Makefile.in 2000/11/20 14:59:03 1.1 ++++ gdk/Makefile.in 2000/11/20 15:01:41 +@@ -228,7 +228,7 @@ + # + # Rule to install gdkconfig.h header file + # +-configexecincludedir = $(libdir)/gtk-2.0/include ++configexecincludedir = $(prefix)/include/gtk-2.0/gtk + + BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 2183339b927c..5bf925ac1a89 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,4 +1,10 @@ bin/gtk-config-2.0 +bin/gtk-demo +bin/gtk-query-immodules-2.0 +bin/make-inline-pixbuf +etc/gtk-2.0/gtk.immodules +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-features.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk/gdk.h @@ -33,6 +39,7 @@ include/gtk-2.0/gdk/x11/gdkdrawable-x11.h include/gtk-2.0/gdk/x11/gdkpixmap-x11.h include/gtk-2.0/gdk/x11/gdkwindow-x11.h include/gtk-2.0/gtk/gdk-pixbuf-loader.h +include/gtk-2.0/gtk/gdkconfig.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h @@ -47,8 +54,14 @@ include/gtk-2.0/gtk/gtkbindings.h include/gtk-2.0/gtk/gtkbox.h include/gtk-2.0/gtk/gtkbutton.h include/gtk-2.0/gtk/gtkcalendar.h +include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertext.h +include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h +include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h include/gtk-2.0/gtk/gtkcheckmenuitem.h +include/gtk-2.0/gtk/gtkclipboard.h include/gtk-2.0/gtk/gtkclist.h include/gtk-2.0/gtk/gtkcolorsel.h include/gtk-2.0/gtk/gtkcolorseldialog.h @@ -81,8 +94,10 @@ include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h include/gtk-2.0/gtk/gtkhsv.h +include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkimage.h include/gtk-2.0/gtk/gtkimcontext.h +include/gtk-2.0/gtk/gtkimmodule.h include/gtk-2.0/gtk/gtkimmulticontext.h include/gtk-2.0/gtk/gtkinputdialog.h include/gtk-2.0/gtk/gtkinvisible.h @@ -92,6 +107,7 @@ include/gtk-2.0/gtk/gtklabel.h include/gtk-2.0/gtk/gtklayout.h include/gtk-2.0/gtk/gtklist.h include/gtk-2.0/gtk/gtklistitem.h +include/gtk-2.0/gtk/gtkliststore.h include/gtk-2.0/gtk/gtkmain.h include/gtk-2.0/gtk/gtkmarshal.h include/gtk-2.0/gtk/gtkmenu.h @@ -99,9 +115,12 @@ include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenufactory.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodelsimple.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h +include/gtk-2.0/gtk/gtkoldeditable.h include/gtk-2.0/gtk/gtkoptionmenu.h include/gtk-2.0/gtk/gtkpacker.h include/gtk-2.0/gtk/gtkpaned.h @@ -125,29 +144,32 @@ include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksocket.h include/gtk-2.0/gtk/gtkspinbutton.h include/gtk-2.0/gtk/gtkstatusbar.h +include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h include/gtk-2.0/gtk/gtktext.h -include/gtk-2.0/gtk/gtktextbtree.h include/gtk-2.0/gtk/gtktextbuffer.h include/gtk-2.0/gtk/gtktextchild.h include/gtk-2.0/gtk/gtktextdisplay.h include/gtk-2.0/gtk/gtktextiter.h include/gtk-2.0/gtk/gtktextlayout.h include/gtk-2.0/gtk/gtktextmark.h -include/gtk-2.0/gtk/gtktextsegment.h include/gtk-2.0/gtk/gtktexttag.h include/gtk-2.0/gtk/gtktexttagtable.h -include/gtk-2.0/gtk/gtktexttypes.h include/gtk-2.0/gtk/gtktextview.h -include/gtk-2.0/gtk/gtkthemes.h include/gtk-2.0/gtk/gtktipsquery.h include/gtk-2.0/gtk/gtktogglebutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h include/gtk-2.0/gtk/gtktreeitem.h +include/gtk-2.0/gtk/gtktreemodel.h +include/gtk-2.0/gtk/gtktreemodelsort.h +include/gtk-2.0/gtk/gtktreeselection.h +include/gtk-2.0/gtk/gtktreestore.h +include/gtk-2.0/gtk/gtktreeview.h +include/gtk-2.0/gtk/gtktreeviewcolumn.h include/gtk-2.0/gtk/gtktypebuiltins.h include/gtk-2.0/gtk/gtktypeutils.h include/gtk-2.0/gtk/gtkvbbox.h @@ -160,58 +182,58 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so.1 -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.a -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so -lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so.1 -lib/gtk-2.0/include/gdkconfig.h +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so +lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.so -lib/libgdk-x11-1.3.so.1 +lib/libgdk-x11-1.3.so.2 lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.so -lib/libgdk_pixbuf-1.3.so.1 +lib/libgdk_pixbuf-1.3.so.2 +lib/libgdk_pixbuf_xlib-1.3.a +lib/libgdk_pixbuf_xlib-1.3.so +lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.so -lib/libgtk-x11-1.3.so.1 +lib/libgtk-x11-1.3.so.2 share/aclocal/gtk-2.0.m4 +share/gtk-2.0/demo/button_box.c +share/gtk-2.0/demo/item_factory.c +share/gtk-2.0/demo/menus.c +share/gtk-2.0/demo/panes.c +share/gtk-2.0/demo/textview.c share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo share/locale/da/LC_MESSAGES/gtk20.mo share/locale/de/LC_MESSAGES/gtk20.mo share/locale/el/LC_MESSAGES/gtk20.mo +share/locale/en@IPA/LC_MESSAGES/gtk20.mo +share/locale/en_GB/LC_MESSAGES/gtk20.mo share/locale/es/LC_MESSAGES/gtk20.mo share/locale/et/LC_MESSAGES/gtk20.mo share/locale/eu/LC_MESSAGES/gtk20.mo +share/locale/fa/LC_MESSAGES/gtk20.mo share/locale/fi/LC_MESSAGES/gtk20.mo share/locale/fr/LC_MESSAGES/gtk20.mo share/locale/ga/LC_MESSAGES/gtk20.mo share/locale/gl/LC_MESSAGES/gtk20.mo +share/locale/he/LC_MESSAGES/gtk20.mo share/locale/hr/LC_MESSAGES/gtk20.mo share/locale/hu/LC_MESSAGES/gtk20.mo +share/locale/ia/LC_MESSAGES/gtk20.mo share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo @@ -225,71 +247,27 @@ share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sp/LC_MESSAGES/gtk20.mo +share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/gtk20.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gtk20.mo +share/locale/zh_CN/LC_MESSAGES/gtk20.mo +share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0/gtkrc -share/themes/Default/gtk-2.0/gtkrc.be -share/themes/Default/gtk-2.0/gtkrc.bg -share/themes/Default/gtk-2.0/gtkrc.bg_BG.iso88595 -share/themes/Default/gtk-2.0/gtkrc.cp1251 -share/themes/Default/gtk-2.0/gtkrc.cs -share/themes/Default/gtk-2.0/gtkrc.cy -share/themes/Default/gtk-2.0/gtkrc.el -share/themes/Default/gtk-2.0/gtkrc.eo -share/themes/Default/gtk-2.0/gtkrc.et -share/themes/Default/gtk-2.0/gtkrc.ga -share/themes/Default/gtk-2.0/gtkrc.he -share/themes/Default/gtk-2.0/gtkrc.hr -share/themes/Default/gtk-2.0/gtkrc.hu -share/themes/Default/gtk-2.0/gtkrc.hy -share/themes/Default/gtk-2.0/gtkrc.iso-8859-13 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-14 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-15 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-2 -share/themes/Default/gtk-2.0/gtkrc.iso-8859-5 -share/themes/Default/gtk-2.0/gtkrc.ja -share/themes/Default/gtk-2.0/gtkrc.ka -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianacademy -share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianps -share/themes/Default/gtk-2.0/gtkrc.ko -share/themes/Default/gtk-2.0/gtkrc.lt -share/themes/Default/gtk-2.0/gtkrc.lv -share/themes/Default/gtk-2.0/gtkrc.mk -share/themes/Default/gtk-2.0/gtkrc.pl -share/themes/Default/gtk-2.0/gtkrc.ro -share/themes/Default/gtk-2.0/gtkrc.ru -share/themes/Default/gtk-2.0/gtkrc.ru_RU.iso88595 -share/themes/Default/gtk-2.0/gtkrc.sk -share/themes/Default/gtk-2.0/gtkrc.sl -share/themes/Default/gtk-2.0/gtkrc.sp -share/themes/Default/gtk-2.0/gtkrc.sq -share/themes/Default/gtk-2.0/gtkrc.sr -share/themes/Default/gtk-2.0/gtkrc.th -share/themes/Default/gtk-2.0/gtkrc.tr -share/themes/Default/gtk-2.0/gtkrc.uk -share/themes/Default/gtk-2.0/gtkrc.vi -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn -share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn5712 -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii -share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii111 -share/themes/Default/gtk-2.0/gtkrc.zh_CN -share/themes/Default/gtk-2.0/gtkrc.zh_TW.Big5 @dirrm share/themes/Default/gtk-2.0 @dirrm share/themes/Default -@dirrm share/themes -@dirrm lib/gtk-2.0/include -@dirrm lib/gtk-2.0/1.3.1/loaders -@dirrm lib/gtk-2.0/1.3.1 +@dirrm share/gtk-2.0/demo +@dirrm share/gtk-2.0 +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders +@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules +@dirrm lib/gtk-2.0/%%GTK_VERSION%% @dirrm lib/gtk-2.0 @dirrm include/gtk-2.0/gtk @dirrm include/gtk-2.0/gdk/x11 +@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 -@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/* 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true +@dirrm etc/gtk-2.0