From 4cc003f784fd7ddd884d35fc7bf811ad015bbb29 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 8 Jul 2021 12:18:51 +0000 Subject: [PATCH] x11-toolkits/gtk30: update to 3.24.30 Changes: https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.29...3.24.30 PR: 258115 Approved by: ? --- x11-toolkits/gtk30/Makefile | 14 +++----------- x11-toolkits/gtk30/distinfo | 6 +++--- x11-toolkits/gtk30/files/patch-configure | 12 ++++++------ x11-toolkits/gtk30/pkg-plist | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 6f0cfb7a6193..5584c39abeab 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,8 +3,7 @@ # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk -PORTVERSION= 3.24.29 -PORTREVISION= 1 +PORTVERSION= 3.24.30 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -38,7 +37,7 @@ CPPFLAGS+= -fno-omit-frame-pointer INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -LIBVERSION= 0.2404.25 +LIBVERSION= 0.2404.26 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ @@ -47,7 +46,7 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.EmojiChooser.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml -OPTIONS_DEFINE= ATK_BRIDGE CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND X11 +OPTIONS_DEFINE= ATK_BRIDGE CUPS COLORD DEBUG BROADWAY WAYLAND X11 OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11 OPTIONS_SUB= yes @@ -66,13 +65,6 @@ COLORD_CONFIGURE_ENABLE=colord CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CONFIGURE_ENABLE= cups -CLOUDPRINT_DESC= Cloud printing support -CLOUDPRINT_CONFIGURE_ENABLE= cloudprint -CLOUDPRINT_USE= gnome=libxml2 -CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:devel/librest \ - libsoup-2.4.so:devel/libsoup \ - libjson-glib-1.0.so:devel/json-glib - # don't explicitly disable debug, this causes segfaults. See ports r437293 DEBUG_CONFIGURE_ON= --enable-debug=yes diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 80b794133ece..bf333ed0fa66 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618425855 -SHA256 (gnome/gtk+-3.24.29.tar.xz) = f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa -SIZE (gnome/gtk+-3.24.29.tar.xz) = 21396876 +TIMESTAMP = 1625746731 +SHA256 (gnome/gtk+-3.24.30.tar.xz) = ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9 +SIZE (gnome/gtk+-3.24.30.tar.xz) = 22407016 diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure index d8b7ca6d7ea6..7339100636a2 100644 --- a/x11-toolkits/gtk30/files/patch-configure +++ b/x11-toolkits/gtk30/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2018-03-12 21:34:40 UTC +--- configure.orig 2021-07-08 12:18:36 UTC +++ configure -@@ -4108,9 +4108,15 @@ GAIL_LT_CURRENT_MINUS_AGE=0 +@@ -4139,9 +4139,15 @@ GAIL_LT_CURRENT_MINUS_AGE=0 # Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive if test "$cross_compiling" = "no"; then @@ -16,13 +16,13 @@ if test -n "$CPPFLAGS"; then CPPFLAGS_FOR_BUILD=$CPPFLAGS fi -@@ -27955,9 +27961,7 @@ fi +@@ -27875,9 +27881,7 @@ fi if test "$have_cups" = "yes"; then GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups" fi -if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr" -fi - if test "$have_cloudprint" = "yes"; then - GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint" - fi + + + ################################################################ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index b9d0cb6bb025..a008665c4c5b 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -100,6 +100,7 @@ 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/gtkfilechooserwidgetaccessible.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 @@ -434,7 +435,6 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so %%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so %%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-waylandgtk.so %%X11%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so -%%CLOUDPRINT%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cloudprint.so %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so