Update to gtk+3-3.12.0.

ok jasper@
This commit is contained in:
ajacoutot 2014-03-26 08:31:13 +00:00
parent 8a796d6443
commit 67e54e897c
8 changed files with 103 additions and 37 deletions

View File

@ -1,20 +1,22 @@
# $OpenBSD: Makefile,v 1.93 2014/01/28 08:40:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.94 2014/03/26 08:31:13 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= multi-platform graphical toolkit
COMMENT-cups= gtk+3 CUPS print backend
COMMENT-cloudprint= gtk+3 Google Cloud Print backend
GNOME_VERSION= 3.10.7
GNOME_VERSION= 3.12.0
GNOME_PROJECT= gtk+
PKGNAME-main= gtk+3-${GNOME_VERSION}
PKGNAME-cups= gtk+3-cups-${GNOME_VERSION}
PKGNAME-cloudprint= gtk+3-cloudprint-${GNOME_VERSION}
CATEGORIES= x11 devel
SHARED_LIBS += gdk-3 1000.0 # 1000.2
SHARED_LIBS += gtk-3 1000.0 # 1000.2
SHARED_LIBS += gdk-3 1200.0 # 1200.0
SHARED_LIBS += gtk-3 1200.0 # 1200.0
SHARED_LIBS += gailutil-3 0.0 # 0.0
HOMEPAGE= http://www.gtk.org/
@ -24,15 +26,15 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes graphite2
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo cairo-gobject
WANTLIB += expat ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += ICE SM dbus-1 harfbuzz pthread
WANTLIB += xcb xcb-render xcb-shm z atk-bridge-2.0 atspi
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += cairo cairo-gobject dbus-1 expat ffi fontconfig freetype
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gthread-2.0 harfbuzz m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += xcb xcb-render xcb-shm z
MULTI_PACKAGES= -main -cups
MULTI_PACKAGES= -main -cups -cloudprint
MODULES= devel/gettext \
devel/dconf \
@ -41,14 +43,13 @@ MODULES= devel/gettext \
# man pages
BUILD_DEPENDS += textproc/docbook-xsl
RUN_DEPENDS= x11/hicolor-icon-theme
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/pango \
graphics/gdk-pixbuf2 \
x11/gnome/at-spi2-atk
x11/gnome/at-spi2-atk>=2.12.0
RUN_DEPENDS-main= ${RUN_DEPENDS}
RUN_DEPENDS-main= ${RUN_DEPENDS} \
x11/hicolor-icon-theme
# convenient dependency to prevent hunting what needs what:
# some apps need more icons than the stock ones
@ -70,6 +71,16 @@ WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl
WANTLIB-cups += avahi-client avahi-common
WANTLIB-cups += com_err heimbase roken wind
RUN_DEPENDS-cloudprint= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-cloudprint= ${LIB_DEPENDS} \
devel/json-glib \
net/librest \
${BASE_PKGPATH},-main=${GNOME_VERSION}
WANTLIB-cloudprint += ${WANTLIB}
WANTLIB-cloudprint += gdk-3 gtk-3 json-glib-1.0 rest-0.7 soup-2.4 soup-gnome-2.4
WANTLIB-cloudprint += sqlite3 xml2
MODGNOME_TOOLS= gi
MODGNOME_CPPFLAGS= -I${X11BASE}/include/freetype2
MODGNOME_ICON_CACHE= Yes
@ -77,8 +88,6 @@ MODGNOME_ICON_CACHE= Yes
TEST_IS_INTERACTIVE= x11
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-x11-backend \
--disable-wayland-backend
# sync archs list with devel/spidermonkey
# colord depends on polkit which depends on spidermonkey

View File

@ -1,2 +1,2 @@
SHA256 (gtk+-3.10.7.tar.xz) = t+neFThQMc/0OJfn5Z9mkuqr9QDzbu+A5rnWSGrUlCc=
SIZE (gtk+-3.10.7.tar.xz) = 14363820
SHA256 (gtk+-3.12.0.tar.xz) = 62l0HNQCm1oayc8E2d5V3PnjB3emOJF1D10gzFVLbks=
SIZE (gtk+-3.12.0.tar.xz) = 14738160

View File

