Tue Dec 8 18:54:37 2009 UTC ()
Update to 2.18.5:

Overview of Changes from GTK+ 2.18.4 to 2.18.5
==============================================

* Bugs fixed:
 603652	Sporadic crashes with GtkSocket
 598476	gnome-screensaver crashes when entering password...
 601473 GDK_BUTTON?_MOTION_MASK appears to be broken
 597386 Cannot click buttons more than once without...
 603619 the colormap of offscreen's pixmap doesn't...
 603904 gdk_draw_line doesn't have expose area.


(wiz)
diff -r1.192 -r1.193 pkgsrc/x11/gtk2/Makefile
diff -r1.119 -r1.120 pkgsrc/x11/gtk2/distinfo
cvs diff -r1.192 -r1.193 pkgsrc/x11/gtk2/Makefile (switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2009/12/06 22:40:02 1.192
+++ pkgsrc/x11/gtk2/Makefile 2009/12/08 18:54:36 1.193
@@ -1,111 +1,111 @@ @@ -1,111 +1,111 @@
1# $NetBSD: Makefile,v 1.192 2009/12/06 22:40:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.193 2009/12/08 18:54:36 wiz Exp $
2 2
3DISTNAME= gtk+-2.18.4 3DISTNAME= gtk+-2.18.5
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \ 6MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \
7 ${MASTER_SITE_GNOME:=sources/gtk+/2.18/} 7 ${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gtk.org/ 11HOMEPAGE= http://www.gtk.org/
12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17CONFLICTS= gtk2-engines<2.6.0 17CONFLICTS= gtk2-engines<2.6.0
18CONFLICTS+= gail-[0-9]* 18CONFLICTS+= gail-[0-9]*
19 19
20SUPERSEDES= gail-[0-9]* 20SUPERSEDES= gail-[0-9]*
21 21
22USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
23USE_TOOLS+= gmake msgfmt perl pkg-config 23USE_TOOLS+= gmake msgfmt perl pkg-config
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26PTHREAD_AUTO_VARS= yes 26PTHREAD_AUTO_VARS= yes
27 27
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
30# Work around build problems, disable unstable PAPI, PR #41608: 30# Work around build problems, disable unstable PAPI, PR #41608:
31CONFIGURE_ARGS+= --disable-papi 31CONFIGURE_ARGS+= --disable-papi
32MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 32MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
33TEST_TARGET= check 33TEST_TARGET= check
34 34
35PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in 35PKGCONFIG_OVERRIDE= gdk-2.0-uninstalled.pc.in
36PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in 36PKGCONFIG_OVERRIDE+= gdk-2.0.pc.in
37PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in 37PKGCONFIG_OVERRIDE+= gtk+-2.0-uninstalled.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-2.0.pc.in
39PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-unix-print-2.0.pc.in
40PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in 40PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0-uninstalled.pc.in
41PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in 41PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
42PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in 42PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
43 43
44INSTALLATION_DIRS+= lib/gtk-2.0/immodules 44INSTALLATION_DIRS+= lib/gtk-2.0/immodules
45INSTALLATION_DIRS+= lib/gtk-2.0/modules 45INSTALLATION_DIRS+= lib/gtk-2.0/modules
46INSTALLATION_DIRS+= lib/gtk-2.0/2.10.0/filesystems 46INSTALLATION_DIRS+= lib/gtk-2.0/2.10.0/filesystems
47 47
48REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0 48REQD_DIRS+= ${PREFIX}/libdata/gtk-2.0
49 49
50BUILD_DIRS= . demos/gtk-demo 50BUILD_DIRS= . demos/gtk-demo
51 51
52.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
53 53
54# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms 54# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms
55# which do not have it. 55# which do not have it.
56.if ${OPSYS} == "SunOS" 56.if ${OPSYS} == "SunOS"
57BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep 57BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
58TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep 58TOOLS_PATH.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
59.endif 59.endif
60 60
61CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 61CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
62 62
63SUBST_CLASSES+= pthread 63SUBST_CLASSES+= pthread
64SUBST_STAGE.pthread= pre-configure 64SUBST_STAGE.pthread= pre-configure
65SUBST_MESSAGE.pthread= Fixing pthread flags. 65SUBST_MESSAGE.pthread= Fixing pthread flags.
66SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' 66SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
67SUBST_FILES.pthread= gdk-pixbuf/Makefile.in 67SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
68 68
69PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert 69PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert
70# gtk-builder-convert uses minidom from xml.dom, which needs expat 70# gtk-builder-convert uses minidom from xml.dom, which needs expat
71.include "../../lang/python/pyversion.mk" 71.include "../../lang/python/pyversion.mk"
72.if ${PYPKGPREFIX} == "py24" 72.if ${PYPKGPREFIX} == "py24"
73DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 73DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
74.endif 74.endif
75 75
76.include "options.mk" 76.include "options.mk"
77 77
78# We remove the module databases during post-install since we create them 78# We remove the module databases during post-install since we create them
79# anew in the +INSTALL script as part of the POST-INSTALL action. 79# anew in the +INSTALL script as part of the POST-INSTALL action.
80# 80#
81post-install: 81post-install:
82 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} 82 ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
83 ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB} 83 ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
84 84
85EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme 85EVAL_PREFIX+= PREFIX.hicolor=hicolor-icon-theme
86FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache" 86FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
87FILES_SUBST+= ICON_THEME_DIR="${PREFIX.hicolor}/share/icons/hicolor" 87FILES_SUBST+= ICON_THEME_DIR="${PREFIX.hicolor}/share/icons/hicolor"
88INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl 88INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl
89PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; } 89PRINT_PLIST_AWK+= /^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
90 90
91_BUILDING_GTK2= yes 91_BUILDING_GTK2= yes
92.include "modules.mk" 92.include "modules.mk"
93 93
94.include "../../databases/shared-mime-info/buildlink3.mk" 94.include "../../databases/shared-mime-info/buildlink3.mk"
95BUILDLINK_API_DEPENDS.atk+= atk>=1.13.0 95BUILDLINK_API_DEPENDS.atk+= atk>=1.13.0
96.include "../../devel/atk/buildlink3.mk" 96.include "../../devel/atk/buildlink3.mk"
97.include "../../devel/gettext-lib/buildlink3.mk" 97.include "../../devel/gettext-lib/buildlink3.mk"
98BUILDLINK_API_DEPENDS.glib2+= glib2>=2.21.3 98BUILDLINK_API_DEPENDS.glib2+= glib2>=2.21.3
99.include "../../devel/glib2/buildlink3.mk" 99.include "../../devel/glib2/buildlink3.mk"
100BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 100BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0
101.include "../../devel/pango/buildlink3.mk" 101.include "../../devel/pango/buildlink3.mk"
102.include "../../fonts/fontconfig/buildlink3.mk" 102.include "../../fonts/fontconfig/buildlink3.mk"
103BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0 103BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0
104.include "../../graphics/cairo/buildlink3.mk" 104.include "../../graphics/cairo/buildlink3.mk"
105.include "../../graphics/freetype2/buildlink3.mk" 105.include "../../graphics/freetype2/buildlink3.mk"
106.include "../../graphics/jpeg/buildlink3.mk" 106.include "../../graphics/jpeg/buildlink3.mk"
107.include "../../graphics/png/buildlink3.mk" 107.include "../../graphics/png/buildlink3.mk"
108.include "../../graphics/tiff/buildlink3.mk" 108.include "../../graphics/tiff/buildlink3.mk"
109.include "../../lang/python/application.mk" 109.include "../../lang/python/application.mk"
110 110
111.include "../../mk/bsd.pkg.mk" 111.include "../../mk/bsd.pkg.mk"
cvs diff -r1.119 -r1.120 pkgsrc/x11/gtk2/distinfo (switch to unified diff)

