Attachment #227510 for bug #258115




# adwaita-icon-theme, gnome-themes-standard and mate-themes

PORTNAME=	gtk
PORTVERSION=	3.24.30
PORTREVISION=	1
CATEGORIES=	x11-toolkits
MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX=	3

INSTALLS_ICONS=	yes
INSTALL_TARGET=	install-strip

LIBVERSION=	0.2404.26
PLIST_SUB+=	LIBVERSION=${LIBVERSION}

GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \

		org.gtk.Settings.EmojiChooser.gschema.xml \
		org.gtk.Settings.FileChooser.gschema.xml

OPTIONS_DEFINE=	ATK_BRIDGE CUPS COLORD DEBUG BROADWAY WAYLAND X11
OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11
OPTIONS_SUB=	yes


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


Lines 1-3 Link Here

(-)b/x11-toolkits/gtk30/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618425855	1	TIMESTAMP = 1625746731
2	SHA256 (gnome/gtk+-3.24.29.tar.xz) = f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa	2	SHA256 (gnome/gtk+-3.24.30.tar.xz) = ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
3	SIZE (gnome/gtk+-3.24.29.tar.xz) = 21396876	3	SIZE (gnome/gtk+-3.24.30.tar.xz) = 22407016




--- configure.orig	2021-07-08 12:18:36 UTC
+++ configure
@@ -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

   if test -n "$CPPFLAGS"; then
     CPPFLAGS_FOR_BUILD=$CPPFLAGS
   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
 
 
 ################################################################

Return to bug 258115

Lines 3-10 Link Here

(-)b/x11-toolkits/gtk30/Makefile (-11 / +3 lines)
3	# adwaita-icon-theme, gnome-themes-standard and mate-themes	3	# adwaita-icon-theme, gnome-themes-standard and mate-themes
4		4
5	PORTNAME= gtk	5	PORTNAME= gtk
6	PORTVERSION= 3.24.29	6	PORTVERSION= 3.24.30
7	PORTREVISION= 1
8	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
9	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	8	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
10	PKGNAMESUFFIX= 3	9	PKGNAMESUFFIX= 3
Lines 38-44 CPPFLAGS+= -fno-omit-frame-pointer Link Here
38	INSTALLS_ICONS= yes	37	INSTALLS_ICONS= yes
39	INSTALL_TARGET= install-strip	38	INSTALL_TARGET= install-strip
40		39
41	LIBVERSION= 0.2404.25	40	LIBVERSION= 0.2404.26
42	PLIST_SUB+= LIBVERSION=${LIBVERSION}	41	PLIST_SUB+= LIBVERSION=${LIBVERSION}
43		42
44	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \	43	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \
Lines 47-53 GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ Link Here
47	org.gtk.Settings.EmojiChooser.gschema.xml \	46	org.gtk.Settings.EmojiChooser.gschema.xml \
48	org.gtk.Settings.FileChooser.gschema.xml	47	org.gtk.Settings.FileChooser.gschema.xml
49		48
50	OPTIONS_DEFINE= ATK_BRIDGE CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND X11	49	OPTIONS_DEFINE= ATK_BRIDGE CUPS COLORD DEBUG BROADWAY WAYLAND X11
51	OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11	50	OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11
52	OPTIONS_SUB= yes	51	OPTIONS_SUB= yes
53		52
Lines 66-78 COLORD_CONFIGURE_ENABLE=colord Link Here
66	CUPS_LIB_DEPENDS= libcups.so:print/cups	65	CUPS_LIB_DEPENDS= libcups.so:print/cups
67	CUPS_CONFIGURE_ENABLE= cups	66	CUPS_CONFIGURE_ENABLE= cups
68		67
69	CLOUDPRINT_DESC= Cloud printing support
70	CLOUDPRINT_CONFIGURE_ENABLE= cloudprint
71	CLOUDPRINT_USE= gnome=libxml2
72	CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:devel/librest \
73	libsoup-2.4.so:devel/libsoup \
74	libjson-glib-1.0.so:devel/json-glib
75
76	# don't explicitly disable debug, this causes segfaults. See ports r437293	68	# don't explicitly disable debug, this causes segfaults. See ports r437293
77	DEBUG_CONFIGURE_ON= --enable-debug=yes	69	DEBUG_CONFIGURE_ON= --enable-debug=yes
78		70

Lines 1-6 Link Here

(-)b/x11-toolkits/gtk30/files/patch-configure (-6 / +6 lines)
1	--- configure.orig 2018-03-12 21:34:40 UTC	1	--- configure.orig 2021-07-08 12:18:36 UTC
2	+++ configure	2	+++ configure
3	@@ -4108,9 +4108,15 @@ GAIL_LT_CURRENT_MINUS_AGE=0	3	@@ -4139,9 +4139,15 @@ GAIL_LT_CURRENT_MINUS_AGE=0
4		4
5	# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive	5	# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive
6	if test "$cross_compiling" = "no"; then	6	if test "$cross_compiling" = "no"; then
Lines 16-28 Link Here
16	if test -n "$CPPFLAGS"; then	16	if test -n "$CPPFLAGS"; then
17	CPPFLAGS_FOR_BUILD=$CPPFLAGS	17	CPPFLAGS_FOR_BUILD=$CPPFLAGS
18	fi	18	fi
19	@@ -27955,9 +27961,7 @@ fi	19	@@ -27875,9 +27881,7 @@ fi
20	if test "$have_cups" = "yes"; then	20	if test "$have_cups" = "yes"; then
21	GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"	21	GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
22	fi	22	fi
23	-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then	23	-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
24	GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"	24	GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
25	-fi	25	-fi
26	if test "$have_cloudprint" = "yes"; then	26
27	GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"	27
28	fi	28	################################################################

Lines 100-105 include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h Link Here

(-)b/x11-toolkits/gtk30/pkg-plist (-1 / +1 lines)
100	include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h	100	include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h
101	include/gtk-3.0/gtk/a11y/gtkentryaccessible.h	101	include/gtk-3.0/gtk/a11y/gtkentryaccessible.h
102	include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h	102	include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h
		103	include/gtk-3.0/gtk/a11y/gtkfilechooserwidgetaccessible.h
103	include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h	104	include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h
104	include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h	105	include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h
105	include/gtk-3.0/gtk/a11y/gtkframeaccessible.h	106	include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
Lines 434-440 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so Link Here
434	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so	435	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-wayland.so
435	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-waylandgtk.so	436	%%WAYLAND%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-waylandgtk.so
436	%%X11%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so	437	%%X11%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
437	%%CLOUDPRINT%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cloudprint.so
438	%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so	438	%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
439	lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so	439	lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so
440	lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so	440	lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so