Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 538186) +++ head/x11-toolkits/gtk30/Makefile (revision 538187) @@ -1,111 +1,113 @@ # Created by: Vanilla I. Shu # $FreeBSD$ # Please keep gtk30 in sync with the following x11-themes ports: # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk PORTVERSION= 3.24.10 PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 PORTSCOUT= limit:1,even -BUILD_DEPENDS+= at-spi2-atk>=0:accessibility/at-spi2-atk LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfribidi.so:converters/fribidi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \ adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \ - at-spi2-atk>=0:accessibility/at-spi2-atk \ librsvg2>=0:graphics/librsvg2 USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango USES= compiler:c11 gettext gmake gnome libtool localbase \ pathfix perl5 pkgconfig tar:xz xorg USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-x11-backend \ --enable-introspection CPPFLAGS+= -fno-omit-frame-pointer INSTALLS_ICONS= yes INSTALL_TARGET= install-strip LIBVERSION= 0.2404.6 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.EmojiChooser.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml -OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND -OPTIONS_DEFAULT=CUPS COLORD BROADWAY WAYLAND +OPTIONS_DEFINE= ATK_BRIDGE CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND +OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND OPTIONS_SUB= yes + +ATK_BRIDGE_DESC=AT-SPI ATK bridge support +ATK_BRIDGE_CONFIGURE_WITH= atk-bridge +ATK_BRIDGE_LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:graphics/colord 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 WAYLAND_DESC= GDK Wayland backend WAYLAND_CONFIGURE_ENABLE= wayland-backend WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ v4l_compat>=0:multimedia/v4l_compat WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_USES= gl WAYLAND_USE= GL=egl post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-xlib; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ ${FALSE}; \ fi pre-build: @${RM} -r ${WRKSRC}/docs/gtk.info* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include Index: head/x11-toolkits/gtk30/files/patch-atk-bridge-option =================================================================== --- head/x11-toolkits/gtk30/files/patch-atk-bridge-option (nonexistent) +++ head/x11-toolkits/gtk30/files/patch-atk-bridge-option (revision 538187) @@ -0,0 +1,120 @@ +Revert https://gitlab.gnome.org/GNOME/gtk/-/commit/ed8203e700aa + +--- config.h.in.orig 2019-07-03 20:26:06 UTC ++++ config.h.in +@@ -10,6 +10,9 @@ + /* Disable deprecation warnings from glib */ + #undef GLIB_DISABLE_DEPRECATION_WARNINGS + ++/* Define to use atk-bridge-2.0 */ ++#undef HAVE_ATK_BRIDGE ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + +--- config.h.meson.orig 2019-06-17 17:04:21 UTC ++++ config.h.meson +@@ -11,6 +11,9 @@ + /* Disable deprecation warnings from glib */ + #mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS + ++/* Define to use atk-bridge-2.0 */ ++#mesondefine HAVE_ATK_BRIDGE ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #mesondefine HAVE_BIND_TEXTDOMAIN_CODESET + +--- configure.orig 2019-07-03 20:26:06 UTC ++++ configure +@@ -1061,6 +1061,7 @@ enable_glibtest + enable_modules + with_included_immodules + with_x ++with_atk_bridge + enable_win32_gles + enable_cups + enable_papi +@@ -1838,6 +1839,7 @@ Optional Packages: + --with-included-immodules=MODULE1,MODULE2,... + build the specified input methods into gtk + --with-x use the X Window System ++ --without-atk-bridge Do not use AT-SPI ATK bridge + --with-html-dir=PATH path to installed docs + --with-xml-catalog=CATALOG + path to xml catalog to use +@@ -27103,8 +27105,20 @@ fi + # Check for Accessibility Toolkit flags + ######################################## + +-if test x$enable_x11_backend = xyes; then ++ ++# Check whether --with-atk-bridge was given. ++if test "${with_atk_bridge+set}" = set; then : ++ withval=$with_atk_bridge; : ++else ++ with_atk_bridge=$enable_x11_backend ++fi ++ ++ ++if test x$with_atk_bridge != xno; then + ATK_PACKAGES="atk atk-bridge-2.0" ++ ++$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h ++ + else + ATK_PACKAGES="atk" + fi +--- gtk/a11y/gtkaccessibility.c.orig 2019-01-03 00:44:12 UTC ++++ gtk/a11y/gtkaccessibility.c +@@ -37,7 +37,7 @@ + #include + #include + +-#ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + #include + #endif + +@@ -988,7 +988,7 @@ _gtk_accessibility_init (void) + _gtk_accessibility_override_atk_util (); + do_window_event_initialization (); + +-#ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + atk_bridge_adaptor_init (NULL, NULL); + #endif + +--- meson.build.orig 2019-07-03 20:24:52 UTC ++++ meson.build +@@ -561,7 +561,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: atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req, required: get_option('atk-bridge')) + + x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr'] + +@@ -578,7 +578,10 @@ if x11_enabled + x11_pkgs += ['xdamage'] + endif + +- atk_pkgs += ['atk-bridge-2.0'] ++ if atkbridge_dep.found() ++ atk_pkgs += ['atk-bridge-2.0'] ++ cdata.set('HAVE_ATK_BRIDGE', 1) ++ endif + + cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) + cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) +--- meson_options.txt.orig 2019-06-17 18:03:27 UTC ++++ meson_options.txt +@@ -13,6 +13,8 @@ option('mir_backend', type: 'boolean', value: false, + description : 'Enable the Mir gdk backend') + + # Optional dependencies ++option('atk-bridge', type: 'boolean', value: 'true', ++ description : 'Enable AT-SPI ATK bridge support') + option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', + description : 'Enable support for the Xinerama extension') + option('cloudproviders', type: 'boolean', value: false, Property changes on: head/x11-toolkits/gtk30/files/patch-atk-bridge-option ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property