diff options
author | drochner <drochner@pkgsrc.org> | 2010-11-15 18:28:45 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2010-11-15 18:28:45 +0000 |
commit | b717d36ed1512a3aee84de04ff5a55f1798f3f1b (patch) | |
tree | e45aa14394dd5c05d28e959d8f4356ddf2b49a13 /x11 | |
parent | 3a43530458b602d9d6d171912e2a3074997f371a (diff) | |
download | pkgsrc-b717d36ed1512a3aee84de04ff5a55f1798f3f1b.tar.gz |
update to 2.22.0
This switches to the gnome-2.32 release branch
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gtk2/Makefile | 33 | ||||
-rw-r--r-- | x11/gtk2/PLIST | 289 | ||||
-rw-r--r-- | x11/gtk2/buildlink3.mk | 5 | ||||
-rw-r--r-- | x11/gtk2/distinfo | 13 | ||||
-rw-r--r-- | x11/gtk2/modules.mk | 13 | ||||
-rw-r--r-- | x11/gtk2/options.mk | 14 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-aa | 13 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-af | 26 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-aj | 12 |
9 files changed, 145 insertions, 273 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 5146691e24a..96430f4ebc3 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.206 2010/10/10 07:41:13 obache Exp $ +# $NetBSD: Makefile,v 1.207 2010/11/15 18:28:45 drochner Exp $ -DISTNAME= gtk+-2.20.1 +DISTNAME= gtk+-2.22.0 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.20/ \ - ${MASTER_SITE_GNOME:=sources/gtk+/2.20/} +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.22/ \ + ${MASTER_SITE_GNOME:=sources/gtk+/2.22/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -43,9 +42,9 @@ PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in -PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in -PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in -PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in +#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in +#PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in +#PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in INSTALLATION_DIRS+= lib/gtk-2.0/immodules INSTALLATION_DIRS+= lib/gtk-2.0/modules @@ -66,11 +65,11 @@ TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" -SUBST_CLASSES+= pthread -SUBST_STAGE.pthread= pre-configure -SUBST_MESSAGE.pthread= Fixing pthread flags. -SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' -SUBST_FILES.pthread= gdk-pixbuf/Makefile.in +#SUBST_CLASSES+= pthread +#SUBST_STAGE.pthread= pre-configure +#SUBST_MESSAGE.pthread= Fixing pthread flags. +#SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' +#SUBST_FILES.pthread= gdk-pixbuf/Makefile.in PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert @@ -79,7 +78,6 @@ PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert # post-install: ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} - ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB} EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache" @@ -96,6 +94,7 @@ BUILDLINK_API_DEPENDS.atk+= atk>=1.30.0 .include "../../devel/gettext-lib/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0 .include "../../devel/glib2/buildlink3.mk" +.include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "options.mk" @@ -105,9 +104,9 @@ BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0 .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" +#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../graphics/png/buildlink3.mk" +#.include "../../graphics/tiff/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index ebdffccce13..d9c8d2846a6 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST,v 1.72 2010/08/27 22:52:57 minskim Exp $ -bin/gdk-pixbuf-csource -bin/gdk-pixbuf-query-loaders +@comment $NetBSD: PLIST,v 1.73 2010/11/15 18:28:45 drochner Exp $ bin/gtk-builder-convert bin/gtk-demo bin/gtk-query-immodules-2.0 @@ -9,19 +7,6 @@ include/gail-1.0/gail/gailwidget.h include/gail-1.0/libgail-util/gail-util.h include/gail-1.0/libgail-util/gailmisc.h include/gail-1.0/libgail-util/gailtextutil.h -${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h -include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h -include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkapplaunchcontext.h include/gtk-2.0/gdk/gdkcairo.h @@ -39,6 +24,7 @@ include/gtk-2.0/gdk/gdki18n.h include/gtk-2.0/gdk/gdkimage.h include/gtk-2.0/gdk/gdkinput.h include/gtk-2.0/gdk/gdkkeys.h +include/gtk-2.0/gdk/gdkkeysyms-compat.h include/gtk-2.0/gdk/gdkkeysyms.h include/gtk-2.0/gdk/gdkpango.h include/gtk-2.0/gdk/gdkpixbuf.h @@ -287,23 +273,6 @@ lib/gtk-2.0/2.10.0/immodules/im-ti-er.la lib/gtk-2.0/2.10.0/immodules/im-ti-et.la lib/gtk-2.0/2.10.0/immodules/im-viqr.la ${PLIST.x11}lib/gtk-2.0/2.10.0/immodules/im-xim.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la -${PLIST.jasper}lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la -lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la ${PLIST.cups}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la @@ -313,19 +282,15 @@ lib/gtk-2.0/modules/libgail.la lib/libgailutil.la ${PLIST.quartz}lib/libgdk-quartz-2.0.la ${PLIST.x11}lib/libgdk-x11-2.0.la -lib/libgdk_pixbuf-2.0.la -${PLIST.x11}lib/libgdk_pixbuf_xlib-2.0.la ${PLIST.quartz}lib/libgtk-quartz-2.0.la ${PLIST.x11}lib/libgtk-x11-2.0.la lib/pkgconfig/gail.pc lib/pkgconfig/gdk-2.0.pc -lib/pkgconfig/gdk-pixbuf-2.0.pc -lib/pkgconfig/gtk+-2.0.pc -lib/pkgconfig/gtk+-unix-print-2.0.pc -${PLIST.x11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc ${PLIST.quartz}lib/pkgconfig/gdk-quartz-2.0.pc ${PLIST.quartz}lib/pkgconfig/gtk+-quartz-2.0.pc ${PLIST.x11}lib/pkgconfig/gdk-x11-2.0.pc +lib/pkgconfig/gtk+-2.0.pc +lib/pkgconfig/gtk+-unix-print-2.0.pc ${PLIST.x11}lib/pkgconfig/gtk+-x11-2.0.pc libdata/gtk-2.0/im-multipress.conf share/aclocal/gtk-2.0.m4 @@ -394,52 +359,6 @@ share/gtk-doc/html/gail-libgail-util/libgail-util-main.html share/gtk-doc/html/gail-libgail-util/right.png share/gtk-doc/html/gail-libgail-util/style.css share/gtk-doc/html/gail-libgail-util/up.png -share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html -share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html -share/gtk-doc/html/gdk-pixbuf/apa.html -share/gtk-doc/html/gdk-pixbuf/apas02.html -share/gtk-doc/html/gdk-pixbuf/apas03.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html -share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html -share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html -share/gtk-doc/html/gdk-pixbuf/api-index-full.html -share/gtk-doc/html/gdk-pixbuf/composite.png -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp -share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2 -share/gtk-doc/html/gdk-pixbuf/home.png -share/gtk-doc/html/gdk-pixbuf/index.html -share/gtk-doc/html/gdk-pixbuf/index.sgml -share/gtk-doc/html/gdk-pixbuf/left.png -share/gtk-doc/html/gdk-pixbuf/license.html -share/gtk-doc/html/gdk-pixbuf/right.png -share/gtk-doc/html/gdk-pixbuf/rn01.html -share/gtk-doc/html/gdk-pixbuf/rn02.html -share/gtk-doc/html/gdk-pixbuf/style.css -share/gtk-doc/html/gdk-pixbuf/up.png share/gtk-doc/html/gdk/GdkDisplay.html share/gtk-doc/html/gdk/GdkDisplayManager.html share/gtk-doc/html/gdk/GdkScreen.html @@ -452,6 +371,7 @@ share/gtk-doc/html/gdk/api-index-2-16.html share/gtk-doc/html/gdk/api-index-2-18.html share/gtk-doc/html/gdk/api-index-2-2.html share/gtk-doc/html/gdk/api-index-2-20.html +share/gtk-doc/html/gdk/api-index-2-22.html share/gtk-doc/html/gdk/api-index-2-4.html share/gtk-doc/html/gdk/api-index-2-6.html share/gtk-doc/html/gdk/api-index-2-8.html @@ -591,6 +511,7 @@ share/gtk-doc/html/gtk/GtkAspectFrame.html share/gtk-doc/html/gtk/GtkAssistant.html share/gtk-doc/html/gtk/GtkBin.html share/gtk-doc/html/gtk/GtkBox.html +share/gtk-doc/html/gtk/GtkBuildable.html share/gtk-doc/html/gtk/GtkBuilder.html share/gtk-doc/html/gtk/GtkButton.html share/gtk-doc/html/gtk/GtkButtonBox.html @@ -786,11 +707,13 @@ share/gtk-doc/html/gtk/api-index-2-16.html share/gtk-doc/html/gtk/api-index-2-18.html share/gtk-doc/html/gtk/api-index-2-2.html share/gtk-doc/html/gtk/api-index-2-20.html +share/gtk-doc/html/gtk/api-index-2-22.html share/gtk-doc/html/gtk/api-index-2-4.html share/gtk-doc/html/gtk/api-index-2-6.html share/gtk-doc/html/gtk/api-index-2-8.html share/gtk-doc/html/gtk/api-index-deprecated.html share/gtk-doc/html/gtk/api-index-full.html +share/gtk-doc/html/gtk/application-exit.png share/gtk-doc/html/gtk/assistant.png share/gtk-doc/html/gtk/button.png share/gtk-doc/html/gtk/ch01.html @@ -805,15 +728,71 @@ share/gtk-doc/html/gtk/colorsel.png share/gtk-doc/html/gtk/combo-box-entry.png share/gtk-doc/html/gtk/combo-box.png share/gtk-doc/html/gtk/decorating-the-assistant-pages.html +share/gtk-doc/html/gtk/dialog-error.png +share/gtk-doc/html/gtk/dialog-information.png +share/gtk-doc/html/gtk/dialog-password.png +share/gtk-doc/html/gtk/dialog-question.png +share/gtk-doc/html/gtk/dialog-warning.png +share/gtk-doc/html/gtk/document-new.png +share/gtk-doc/html/gtk/document-open.png +share/gtk-doc/html/gtk/document-print-preview.png +share/gtk-doc/html/gtk/document-print.png +share/gtk-doc/html/gtk/document-properties.png +share/gtk-doc/html/gtk/document-revert-ltr.png +share/gtk-doc/html/gtk/document-revert-rtl.png +share/gtk-doc/html/gtk/document-save-as.png +share/gtk-doc/html/gtk/document-save.png +share/gtk-doc/html/gtk/document-x-generic.png +share/gtk-doc/html/gtk/drive-harddisk.png +share/gtk-doc/html/gtk/edit-clear.png +share/gtk-doc/html/gtk/edit-copy.png +share/gtk-doc/html/gtk/edit-cut.png +share/gtk-doc/html/gtk/edit-delete.png +share/gtk-doc/html/gtk/edit-find-replace.png +share/gtk-doc/html/gtk/edit-find.png +share/gtk-doc/html/gtk/edit-paste.png +share/gtk-doc/html/gtk/edit-redo-ltr.png +share/gtk-doc/html/gtk/edit-redo-rtl.png +share/gtk-doc/html/gtk/edit-select-all.png +share/gtk-doc/html/gtk/edit-undo-ltr.png +share/gtk-doc/html/gtk/edit-undo-rtl.png share/gtk-doc/html/gtk/entry.png share/gtk-doc/html/gtk/figure-hierarchical-drawing.png share/gtk-doc/html/gtk/figure-windowed-label.png share/gtk-doc/html/gtk/file-button.png share/gtk-doc/html/gtk/filechooser.png +share/gtk-doc/html/gtk/folder.png share/gtk-doc/html/gtk/font-button.png share/gtk-doc/html/gtk/fontsel.png +share/gtk-doc/html/gtk/format-indent-less-ltr.png +share/gtk-doc/html/gtk/format-indent-less-rtl.png +share/gtk-doc/html/gtk/format-indent-more-ltr.png +share/gtk-doc/html/gtk/format-indent-more-rtl.png +share/gtk-doc/html/gtk/format-justify-center.png +share/gtk-doc/html/gtk/format-justify-fill.png +share/gtk-doc/html/gtk/format-justify-left.png +share/gtk-doc/html/gtk/format-justify-right.png +share/gtk-doc/html/gtk/format-text-bold.png +share/gtk-doc/html/gtk/format-text-italic.png +share/gtk-doc/html/gtk/format-text-strikethrough.png +share/gtk-doc/html/gtk/format-text-underline.png share/gtk-doc/html/gtk/frame.png share/gtk-doc/html/gtk/glossary.html +share/gtk-doc/html/gtk/go-bottom.png +share/gtk-doc/html/gtk/go-down.png +share/gtk-doc/html/gtk/go-first-ltr.png +share/gtk-doc/html/gtk/go-first-rtl.png +share/gtk-doc/html/gtk/go-home.png +share/gtk-doc/html/gtk/go-jump-ltr.png +share/gtk-doc/html/gtk/go-jump-rtl.png +share/gtk-doc/html/gtk/go-last-ltr.png +share/gtk-doc/html/gtk/go-last-rtl.png +share/gtk-doc/html/gtk/go-next-ltr.png +share/gtk-doc/html/gtk/go-next-rtl.png +share/gtk-doc/html/gtk/go-previous-ltr.png +share/gtk-doc/html/gtk/go-previous-rtl.png +share/gtk-doc/html/gtk/go-top.png +share/gtk-doc/html/gtk/go-up.png share/gtk-doc/html/gtk/gtk-Accelerator-Maps.html share/gtk-doc/html/gtk/gtk-Bindings.html share/gtk-doc/html/gtk/gtk-Clipboards.html @@ -836,87 +815,26 @@ share/gtk-doc/html/gtk/gtk-Stock-Items.html share/gtk-doc/html/gtk/gtk-Testing.html share/gtk-doc/html/gtk/gtk-Themeable-Stock-Images.html share/gtk-doc/html/gtk/gtk-Types.html -share/gtk-doc/html/gtk/gtk-about.png -share/gtk-doc/html/gtk/gtk-add.png share/gtk-doc/html/gtk/gtk-apply.png -share/gtk-doc/html/gtk/gtk-bold.png share/gtk-doc/html/gtk/gtk-builder-convert.html share/gtk-doc/html/gtk/gtk-building.html share/gtk-doc/html/gtk/gtk-cancel.png share/gtk-doc/html/gtk/gtk-caps-lock-warning.png -share/gtk-doc/html/gtk/gtk-cdrom.png share/gtk-doc/html/gtk/gtk-changes-1-2.html share/gtk-doc/html/gtk/gtk-changes-2-0.html -share/gtk-doc/html/gtk/gtk-clear.png -share/gtk-doc/html/gtk/gtk-close.png share/gtk-doc/html/gtk/gtk-color-picker.png share/gtk-doc/html/gtk/gtk-compiling.html share/gtk-doc/html/gtk/gtk-connect.png share/gtk-doc/html/gtk/gtk-convert.png -share/gtk-doc/html/gtk/gtk-copy.png -share/gtk-doc/html/gtk/gtk-cut.png -share/gtk-doc/html/gtk/gtk-delete.png -share/gtk-doc/html/gtk/gtk-dialog-authentication.png -share/gtk-doc/html/gtk/gtk-dialog-error.png -share/gtk-doc/html/gtk/gtk-dialog-info.png -share/gtk-doc/html/gtk/gtk-dialog-question.png -share/gtk-doc/html/gtk/gtk-dialog-warning.png share/gtk-doc/html/gtk/gtk-directfb.html -share/gtk-doc/html/gtk/gtk-directory.png share/gtk-doc/html/gtk/gtk-disconnect.png share/gtk-doc/html/gtk/gtk-dnd-multiple.png share/gtk-doc/html/gtk/gtk-dnd.png share/gtk-doc/html/gtk/gtk-edit.png -share/gtk-doc/html/gtk/gtk-execute.png -share/gtk-doc/html/gtk/gtk-file.png -share/gtk-doc/html/gtk/gtk-find-and-replace.png -share/gtk-doc/html/gtk/gtk-find.png -share/gtk-doc/html/gtk/gtk-floppy.png share/gtk-doc/html/gtk/gtk-font.png -share/gtk-doc/html/gtk/gtk-fullscreen.png -share/gtk-doc/html/gtk/gtk-go-back-ltr.png -share/gtk-doc/html/gtk/gtk-go-back-rtl.png -share/gtk-doc/html/gtk/gtk-go-down.png -share/gtk-doc/html/gtk/gtk-go-forward-ltr.png -share/gtk-doc/html/gtk/gtk-go-forward-rtl.png -share/gtk-doc/html/gtk/gtk-go-up.png -share/gtk-doc/html/gtk/gtk-goto-bottom.png -share/gtk-doc/html/gtk/gtk-goto-first-ltr.png -share/gtk-doc/html/gtk/gtk-goto-first-rtl.png -share/gtk-doc/html/gtk/gtk-goto-last-ltr.png -share/gtk-doc/html/gtk/gtk-goto-last-rtl.png -share/gtk-doc/html/gtk/gtk-goto-top.png -share/gtk-doc/html/gtk/gtk-gtkbuildable.html share/gtk-doc/html/gtk/gtk-gtkcheckmenuitem.html share/gtk-doc/html/gtk/gtk-gtkfilefilter.html -share/gtk-doc/html/gtk/gtk-harddisk.png -share/gtk-doc/html/gtk/gtk-help.png -share/gtk-doc/html/gtk/gtk-home.png -share/gtk-doc/html/gtk/gtk-indent-ltr.png -share/gtk-doc/html/gtk/gtk-indent-rtl.png share/gtk-doc/html/gtk/gtk-index.png -share/gtk-doc/html/gtk/gtk-info.png -share/gtk-doc/html/gtk/gtk-italic.png -share/gtk-doc/html/gtk/gtk-jump-to-ltr.png -share/gtk-doc/html/gtk/gtk-jump-to-rtl.png -share/gtk-doc/html/gtk/gtk-justify-center.png -share/gtk-doc/html/gtk/gtk-justify-fill.png -share/gtk-doc/html/gtk/gtk-justify-left.png -share/gtk-doc/html/gtk/gtk-justify-right.png -share/gtk-doc/html/gtk/gtk-leave-fullscreen.png -share/gtk-doc/html/gtk/gtk-media-forward-ltr.png -share/gtk-doc/html/gtk/gtk-media-forward-rtl.png -share/gtk-doc/html/gtk/gtk-media-next-ltr.png -share/gtk-doc/html/gtk/gtk-media-next-rtl.png -share/gtk-doc/html/gtk/gtk-media-pause.png -share/gtk-doc/html/gtk/gtk-media-play-ltr.png -share/gtk-doc/html/gtk/gtk-media-play-rtl.png -share/gtk-doc/html/gtk/gtk-media-previous-ltr.png -share/gtk-doc/html/gtk/gtk-media-previous-rtl.png -share/gtk-doc/html/gtk/gtk-media-record.png -share/gtk-doc/html/gtk/gtk-media-rewind-ltr.png -share/gtk-doc/html/gtk/gtk-media-rewind-rtl.png -share/gtk-doc/html/gtk/gtk-media-stop.png share/gtk-doc/html/gtk/gtk-migrating-ClientSideWindows.html share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html @@ -932,61 +850,26 @@ share/gtk-doc/html/gtk/gtk-migrating-checklist.html share/gtk-doc/html/gtk/gtk-migrating-entry-icons.html share/gtk-doc/html/gtk/gtk-migrating-label-links.html share/gtk-doc/html/gtk/gtk-migrating-tooltips.html -share/gtk-doc/html/gtk/gtk-missing-image.png -share/gtk-doc/html/gtk/gtk-network.png -share/gtk-doc/html/gtk/gtk-new.png share/gtk-doc/html/gtk/gtk-no.png share/gtk-doc/html/gtk/gtk-ok.png -share/gtk-doc/html/gtk/gtk-open.png share/gtk-doc/html/gtk/gtk-orientation-landscape.png share/gtk-doc/html/gtk/gtk-orientation-portrait.png share/gtk-doc/html/gtk/gtk-orientation-reverse-landscape.png share/gtk-doc/html/gtk/gtk-orientation-reverse-portrait.png share/gtk-doc/html/gtk/gtk-osx.html -share/gtk-doc/html/gtk/gtk-paste.png +share/gtk-doc/html/gtk/gtk-page-setup.png share/gtk-doc/html/gtk/gtk-preferences.png -share/gtk-doc/html/gtk/gtk-print-error.png -share/gtk-doc/html/gtk/gtk-print-paused.png -share/gtk-doc/html/gtk/gtk-print-preview.png -share/gtk-doc/html/gtk/gtk-print-report.png -share/gtk-doc/html/gtk/gtk-print-warning.png -share/gtk-doc/html/gtk/gtk-print.png -share/gtk-doc/html/gtk/gtk-properties.png share/gtk-doc/html/gtk/gtk-query-immodules-2.0.html share/gtk-doc/html/gtk/gtk-question-index.html -share/gtk-doc/html/gtk/gtk-quit.png -share/gtk-doc/html/gtk/gtk-redo-ltr.png -share/gtk-doc/html/gtk/gtk-redo-rtl.png -share/gtk-doc/html/gtk/gtk-refresh.png -share/gtk-doc/html/gtk/gtk-remove.png share/gtk-doc/html/gtk/gtk-resources.html -share/gtk-doc/html/gtk/gtk-revert-to-saved-ltr.png -share/gtk-doc/html/gtk/gtk-revert-to-saved-rtl.png share/gtk-doc/html/gtk/gtk-running.html -share/gtk-doc/html/gtk/gtk-save-as.png -share/gtk-doc/html/gtk/gtk-save.png -share/gtk-doc/html/gtk/gtk-select-all.png share/gtk-doc/html/gtk/gtk-select-color.png -share/gtk-doc/html/gtk/gtk-sort-ascending.png -share/gtk-doc/html/gtk/gtk-sort-descending.png -share/gtk-doc/html/gtk/gtk-spell-check.png -share/gtk-doc/html/gtk/gtk-stop.png -share/gtk-doc/html/gtk/gtk-strikethrough.png share/gtk-doc/html/gtk/gtk-undelete-ltr.png share/gtk-doc/html/gtk/gtk-undelete-rtl.png -share/gtk-doc/html/gtk/gtk-underline.png -share/gtk-doc/html/gtk/gtk-undo-ltr.png -share/gtk-doc/html/gtk/gtk-undo-rtl.png -share/gtk-doc/html/gtk/gtk-unindent-ltr.png -share/gtk-doc/html/gtk/gtk-unindent-rtl.png share/gtk-doc/html/gtk/gtk-update-icon-cache.html share/gtk-doc/html/gtk/gtk-windows.html share/gtk-doc/html/gtk/gtk-x11.html share/gtk-doc/html/gtk/gtk-yes.png -share/gtk-doc/html/gtk/gtk-zoom-100.png -share/gtk-doc/html/gtk/gtk-zoom-fit.png -share/gtk-doc/html/gtk/gtk-zoom-in.png -share/gtk-doc/html/gtk/gtk-zoom-out.png share/gtk-doc/html/gtk/gtk.devhelp share/gtk-doc/html/gtk/gtk.devhelp2 share/gtk-doc/html/gtk/gtk.html @@ -998,8 +881,11 @@ share/gtk-doc/html/gtk/gtkfilechooser-selection-modes.html share/gtk-doc/html/gtk/gtkobjects.html share/gtk-doc/html/gtk/gtkrecent-advanced.html share/gtk-doc/html/gtk/gtkrecent-chooser.html +share/gtk-doc/html/gtk/help-about.png +share/gtk-doc/html/gtk/help-contents.png share/gtk-doc/html/gtk/home.png share/gtk-doc/html/gtk/icon-view.png +share/gtk-doc/html/gtk/image-missing.png share/gtk-doc/html/gtk/image.png share/gtk-doc/html/gtk/index.html share/gtk-doc/html/gtk/index.sgml @@ -1014,18 +900,41 @@ share/gtk-doc/html/gtk/layout-tblr.png share/gtk-doc/html/gtk/layout-tbrl.png share/gtk-doc/html/gtk/left.png share/gtk-doc/html/gtk/link-button.png +share/gtk-doc/html/gtk/list-add.png share/gtk-doc/html/gtk/list-and-tree.png +share/gtk-doc/html/gtk/list-remove.png +share/gtk-doc/html/gtk/media-floppy.png +share/gtk-doc/html/gtk/media-optical.png +share/gtk-doc/html/gtk/media-playback-pause.png +share/gtk-doc/html/gtk/media-playback-start-ltr.png +share/gtk-doc/html/gtk/media-playback-start-rtl.png +share/gtk-doc/html/gtk/media-playback-stop.png +share/gtk-doc/html/gtk/media-record.png +share/gtk-doc/html/gtk/media-seek-backward-ltr.png +share/gtk-doc/html/gtk/media-seek-backward-rtl.png +share/gtk-doc/html/gtk/media-seek-forward-ltr.png +share/gtk-doc/html/gtk/media-seek-forward-rtl.png +share/gtk-doc/html/gtk/media-skip-backward-ltr.png +share/gtk-doc/html/gtk/media-skip-backward-rtl.png +share/gtk-doc/html/gtk/media-skip-forward-ltr.png +share/gtk-doc/html/gtk/media-skip-forward-rtl.png share/gtk-doc/html/gtk/menubar.png share/gtk-doc/html/gtk/messagedialog.png share/gtk-doc/html/gtk/migrating-GtkCombo.html share/gtk-doc/html/gtk/migrating-gnomeuiinfo.html share/gtk-doc/html/gtk/migrating.html share/gtk-doc/html/gtk/multiline-text.png +share/gtk-doc/html/gtk/network-idle.png share/gtk-doc/html/gtk/new-features-GtkComboBox.html share/gtk-doc/html/gtk/notebook.png share/gtk-doc/html/gtk/pagesetupdialog.png share/gtk-doc/html/gtk/panes.png share/gtk-doc/html/gtk/printdialog.png +share/gtk-doc/html/gtk/printer-error.png +share/gtk-doc/html/gtk/printer-info.png +share/gtk-doc/html/gtk/printer-paused.png +share/gtk-doc/html/gtk/printer-warning.png +share/gtk-doc/html/gtk/process-stop.png share/gtk-doc/html/gtk/progressbar.png share/gtk-doc/html/gtk/pt05.html share/gtk-doc/html/gtk/radio-group.png @@ -1039,14 +948,26 @@ share/gtk-doc/html/gtk/spinbutton.png share/gtk-doc/html/gtk/spinner.png share/gtk-doc/html/gtk/statusbar.png share/gtk-doc/html/gtk/style.css +share/gtk-doc/html/gtk/system-run.png share/gtk-doc/html/gtk/toggle-button.png share/gtk-doc/html/gtk/toolbar.png share/gtk-doc/html/gtk/toolpalette.png +share/gtk-doc/html/gtk/tools-check-spelling.png share/gtk-doc/html/gtk/tree-view-coordinates.png share/gtk-doc/html/gtk/ui-manager.html share/gtk-doc/html/gtk/up.png +share/gtk-doc/html/gtk/view-fullscreen.png +share/gtk-doc/html/gtk/view-refresh.png +share/gtk-doc/html/gtk/view-restore.png +share/gtk-doc/html/gtk/view-sort-ascending.png +share/gtk-doc/html/gtk/view-sort-descending.png share/gtk-doc/html/gtk/volumebutton.png +share/gtk-doc/html/gtk/window-close.png share/gtk-doc/html/gtk/window.png +share/gtk-doc/html/gtk/zoom-fit-best.png +share/gtk-doc/html/gtk/zoom-in.png +share/gtk-doc/html/gtk/zoom-original.png +share/gtk-doc/html/gtk/zoom-out.png share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo @@ -1143,6 +1064,8 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ka/LC_MESSAGES/gtk20-properties.mo share/locale/ka/LC_MESSAGES/gtk20.mo +share/locale/kk/LC_MESSAGES/gtk20-properties.mo +share/locale/kk/LC_MESSAGES/gtk20.mo share/locale/kn/LC_MESSAGES/gtk20-properties.mo share/locale/kn/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo @@ -1231,6 +1154,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/tt/LC_MESSAGES/gtk20-properties.mo share/locale/tt/LC_MESSAGES/gtk20.mo +share/locale/ug/LC_MESSAGES/gtk20-properties.mo +share/locale/ug/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20-properties.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/ur/LC_MESSAGES/gtk20-properties.mo diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index d3b193e18db..cdbb11a7e64 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.46 2010/10/10 10:56:44 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2010/11/15 18:28:45 drochner Exp $ BUILDLINK_TREE+= gtk2 @@ -21,13 +21,14 @@ pkgbase := gtk2 .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/gdk-pixbuf2/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" .endif .endif # GTK2_BUILDLINK3_MK diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 3d449b6693a..8439aef4257 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.129 2010/06/13 22:45:39 wiz Exp $ +$NetBSD: distinfo,v 1.130 2010/11/15 18:28:45 drochner Exp $ -SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02 -RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 -Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes -SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3 +SHA1 (gtk+-2.22.0.tar.bz2) = 3af12d8eb3520516b25fa82873f87473dfb42cc0 +RMD160 (gtk+-2.22.0.tar.bz2) = 50da72c8f1f7416e79ffbd458252e65fe7ba96af +Size (gtk+-2.22.0.tar.bz2) = 18146592 bytes SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 -SHA1 (patch-af) = eb3eb3033d7fb3b8fba92a965072786da2f18e19 -SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133 +SHA1 (patch-af) = 9e3009396f2377ece4dba1f79d6f65c3478ec81f +SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk index 56270e9a26a..3b9a8a1477c 100644 --- a/x11/gtk2/modules.mk +++ b/x11/gtk2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $ +# $NetBSD: modules.mk,v 1.16 2010/11/15 18:28:45 drochner Exp $ # # This Makefile fragment is intended to be included by packages that install # GTK2 modules. It takes care of rebuilding the corresponding databases at @@ -6,19 +6,16 @@ # # The following variables can be defined: # GTK2_IMMODULES - Set to YES if the package installs immodules. -# GTK2_LOADERS - Set to YES if the package installs pixbuf loaders. # .if !defined(GTK2_MODULES_MK) GTK2_MODULES_MK= # defined GTK_QUERY_IMMODULES= ${BUILDLINK_PREFIX.gtk2}/bin/gtk-query-immodules-2.0 -GDK_PIXBUF_QUERY_LOADERS= ${BUILDLINK_PREFIX.gtk2}/bin/gdk-pixbuf-query-loaders .if defined(_BUILDING_GTK2) BUILDLINK_PREFIX.gtk2= ${PREFIX} GTK2_IMMODULES= YES -GTK2_LOADERS= YES .endif .if defined(GTK2_IMMODULES) && !empty(GTK2_IMMODULES:M[Yy][Ee][Ss]) @@ -29,14 +26,6 @@ INSTALL_TEMPLATES+= ../../x11/gtk2/files/immodules.tmpl DEINSTALL_TEMPLATES+= ../../x11/gtk2/files/immodules.tmpl .endif -.if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss]) -FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q} -FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q} -GDK_PIXBUF_LOADERS_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gdk-pixbuf.loaders -INSTALL_TEMPLATES+= ../../x11/gtk2/files/loaders.tmpl -DEINSTALL_TEMPLATES+= ../../x11/gtk2/files/loaders.tmpl -.endif - PRINT_PLIST_AWK+= /^libdata\/gtk-2.0/ { next; } .if !defined(_BUILDING_GTK2) diff --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk index 5248e5b5405..b2301e7bec6 100644 --- a/x11/gtk2/options.mk +++ b/x11/gtk2/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.10 2009/11/23 11:47:34 drochner Exp $ +# $NetBSD: options.mk,v 1.11 2010/11/15 18:28:45 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2 -PKG_SUPPORTED_OPTIONS= cups debug jasper +PKG_SUPPORTED_OPTIONS= cups debug PKG_OPTIONS_REQUIRED_GROUPS= gdk-target PKG_OPTIONS_GROUP.gdk-target= x11 .if exists(/System/Library/Frameworks/Quartz.framework) @@ -50,14 +50,6 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" .endif - -PLIST_VARS+= jasper -.if !empty(PKG_OPTIONS:Mjasper) -CONFIGURE_ARGS+= --with-libjasper -.include "../../graphics/jasper/buildlink3.mk" -PLIST.jasper= yes -.else -CONFIGURE_ARGS+= --without-libjasper -.endif diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa deleted file mode 100644 index 144f4c51bb5..00000000000 --- a/x11/gtk2/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.17 2009/10/21 15:34:06 drochner Exp $ - ---- gdk-pixbuf/Makefile.in.orig 2009-09-23 04:22:48.000000000 +0200 -+++ gdk-pixbuf/Makefile.in -@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS) - gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c - gdk_pixbuf_csource_LDADD = $(LDADDS) - gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) --gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) __PTHREAD_FLAGS__ - gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - - # diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af index 21b35e6fa94..57ba77c8148 100644 --- a/x11/gtk2/patches/patch-af +++ b/x11/gtk2/patches/patch-af @@ -1,28 +1,8 @@ -$NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $ +$NetBSD: patch-af,v 1.19 2010/11/15 18:28:45 drochner Exp $ ---- configure.orig 2010-05-02 23:55:05.000000000 +0000 +--- configure.orig 2010-09-23 14:27:27.000000000 +0000 +++ configure -@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load - fi - - if test x$with_libpng != xno && test -z "$LIBPNG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5 --$as_echo_n "checking for libpng12... " >&6; } -- if $PKG_CONFIG --exists libpng12 ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5 -+$as_echo_n "checking for libpng... " >&6; } -+ if $PKG_CONFIG --exists libpng ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - PNG='png' -- PNG_DEP_CFLAGS_PACKAGES=libpng12 -- LIBPNG=`$PKG_CONFIG --libs libpng12` -+ PNG_DEP_CFLAGS_PACKAGES=libpng -+ LIBPNG=`$PKG_CONFIG --libs libpng` - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -@@ -23098,7 +23098,7 @@ _ACEOF +@@ -21936,7 +21936,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj index 80aec9904df..99d1b09a0cd 100644 --- a/x11/gtk2/patches/patch-aj +++ b/x11/gtk2/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.13 2009/10/21 15:34:06 drochner Exp $ +$NetBSD: patch-aj,v 1.14 2010/11/15 18:28:45 drochner Exp $ ---- Makefile.in.orig 2009-09-23 04:22:53.000000000 +0200 +--- Makefile.in.orig 2010-09-23 14:27:26.000000000 +0000 +++ Makefile.in -@@ -464,7 +464,7 @@ XVFB_START = \ +@@ -458,7 +458,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros +-SRC_SUBDIRS = gdk gtk modules demos tests perf ++SRC_SUBDIRS = gdk gtk modules demos + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build # require automake 1.4 |