@ -1,12 +1,17 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.21 2013/12/05 09:45:12 ajacoutot Exp $
--- gtk/Makefile.in.orig Thu Dec 5 05:09:40 2013
+++ gtk/Makefile.in Thu Dec 5 10:10:52 2013
@@ -1020,7 +1020,7 @@ INTROSPECTION_COMPILER_ARGS = \
$OpenBSD: patch-gtk_Makefile_in,v 1.22 2014/03/26 08:31:13 ajacoutot Exp $
--- gtk/Makefile.in.orig Tue Mar 25 01:22:07 2014
+++ gtk/Makefile.in Tue Mar 25 10:08:20 2014
@@ -1036,11 +1036,11 @@ INTROSPECTION_COMPILER_ARGS = \
SUBDIRS = a11y native .
@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_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
+@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
@HAVE_CLOUDPRINT_FALSE@@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
@HAVE_CLOUDPRINT_FALSE@@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
-@HAVE_CLOUDPRINT_FALSE@@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
+@HAVE_CLOUDPRINT_FALSE@@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr
@HAVE_CLOUDPRINT_FALSE@@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
@HAVE_CLOUDPRINT_TRUE@@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr,cloudprint
@HAVE_CLOUDPRINT_TRUE@@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi,cloudprint
-@HAVE_CLOUDPRINT_TRUE@@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,cloudprint
+@HAVE_CLOUDPRINT_TRUE@@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr,cloudprint
@HAVE_CLOUDPRINT_TRUE@@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups,cloudprint
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gtk\" \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_gtksettings_c,v 1.10 2013/11/27 07:34:41 ajacoutot Exp $
--- gtk/gtksettings.c.orig Fri Nov 15 13:53:03 2013
+++ gtk/gtksettings.c Sat Nov 16 08:52:13 2013
@@ -464,7 +464,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
$OpenBSD: patch-gtk_gtksettings_c,v 1.11 2014/03/26 08:31:13 ajacoutot Exp $
--- gtk/gtksettings.c.orig Mon Mar 24 18:28:56 2014
+++ gtk/gtksettings.c Tue Mar 25 10:07:48 2014
@@ -472,7 +472,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
g_param_spec_string ("gtk-key-theme-name",
P_("Key Theme Name"),
P_("Name of key theme to load"),

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-modules_printbackends_cloudprint_gtkprintercloudprint_h,v 1.1 2014/03/26 08:31:13 ajacoutot Exp $
From 8ede929ef7fc79f52e5b7aa845f63975635a46d6 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Tue, 25 Mar 2014 11:24:41 +0000
Subject: prevent redefinition of typedef GtkPrinterCloudprint
--- modules/printbackends/cloudprint/gtkprintercloudprint.h.orig Tue Mar 25 10:50:09 2014
+++ modules/printbackends/cloudprint/gtkprintercloudprint.h Tue Mar 25 10:59:36 2014
@@ -30,8 +30,6 @@ G_BEGIN_DECLS
#define GTK_PRINTER_CLOUDPRINT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_CLOUDPRINT, GtkPrinterCloudprint))
#define GTK_IS_PRINTER_CLOUDPRINT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_CLOUDPRINT))
-typedef struct _GtkPrinterCloudprint GtkPrinterCloudprint;
-
void gtk_printer_cloudprint_register_type (GTypeModule *module);
GtkPrinterCloudprint *gtk_printer_cloudprint_new (const char *name,
gboolean is_virtual,

View File

@ -0,0 +1 @@
Google Cloud Print backend for gtk+3.

View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PLIST-cloudprint,v 1.1 2014/03/26 08:31:13 ajacoutot Exp $
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cloudprint.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.26 2013/12/05 09:45:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.27 2014/03/26 08:31:13 ajacoutot Exp $
@conflict gtk+3-docs-*
@pkgpath x11/gtk+3,-docs
@unexec-delete rm -f %D/lib/gtk-3.0/3.0.0/immodules.cache
@ -80,6 +80,8 @@ include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h
include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h
include/gtk-3.0/gtk/a11y/gtkentryaccessible.h
include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h
include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h
include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h
include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
@ -91,11 +93,13 @@ include/gtk-3.0/gtk/a11y/gtklistboxaccessible.h
include/gtk-3.0/gtk/a11y/gtklistboxrowaccessible.h
include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h
include/gtk-3.0/gtk/a11y/gtkmenubuttonaccessible.h
include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h
include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h
include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h
include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h
include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h
include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h
include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h
include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h
@ -157,6 +161,7 @@ include/gtk-3.0/gtk/gtkaccellabel.h
include/gtk-3.0/gtk/gtkaccelmap.h
include/gtk-3.0/gtk/gtkaccessible.h
include/gtk-3.0/gtk/gtkactionable.h
include/gtk-3.0/gtk/gtkactionbar.h
include/gtk-3.0/gtk/gtkadjustment.h
include/gtk-3.0/gtk/gtkalignment.h
include/gtk-3.0/gtk/gtkappchooser.h
@ -222,6 +227,7 @@ include/gtk-3.0/gtk/gtkfilechooserdialog.h
include/gtk-3.0/gtk/gtkfilechooserwidget.h
include/gtk-3.0/gtk/gtkfilefilter.h
include/gtk-3.0/gtk/gtkfixed.h
include/gtk-3.0/gtk/gtkflowbox.h
include/gtk-3.0/gtk/gtkfontbutton.h
include/gtk-3.0/gtk/gtkfontchooser.h
include/gtk-3.0/gtk/gtkfontchooserdialog.h
@ -267,6 +273,7 @@ include/gtk-3.0/gtk/gtkpaned.h
include/gtk-3.0/gtk/gtkpapersize.h
include/gtk-3.0/gtk/gtkplacessidebar.h
include/gtk-3.0/gtk/gtkplug.h
include/gtk-3.0/gtk/gtkpopover.h
include/gtk-3.0/gtk/gtkprintcontext.h
include/gtk-3.0/gtk/gtkprintoperation.h
include/gtk-3.0/gtk/gtkprintoperationpreview.h
@ -397,6 +404,9 @@ lib/pkgconfig/gtk+-x11-3.0.pc
@man man/man1/gtk-query-immodules-3.0.1
@comment @man man/man1/gtk-update-icon-cache.1
share/aclocal/gtk-3.0.m4
share/applications/
share/applications/gtk3-demo.desktop
share/applications/gtk3-widget-factory.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/gtk+3/
share/examples/gtk+3/gtk-3.0/
@ -433,11 +443,13 @@ share/gtk-doc/html/gdk3/GdkDevice.html
share/gtk-doc/html/gdk3/GdkDeviceManager.html
share/gtk-doc/html/gdk3/GdkDisplay.html
share/gtk-doc/html/gdk3/GdkDisplayManager.html
share/gtk-doc/html/gdk3/GdkFrameClock.html
share/gtk-doc/html/gdk3/GdkScreen.html
share/gtk-doc/html/gdk3/X_cursor.png
share/gtk-doc/html/gdk3/annotation-glossary.html
share/gtk-doc/html/gdk3/api-index-3-0.html
share/gtk-doc/html/gdk3/api-index-3-10.html
share/gtk-doc/html/gdk3/api-index-3-12.html
share/gtk-doc/html/gdk3/api-index-3-2.html
share/gtk-doc/html/gdk3/api-index-3-4.html
share/gtk-doc/html/gdk3/api-index-3-6.html
@ -477,7 +489,6 @@ share/gtk-doc/html/gdk3/gdk3-Cursors.html
share/gtk-doc/html/gdk3/gdk3-Drag-and-Drop.html
share/gtk-doc/html/gdk3/gdk3-Event-Structures.html
share/gtk-doc/html/gdk3/gdk3-Events.html
share/gtk-doc/html/gdk3/gdk3-GdkFrameClock.html
share/gtk-doc/html/gdk3/gdk3-GdkFrameTimings.html
share/gtk-doc/html/gdk3/gdk3-General.html
share/gtk-doc/html/gdk3/gdk3-Keyboard-Handling.html
@ -630,6 +641,7 @@ share/gtk-doc/html/gtk3/GtkFileChooserDialog.html
share/gtk-doc/html/gtk3/GtkFileChooserWidget.html
share/gtk-doc/html/gtk3/GtkFileFilter.html
share/gtk-doc/html/gtk3/GtkFixed.html
share/gtk-doc/html/gtk3/GtkFlowBox.html
share/gtk-doc/html/gtk3/GtkFontButton.html
share/gtk-doc/html/gtk3/GtkFontChooser.html
share/gtk-doc/html/gtk3/GtkFontChooserDialog.html
@ -680,6 +692,8 @@ share/gtk-doc/html/gtk3/GtkPageSetupUnixDialog.html
share/gtk-doc/html/gtk3/GtkPaned.html
share/gtk-doc/html/gtk3/GtkPaperSize.html
share/gtk-doc/html/gtk3/GtkPlacesSidebar.html
share/gtk-doc/html/gtk3/GtkPlug.html
share/gtk-doc/html/gtk3/GtkPopover.html
share/gtk-doc/html/gtk3/GtkPrintContext.html
share/gtk-doc/html/gtk3/GtkPrintJob.html
share/gtk-doc/html/gtk3/GtkPrintSettings.html
@ -711,6 +725,7 @@ share/gtk-doc/html/gtk3/GtkSeparatorMenuItem.html
share/gtk-doc/html/gtk3/GtkSeparatorToolItem.html
share/gtk-doc/html/gtk3/GtkSettings.html
share/gtk-doc/html/gtk3/GtkSizeGroup.html
share/gtk-doc/html/gtk3/GtkSocket.html
share/gtk-doc/html/gtk3/GtkSpinButton.html
share/gtk-doc/html/gtk3/GtkSpinner.html
share/gtk-doc/html/gtk3/GtkStack.html
@ -780,6 +795,7 @@ share/gtk-doc/html/gtk3/accel-label.png
share/gtk-doc/html/gtk3/annotation-glossary.html
share/gtk-doc/html/gtk3/api-index-3-0.html
share/gtk-doc/html/gtk3/api-index-3-10.html
share/gtk-doc/html/gtk3/api-index-3-12.html
share/gtk-doc/html/gtk3/api-index-3-2.html
share/gtk-doc/html/gtk3/api-index-3-4.html
share/gtk-doc/html/gtk3/api-index-3-6.html
@ -866,6 +882,7 @@ share/gtk-doc/html/gtk3/figure-hierarchical-drawing.png
share/gtk-doc/html/gtk3/figure-windowed-label.png
share/gtk-doc/html/gtk3/file-button.png
share/gtk-doc/html/gtk3/filechooser.png
share/gtk-doc/html/gtk3/flow-box.png
share/gtk-doc/html/gtk3/focus.png
share/gtk-doc/html/gtk3/folder.png
share/gtk-doc/html/gtk3/font-button.png
@ -886,6 +903,7 @@ share/gtk-doc/html/gtk3/frame-gap.png
share/gtk-doc/html/gtk3/frame.png
share/gtk-doc/html/gtk3/frames.png
share/gtk-doc/html/gtk3/getting-started-app1.png
share/gtk-doc/html/gtk3/getting-started-app10.png
share/gtk-doc/html/gtk3/getting-started-app2.png
share/gtk-doc/html/gtk3/getting-started-app3.png
share/gtk-doc/html/gtk3/getting-started-app4.png
@ -972,9 +990,8 @@ share/gtk-doc/html/gtk3/gtk3-Drag-and-Drop.html
share/gtk-doc/html/gtk3/gtk3-Feature-Test-Macros.html
share/gtk-doc/html/gtk3/gtk3-Filesystem-utilities.html
share/gtk-doc/html/gtk3/gtk3-General.html
share/gtk-doc/html/gtk3/gtk3-GtkActionBar.html
share/gtk-doc/html/gtk3/gtk3-GtkGradient.html
share/gtk-doc/html/gtk3/gtk3-GtkPlug.html
share/gtk-doc/html/gtk3/gtk3-GtkSocket.html
share/gtk-doc/html/gtk3/gtk3-GtkStyleProperties.html
share/gtk-doc/html/gtk3/gtk3-GtkSymbolicColor.html
share/gtk-doc/html/gtk3/gtk3-GtkTreeView-drag-and-drop.html
@ -1114,6 +1131,18 @@ share/gtk-doc/html/gtk3/zoom-fit-best.png
share/gtk-doc/html/gtk3/zoom-in.png
share/gtk-doc/html/gtk3/zoom-original.png
share/gtk-doc/html/gtk3/zoom-out.png
share/icons/hicolor/16x16/apps/gtk3-demo.png
share/icons/hicolor/16x16/apps/gtk3-widget-factory.png
share/icons/hicolor/22x22/apps/gtk3-demo.png
share/icons/hicolor/22x22/apps/gtk3-widget-factory.png
share/icons/hicolor/24x24/apps/gtk3-demo.png
share/icons/hicolor/24x24/apps/gtk3-widget-factory.png
share/icons/hicolor/256x256/apps/gtk3-demo.png
share/icons/hicolor/256x256/apps/gtk3-widget-factory.png
share/icons/hicolor/32x32/apps/gtk3-demo.png
share/icons/hicolor/32x32/apps/gtk3-widget-factory.png
share/icons/hicolor/48x48/apps/gtk3-demo.png
share/icons/hicolor/48x48/apps/gtk3-widget-factory.png
share/locale/af/LC_MESSAGES/gtk30-properties.mo
share/locale/af/LC_MESSAGES/gtk30.mo
share/locale/am/LC_MESSAGES/gtk30-properties.mo
@ -1361,6 +1390,8 @@ 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
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@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 --update-cache