From afa8709a25036981e4dc2780558561ceea8cf561 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 26 Sep 2012 21:38:48 +0000 Subject: [PATCH] Update to stable gtk+3-3.6.0. --- x11/gtk+3/Makefile | 8 +++--- x11/gtk+3/distinfo | 4 +-- x11/gtk+3/patches/patch-gtk_Makefile_in | 8 +++--- x11/gtk+3/pkg/PLIST-main | 37 ++++++------------------- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/x11/gtk+3/Makefile b/x11/gtk+3/Makefile index 7a21aa0e5c9..a7ffad7742b 100644 --- a/x11/gtk+3/Makefile +++ b/x11/gtk+3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.48 2012/09/21 14:48:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.49 2012/09/26 21:38:48 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT-main= multi-platform graphical toolkit COMMENT-cups= gtk+3 CUPS print backend -V= 3.5.18 +V= 3.6.0 DISTNAME= gtk+-${V} EXTRACT_SUFX= .tar.xz @@ -61,9 +61,9 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \ misc/shared-mime-info LIB_DEPENDS-main= ${LIB_DEPENDS} \ - devel/pango>=1.31.2 \ + devel/pango>=1.32.0 \ graphics/gdk-pixbuf2 \ - x11/gnome/at-spi2-atk>=2.5.92 + x11/gnome/at-spi2-atk>=2.6.0 WANTLIB-main += ${WANTLIB} WANTLIB-main += c diff --git a/x11/gtk+3/distinfo b/x11/gtk+3/distinfo index 8b1d7197154..b8e450ee3d8 100644 --- a/x11/gtk+3/distinfo +++ b/x11/gtk+3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gtk+-3.5.18.tar.xz) = LcZ3nkRzMrSWPU7zrGc+WQqs7V6k5xmYwGPcQ92Gb60= -SIZE (gtk+-3.5.18.tar.xz) = 13224216 +SHA256 (gtk+-3.6.0.tar.xz) = 4T9FIlp5Xr6eQEdIb6V7MjLmohU5mDd122zUrpBGsEk= +SIZE (gtk+-3.6.0.tar.xz) = 13211800 diff --git a/x11/gtk+3/patches/patch-gtk_Makefile_in b/x11/gtk+3/patches/patch-gtk_Makefile_in index 6b8f29783db..a1a12d0c286 100644 --- a/x11/gtk+3/patches/patch-gtk_Makefile_in +++ b/x11/gtk+3/patches/patch-gtk_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-gtk_Makefile_in,v 1.13 2012/09/21 13:20:19 ajacoutot Exp $ ---- gtk/Makefile.in.orig Tue Sep 18 23:38:15 2012 -+++ gtk/Makefile.in Thu Sep 20 16:34:48 2012 -@@ -937,7 +937,7 @@ INTROSPECTION_COMPILER_ARGS = \ +$OpenBSD: patch-gtk_Makefile_in,v 1.14 2012/09/26 21:38:48 ajacoutot Exp $ +--- gtk/Makefile.in.orig Mon Sep 24 22:54:10 2012 ++++ gtk/Makefile.in Wed Sep 26 22:58:36 2012 +@@ -938,7 +938,7 @@ INTROSPECTION_COMPILER_ARGS = \ SUBDIRS = a11y . 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 diff --git a/x11/gtk+3/pkg/PLIST-main b/x11/gtk+3/pkg/PLIST-main index 2e0761978dd..eb3712ed9ac 100644 --- a/x11/gtk+3/pkg/PLIST-main +++ b/x11/gtk+3/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.13 2012/09/21 13:20:19 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.14 2012/09/26 21:38:48 ajacoutot Exp $ @conflict gtk+3-docs-* @pkgpath x11/gtk+3,-docs @unexec-delete rm -f ${SYSCONFDIR}/gtk-3.0/gtk.immodules @@ -304,32 +304,6 @@ lib/girepository-1.0/Gdk-3.0.typelib lib/girepository-1.0/GdkX11-3.0.typelib lib/girepository-1.0/Gtk-3.0.typelib lib/gtk-3.0/ -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-am-et.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-am-et.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cedilla.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cedilla.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cyrillic-translit.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-cyrillic-translit.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-inuktitut.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-inuktitut.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ipa.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ipa.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-multipress.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-multipress.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-thai.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-thai.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-er.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-er.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-et.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-ti-et.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-viqr.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-viqr.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-xim.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-xim.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-file.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-file.la -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-lpr.a -@comment lib/gtk-3.0/${GTK_BINARY_VERSION}/printbackends/libprintbackend-lpr.la lib/gtk-3.0/${GTK_BINARY_VERSION}/ lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/ lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules/im-am-et.so @@ -368,7 +342,9 @@ lib/pkgconfig/gtk+-x11-3.0.pc share/aclocal/gtk-3.0.m4 share/examples/gtk+3/ share/examples/gtk+3/gtk-3.0/ +@sample ${SYSCONFDIR}/gtk-3.0/ share/examples/gtk+3/gtk-3.0/im-multipress.conf +@sample ${SYSCONFDIR}/gtk-3.0/im-multipress.conf share/gir-1.0/Gdk-3.0.gir share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir @@ -398,6 +374,8 @@ share/gtk-3.0/demo/css_multiplebgs.c share/gtk-3.0/demo/css_multiplebgs.css share/gtk-3.0/demo/css_pixbufs.c share/gtk-3.0/demo/css_pixbufs.css +share/gtk-3.0/demo/css_shadows.c +share/gtk-3.0/demo/css_shadows.css share/gtk-3.0/demo/cssview.css share/gtk-3.0/demo/demo.ui share/gtk-3.0/demo/dialog.c @@ -1222,6 +1200,10 @@ share/locale/ko/LC_MESSAGES/gtk30-properties.mo share/locale/ko/LC_MESSAGES/gtk30.mo share/locale/ku/LC_MESSAGES/gtk30-properties.mo share/locale/ku/LC_MESSAGES/gtk30.mo +share/locale/ky/ +share/locale/ky/LC_MESSAGES/ +share/locale/ky/LC_MESSAGES/gtk30-properties.mo +share/locale/ky/LC_MESSAGES/gtk30.mo share/locale/lg/ share/locale/lg/LC_MESSAGES/ share/locale/lg/LC_MESSAGES/gtk30-properties.mo @@ -1341,7 +1323,6 @@ share/themes/Default/gtk-3.0/gtk-keys.css share/themes/Emacs/ share/themes/Emacs/gtk-3.0/ share/themes/Emacs/gtk-3.0/gtk-keys.css -@sample ${SYSCONFDIR}/gtk-3.0/ @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null @exec %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/${GTK_BINARY_VERSION}/immodules.cache