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

Bugfix update to gtk+2-2.20.1 (fixes a crash in g_file_get_child).

Browse Source
This commit is contained in:
ajacoutot 2010-05-03 15:04:27 +00:00
parent 34e4f3aa78
commit 67fb711cc7
9 changed files with 36 additions and 42 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.106 2010/05/02 14:07:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.107 2010/05/03 15:04:27 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.20.0
VERSION= 2.20.1
DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}p5
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
PKGNAME-cups= gtk+2-cups-${VERSION}p1
PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel

10
x11/gtk+2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtk+-2.20.0.tar.bz2) = VRf3ix65setgvUigFS0J5g==
RMD160 (gtk+-2.20.0.tar.bz2) = nxXfoNu6JtskfFvk7Rt5BSLxIiA=
SHA1 (gtk+-2.20.0.tar.bz2) = 24qPEECoE/waeHLTi2dbSAX6BEY=
SHA256 (gtk+-2.20.0.tar.bz2) = jqfhH/iOmohnt9kiHUCjv85cZIzifNa6xCL/j2zKQU0=
SIZE (gtk+-2.20.0.tar.bz2) = 19146851
MD5 (gtk+-2.20.1.tar.bz2) = U+bzqTvSKTSHj8Sko0xoqg==
RMD160 (gtk+-2.20.1.tar.bz2) = vNXyD54/jU5vm9kTiN4v6YUe82E=
SHA1 (gtk+-2.20.1.tar.bz2) = qAlTtOgcalvCqYaFL3/mDIcEzAI=
SHA256 (gtk+-2.20.1.tar.bz2) = DggXMdIeNP9FyCGZSQwoiVBPqLPH4RfAQ+gqurrsD2U=
SIZE (gtk+-2.20.1.tar.bz2) = 19089076

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

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.24 2010/05/02 07:10:04 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.25 2010/05/03 15:04:27 ajacoutot Exp $
Do not force enable_man to yes.
--- configure.orig Sun May 2 09:00:53 2010
+++ configure Sun May 2 09:02:24 2010
@@ -25373,7 +25373,7 @@ fi
--- configure.orig Mon May 3 01:55:05 2010
+++ configure Mon May 3 13:51:14 2010
@@ -25374,7 +25374,7 @@ fi
# Check whether --enable-man was given.
if test "${enable_man+set}" = set; then :

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

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.24 2010/04/20 19:03:37 ajacoutot Exp $
--- demos/Makefile.in.orig Tue Mar 23 04:32:56 2010
+++ demos/Makefile.in Tue Apr 20 19:24:50 2010
@@ -969,6 +969,7 @@ test-report perf-report full-report: ${TEST_PROGS}
$OpenBSD: patch-demos_Makefile_in,v 1.25 2010/05/03 15:04:27 ajacoutot Exp $
--- demos/Makefile.in.orig Mon May 3 01:54:58 2010
+++ demos/Makefile.in Mon May 3 13:51:14 2010
@@ -966,6 +966,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.30 2010/04/25 20:35:08 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Tue Mar 23 04:32:58 2010
+++ gdk-pixbuf/Makefile.in Sun Apr 25 22:29:27 2010
@@ -1379,7 +1379,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.31 2010/05/03 15:04:27 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Mon May 3 01:54:59 2010
+++ gdk-pixbuf/Makefile.in Mon May 3 13:51:14 2010
@@ -1376,7 +1376,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.30 2010/04/25 20:35:08 ajacoutot Exp
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
#
@@ -2451,13 +2451,6 @@ install-data-hook: install-ms-lib install-def-file
@@ -2448,13 +2448,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.30 2010/04/25 20:35:08 ajacoutot Exp
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2469,7 +2462,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2466,7 +2459,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."; \

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

@ -1,10 +1,10 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.22 2010/05/02 14:07:14 ajacoutot Exp $
$OpenBSD: patch-gtk_Makefile_in,v 1.23 2010/05/03 15:04:27 ajacoutot Exp $
Fix use of grep(1) as we don't support the -o switch.
--- gtk/Makefile.in.orig Tue Mar 23 04:32:59 2010
+++ gtk/Makefile.in Sun May 2 12:51:17 2010
@@ -971,7 +971,7 @@ SUBDIRS = theme-bits . tests
--- gtk/Makefile.in.orig Mon May 3 01:55:01 2010
+++ gtk/Makefile.in Mon May 3 13:51:15 2010
@@ -968,7 +968,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
@ -13,7 +13,7 @@ Fix use of grep(1) as we don't support the -o switch.
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
INCLUDES = \
-DG_LOG_DOMAIN=\"Gtk\" \
@@ -2778,7 +2778,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) g
@@ -2775,7 +2775,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) g
gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.26 2010/04/20 19:03:37 ajacoutot Exp $
--- modules/input/Makefile.in.orig Tue Mar 23 04:33:00 2010
+++ modules/input/Makefile.in Tue Apr 20 19:24:51 2010
@@ -1255,13 +1255,6 @@ install-data-hook:
$OpenBSD: patch-modules_input_Makefile_in,v 1.27 2010/05/03 15:04:27 ajacoutot Exp $
--- modules/input/Makefile.in.orig Mon May 3 01:55:02 2010
+++ modules/input/Makefile.in Mon May 3 13:51:15 2010
@@ -1252,13 +1252,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.26 2010/04/20 19:03:37 ajacoutot E
fi
uninstall-local:
@@ -1270,6 +1263,7 @@ uninstall-local:
@@ -1267,6 +1260,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

4
x11/gtk+2/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.27 2010/04/20 19:03:37 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.28 2010/05/03 15:04:27 ajacoutot Exp $
@conflict gtk+2-<2.4.9
share/gtk-doc/
share/gtk-doc/html/
@ -234,7 +234,6 @@ share/gtk-doc/html/gtk/GtkCellRendererText.html
share/gtk-doc/html/gtk/GtkCellRendererToggle.html
share/gtk-doc/html/gtk/GtkCellView.html
share/gtk-doc/html/gtk/GtkCheckButton.html
share/gtk-doc/html/gtk/GtkCheckMenuItem.html
share/gtk-doc/html/gtk/GtkColorButton.html
share/gtk-doc/html/gtk/GtkColorSelection.html
share/gtk-doc/html/gtk/GtkColorSelectionDialog.html
@ -512,6 +511,7 @@ 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

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.17 2010/04/20 19:03:37 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.18 2010/05/03 15:04:27 ajacoutot Exp $
@conflict gail-*
@pkgpath x11/gtk+2
@bin bin/gdk-pixbuf-csource
@ -473,8 +473,6 @@ share/gtk-2.0/demo/textview.c
share/gtk-2.0/demo/toolpalette.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/gtk20-properties.mo
share/locale/af/LC_MESSAGES/gtk20.mo
share/locale/am/LC_MESSAGES/gtk20-properties.mo
@ -487,8 +485,6 @@ share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/as/LC_MESSAGES/gtk20-properties.mo
share/locale/as/LC_MESSAGES/gtk20.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/gtk20-properties.mo
share/locale/ast/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20-properties.mo
@ -621,8 +617,6 @@ share/locale/my/LC_MESSAGES/gtk20-properties.mo
share/locale/my/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