Attachment #220346 for bug #251647

Lines 2-8 Link Here

(-)b/graphics/gtk-update-icon-cache/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gtk-update-icon-cache	4	PORTNAME= gtk-update-icon-cache
5	PORTVERSION= 3.24.20	5	PORTVERSION= 3.24.24
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	DIST_SUBDIR= gnome	7	DIST_SUBDIR= gnome
8		8
Lines 17-23 USE_GNOME= gdkpixbuf2 Link Here
17	USE_GITLAB= yes	17	USE_GITLAB= yes
18	GL_SITE= https://gitlab.gnome.org	18	GL_SITE= https://gitlab.gnome.org
19	GL_ACCOUNT= Community/gentoo	19	GL_ACCOUNT= Community/gentoo
20	GL_COMMIT= 667cc0e1cdfd63a49703fe37228b0550e9f91f73	20	GL_COMMIT= e63f1449334b9279fb4640ba1f2e6f57976b43e6
21		21
22	OPTIONS_DEFINE= MANPAGES	22	OPTIONS_DEFINE= MANPAGES
23	OPTIONS_DEFAULT=MANPAGES	23	OPTIONS_DEFAULT=MANPAGES

Lines 1-3 Link Here

(-)b/graphics/gtk-update-icon-cache/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580730312	1	TIMESTAMP = 1607270842
2	SHA256 (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 405b7d5147c3fedddf53ef411d69c4575550abfdcae1bfffaa89f17cddb33732	2	SHA256 (gnome/Community/gentoo-gtk-update-icon-cache-e63f1449334b9279fb4640ba1f2e6f57976b43e6_GL0.tar.gz) = 936bbdd51d29e09a16c252a6b75932ce8e33822b248d9d1af57a6dd7b36695c1
3	SIZE (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 113939	3	SIZE (gnome/Community/gentoo-gtk-update-icon-cache-e63f1449334b9279fb4640ba1f2e6f57976b43e6_GL0.tar.gz) = 114133

Lines 4-11 Link Here

(-)b/x11-toolkits/gtk30/Makefile (-3 / +2 lines)
4	# adwaita-icon-theme, gnome-themes-standard and mate-themes	4	# adwaita-icon-theme, gnome-themes-standard and mate-themes
5		5
6	PORTNAME= gtk	6	PORTNAME= gtk
7	PORTVERSION= 3.24.23	7	PORTVERSION= 3.24.24
8	PORTREVISION= 2
9	CATEGORIES= x11-toolkits	8	CATEGORIES= x11-toolkits
10	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	9	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
11	PKGNAMESUFFIX= 3	10	PKGNAMESUFFIX= 3
Lines 39-45 CPPFLAGS+= -fno-omit-frame-pointer Link Here
39	INSTALLS_ICONS= yes	38	INSTALLS_ICONS= yes
40	INSTALL_TARGET= install-strip	39	INSTALL_TARGET= install-strip
41		40
42	LIBVERSION= 0.2404.19	41	LIBVERSION= 0.2404.20
43	PLIST_SUB+= LIBVERSION=${LIBVERSION}	42	PLIST_SUB+= LIBVERSION=${LIBVERSION}
44		43
45	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \	44	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \

Lines 1-3 Link Here

(-)b/x11-toolkits/gtk30/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1597070504	1	TIMESTAMP = 1607215804
2	SHA256 (gnome/gtk+-3.24.23.tar.xz) = 5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1	2	SHA256 (gnome/gtk+-3.24.24.tar.xz) = cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a
3	SIZE (gnome/gtk+-3.24.23.tar.xz) = 21345936	3	SIZE (gnome/gtk+-3.24.24.tar.xz) = 21341240




   atk_bridge_adaptor_init (NULL, NULL);
 #endif
 
--- meson.build.orig	2020-12-06 00:49:26 UTC
+++ meson.build
@@ -576,7 +576,7 @@ if x11_enabled
   xfixes_dep     = dependency('xfixes', required: false)
   xcomposite_dep = dependency('xcomposite', required: false)
   fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
-  atkbridge_dep  = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
+  atkbridge_dep  = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: get_option('atk-bridge'))
 
   x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr']
 
@@ -593,7 +593,10 @@ if x11_enabled
     x11_pkgs += ['xdamage']
   endif
 

Return to bug 251647

Lines 84-101 Revert https://gitlab.gnome.org/GNOME/gtk/-/commit/ed8203e700aa Link Here

(-)b/x11-toolkits/gtk30/files/patch-atk-bridge-option (-5 / +5 lines)
84	atk_bridge_adaptor_init (NULL, NULL);	84	atk_bridge_adaptor_init (NULL, NULL);
85	#endif	85	#endif
86		86
87	--- meson.build.orig 2019-07-03 20:24:52 UTC	87	--- meson.build.orig 2020-12-06 00:49:26 UTC
88	+++ meson.build	88	+++ meson.build
89	@@ -561,7 +561,7 @@ if x11_enabled	89	@@ -576,7 +576,7 @@ if x11_enabled
90	xfixes_dep = dependency('xfixes', required: false)	90	xfixes_dep = dependency('xfixes', required: false)
91	xcomposite_dep = dependency('xcomposite', required: false)	91	xcomposite_dep = dependency('xcomposite', required: false)
92	fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])	92	fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
93	- atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req)	93	- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
94	+ atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req, required: get_option('atk-bridge'))	94	+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: get_option('atk-bridge'))
95		95
96	x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr']	96	x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr']
97		97
98	@@ -578,7 +578,10 @@ if x11_enabled	98	@@ -593,7 +593,10 @@ if x11_enabled
99	x11_pkgs += ['xdamage']	99	x11_pkgs += ['xdamage']
100	endif	100	endif
101		101

Lines 120-125 include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h Link Here

(-)b/x11-toolkits/gtk30/pkg-plist (+2 lines)
120	include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h	120	include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h
121	include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h	121	include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h
122	include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h	122	include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h
		123	include/gtk-3.0/gtk/a11y/gtkplugaccessible.h
123	include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h	124	include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h
124	include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h	125	include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h
125	include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h	126	include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
Lines 129-134 include/gtk-3.0/gtk/a11y/gtkrenderercellaccessible.h Link Here
129	include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h	130	include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h
130	include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h	131	include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h
131	include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h	132	include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h
		133	include/gtk-3.0/gtk/a11y/gtksocketaccessible.h
132	include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h	134	include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h
133	include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h	135	include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h
134	include/gtk-3.0/gtk/a11y/gtkstackaccessible.h	136	include/gtk-3.0/gtk/a11y/gtkstackaccessible.h