Bugfix update to gtk+2-2.24.7.

This commit is contained in:
ajacoutot 2011-10-18 06:20:16 +00:00
parent aca4847639
commit 64a15445f3
5 changed files with 20 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.136 2011/09/16 12:29:15 espie Exp $ # $OpenBSD: Makefile,v 1.137 2011/10/18 06:20:16 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -6,13 +6,12 @@ COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+2 documentation COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend COMMENT-cups= gtk+2 CUPS print backend
V= 2.24.6 V= 2.24.7
DISTNAME= gtk+-${V} DISTNAME= gtk+-${V}
PKGNAME-main= gtk+2-${V} PKGNAME-main= gtk+2-${V}
PKGNAME-docs= gtk+2-docs-${V} PKGNAME-docs= gtk+2-docs-${V}
PKGNAME-cups= gtk+2-cups-${V} PKGNAME-cups= gtk+2-cups-${V}
REVISION-main = 0
CATEGORIES= x11 devel CATEGORIES= x11 devel
@ -32,7 +31,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender cairo expat fontconfig freetype WANTLIB += Xi Xinerama Xrandr Xrender cairo expat fontconfig freetype
WANTLIB += gthread-2.0 m pcre pixman-1 pthread-stubs xcb WANTLIB += gthread-2.0 m pcre pixman-1 pthread-stubs xcb ffi
WANTLIB += xcb-render z gdk_pixbuf-2.0 GL Xxf86vm drm xcb-shm WANTLIB += xcb-render z gdk_pixbuf-2.0 GL Xxf86vm drm xcb-shm
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}

View File

@ -1,5 +1,5 @@
MD5 (gtk+-2.24.6.tar.bz2) = QhEA9ll+YTI0+N6tYJGp/g== MD5 (gtk+-2.24.7.tar.bz2) = s6PmUvGGXC/XiJE3BaRWhw==
RMD160 (gtk+-2.24.6.tar.bz2) = m80r0B19rUWIdHTHWz+QsoXvnWk= RMD160 (gtk+-2.24.7.tar.bz2) = OoBF+UrPeIFZBg0ImTMelPZ4u6Q=
SHA1 (gtk+-2.24.6.tar.bz2) = GAICNyXHtjmkdD0BKsw3hjOIVLE= SHA1 (gtk+-2.24.7.tar.bz2) = Cw459MADDHg/8+RU0XYdOgVPG3Q=
SHA256 (gtk+-2.24.6.tar.bz2) = b0W9v56ifrO1+XfX7iNl3t4NDORUmFaAwm5SEBY7vzc= SHA256 (gtk+-2.24.7.tar.bz2) = hIHDUVbqAcqUxzR9nyi3Juu+CRTVQWowurmwB6/v4UE=
SIZE (gtk+-2.24.6.tar.bz2) = 18330995 SIZE (gtk+-2.24.7.tar.bz2) = 18177406

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.31 2011/08/31 06:25:55 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.32 2011/10/18 06:20:16 ajacoutot Exp $
./configure[23737]: ${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}: bad substitution ./configure[23737]: ${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}: bad substitution
Do not force enable_man to yes. Do not force enable_man to yes.
--- configure.orig Tue Aug 30 22:23:21 2011 --- configure.orig Tue Oct 18 00:02:58 2011
+++ configure Wed Aug 31 07:53:02 2011 +++ configure Tue Oct 18 07:49:02 2011
@@ -25121,7 +25121,7 @@ fi @@ -25142,7 +25142,7 @@ fi
# Check whether --enable-man was given. # Check whether --enable-man was given.
if test "${enable_man+set}" = set; then : if test "${enable_man+set}" = set; then :

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.32 2011/08/31 06:25:55 ajacoutot Exp $ $OpenBSD: patch-gtk_Makefile_in,v 1.33 2011/10/18 06:20:16 ajacoutot Exp $
XXX Link the new icon names to their old icon names XXX Link the new icon names to their old icon names
because some applications are broken. Use this until because some applications are broken. Use this until
they get fixed. This is temporary. they get fixed. This is temporary.
https://bugzilla.gnome.org/show_bug.cgi?id=629878 https://bugzilla.gnome.org/show_bug.cgi?id=629878
--- gtk/Makefile.in.orig Tue Aug 30 22:23:19 2011 --- gtk/Makefile.in.orig Tue Oct 18 00:38:32 2011
+++ gtk/Makefile.in Wed Aug 31 07:53:02 2011 +++ gtk/Makefile.in Tue Oct 18 07:49:02 2011
@@ -952,7 +952,7 @@ SUBDIRS = theme-bits . tests @@ -1236,7 +1236,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests DIST_SUBDIRS = theme-bits tests
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
@ -16,7 +16,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups @HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"Gtk\" \ -DG_LOG_DOMAIN=\"Gtk\" \
@@ -1616,7 +1616,171 @@ GENERATED_ICONS = \ @@ -1896,7 +1896,171 @@ GENERATED_ICONS = \
stock-icons/24/folder-remote.png \ stock-icons/24/folder-remote.png \
stock-icons/24/user-home.png \ stock-icons/24/user-home.png \
stock-icons/24/user-desktop.png \ stock-icons/24/user-desktop.png \
@ -189,7 +189,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
@@ -2907,6 +3071,88 @@ stamp-icons: $(STOCK_ICONS) @@ -5626,6 +5790,88 @@ stamp-icons: $(STOCK_ICONS)
&& $(LN_S) folder.png user-desktop.png \ && $(LN_S) folder.png user-desktop.png \
&& $(RM) user-home.png \ && $(RM) user-home.png \
&& $(LN_S) folder.png user-home.png \ && $(LN_S) folder.png user-home.png \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.32 2011/06/16 08:38:41 ajacoutot Exp $ @comment $OpenBSD: PLIST-docs,v 1.33 2011/10/18 06:20:16 ajacoutot Exp $
@conflict gtk+2-<2.4.9 @conflict gtk+2-<2.4.9
share/gtk-doc/ share/gtk-doc/
share/gtk-doc/html/ share/gtk-doc/html/
@ -85,7 +85,6 @@ share/gtk-doc/html/gdk/gdk-Testing.html
share/gtk-doc/html/gdk/gdk-Threads.html share/gtk-doc/html/gdk/gdk-Threads.html
share/gtk-doc/html/gdk/gdk-Visuals.html share/gtk-doc/html/gdk/gdk-Visuals.html
share/gtk-doc/html/gdk/gdk-Windows.html share/gtk-doc/html/gdk/gdk-Windows.html
share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html
share/gtk-doc/html/gdk/gdk.devhelp2 share/gtk-doc/html/gdk/gdk.devhelp2
share/gtk-doc/html/gdk/gobbler.png share/gtk-doc/html/gdk/gobbler.png
share/gtk-doc/html/gdk/gumby.png share/gtk-doc/html/gdk/gumby.png
@ -605,6 +604,7 @@ share/gtk-doc/html/gtk/spinner.png
share/gtk-doc/html/gtk/statusbar.png share/gtk-doc/html/gtk/statusbar.png
share/gtk-doc/html/gtk/style.css share/gtk-doc/html/gtk/style.css
share/gtk-doc/html/gtk/system-run.png share/gtk-doc/html/gtk/system-run.png
share/gtk-doc/html/gtk/text-x-generic.png
share/gtk-doc/html/gtk/toggle-button.png share/gtk-doc/html/gtk/toggle-button.png
share/gtk-doc/html/gtk/toolbar.png share/gtk-doc/html/gtk/toolbar.png
share/gtk-doc/html/gtk/toolpalette.png share/gtk-doc/html/gtk/toolpalette.png