From 87724b9d6cdf5e0e2189f41c3ac80d6f1d6c1582 Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 9 Feb 2008 17:55:39 +0000 Subject: [PATCH] - update gtk+2 to 2.12.7 (bugfixes, updated translations and accesibility support for GtkBuilder) tested in a bulk build by steven@ ok ajacoutot@ --- x11/gtk+2/Makefile | 12 ++++++------ x11/gtk+2/distinfo | 10 +++++----- x11/gtk+2/patches/patch-configure | 8 ++++---- .../patch-docs_reference_gdk-pixbuf_Makefile_in | 12 ------------ .../patches/patch-docs_reference_gdk_Makefile_in | 12 ------------ .../patches/patch-docs_reference_gtk_Makefile_in | 12 ------------ x11/gtk+2/pkg/PLIST-docs | 4 ++-- x11/gtk+2/pkg/PLIST-main | 8 +++++++- 8 files changed, 24 insertions(+), 54 deletions(-) delete mode 100644 x11/gtk+2/patches/patch-docs_reference_gdk-pixbuf_Makefile_in delete mode 100644 x11/gtk+2/patches/patch-docs_reference_gdk_Makefile_in delete mode 100644 x11/gtk+2/patches/patch-docs_reference_gtk_Makefile_in diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 24826123479..7427305647f 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,18 +1,18 @@ -# $OpenBSD: Makefile,v 1.59 2008/01/17 22:26:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.60 2008/02/09 17:55:39 jasper Exp $ SHARED_ONLY= Yes COMMENT-main= multi-platform graphical toolkit COMMENT-docs= gtk+-2 documentation -VERSION= 2.12.3 +VERSION= 2.12.7 DISTNAME= gtk+-${VERSION} PKGNAME-main= gtk+2-${VERSION} PKGNAME-docs= gtk+2-docs-${VERSION} -SHARED_LIBS += gdk_pixbuf-2.0 1200.3 # .1200.3 -SHARED_LIBS += gdk-x11-2.0 1200.3 # .1200.3 -SHARED_LIBS += gtk-x11-2.0 1200.3 # .1200.3 -SHARED_LIBS += gdk_pixbuf_xlib-2.0 1200.3 # .1200.3 +SHARED_LIBS += gdk_pixbuf-2.0 1200.7 # .1200.7 +SHARED_LIBS += gdk-x11-2.0 1200.7 # .1200.7 +SHARED_LIBS += gtk-x11-2.0 1200.7 # .1200.7 +SHARED_LIBS += gdk_pixbuf_xlib-2.0 1200.7 # .1200.7 CATEGORIES= x11 devel HOMEPAGE= http://www.gtk.org/ diff --git a/x11/gtk+2/distinfo b/x11/gtk+2/distinfo index 5c6a1388269..91f73a65a32 100644 --- a/x11/gtk+2/distinfo +++ b/x11/gtk+2/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk+-2.12.3.tar.bz2) = 3IRVFE8nlF8vy+kedazRGA== -RMD160 (gtk+-2.12.3.tar.bz2) = XaIq5Kwle9L8774vN06StrDbzIU= -SHA1 (gtk+-2.12.3.tar.bz2) = WvWrBpxJGJq/Ijslc2wlTaBHxxI= -SHA256 (gtk+-2.12.3.tar.bz2) = 533OwbL3q3YGr9r2Oh3fgK9MX1GOH8xyYNrbZ53YWPo= -SIZE (gtk+-2.12.3.tar.bz2) = 15898599 +MD5 (gtk+-2.12.7.tar.bz2) = VxMsSpIe8A4kGg/JkXh1Vg== +RMD160 (gtk+-2.12.7.tar.bz2) = O7L9kH+astI1ORNiyWIO7itfMig= +SHA1 (gtk+-2.12.7.tar.bz2) = fwGb04NNnj5l5zvY1pqqDz/RxsY= +SHA256 (gtk+-2.12.7.tar.bz2) = 7xvm0Qm4pKBcYElEYWBDpGR1EPXB/164Sh6uzD1UJdM= +SIZE (gtk+-2.12.7.tar.bz2) = 16111869 diff --git a/x11/gtk+2/patches/patch-configure b/x11/gtk+2/patches/patch-configure index 8006d583b54..20d614c34d3 100644 --- a/x11/gtk+2/patches/patch-configure +++ b/x11/gtk+2/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.18 2008/01/17 22:26:50 jasper Exp $ ---- configure.orig Thu Jan 17 23:20:27 2008 -+++ configure Thu Jan 17 23:21:05 2008 -@@ -32936,7 +32936,9 @@ fi +$OpenBSD: patch-configure,v 1.19 2008/02/09 17:55:39 jasper Exp $ +--- configure.orig Wed Jan 30 04:13:49 2008 ++++ configure Fri Feb 1 14:23:41 2008 +@@ -32939,7 +32939,9 @@ fi fi diff --git a/x11/gtk+2/patches/patch-docs_reference_gdk-pixbuf_Makefile_in b/x11/gtk+2/patches/patch-docs_reference_gdk-pixbuf_Makefile_in deleted file mode 100644 index 872d1939122..00000000000 --- a/x11/gtk+2/patches/patch-docs_reference_gdk-pixbuf_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_reference_gdk-pixbuf_Makefile_in,v 1.1 2008/01/17 22:26:50 jasper Exp $ ---- docs/reference/gdk-pixbuf/Makefile.in.orig Sun Jan 6 23:23:16 2008 -+++ docs/reference/gdk-pixbuf/Makefile.in Sun Jan 6 23:34:51 2008 -@@ -761,7 +761,7 @@ install-data-local: - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -- if test "`which gtkdoc-rebase`" != ""; then \ -+ if test "`whereis gtkdoc-rebase`" != ""; then \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi \ - fi diff --git a/x11/gtk+2/patches/patch-docs_reference_gdk_Makefile_in b/x11/gtk+2/patches/patch-docs_reference_gdk_Makefile_in deleted file mode 100644 index bbb920987fd..00000000000 --- a/x11/gtk+2/patches/patch-docs_reference_gdk_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_reference_gdk_Makefile_in,v 1.1 2008/01/17 22:26:50 jasper Exp $ ---- docs/reference/gdk/Makefile.in.orig Sun Jan 6 23:56:07 2008 -+++ docs/reference/gdk/Makefile.in Sun Jan 6 23:56:20 2008 -@@ -779,7 +779,7 @@ install-data-local: - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -- if test "`which gtkdoc-rebase`" != ""; then \ -+ if test "`whereis gtkdoc-rebase`" != ""; then \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi \ - fi diff --git a/x11/gtk+2/patches/patch-docs_reference_gtk_Makefile_in b/x11/gtk+2/patches/patch-docs_reference_gtk_Makefile_in deleted file mode 100644 index 775f04c7065..00000000000 --- a/x11/gtk+2/patches/patch-docs_reference_gtk_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_reference_gtk_Makefile_in,v 1.1 2008/01/17 22:26:50 jasper Exp $ ---- docs/reference/gtk/Makefile.in.orig Sun Jan 6 23:56:27 2008 -+++ docs/reference/gtk/Makefile.in Sun Jan 6 23:56:41 2008 -@@ -1024,7 +1024,7 @@ install-data-local: - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -- if test "`which gtkdoc-rebase`" != ""; then \ -+ if test "`whereis gtkdoc-rebase`" != ""; then \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi \ - fi diff --git a/x11/gtk+2/pkg/PLIST-docs b/x11/gtk+2/pkg/PLIST-docs index 7211bd527ac..73b872b40d8 100644 --- a/x11/gtk+2/pkg/PLIST-docs +++ b/x11/gtk+2/pkg/PLIST-docs @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST-docs,v 1.21 2008/01/17 22:26:50 jasper Exp $ +@comment $OpenBSD: PLIST-docs,v 1.22 2008/02/09 17:55:39 jasper Exp $ @conflict gtk+2-<2.4.9 share/gtk-doc/ share/gtk-doc/html/ +share/gtk-doc/html/gdk/ share/gtk-doc/html/gdk-pixbuf/ share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html share/gtk-doc/html/gdk-pixbuf/apa.html @@ -45,7 +46,6 @@ 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/ share/gtk-doc/html/gdk/GdkDisplay.html share/gtk-doc/html/gdk/GdkDisplayManager.html share/gtk-doc/html/gdk/GdkScreen.html diff --git a/x11/gtk+2/pkg/PLIST-main b/x11/gtk+2/pkg/PLIST-main index 745018d886e..99ae0fa84f2 100644 --- a/x11/gtk+2/pkg/PLIST-main +++ b/x11/gtk+2/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2007/10/24 22:34:34 jasper Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2008/02/09 17:55:39 jasper Exp $ @pkgpath x11/gtk+2 bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders @@ -529,6 +529,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/kn/LC_MESSAGES/gtk20-properties.mo +share/locale/kn/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20-properties.mo share/locale/ko/LC_MESSAGES/gtk20.mo share/locale/ku/LC_MESSAGES/gtk20-properties.mo @@ -587,6 +589,10 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo share/locale/rw/LC_MESSAGES/gtk20-properties.mo share/locale/rw/LC_MESSAGES/gtk20.mo +share/locale/si/ +share/locale/si/LC_MESSAGES/ +share/locale/si/LC_MESSAGES/gtk20-properties.mo +share/locale/si/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20-properties.mo