cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to gtk+2-2.18.4.

Browse Source
This commit is contained in:
ajacoutot 2009-12-01 09:41:14 +00:00
parent adcdef2c3d
commit 9f43c77cc7
8 changed files with 33 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/gtk+2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2009/11/29 11:54:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.93 2009/12/01 09:41:14 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,12 +6,12 @@ COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend
VERSION= 2.18.3
VERSION= 2.18.4
DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}p0
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
PKGNAME-cups= gtk+2-cups-${VERSION}p0
PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel

10
x11/gtk+2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtk+-2.18.3.tar.bz2) = Np4XNgDvwnITG1OxkCZ56A==
RMD160 (gtk+-2.18.3.tar.bz2) = RLRFAdjvNJB4eWQgC1KWXZ0oLVw=
SHA1 (gtk+-2.18.3.tar.bz2) = pUMgF6MRbLZkYBUNCJ6K7b51ZkE=
SHA256 (gtk+-2.18.3.tar.bz2) = HAZl/lYKVghR6LPJplAdQWxLVKv7b6B1SdcDoE6naL8=
SIZE (gtk+-2.18.3.tar.bz2) = 19069010
MD5 (gtk+-2.18.4.tar.bz2) = MR7EnXyuDAtDGrYjVXn1pA==
RMD160 (gtk+-2.18.4.tar.bz2) = MLeA2I/VjVYUGt3ITishGEd4dB4=
SHA1 (gtk+-2.18.4.tar.bz2) = en1sOMMNKxI01RLuUYTvTDlW54I=
SHA256 (gtk+-2.18.4.tar.bz2) = Z6g8ay53S8ILKgWC+3+tex6NXgTt458pnWFONldW0qc=
SIZE (gtk+-2.18.4.tar.bz2) = 18128230

8
x11/gtk+2/patches/patch-demos_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.20 2009/10/04 18:17:57 ajacoutot Exp $
--- demos/Makefile.in.orig Wed Sep 23 04:22:46 2009
+++ demos/Makefile.in Tue Sep 29 06:59:19 2009
@@ -935,6 +935,7 @@ test-report perf-report full-report: ${TEST_PROGS}
$OpenBSD: patch-demos_Makefile_in,v 1.21 2009/12/01 09:41:14 ajacoutot Exp $
--- demos/Makefile.in.orig Tue Dec 1 05:08:43 2009
+++ demos/Makefile.in Tue Dec 1 09:37:09 2009
@@ -937,6 +937,7 @@ test-report perf-report full-report: ${TEST_PROGS}
check-local: test
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png

12
x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.23 2009/10/04 18:17:57 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Tue Sep 29 09:17:04 2009
+++ gdk-pixbuf/Makefile.in Tue Sep 29 09:18:08 2009
@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.24 2009/12/01 09:41:14 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Tue Dec 1 05:08:44 2009
+++ gdk-pixbuf/Makefile.in Tue Dec 1 09:37:09 2009
@@ -1326,7 +1326,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)
@ -10,7 +10,7 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.23 2009/10/04 18:17:57 ajacoutot Exp
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
#
@@ -2331,13 +2331,6 @@ install-data-hook: install-ms-lib install-def-file
@@ -2333,13 +2333,6 @@ install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
@ -24,7 +24,7 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.23 2009/10/04 18:17:57 ajacoutot Exp
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2349,7 +2342,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2351,7 +2344,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@BUILD_DYNAMIC_MODULES_TRUE@ LOADERS=`echo libpixbufloader-*.la` ; \
@BUILD_DYNAMIC_MODULES_TRUE@ if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
@BUILD_DYNAMIC_MODULES_TRUE@ echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \

8
x11/gtk+2/patches/patch-gtk_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.15 2009/10/17 16:14:54 ajacoutot Exp $
--- gtk/Makefile.in.orig Sat Oct 17 03:53:00 2009
+++ gtk/Makefile.in Sat Oct 17 17:52:05 2009
@@ -935,7 +935,7 @@ SUBDIRS = theme-bits . tests
$OpenBSD: patch-gtk_Makefile_in,v 1.16 2009/12/01 09:41:14 ajacoutot Exp $
--- gtk/Makefile.in.orig Tue Dec 1 05:08:46 2009
+++ gtk/Makefile.in Tue Dec 1 09:37:09 2009
@@ -937,7 +937,7 @@ 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_TRUE@GTK_PRINT_BACKENDS = file,papi

28
x11/gtk+2/patches/patch-gtk_gtktoolbutton_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-gtk_gtktoolbutton_c,v 1.1 2009/11/29 11:54:31 ajacoutot Exp $
Functions like gtk_tool_button_new (NULL, NULL) gives critical warnings:
CRITICAL **: atk_object_set_name: assertion `name != NULL' failed
See:
https://bugzilla.gnome.org/show_bug.cgi?id=599446
--- gtk/gtktoolbutton.c.orig Fri Oct 16 16:38:56 2009
+++ gtk/gtktoolbutton.c Sun Nov 29 12:06:38 2009
@@ -916,11 +916,14 @@ gtk_tool_button_set_label (GtkToolButton *button,
button->priv->label_text = g_strdup (label);
button->priv->contents_invalid = TRUE;
- elided_label = _gtk_toolbar_elide_underscores (label);
- accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
- atk_object_set_name (accessible, elided_label);
+ if (label)
+ {
+ elided_label = _gtk_toolbar_elide_underscores (label);
+ accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
+ atk_object_set_name (accessible, elided_label);
+ g_free (elided_label);
+ }
- g_free (elided_label);
g_free (old_label);
g_object_notify (G_OBJECT (button), "label");

10
x11/gtk+2/patches/patch-modules_input_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.22 2009/10/04 18:17:57 ajacoutot Exp $
--- modules/input/Makefile.in.orig Wed Sep 23 04:22:51 2009
+++ modules/input/Makefile.in Tue Sep 29 06:59:20 2009
@@ -1239,13 +1239,6 @@ install-data-hook:
$OpenBSD: patch-modules_input_Makefile_in,v 1.23 2009/12/01 09:41:14 ajacoutot Exp $
--- modules/input/Makefile.in.orig Tue Dec 1 05:08:47 2009
+++ modules/input/Makefile.in Tue Dec 1 09:37:09 2009
@@ -1241,13 +1241,6 @@ install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
@ -15,7 +15,7 @@ $OpenBSD: patch-modules_input_Makefile_in,v 1.22 2009/10/04 18:17:57 ajacoutot E
fi
uninstall-local:
@@ -1254,6 +1247,7 @@ uninstall-local:
@@ -1256,6 +1249,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

6
x11/gtk+2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.14 2009/10/04 18:17:57 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.15 2009/12/01 09:41:14 ajacoutot Exp $
@conflict gail-*
@pkgpath x11/gtk+2
@bin bin/gdk-pixbuf-csource
@ -609,6 +609,10 @@ share/locale/ms/LC_MESSAGES/gtk20-properties.mo
share/locale/ms/LC_MESSAGES/gtk20.mo
share/locale/nb/LC_MESSAGES/gtk20-properties.mo
share/locale/nb/LC_MESSAGES/gtk20.mo
share/locale/nds/
share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/gtk20-properties.mo
share/locale/nds/LC_MESSAGES/gtk20.mo
share/locale/ne/LC_MESSAGES/gtk20-properties.mo
share/locale/ne/LC_MESSAGES/gtk20.mo
share/locale/nl/LC_MESSAGES/gtk20-properties.mo