--- pkgsrc/x11/gtk2/distinfo 2009/12/06 22:40:02 1.119
+++ pkgsrc/x11/gtk2/distinfo 2009/12/08 18:54:36 1.120
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.119 2009/12/06 22:40:02 wiz Exp $ 1$NetBSD: distinfo,v 1.120 2009/12/08 18:54:36 wiz Exp $
2 2
3SHA1 (gtk+-2.18.4.tar.bz2) = 7a7d6c38c30d2b1234d512ee5184ef4c3956e782 3SHA1 (gtk+-2.18.5.tar.bz2) = ddb004f0f92f7c8e3b84237e05fcf0ef5affc79c
4RMD160 (gtk+-2.18.4.tar.bz2) = 30b780d88fd58d56141addc84e2b21184778741e 4RMD160 (gtk+-2.18.5.tar.bz2) = 712098237fc31dcb99189645f0320aa165855577
5Size (gtk+-2.18.4.tar.bz2) = 18128230 bytes 5Size (gtk+-2.18.5.tar.bz2) = 18126480 bytes
6SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3 6SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
7SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd 7SHA1 (patch-af) = 372a21cdb884e7c62852680d0029ded12c706efd
8SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133 8SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
9SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79 9SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
10SHA1 (patch-iojpeg) = 459db178ba8d44bd32cd089fc33689de5a57556b 10SHA1 (patch-iojpeg) = 459db178ba8d44bd32cd089fc33689de5a57556b
11SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb 11SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb