summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-04-01 18:15:41 +0000
committerjmmv <jmmv>2004-04-01 18:15:41 +0000
commitc27bf8c32d91b87cab64556bf845cf256d127ed1 (patch)
treebfb4d6a6fcd8c316a321c71006298d53249fe4b0 /x11
parent0d107054eebdb83a7ba7683be16380ec82b763d9 (diff)
downloadpkgsrc-c27bf8c32d91b87cab64556bf845cf256d127ed1.tar.gz
Update to 2.4.0:
GTK+-2.4 adds significant new functionality while maintaining source and binary compatibility with GTK+-2.2. Highlights of new features and improvements in GTK+-2.4 are: New file selector widget The new GtkFileChooser widgets provide a radically simplified and improved way for users to select files. Capabilities such as customizable filters and previews are now available for application writers. The filesystem access is encapsulated as a dynamically loaded module; as an example of what this allows, libgnomeui now provides a gnome-vfs backend for GtkFileChooser so that it has the same view of remote filesystems as applications such Nautilus. New drop-down selection widget The GtkComboBox widget replaces the old GtkOptionMenu and GtkCombo widgets with a single unified appearance and programming interface for both editable and non-editable dropdowns. Other enhancements provided include customizability of the main display widget and grid layouts for the drop-down menu. Action-based toolbar and menu API GtkUIManager allows the application to specify a set of "actions", then create menus and toolbars using those actions from an XML-like interface description. This separation makes it easier to coordinate having the same item both in a menu and in a toolbar and simplifies the implementation of toolbar editing. Bidirectional editing and interface flipping improvements GTK+ now automatically determines the base direction for label and text-entry widgets based on their contents, rather than requiring it to be specified by the application; this gives a much better user experience when editing mixed right-to-left and left-to-right text. Support for user-interface mirroring in right-to-left locales has now been extended to cover virtually all widgets. Other enhancements: - The GtkTreeModelFilter tree model allows displaying a filtered view of another tree model - GtkTreeView now supports a fixed-height-mode for faster display. - GtkToolbar has been reworked to provide a more consistent and extensible programming interface along with new features such as an overflow menu and animated editing feedback. - GtkEntry now supports completion dropdowns. - Named icons via the freedesktop.org icon theme specification are now supported. - gdk-pixbuf improvements include a PCX loader and saving support for the ICO and CUR formats. - Round trips to the X server at application startup and during operations such as drag-and-drop have been greatly reduced.
Diffstat (limited to 'x11')
-rw-r--r--x11/gtk2/Makefile14
-rw-r--r--x11/gtk2/PLIST337
-rw-r--r--x11/gtk2/buildlink2.mk6
-rw-r--r--x11/gtk2/buildlink3.mk5
-rw-r--r--x11/gtk2/distinfo17
-rw-r--r--x11/gtk2/patches/patch-aa59
-rw-r--r--x11/gtk2/patches/patch-ab21
-rw-r--r--x11/gtk2/patches/patch-ac12
-rw-r--r--x11/gtk2/patches/patch-ad12
-rw-r--r--x11/gtk2/patches/patch-ae12
-rw-r--r--x11/gtk2/patches/patch-ag13
-rw-r--r--x11/gtk2/patches/patch-ah13
-rw-r--r--x11/gtk2/patches/patch-ai13
-rw-r--r--x11/gtk2/patches/patch-aq13
14 files changed, 289 insertions, 258 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index ea7b6d364fc..b78fb267a29 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.46 2004/03/09 22:15:01 recht Exp $
+# $NetBSD: Makefile,v 1.47 2004/04/01 18:15:41 jmmv Exp $
#
-DISTNAME= gtk+-2.2.4
+DISTNAME= gtk+-2.4.0
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 6
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
- ${MASTER_SITE_GNOME:=sources/gtk+/2.2/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.4/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
+ ${MASTER_SITE_GNOME:=sources/gtk+/2.4/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= xtraeme@NetBSD.org
@@ -32,6 +31,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no
CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no
MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
+MAKE_ENV+= PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
TEST_TARGET= check
PKGCONFIG_OVERRIDE= gdk-2.0.pc.in
@@ -44,6 +44,7 @@ BUILD_DIRS= ${WRKSRC} ${WRKSRC}/demos/gtk-demo
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/engines
${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.4.0/filesystems
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -54,6 +55,7 @@ post-install:
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
.include "../../x11/Xrandr/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index edecc90ff07..8180429bd06 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/03/08 19:40:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/04/01 18:15:41 jmmv Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
bin/gtk-demo
@@ -38,6 +38,7 @@ include/gtk-2.0/gdk/gdkregion.h
include/gtk-2.0/gdk/gdkrgb.h
include/gtk-2.0/gdk/gdkscreen.h
include/gtk-2.0/gdk/gdkselection.h
+include/gtk-2.0/gdk/gdkspawn.h
include/gtk-2.0/gdk/gdktypes.h
include/gtk-2.0/gdk/gdkvisual.h
include/gtk-2.0/gdk/gdkwindow.h
@@ -47,6 +48,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h
include/gtk-2.0/gtk/gtkaccellabel.h
include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
+include/gtk-2.0/gtk/gtkaction.h
+include/gtk-2.0/gtk/gtkactiongroup.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@@ -58,6 +61,7 @@ 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/gtkcelleditable.h
+include/gtk-2.0/gtk/gtkcelllayout.h
include/gtk-2.0/gtk/gtkcellrenderer.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
@@ -66,9 +70,12 @@ 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/gtkcolorbutton.h
include/gtk-2.0/gtk/gtkcolorsel.h
include/gtk-2.0/gtk/gtkcolorseldialog.h
include/gtk-2.0/gtk/gtkcombo.h
+include/gtk-2.0/gtk/gtkcombobox.h
+include/gtk-2.0/gtk/gtkcomboboxentry.h
include/gtk-2.0/gtk/gtkcontainer.h
include/gtk-2.0/gtk/gtkctree.h
include/gtk-2.0/gtk/gtkcurve.h
@@ -78,10 +85,18 @@ include/gtk-2.0/gtk/gtkdnd.h
include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrycompletion.h
include/gtk-2.0/gtk/gtkenums.h
include/gtk-2.0/gtk/gtkeventbox.h
+include/gtk-2.0/gtk/gtkexpander.h
+include/gtk-2.0/gtk/gtkfilechooser.h
+include/gtk-2.0/gtk/gtkfilechooserdialog.h
+include/gtk-2.0/gtk/gtkfilechooserwidget.h
+include/gtk-2.0/gtk/gtkfilefilter.h
include/gtk-2.0/gtk/gtkfilesel.h
+include/gtk-2.0/gtk/gtkfilesystem.h
include/gtk-2.0/gtk/gtkfixed.h
+include/gtk-2.0/gtk/gtkfontbutton.h
include/gtk-2.0/gtk/gtkfontsel.h
include/gtk-2.0/gtk/gtkframe.h
include/gtk-2.0/gtk/gtkgamma.h
@@ -95,6 +110,7 @@ include/gtk-2.0/gtk/gtkhscale.h
include/gtk-2.0/gtk/gtkhscrollbar.h
include/gtk-2.0/gtk/gtkhseparator.h
include/gtk-2.0/gtk/gtkiconfactory.h
+include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkimage.h
include/gtk-2.0/gtk/gtkimagemenuitem.h
include/gtk-2.0/gtk/gtkimcontext.h
@@ -129,8 +145,10 @@ include/gtk-2.0/gtk/gtkpreview.h
include/gtk-2.0/gtk/gtkprivate.h
include/gtk-2.0/gtk/gtkprogress.h
include/gtk-2.0/gtk/gtkprogressbar.h
+include/gtk-2.0/gtk/gtkradioaction.h
include/gtk-2.0/gtk/gtkradiobutton.h
include/gtk-2.0/gtk/gtkradiomenuitem.h
+include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
include/gtk-2.0/gtk/gtkruler.h
@@ -140,6 +158,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h
include/gtk-2.0/gtk/gtkselection.h
include/gtk-2.0/gtk/gtkseparator.h
include/gtk-2.0/gtk/gtkseparatormenuitem.h
+include/gtk-2.0/gtk/gtkseparatortoolitem.h
include/gtk-2.0/gtk/gtksettings.h
include/gtk-2.0/gtk/gtksignal.h
include/gtk-2.0/gtk/gtksizegroup.h
@@ -161,13 +180,18 @@ include/gtk-2.0/gtk/gtktexttag.h
include/gtk-2.0/gtk/gtktexttagtable.h
include/gtk-2.0/gtk/gtktextview.h
include/gtk-2.0/gtk/gtktipsquery.h
+include/gtk-2.0/gtk/gtktoggleaction.h
include/gtk-2.0/gtk/gtktogglebutton.h
+include/gtk-2.0/gtk/gtktoggletoolbutton.h
include/gtk-2.0/gtk/gtktoolbar.h
+include/gtk-2.0/gtk/gtktoolbutton.h
+include/gtk-2.0/gtk/gtktoolitem.h
include/gtk-2.0/gtk/gtktooltips.h
include/gtk-2.0/gtk/gtktree.h
include/gtk-2.0/gtk/gtktreednd.h
include/gtk-2.0/gtk/gtktreeitem.h
include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelfilter.h
include/gtk-2.0/gtk/gtktreemodelsort.h
include/gtk-2.0/gtk/gtktreeselection.h
include/gtk-2.0/gtk/gtktreesortable.h
@@ -176,6 +200,7 @@ 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/gtkuimanager.h
include/gtk-2.0/gtk/gtkvbbox.h
include/gtk-2.0/gtk/gtkvbox.h
include/gtk-2.0/gtk/gtkversion.h
@@ -187,99 +212,99 @@ 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/2.2.0/immodules/im-am-et.a
-lib/gtk-2.0/2.2.0/immodules/im-am-et.la
-lib/gtk-2.0/2.2.0/immodules/im-am-et.so
-lib/gtk-2.0/2.2.0/immodules/im-cedilla.a
-lib/gtk-2.0/2.2.0/immodules/im-cedilla.la
-lib/gtk-2.0/2.2.0/immodules/im-cedilla.so
-lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/2.2.0/immodules/im-hangul.a
-lib/gtk-2.0/2.2.0/immodules/im-hangul.la
-lib/gtk-2.0/2.2.0/immodules/im-hangul.so
-lib/gtk-2.0/2.2.0/immodules/im-inuktitut.a
-lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
-lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
-lib/gtk-2.0/2.2.0/immodules/im-ipa.a
-lib/gtk-2.0/2.2.0/immodules/im-ipa.la
-lib/gtk-2.0/2.2.0/immodules/im-ipa.so
-lib/gtk-2.0/2.2.0/immodules/im-thai-broken.a
-lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
-lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
-lib/gtk-2.0/2.2.0/immodules/im-ti-er.a
-lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
-lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
-lib/gtk-2.0/2.2.0/immodules/im-ti-et.a
-lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
-lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
-lib/gtk-2.0/2.2.0/immodules/im-viqr.a
-lib/gtk-2.0/2.2.0/immodules/im-viqr.la
-lib/gtk-2.0/2.2.0/immodules/im-viqr.so
-lib/gtk-2.0/2.2.0/immodules/im-xim.a
-lib/gtk-2.0/2.2.0/immodules/im-xim.la
-lib/gtk-2.0/2.2.0/immodules/im-xim.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-am-et.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-am-et.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-am-et.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cedilla.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cedilla.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cedilla.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-inuktitut.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-inuktitut.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-inuktitut.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ipa.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ipa.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ipa.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-thai-broken.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-thai-broken.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-thai-broken.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-er.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-er.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-er.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-et.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-et.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-ti-et.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-viqr.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-viqr.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-viqr.so
+lib/gtk-2.0/${PKGVERSION}/immodules/im-xim.a
+lib/gtk-2.0/${PKGVERSION}/immodules/im-xim.la
+lib/gtk-2.0/${PKGVERSION}/immodules/im-xim.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ani.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ani.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-bmp.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-bmp.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-gif.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-gif.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ico.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ico.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-jpeg.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-jpeg.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pcx.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pcx.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pcx.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-png.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-png.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-png.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pnm.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pnm.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ras.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ras.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tga.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tiff.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tiff.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-wbmp.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-wbmp.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xbm.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xbm.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xpm.a
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xpm.la
+lib/gtk-2.0/${PKGVERSION}/loaders/libpixbufloader-xpm.so
lib/gtk-2.0/include/gdkconfig.h
lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.200
-lib/libgdk-x11-2.0.so.200.4
+lib/libgdk-x11-2.0.so.400
+lib/libgdk-x11-2.0.so.400.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.200
-lib/libgdk_pixbuf-2.0.so.200.4
+lib/libgdk_pixbuf-2.0.so.400
+lib/libgdk_pixbuf-2.0.so.400.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.200
-lib/libgdk_pixbuf_xlib-2.0.so.200.4
+lib/libgdk_pixbuf_xlib-2.0.so.400
+lib/libgdk_pixbuf_xlib-2.0.so.400.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.200
-lib/libgtk-x11-2.0.so.200.4
+lib/libgtk-x11-2.0.so.400
+lib/libgtk-x11-2.0.so.400.0
lib/pkgconfig/gdk-2.0.pc
lib/pkgconfig/gdk-pixbuf-2.0.pc
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -289,6 +314,8 @@ lib/pkgconfig/gtk+-x11-2.0.pc
libdata/gtk-2.0/gdk-pixbuf.loaders
libdata/gtk-2.0/gtk.immodules
man/man1/gdk-pixbuf-csource.1
+man/man1/gdk-pixbuf-query-loaders.1
+man/man1/gtk-query-immodules-2.0.1
share/aclocal/gtk-2.0.m4
share/doc/html/gdk-pixbuf/GdkPixbufLoader.html
share/doc/html/gdk-pixbuf/apa.html
@@ -298,6 +325,7 @@ share/doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-animation.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-creating.html
+share/doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
@@ -308,6 +336,7 @@ share/doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-inline.html
+share/doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html
share/doc/html/gdk-pixbuf/gdk-pixbuf-util.html
@@ -320,6 +349,7 @@ share/doc/html/gdk-pixbuf/left.png
share/doc/html/gdk-pixbuf/license.html
share/doc/html/gdk-pixbuf/right.png
share/doc/html/gdk-pixbuf/rn01.html
+share/doc/html/gdk-pixbuf/rn02.html
share/doc/html/gdk-pixbuf/up.png
share/doc/html/gdk/GdkDisplay.html
share/doc/html/gdk/GdkDisplayManager.html
@@ -436,11 +466,14 @@ share/doc/html/gdk/ur_angle.png
share/doc/html/gdk/watch.png
share/doc/html/gdk/xterm.png
share/doc/html/gtk/AbstractObjects.html
+share/doc/html/gtk/Actions.html
share/doc/html/gtk/ButtonWidgets.html
share/doc/html/gtk/DeprecatedObjects.html
share/doc/html/gtk/DisplayWidgets.html
share/doc/html/gtk/GtkAccelLabel.html
share/doc/html/gtk/GtkAccessible.html
+share/doc/html/gtk/GtkAction.html
+share/doc/html/gtk/GtkActionGroup.html
share/doc/html/gtk/GtkAdjustment.html
share/doc/html/gtk/GtkAlignment.html
share/doc/html/gtk/GtkArrow.html
@@ -453,24 +486,34 @@ share/doc/html/gtk/GtkCList.html
share/doc/html/gtk/GtkCTree.html
share/doc/html/gtk/GtkCalendar.html
share/doc/html/gtk/GtkCellEditable.html
+share/doc/html/gtk/GtkCellLayout.html
share/doc/html/gtk/GtkCellRenderer.html
share/doc/html/gtk/GtkCellRendererPixbuf.html
share/doc/html/gtk/GtkCellRendererText.html
share/doc/html/gtk/GtkCellRendererToggle.html
share/doc/html/gtk/GtkCheckButton.html
share/doc/html/gtk/GtkCheckMenuItem.html
+share/doc/html/gtk/GtkColorButton.html
share/doc/html/gtk/GtkColorSelection.html
share/doc/html/gtk/GtkColorSelectionDialog.html
share/doc/html/gtk/GtkCombo.html
+share/doc/html/gtk/GtkComboBox.html
+share/doc/html/gtk/GtkComboBoxEntry.html
share/doc/html/gtk/GtkContainer.html
share/doc/html/gtk/GtkCurve.html
share/doc/html/gtk/GtkDialog.html
share/doc/html/gtk/GtkDrawingArea.html
share/doc/html/gtk/GtkEditable.html
share/doc/html/gtk/GtkEntry.html
+share/doc/html/gtk/GtkEntryCompletion.html
share/doc/html/gtk/GtkEventBox.html
+share/doc/html/gtk/GtkExpander.html
+share/doc/html/gtk/GtkFileChooser.html
+share/doc/html/gtk/GtkFileChooserDialog.html
+share/doc/html/gtk/GtkFileChooserWidget.html
share/doc/html/gtk/GtkFileSelection.html
share/doc/html/gtk/GtkFixed.html
+share/doc/html/gtk/GtkFontButton.html
share/doc/html/gtk/GtkFontSelection.html
share/doc/html/gtk/GtkFontSelectionDialog.html
share/doc/html/gtk/GtkFrame.html
@@ -486,6 +529,7 @@ share/doc/html/gtk/GtkHandleBox.html
share/doc/html/gtk/GtkIMContext.html
share/doc/html/gtk/GtkIMContextSimple.html
share/doc/html/gtk/GtkIMMulticontext.html
+share/doc/html/gtk/GtkIconTheme.html
share/doc/html/gtk/GtkImage.html
share/doc/html/gtk/GtkImageMenuItem.html
share/doc/html/gtk/GtkInputDialog.html
@@ -513,8 +557,10 @@ share/doc/html/gtk/GtkPlug.html
share/doc/html/gtk/GtkPreview.html
share/doc/html/gtk/GtkProgress.html
share/doc/html/gtk/GtkProgressBar.html
+share/doc/html/gtk/GtkRadioAction.html
share/doc/html/gtk/GtkRadioButton.html
share/doc/html/gtk/GtkRadioMenuItem.html
+share/doc/html/gtk/GtkRadioToolButton.html
share/doc/html/gtk/GtkRange.html
share/doc/html/gtk/GtkRuler.html
share/doc/html/gtk/GtkScale.html
@@ -522,6 +568,7 @@ share/doc/html/gtk/GtkScrollbar.html
share/doc/html/gtk/GtkScrolledWindow.html
share/doc/html/gtk/GtkSeparator.html
share/doc/html/gtk/GtkSeparatorMenuItem.html
+share/doc/html/gtk/GtkSeparatorToolItem.html
share/doc/html/gtk/GtkSettings.html
share/doc/html/gtk/GtkSizeGroup.html
share/doc/html/gtk/GtkSocket.html
@@ -537,18 +584,24 @@ share/doc/html/gtk/GtkTextTag.html
share/doc/html/gtk/GtkTextTagTable.html
share/doc/html/gtk/GtkTextView.html
share/doc/html/gtk/GtkTipsQuery.html
+share/doc/html/gtk/GtkToggleAction.html
share/doc/html/gtk/GtkToggleButton.html
+share/doc/html/gtk/GtkToggleToolButton.html
+share/doc/html/gtk/GtkToolButton.html
+share/doc/html/gtk/GtkToolItem.html
share/doc/html/gtk/GtkToolbar.html
share/doc/html/gtk/GtkTooltips.html
share/doc/html/gtk/GtkTree.html
share/doc/html/gtk/GtkTreeItem.html
share/doc/html/gtk/GtkTreeModel.html
+share/doc/html/gtk/GtkTreeModelFilter.html
share/doc/html/gtk/GtkTreeModelSort.html
share/doc/html/gtk/GtkTreeSelection.html
share/doc/html/gtk/GtkTreeSortable.html
share/doc/html/gtk/GtkTreeStore.html
share/doc/html/gtk/GtkTreeView.html
share/doc/html/gtk/GtkTreeViewColumn.html
+share/doc/html/gtk/GtkUIManager.html
share/doc/html/gtk/GtkVBox.html
share/doc/html/gtk/GtkVButtonBox.html
share/doc/html/gtk/GtkVPaned.html
@@ -575,6 +628,8 @@ share/doc/html/gtk/TreeWidget.html
share/doc/html/gtk/TreeWidgetObjects.html
share/doc/html/gtk/WindowWidgets.html
share/doc/html/gtk/ch01.html
+share/doc/html/gtk/checklist-gdkeventexpose-region.html
+share/doc/html/gtk/checklist-modifiers.html
share/doc/html/gtk/gtk-Accelerator-Maps.html
share/doc/html/gtk/gtk-Bindings.html
share/doc/html/gtk/gtk-Clipboards.html
@@ -597,6 +652,12 @@ share/doc/html/gtk/gtk-changes-1-2.html
share/doc/html/gtk/gtk-changes-2-0.html
share/doc/html/gtk/gtk-compiling.html
share/doc/html/gtk/gtk-framebuffer.html
+share/doc/html/gtk/gtk-gtkfilefilter.html
+share/doc/html/gtk/gtk-migrating-GtkAction.html
+share/doc/html/gtk/gtk-migrating-GtkComboBox.html
+share/doc/html/gtk/gtk-migrating-GtkFileChooser.html
+share/doc/html/gtk/gtk-migrating-checklist.html
+share/doc/html/gtk/gtk-query-immodules-2.0.html
share/doc/html/gtk/gtk-question-index.html
share/doc/html/gtk/gtk-resources.html
share/doc/html/gtk/gtk-running.html
@@ -605,12 +666,21 @@ share/doc/html/gtk/gtk-x11.html
share/doc/html/gtk/gtk.devhelp
share/doc/html/gtk/gtk.html
share/doc/html/gtk/gtkbase.html
+share/doc/html/gtk/gtkfilechooser-installing-extra-widgets.html
+share/doc/html/gtk/gtkfilechooser-installing-preview.html
+share/doc/html/gtk/gtkfilechooser-new-features.html
+share/doc/html/gtk/gtkfilechooser-selection-modes.html
share/doc/html/gtk/gtkobjects.html
share/doc/html/gtk/home.png
share/doc/html/gtk/index.html
share/doc/html/gtk/index.sgml
share/doc/html/gtk/ix01.html
share/doc/html/gtk/left.png
+share/doc/html/gtk/migrating-GtkCombo.html
+share/doc/html/gtk/migrating-gnomeuiinfo.html
+share/doc/html/gtk/migrating.html
+share/doc/html/gtk/new-features-GtkComboBox.html
+share/doc/html/gtk/pt05.html
share/doc/html/gtk/right.png
share/doc/html/gtk/stock_add_24.png
share/doc/html/gtk/stock_align_center_24.png
@@ -629,6 +699,7 @@ share/doc/html/gtk/stock_colorselector_24.png
share/doc/html/gtk/stock_convert_24.png
share/doc/html/gtk/stock_copy_24.png
share/doc/html/gtk/stock_cut_24.png
+share/doc/html/gtk/stock_dialog_authentication_48.png
share/doc/html/gtk/stock_dialog_error_48.png
share/doc/html/gtk/stock_dialog_info_48.png
share/doc/html/gtk/stock_dialog_question_48.png
@@ -644,6 +715,7 @@ share/doc/html/gtk/stock_help_24.png
share/doc/html/gtk/stock_home_24.png
share/doc/html/gtk/stock_index_24.png
share/doc/html/gtk/stock_jump_to_24.png
+share/doc/html/gtk/stock_jump_to_rtl_24.png
share/doc/html/gtk/stock_last_24.png
share/doc/html/gtk/stock_left_arrow_24.png
share/doc/html/gtk/stock_new_24.png
@@ -656,9 +728,11 @@ share/doc/html/gtk/stock_print_24.png
share/doc/html/gtk/stock_print_preview_24.png
share/doc/html/gtk/stock_properties_24.png
share/doc/html/gtk/stock_redo_24.png
+share/doc/html/gtk/stock_redo_rtl_24.png
share/doc/html/gtk/stock_refresh_24.png
share/doc/html/gtk/stock_remove_24.png
share/doc/html/gtk/stock_revert_24.png
+share/doc/html/gtk/stock_revert_rtl_24.png
share/doc/html/gtk/stock_right_arrow_24.png
share/doc/html/gtk/stock_save_24.png
share/doc/html/gtk/stock_save_as_24.png
@@ -675,13 +749,16 @@ share/doc/html/gtk/stock_text_underline_24.png
share/doc/html/gtk/stock_top_24.png
share/doc/html/gtk/stock_trash_24.png
share/doc/html/gtk/stock_undelete_24.png
+share/doc/html/gtk/stock_undelete_rtl_24.png
share/doc/html/gtk/stock_undo_24.png
+share/doc/html/gtk/stock_undo_rtl_24.png
share/doc/html/gtk/stock_up_arrow_24.png
share/doc/html/gtk/stock_yes_20.png
share/doc/html/gtk/stock_zoom_1_24.png
share/doc/html/gtk/stock_zoom_fit_24.png
share/doc/html/gtk/stock_zoom_in_24.png
share/doc/html/gtk/stock_zoom_out_24.png
+share/doc/html/gtk/ui-manager.html
share/doc/html/gtk/up.png
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
@@ -693,6 +770,7 @@ share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_completion.c
share/gtk-2.0/demo/floppybuddy.gif
share/gtk-2.0/demo/gnome-applets.png
share/gtk-2.0/demo/gnome-calendar.png
@@ -702,8 +780,8 @@ share/gtk-2.0/demo/gnome-gmush.png
share/gtk-2.0/demo/gnome-gsame.png
share/gtk-2.0/demo/gnu-keys.png
share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/hypertext.c
share/gtk-2.0/demo/images.c
-share/gtk-2.0/demo/item_factory.c
share/gtk-2.0/demo/list_store.c
share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c
@@ -712,64 +790,142 @@ share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textview.c
share/gtk-2.0/demo/tree_store.c
+share/gtk-2.0/demo/ui_manager.c
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ia/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ia/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gtk20.mo
-${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/uz/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/uz/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
+${PKGLOCALEDIR}/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Default/gtk-2.0/gtkrc
@@ -779,22 +935,23 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
@unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
+@comment in xdg-dirs: @dirrm share/themes
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
@dirrm share/doc/html/gtk
@dirrm share/doc/html/gdk-pixbuf
@dirrm share/doc/html/gdk
@dirrm libdata/gtk-2.0
-@exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || ${TRUE}
+@exec ${MKDIR} %D/lib/gtk-2.0/modules
@dirrm lib/gtk-2.0/modules
@dirrm lib/gtk-2.0/include
-@exec ${MKDIR} %D/lib/gtk-2.0/engines 2>/dev/null || ${TRUE}
+@exec ${MKDIR} %D/lib/gtk-2.0/engines
@dirrm lib/gtk-2.0/engines
-@exec ${MKDIR} %D/lib/gtk-2.0/2.2.0/engines
-@dirrm lib/gtk-2.0/2.2.0/engines
-@dirrm lib/gtk-2.0/2.2.0/loaders
-@dirrm lib/gtk-2.0/2.2.0/immodules
-@dirrm lib/gtk-2.0/2.2.0
+@dirrm lib/gtk-2.0/${PKGVERSION}/loaders
+@dirrm lib/gtk-2.0/${PKGVERSION}/immodules
+@exec ${MKDIR} %D/lib/gtk-2.0/${PKGVERSION}/filesystems
+@dirrm lib/gtk-2.0/${PKGVERSION}/filesystems
+@dirrm lib/gtk-2.0/${PKGVERSION}
@dirrm lib/gtk-2.0
@dirrm include/gtk-2.0/gtk
@dirrm include/gtk-2.0/gdk-pixbuf-xlib
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 96450ca6b89..6261fe518bd 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,11 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.13 2004/03/29 05:05:50 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/04/01 18:15:41 jmmv Exp $
.if !defined(GTK2_BUILDLINK2_MK)
GTK2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtk2
-BUILDLINK_PKGBASE.gtk2?= gtk2+
-BUILDLINK_DEPENDS.gtk2?= gtk2+>=2.2.4nb2
+BUILDLINK_DEPENDS.gtk2?= gtk2+>=2.4.0
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
EVAL_PREFIX+= BUILDLINK_PREFIX.gtk2=gtk2
@@ -28,6 +27,7 @@ USE_X11= YES
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/xcursor/buildlink2.mk"
.include "../../x11/Xrandr/buildlink2.mk"
BUILDLINK_TARGETS+= gtk2-buildlink
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 9b38c2b57c8..938f7cf4c8d 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/04/01 18:15:41 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= gtk2
.if !empty(GTK2_BUILDLINK3_MK:M+)
BUILDLINK_PKGBASE.gtk2?= gtk2+
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.2.4nb2
+BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.4.0
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
.endif # GTK2_BUILDLINK3_MK
@@ -26,6 +26,7 @@ USE_X11= yes
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/xcursor/buildlink3.mk"
.include "../../x11/Xrandr/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 10f41e5f298..9d8e5548c73 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.21 2004/01/22 12:38:47 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2004/04/01 18:15:41 jmmv Exp $
-SHA1 (gtk+-2.2.4.tar.bz2) = ef3d3d9c044f625d8dda25d62dfc0ac50a1024c6
-Size (gtk+-2.2.4.tar.bz2) = 7189272 bytes
-SHA1 (patch-aa) = ba7db037792ffcb8fc3441b7affa973ef89c5fc1
-SHA1 (patch-ab) = 1734c8ff78460891a2c0bda4ddf0d798c99a31d3
-SHA1 (patch-ac) = 68b0d7da55de5209bed53f3daea1881a634a216f
-SHA1 (patch-ad) = f514ec4f261a148bde25a9618694df71d7586f6a
-SHA1 (patch-ae) = a678a466ccf60adb284f017b08bd1d59388c9669
-SHA1 (patch-ag) = d01d38f2920730e0516edcb447be37960c122aca
-SHA1 (patch-ah) = a39d8d976ae91529aa0db48579ef1d68a44a969c
-SHA1 (patch-ai) = 68a39f11d5b62a5c5adf8eaab5bd5e821f892b7f
-SHA1 (patch-aq) = 815a362bdc60f2b645b7b5e9381a1925d1a6df8e
+SHA1 (gtk+-2.4.0.tar.bz2) = f34efa7e3bc05cb945a8ad03bd043d2cc7ba91f7
+Size (gtk+-2.4.0.tar.bz2) = 8476610 bytes
+SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
+SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 4f2ff496393..f6a4ddef174 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,48 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2003/08/27 10:58:17 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2004/04/01 18:15:41 jmmv Exp $
---- configure.orig 2003-08-27 01:11:43.000000000 +0200
-+++ configure 2003-08-27 01:15:39.000000000 +0200
-@@ -24616,12 +24616,11 @@
-
-
-
--GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
-+GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0 gthread-2.0"
- GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
- GDK_PIXBUF_EXTRA_CFLAGS=
- GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
--
-+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-
-
-
-@@ -27693,8 +27692,7 @@
-
- GDK_PIXBUF_XLIB_PACKAGES=
- GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
--GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
--
-+GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
-
-
-
-@@ -27894,7 +27892,7 @@
-
- GDK_PACKAGES=$PANGO_PACKAGES
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-
- #
- # If we aren't writing explicit dependencies, then don't put the extra libraries we need
-@@ -27997,8 +27995,7 @@
- GTK_EXTRA_LIBS=
- GTK_EXTRA_CFLAGS=
- GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
--GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
--
-+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
-
-
-
+--- gdk-pixbuf/Makefile.in.orig 2004-03-09 16:08:28.000000000 +0100
++++ gdk-pixbuf/Makefile.in
+@@ -751,7 +751,7 @@ gdk_pixbuf_csource_LDFLAGS =
+ am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT)
+ gdk_pixbuf_query_loaders_OBJECTS = \
+ $(am_gdk_pixbuf_query_loaders_OBJECTS)
+-gdk_pixbuf_query_loaders_LDFLAGS =
++gdk_pixbuf_query_loaders_LDFLAGS = $(PTHREAD_LDFLAGS)
+ test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c
+ test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT)
+ test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index 84b6b0500c2..61a914a54fd 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/12/24 04:07:33 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2004/04/01 18:15:41 jmmv Exp $
---- demos/Makefile.am.orig Sat Nov 9 01:07:21 2002
-+++ demos/Makefile.am
-@@ -19,6 +19,7 @@ DEPS = \
- $(top_builddir)/gtk/@gtktargetlib@
+--- gtk/Makefile.in.orig 2004-03-09 16:08:31.000000000 +0100
++++ gtk/Makefile.in
+@@ -1113,7 +1113,7 @@ PROGRAMS = $(bin_PROGRAMS)
- LDADDS = @STRIP_BEGIN@ \
-+ @LDFLAGS@ \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/@gdktargetlib@ \
- $(top_builddir)/gtk/@gtktargetlib@ \
+ am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT)
+ gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS)
+-gtk_query_immodules_2_0_LDFLAGS =
++gtk_query_immodules_2_0_LDFLAGS = $(PTHREAD_LDFLAGS)
+
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
deleted file mode 100644
index d4b38eb8c80..00000000000
--- a/x11/gtk2/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2002/12/24 04:07:34 wiz Exp $
-
---- demos/Makefile.in.orig Sat Dec 21 02:35:04 2002
-+++ demos/Makefile.in
-@@ -188,6 +188,7 @@ DEPS = \
-
-
- LDADDS = @STRIP_BEGIN@ \
-+ @LDFLAGS@ \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/@gdktargetlib@ \
- $(top_builddir)/gtk/@gtktargetlib@ \
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
deleted file mode 100644
index 122a163c753..00000000000
--- a/x11/gtk2/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/12/24 04:07:34 wiz Exp $
-
---- demos/gtk-demo/Makefile.am.orig Sun Sep 29 23:43:06 2002
-+++ demos/gtk-demo/Makefile.am
-@@ -42,6 +42,7 @@ DEPS = \
- $(top_builddir)/gtk/@gtktargetlib@
-
- LDADDS = @STRIP_BEGIN@ \
-+ @LDFLAGS@ \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/@gdktargetlib@ \
- $(top_builddir)/gtk/@gtktargetlib@ \
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
deleted file mode 100644
index 97390d88bd4..00000000000
--- a/x11/gtk2/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2002/12/24 04:07:34 wiz Exp $
-
---- demos/gtk-demo/Makefile.in.orig Sat Dec 21 02:35:05 2002
-+++ demos/gtk-demo/Makefile.in
-@@ -210,6 +210,7 @@ DEPS = \
-
-
- LDADDS = @STRIP_BEGIN@ \
-+ @LDFLAGS@ \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/@gdktargetlib@ \
- $(top_builddir)/gtk/@gtktargetlib@ \
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
deleted file mode 100644
index b56b81a32fd..00000000000
--- a/x11/gtk2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2002/12/24 04:07:34 wiz Exp $
-
---- gdk-pixbuf/Makefile.am.orig Sat Dec 7 16:13:58 2002
-+++ gdk-pixbuf/Makefile.am
-@@ -255,7 +255,7 @@ INCLUDES = @STRIP_BEGIN@ \
- @STRIP_END@
-
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
--LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-+LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
-
- noinst_PROGRAMS = test-gdk-pixbuf
- test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
deleted file mode 100644
index ab5ead25609..00000000000
--- a/x11/gtk2/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2004/01/22 12:38:47 jmmv Exp $
-
---- gdk-pixbuf/Makefile.in.orig Sat Dec 21 02:34:56 2002
-+++ gdk-pixbuf/Makefile.in
-@@ -383,7 +384,7 @@ INCLUDES = @STRIP_BEGIN@ \
-
-
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
--LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-+LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
-
- noinst_PROGRAMS = test-gdk-pixbuf
- test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
deleted file mode 100644
index f0c1b3afbe8..00000000000
--- a/x11/gtk2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2003/09/27 19:58:36 danw Exp $
-
---- demos/gtk-demo/main.c.orig Tue Apr 15 21:43:16 2003
-+++ demos/gtk-demo/main.c Tue Apr 15 21:43:22 2003
-@@ -96,7 +96,7 @@
- {
- int c;
-
--#ifndef G_OS_WIN32
-+#ifdef HAVE_FLOCKFILE
- c = getc_unlocked (stream);
- #else
- c = getc (stream);
diff --git a/x11/gtk2/patches/patch-aq b/x11/gtk2/patches/patch-aq
deleted file mode 100644
index 6f291edfc6a..00000000000
--- a/x11/gtk2/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/12/24 04:07:35 wiz Exp $
-
---- Makefile.in.orig Sat Dec 21 02:34:37 2002
-+++ Makefile.in
-@@ -167,7 +167,7 @@ gtktargetlib = @gtktargetlib@
- ms_librarian = @ms_librarian@
- xinput_progs = @xinput_progs@
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
-
- # require automake 1.4