From nobody Sat Dec 23 18:14:34 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SyC4B2r9qz54pkB; Sat, 23 Dec 2023 18:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SyC4B2NKSz3Y4f; Sat, 23 Dec 2023 18:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703355274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6JDCgNDlHB9Yor+eehHkL5ShbTYdpawAEukUPkcanG8=; b=Ig2uSNUPmGFA+vHhtm9nKsSaCxhv5z65f4V7cJRLs7Y6dMlAT/qwctnD/0/1CDTYTChuZM tper5H/BvS0BRMFvbg3E08IWRJX8fgMuC5R51oYZewL4YVWHxHajSvtnKR/fp5uT2dM6o8 fTv7MgU5y83N4DMknrYKOiuQjz0xpIONYQ9QWkDtjaBFpfJj4pa+e+27OyWzSrpgaebjfC QPnT2hNv9vfC2kxm53M3fATDGlqWwsuhtu6zwdExbhPunOH2RaclIc+J/j8jJ8U+OdsH0/ 00Vu5elBg3qLrNBbvS23XwkVTYINgeLjO6WVA+Tma4V1x1rs8tfm2ulEEEY5/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703355274; a=rsa-sha256; cv=none; b=eOQ1y9gBUPeCC1pF6pgcan/eHuv9+PRzbGsYti0TrbTil68sVhshPtMPAHXyIx3izYpI0T UfbVY9G3pO9NqyE00Rt8ijW5i7LRXXVrRX9kMK1FH2QVtf2bRDAL6YQPjUX6RW56Z32wN5 Fu+spt8jhwPtUvO8G3SRt+K5LSMbO9nszlBms7jRhsDiGZEVNlr7JGqvgXA9G2w7xLYxv7 vs4nmjEKtyFBqmsHgsNeK3Rp0H6NgyPQdzG2NKfVlgJIInCKx6gEXXCXAkFumh2K+5CkX+ tS7LkGnZcDceKvcrF0DTDGgEYsUErBIvFUcOtQC2QpRFV3C8v7GzpYx44XA6gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703355274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6JDCgNDlHB9Yor+eehHkL5ShbTYdpawAEukUPkcanG8=; b=CMtDUdYCtGrF9jKVroodahVlCyhK0ncv9xHSzoZXnwYUcCKuiOxAbmQ0UsUCCcoTvgM6+0 J1cxvTpch4aKvKUtXmn9EJJVf29j+8ZK9lg5+NHUcWO3YLm8dAAaANrJsCway3t5wacWvd sJF5+VxNJj29ocw2RIzkEqg6QPWMyIuC8b2F4AvtMpLBgI8JkDxiwpUNSZyk3lReiZJv4J qx/XYyh/mZSXGVm96ij3AvAVWQ+U1ElHQhWszjpuSmPTZCCsfqfeXZ2r1zqo0+yDgHCX3I 86QZZ2B5zSD6T58apfuLb/1oYGICzcovnWMpoiAR9PUD63YTjqSkhLPhQ6wVfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SyC4B1Qb7z199x; Sat, 23 Dec 2023 18:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BNIEYDB060712; Sat, 23 Dec 2023 18:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BNIEY7Q060709; Sat, 23 Dec 2023 18:14:34 GMT (envelope-from git) Date: Sat, 23 Dec 2023 18:14:34 GMT Message-Id: <202312231814.3BNIEY7Q060709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 0a1dd69c3167 - main - x11-toolkits/gtk30: Update to 3.24.38 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a1dd69c3167141ace3cb39e897fd6e6ee0026c1 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a1dd69c3167141ace3cb39e897fd6e6ee0026c1 commit 0a1dd69c3167141ace3cb39e897fd6e6ee0026c1 Author: Nuno Teixeira AuthorDate: 2023-12-23 12:56:37 +0000 Commit: Nuno Teixeira CommitDate: 2023-12-23 18:14:13 +0000 x11-toolkits/gtk30: Update to 3.24.38 - Switch to DISTVERSION - Switch to meson build - Fix ATK_BRIGDE option (deps run detection: #PR269963) - Group backends into multi option (at least one backend needed to build) - Pet portlint, portclippy and portfmt ChangeLog: https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/NEWS PR: 269963, 275567 Exp-run by: antoine --- x11-toolkits/gtk30/Makefile | 107 +- x11-toolkits/gtk30/distinfo | 6 +- x11-toolkits/gtk30/files/patch-Makefile.in | 11 - x11-toolkits/gtk30/files/patch-atk-bridge-option | 124 +- x11-toolkits/gtk30/files/patch-configure | 28 - x11-toolkits/gtk30/files/patch-docs_Makefile.in | 20 - .../files/patch-docs_reference_gtk_Makefile.in | 10 - .../files/patch-docs_reference_gtk_meson.build | 10 + .../gtk30/files/patch-gtk_gtkbuilderparser.c | 8 +- .../gtk30/files/patch-gtk_updateiconcache.c | 6 +- x11-toolkits/gtk30/pkg-plist | 1397 ++++++++++---------- 11 files changed, 820 insertions(+), 907 deletions(-) diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index b0dac7d94fff..e7590f2f4d45 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,11 +1,7 @@ -# 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.34 -PORTREVISION= 1 +DISTVERSION= 3.24.38 # sync with x11-themes: adwaita-icon-theme, gnome-themes-standard and mate-themes CATEGORIES= x11-toolkits -MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME/sources/gtk+/${DISTVERSION:R} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome @@ -16,82 +12,73 @@ WWW= https://www.gtk.org/ LICENSE= LGPL20 -PORTSCOUT= limit:1,even - LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ - libfribidi.so:converters/fribidi \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ + libfribidi.so:converters/fribidi \ libharfbuzz.so:print/harfbuzz -RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \ - adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme +RUN_DEPENDS= adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \ + hicolor-icon-theme>=0:misc/hicolor-icon-theme -USE_PERL5= build -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango \ - librsvg2:run gtk-update-icon-cache -USES= compiler:c11 cpe gettext gmake gnome libtool localbase \ - pathfix perl5 pkgconfig tar:xz +USES= compiler:c11 cpe gettext gnome localbase meson ninja pathfix \ + perl5 pkgconfig python shebangfix tar:xz CPE_VENDOR= gnome -CONFIGURE_ARGS= --enable-introspection -CPPFLAGS+= -fno-omit-frame-pointer -INSTALL_TARGET= install-strip - -LIBVERSION= 0.2404.30 -PLIST_SUB+= LIBVERSION=${LIBVERSION} - +USE_GNOME= atk cairo gdkpixbuf2 gtk-update-icon-cache pango \ + introspection:build librsvg2:run 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 +USE_LDCONFIG= yes +USE_PERL5= build +SHEBANG_GLOB= *.py + +MESON_ARGS= -Dtests=false -OPTIONS_DEFINE= ATK_BRIDGE CUPS COLORD DEBUG BROADWAY WAYLAND X11 -OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11 -OPTIONS_SUB= yes +PORTSCOUT= limit:1,even + +LIBVERSION= 0.2406.32 +PLIST_SUB+= LIBVERSION=${LIBVERSION} + +OPTIONS_DEFINE= ATK_BRIDGE COLORD CUPS DEBUG DOCS +OPTIONS_DEFAULT= ATK_BRIDGE BROADWAY COLORD CUPS WAYLAND X11 +OPTIONS_MULTI= BACKENDS +OPTIONS_MULTI_BACKENDS= BROADWAY WAYLAND X11 +OPTIONS_SUB= yes + +ATK_BRIDGE_DESC= AT-SPI ATK bridge support +BROADWAY_DESC= Enable GDK Broadway backend for showing GTK in the webbrowser using HTML5 and web sockets. +COLORD_DESC= Color profile support +WAYLAND_DESC= GDK Wayland backend +X11_DESC= GDK X11 backend -ATK_BRIDGE_DESC=AT-SPI ATK bridge support -ATK_BRIDGE_CONFIGURE_WITH= atk-bridge +ATK_BRIDGE_IMPLIES= X11 ATK_BRIDGE_LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core +ATK_BRIDGE_MESON_TRUE= atk_bridge -BROADWAY_DESC= Enable GDK Broadway backend for showing GTK in the webbrowser using HTML5 and web sockets. -BROADWAY_CONFIGURE_ENABLE= broadway-backend +BROADWAY_MESON_TRUE= broadway_backend -COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:graphics/colord -COLORD_CONFIGURE_ENABLE=colord +COLORD_MESON_YES= colord CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CONFIGURE_ENABLE= cups +CUPS_MESON_ON= -Dprint_backends=cups,file,lpr +CUPS_MESON_OFF= -Dprint_backends=file,lpr -# don't explicitly disable debug, this causes segfaults. See ports r437293 -DEBUG_CONFIGURE_ON= --enable-debug=yes +DEBUG_MESON_ON= --buildtype=debug + +DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc +DOCS_MESON_TRUE= gtk_doc man -WAYLAND_DESC= GDK Wayland backend -WAYLAND_CONFIGURE_ENABLE= wayland-backend WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas -WAYLAND_USES= gl -WAYLAND_USE= GL=egl - -X11_DESC= GDK X11 backend -X11_CONFIGURE_ENABLE= x11-backend -X11_USES= xorg -X11_USE= XORG=x11,xcomposite,xcursor,xdamage,xext,xfixes,xi,xinerama,xrandr,xrender - -post-patch: - @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ - ${WRKSRC}/configure +WAYLAND_MESON_TRUE= wayland_backend -pre-configure-X11-on: -# .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 +X11_USES= xorg +X11_USE= XORG=x11,xcomposite,xcursor,xdamage,xext,xfixes,xi,xinerama,xrandr,xrender +X11_MESON_TRUE= x11_backend pre-build: @${RM} -r ${WRKSRC}/docs/gtk.info* @@ -100,7 +87,9 @@ 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 + +pre-test: + ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE} + ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true" .include diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 114abbd59d1a..6152fac53a6a 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657915097 -SHA256 (gnome/gtk+-3.24.34.tar.xz) = dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec -SIZE (gnome/gtk+-3.24.34.tar.xz) = 21587592 +TIMESTAMP = 1702200536 +SHA256 (gnome/gtk+-3.24.38.tar.xz) = ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 +SIZE (gnome/gtk+-3.24.38.tar.xz) = 12398104 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in deleted file mode 100644 index d38071b574ae..000000000000 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2020-09-03 22:05:26 UTC -+++ Makefile.in -@@ -573,7 +573,7 @@ XVFB_START = \ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples -+SRC_SUBDIRS = gdk gtk libgail-util modules demos - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32 - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - MAINTAINERCLEANFILES = \ diff --git a/x11-toolkits/gtk30/files/patch-atk-bridge-option b/x11-toolkits/gtk30/files/patch-atk-bridge-option index aa07786f757d..fe5bb6ce22a9 100644 --- a/x11-toolkits/gtk30/files/patch-atk-bridge-option +++ b/x11-toolkits/gtk30/files/patch-atk-bridge-option @@ -1,120 +1,68 @@ Revert https://gitlab.gnome.org/GNOME/gtk/-/commit/ed8203e700aa +NetBSD pkgsrc patch ---- 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.orig 2023-05-22 02:22:08 UTC +++ gtk/a11y/gtkaccessibility.c -@@ -37,7 +37,7 @@ - #include +@@ -38,8 +38,10 @@ #include --#ifdef GDK_WINDOWING_X11 + #ifdef GDK_WINDOWING_X11 +#ifdef HAVE_ATK_BRIDGE #include #endif ++#endif -@@ -988,7 +988,7 @@ _gtk_accessibility_init (void) - _gtk_accessibility_override_atk_util (); + static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, + guint n_param_values, +@@ -989,7 +991,9 @@ _gtk_accessibility_init (void) do_window_event_initialization (); --#ifdef GDK_WINDOWING_X11 + #ifdef GDK_WINDOWING_X11 +#ifdef HAVE_ATK_BRIDGE atk_bridge_adaptor_init (NULL, NULL); ++#endif #endif ---- meson.build.orig 2020-12-06 00:49:26 UTC + atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); +--- meson.build.orig 2023-05-22 02:22:08 UTC +++ meson.build -@@ -576,7 +576,7 @@ if x11_enabled +@@ -137,6 +137,7 @@ win32_enabled = get_option('win32_backend') + broadway_enabled = get_option('broadway_backend') + quartz_enabled = get_option('quartz_backend') + win32_enabled = get_option('win32_backend') ++atkbridge_enabled = get_option('atk_bridge') + + os_unix = false + os_linux = false +@@ -564,7 +565,10 @@ 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')) ++ if atkbridge_enabled + atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ cdata.set('HAVE_ATK_BRIDGE', 1) ++ endif - x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr'] + backend_immodules += ['xim'] -@@ -593,7 +593,10 @@ if x11_enabled +@@ -583,7 +587,9 @@ 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) ++ if atkbridge_enabled + atk_pkgs += ['atk-bridge-2.0'] + 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.orig 2023-05-22 02:22:08 UTC +++ meson_options.txt -@@ -13,6 +13,8 @@ option('mir_backend', type: 'boolean', value: false, - description : 'Enable the Mir gdk backend') +@@ -9,6 +9,8 @@ option('quartz_backend', type: 'boolean', value: true, + description : 'Enable the Windows gdk backend (only when building on Windows)') + option('quartz_backend', type: 'boolean', value: true, + description : 'Enable the macOS gdk backend (only when building on macOS)') ++option('atk_bridge', type: 'boolean', value: true, ++ description : 'Enable Atk bridge') # 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, diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure deleted file mode 100644 index 7339100636a2..000000000000 --- a/x11-toolkits/gtk30/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 "$CC"; then -+ CC_FOR_BUILD=$CC -+ fi - if test -n "$CFLAGS"; then - CFLAGS_FOR_BUILD=$CFLAGS - fi -+ if test -n "$CPP"; then -+ CPP_FOR_BUILD=$CPP -+ fi - 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 - - - ################################################################ diff --git a/x11-toolkits/gtk30/files/patch-docs_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_Makefile.in deleted file mode 100644 index ec16ac7340f9..000000000000 --- a/x11-toolkits/gtk30/files/patch-docs_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- docs/Makefile.in.orig 2015-03-09 16:12:04.497272000 +0100 -+++ docs/Makefile.in 2015-03-09 16:23:52.809599000 +0100 -@@ -341,7 +341,7 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - MANIFEST_TOOL = @MANIFEST_TOOL@ - MATH_LIB = @MATH_LIB@ - MKDIR_P = @MKDIR_P@ -@@ -486,7 +486,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --SUBDIRS = reference tools -+SUBDIRS = reference - all: all-recursive - - .SUFFIXES: diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in deleted file mode 100644 index 83ee0513ad31..000000000000 --- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- docs/reference/gtk/Makefile.in.orig 2014-10-14 15:50:07.675435846 +0200 -+++ docs/reference/gtk/Makefile.in 2014-10-14 15:50:49.218431589 +0200 -@@ -820,7 +820,6 @@ - ######################################################################## - man_MANS = \ - gtk-query-immodules-3.0.1 \ -- gtk-update-icon-cache.1 \ - gtk-encode-symbolic-svg.1 \ - gtk-launch.1 \ - gtk3-demo.1 \ diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_meson.build b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_meson.build new file mode 100644 index 000000000000..1f29b1e7fbed --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_meson.build @@ -0,0 +1,10 @@ +--- docs/reference/gtk/meson.build.orig 2023-12-11 10:53:44 UTC ++++ docs/reference/gtk/meson.build +@@ -500,7 +500,6 @@ if get_option('man') and xsltproc.found() + + man_files = [ + [ 'gtk-query-immodules-3.0', '1', ], +- [ 'gtk-update-icon-cache', '1', ], + [ 'gtk-encode-symbolic-svg', '1', ], + [ 'gtk-launch', '1', ], + [ 'gtk-builder-tool', '1', ], diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c b/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c index c916dfe85e80..85d7aba8142a 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkbuilderparser.c @@ -1,6 +1,6 @@ ---- gtk/gtkbuilderparser.c.orig 2015-11-12 16:34:36.000000000 +0100 -+++ gtk/gtkbuilderparser.c 2015-11-12 23:17:26.500037000 +0100 -@@ -1146,7 +1146,7 @@ +--- gtk/gtkbuilderparser.c.orig 2023-05-22 02:22:08 UTC ++++ gtk/gtkbuilderparser.c +@@ -1149,7 +1149,7 @@ static void /* Called for character data */ /* text is not nul-terminated */ static void @@ -9,7 +9,7 @@ const gchar *text, gsize text_len, gpointer user_data, -@@ -1204,7 +1204,7 @@ +@@ -1207,7 +1207,7 @@ static const GMarkupParser parser = { static const GMarkupParser parser = { start_element, end_element, diff --git a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c index 206257551dbe..b1c35240bd23 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c +++ b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c @@ -1,6 +1,6 @@ ---- gtk/updateiconcache.c.orig 2009-05-11 18:05:35.000000000 +0200 -+++ gtk/updateiconcache.c 2009-05-30 12:03:39.000000000 +0200 -@@ -1505,7 +1505,7 @@ opentmp: +--- gtk/updateiconcache.c.orig 2023-05-22 02:22:08 UTC ++++ gtk/updateiconcache.c +@@ -1556,7 +1556,7 @@ opentmp: if (!validate_file (tmp_cache_path)) { g_printerr (_("The generated cache was invalid.\n")); diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index a008665c4c5b..072bbb55de8b 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -433,7 +433,6 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so 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 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so @@ -457,695 +456,727 @@ libdata/pkgconfig/gtk+-3.0.pc libdata/pkgconfig/gtk+-unix-print-3.0.pc %%WAYLAND%%libdata/pkgconfig/gtk+-wayland-3.0.pc %%X11%%libdata/pkgconfig/gtk+-x11-3.0.pc -%%BROADWAY%%man/man1/broadwayd.1.gz -man/man1/gtk-builder-tool.1.gz -man/man1/gtk-encode-symbolic-svg.1.gz -man/man1/gtk-launch.1.gz -man/man1/gtk-query-immodules-3.0.1.gz -man/man1/gtk-query-settings.1.gz -man/man1/gtk3-demo-application.1.gz -man/man1/gtk3-demo.1.gz -man/man1/gtk3-icon-browser.1.gz -man/man1/gtk3-widget-factory.1.gz +%%DOCS%%man/man1/broadwayd.1.gz +%%DOCS%%man/man1/gtk-builder-tool.1.gz +%%DOCS%%man/man1/gtk-encode-symbolic-svg.1.gz +%%DOCS%%man/man1/gtk-launch.1.gz +%%DOCS%%man/man1/gtk-query-immodules-3.0.1.gz +%%DOCS%%man/man1/gtk-query-settings.1.gz +%%DOCS%%man/man1/gtk3-demo-application.1.gz +%%DOCS%%man/man1/gtk3-demo.1.gz +%%DOCS%%man/man1/gtk3-icon-browser.1.gz +%%DOCS%%man/man1/gtk3-widget-factory.1.gz share/aclocal/gtk-3.0.m4 share/applications/gtk3-demo.desktop share/applications/gtk3-icon-browser.desktop share/applications/gtk3-widget-factory.desktop share/gettext/its/gtkbuilder.its share/gettext/its/gtkbuilder.loc +share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml share/gir-1.0/Gdk-3.0.gir %%X11%%share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir -%%DATADIR%%-3.0/gtkbuilder.rng -%%DATADIR%%-3.0/valgrind/gtk.supp -%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html -%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html -%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2 -%%DATADIR%%-doc/html/gail-libgail-util3/home.png -%%DATADIR%%-doc/html/gail-libgail-util3/index.html -%%DATADIR%%-doc/html/gail-libgail-util3/left-insensitive.png -%%DATADIR%%-doc/html/gail-libgail-util3/left.png -%%DATADIR%%-doc/html/gail-libgail-util3/libgail-util-main.html -%%DATADIR%%-doc/html/gail-libgail-util3/right-insensitive.png -%%DATADIR%%-doc/html/gail-libgail-util3/right.png -%%DATADIR%%-doc/html/gail-libgail-util3/style.css -%%DATADIR%%-doc/html/gail-libgail-util3/up-insensitive.png -%%DATADIR%%-doc/html/gail-libgail-util3/up.png -%%DATADIR%%-doc/html/gdk3/GdkDevice.html -%%DATADIR%%-doc/html/gdk3/GdkDeviceManager.html -%%DATADIR%%-doc/html/gdk3/GdkDevicePad.html -%%DATADIR%%-doc/html/gdk3/GdkDisplay.html -%%DATADIR%%-doc/html/gdk3/GdkDisplayManager.html -%%DATADIR%%-doc/html/gdk3/GdkDrawingContext.html -%%DATADIR%%-doc/html/gdk3/GdkFrameClock.html -%%DATADIR%%-doc/html/gdk3/GdkGLContext.html -%%DATADIR%%-doc/html/gdk3/GdkMonitor.html -%%DATADIR%%-doc/html/gdk3/GdkScreen.html -%%DATADIR%%-doc/html/gdk3/GdkSeat.html -%%DATADIR%%-doc/html/gdk3/X_cursor.png -%%DATADIR%%-doc/html/gdk3/alias_cursor.png -%%DATADIR%%-doc/html/gdk3/all_scroll_cursor.png -%%DATADIR%%-doc/html/gdk3/annotation-glossary.html -%%DATADIR%%-doc/html/gdk3/api-index-full.html -%%DATADIR%%-doc/html/gdk3/arrow.png -%%DATADIR%%-doc/html/gdk3/based_arrow_down.png -%%DATADIR%%-doc/html/gdk3/based_arrow_up.png -%%DATADIR%%-doc/html/gdk3/boat.png -%%DATADIR%%-doc/html/gdk3/bogosity.png -%%DATADIR%%-doc/html/gdk3/bottom_left_corner.png -%%DATADIR%%-doc/html/gdk3/bottom_right_corner.png -%%DATADIR%%-doc/html/gdk3/bottom_side.png -%%DATADIR%%-doc/html/gdk3/bottom_tee.png -%%DATADIR%%-doc/html/gdk3/box_spiral.png -%%DATADIR%%-doc/html/gdk3/cell_cursor.png -%%DATADIR%%-doc/html/gdk3/center_ptr.png -%%DATADIR%%-doc/html/gdk3/circle.png -%%DATADIR%%-doc/html/gdk3/clock.png -%%DATADIR%%-doc/html/gdk3/coffee_mug.png -%%DATADIR%%-doc/html/gdk3/col_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/context_menu_cursor.png -%%DATADIR%%-doc/html/gdk3/copy_cursor.png -%%DATADIR%%-doc/html/gdk3/cross.png -%%DATADIR%%-doc/html/gdk3/cross_reverse.png -%%DATADIR%%-doc/html/gdk3/crosshair.png -%%DATADIR%%-doc/html/gdk3/crosshair_cursor.png -%%DATADIR%%-doc/html/gdk3/default_cursor.png -%%DATADIR%%-doc/html/gdk3/diamond_cross.png -%%DATADIR%%-doc/html/gdk3/dot.png -%%DATADIR%%-doc/html/gdk3/dotbox.png -%%DATADIR%%-doc/html/gdk3/double_arrow.png -%%DATADIR%%-doc/html/gdk3/draft_large.png -%%DATADIR%%-doc/html/gdk3/draft_small.png -%%DATADIR%%-doc/html/gdk3/draped_box.png -%%DATADIR%%-doc/html/gdk3/e_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/ew_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/exchange.png -%%DATADIR%%-doc/html/gdk3/fleur.png -%%DATADIR%%-doc/html/gdk3/gdk3-Application-launching.html -%%DATADIR%%-doc/html/gdk3/gdk3-Cairo-Interaction.html -%%DATADIR%%-doc/html/gdk3/gdk3-Colors.html -%%DATADIR%%-doc/html/gdk3/gdk3-Cursors.html -%%DATADIR%%-doc/html/gdk3/gdk3-Drag-and-Drop.html -%%DATADIR%%-doc/html/gdk3/gdk3-Event-Structures.html -%%DATADIR%%-doc/html/gdk3/gdk3-Events.html -%%DATADIR%%-doc/html/gdk3/gdk3-GdkFrameTimings.html -%%DATADIR%%-doc/html/gdk3/gdk3-General.html -%%DATADIR%%-doc/html/gdk3/gdk3-Keyboard-Handling.html -%%DATADIR%%-doc/html/gdk3/gdk3-Pango-Interaction.html -%%DATADIR%%-doc/html/gdk3/gdk3-Pixbufs.html -%%DATADIR%%-doc/html/gdk3/gdk3-Points-Rectangles-and-Regions.html -%%DATADIR%%-doc/html/gdk3/gdk3-Properties-and-Atoms.html -%%DATADIR%%-doc/html/gdk3/gdk3-RGBA-Colors.html -%%DATADIR%%-doc/html/gdk3/gdk3-Selections.html -%%DATADIR%%-doc/html/gdk3/gdk3-Testing.html -%%DATADIR%%-doc/html/gdk3/gdk3-Threads.html -%%DATADIR%%-doc/html/gdk3/gdk3-Visuals.html -%%DATADIR%%-doc/html/gdk3/gdk3-Wayland-Interaction.html -%%DATADIR%%-doc/html/gdk3/gdk3-Windows.html -%%DATADIR%%-doc/html/gdk3/gdk3-X-Window-System-Interaction.html -%%DATADIR%%-doc/html/gdk3/gdk3.devhelp2 -%%DATADIR%%-doc/html/gdk3/gobbler.png -%%DATADIR%%-doc/html/gdk3/grab_cursor.png -%%DATADIR%%-doc/html/gdk3/grabbing_cursor.png -%%DATADIR%%-doc/html/gdk3/gumby.png -%%DATADIR%%-doc/html/gdk3/hand1.png -%%DATADIR%%-doc/html/gdk3/hand2.png -%%DATADIR%%-doc/html/gdk3/hand_cursor.png -%%DATADIR%%-doc/html/gdk3/heart.png -%%DATADIR%%-doc/html/gdk3/help_cursor.png -%%DATADIR%%-doc/html/gdk3/home.png -%%DATADIR%%-doc/html/gdk3/icon.png -%%DATADIR%%-doc/html/gdk3/index.html -%%DATADIR%%-doc/html/gdk3/iron_cross.png -%%DATADIR%%-doc/html/gdk3/left-insensitive.png -%%DATADIR%%-doc/html/gdk3/left.png -%%DATADIR%%-doc/html/gdk3/left_ptr.png -%%DATADIR%%-doc/html/gdk3/left_side.png -%%DATADIR%%-doc/html/gdk3/left_tee.png -%%DATADIR%%-doc/html/gdk3/leftbutton.png -%%DATADIR%%-doc/html/gdk3/ll_angle.png -%%DATADIR%%-doc/html/gdk3/lr_angle.png -%%DATADIR%%-doc/html/gdk3/man.png -%%DATADIR%%-doc/html/gdk3/middlebutton.png -%%DATADIR%%-doc/html/gdk3/mouse.png -%%DATADIR%%-doc/html/gdk3/move_cursor.png -%%DATADIR%%-doc/html/gdk3/n_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/ne_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/nesw_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/no_drop_cursor.png -%%DATADIR%%-doc/html/gdk3/not_allowed_cursor.png -%%DATADIR%%-doc/html/gdk3/ns_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/nw_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/nwse_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/pencil.png -%%DATADIR%%-doc/html/gdk3/pirate.png -%%DATADIR%%-doc/html/gdk3/plus.png -%%DATADIR%%-doc/html/gdk3/pointer_cursor.png -%%DATADIR%%-doc/html/gdk3/progress_cursor.png -%%DATADIR%%-doc/html/gdk3/question_arrow.png -%%DATADIR%%-doc/html/gdk3/reference.html -%%DATADIR%%-doc/html/gdk3/right-insensitive.png -%%DATADIR%%-doc/html/gdk3/right.png -%%DATADIR%%-doc/html/gdk3/right_ptr.png -%%DATADIR%%-doc/html/gdk3/right_side.png -%%DATADIR%%-doc/html/gdk3/right_tee.png -%%DATADIR%%-doc/html/gdk3/rightbutton.png -%%DATADIR%%-doc/html/gdk3/rn02.html -%%DATADIR%%-doc/html/gdk3/rotated-text.png -%%DATADIR%%-doc/html/gdk3/row_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/rtl_logo.png -%%DATADIR%%-doc/html/gdk3/s_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/sailboat.png -%%DATADIR%%-doc/html/gdk3/sb_down_arrow.png -%%DATADIR%%-doc/html/gdk3/sb_h_double_arrow.png -%%DATADIR%%-doc/html/gdk3/sb_left_arrow.png -%%DATADIR%%-doc/html/gdk3/sb_right_arrow.png -%%DATADIR%%-doc/html/gdk3/sb_up_arrow.png -%%DATADIR%%-doc/html/gdk3/sb_v_double_arrow.png -%%DATADIR%%-doc/html/gdk3/se_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/shuttle.png -%%DATADIR%%-doc/html/gdk3/sizing.png -%%DATADIR%%-doc/html/gdk3/spider.png -%%DATADIR%%-doc/html/gdk3/spraycan.png -%%DATADIR%%-doc/html/gdk3/star.png -%%DATADIR%%-doc/html/gdk3/style.css -%%DATADIR%%-doc/html/gdk3/sw_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/target.png -%%DATADIR%%-doc/html/gdk3/tcross.png -%%DATADIR%%-doc/html/gdk3/text_cursor.png -%%DATADIR%%-doc/html/gdk3/top_left_arrow.png -%%DATADIR%%-doc/html/gdk3/top_left_corner.png -%%DATADIR%%-doc/html/gdk3/top_right_corner.png -%%DATADIR%%-doc/html/gdk3/top_side.png -%%DATADIR%%-doc/html/gdk3/top_tee.png -%%DATADIR%%-doc/html/gdk3/trek.png -%%DATADIR%%-doc/html/gdk3/ul_angle.png -%%DATADIR%%-doc/html/gdk3/umbrella.png -%%DATADIR%%-doc/html/gdk3/up-insensitive.png -%%DATADIR%%-doc/html/gdk3/up.png -%%DATADIR%%-doc/html/gdk3/ur_angle.png -%%DATADIR%%-doc/html/gdk3/vertical_text_cursor.png -%%DATADIR%%-doc/html/gdk3/w_resize_cursor.png -%%DATADIR%%-doc/html/gdk3/wait_cursor.png -%%DATADIR%%-doc/html/gdk3/watch.png -%%DATADIR%%-doc/html/gdk3/xterm.png -%%DATADIR%%-doc/html/gdk3/zoom_in_cursor.png -%%DATADIR%%-doc/html/gdk3/zoom_out_cursor.png -%%DATADIR%%-doc/html/gtk3/AbstractObjects.html -%%DATADIR%%-doc/html/gtk3/Application.html -%%DATADIR%%-doc/html/gtk3/ApplicationChoosing.html -%%DATADIR%%-doc/html/gtk3/Builder.html -%%DATADIR%%-doc/html/gtk3/ButtonWidgets.html -%%DATADIR%%-doc/html/gtk3/DeprecatedObjects.html -%%DATADIR%%-doc/html/gtk3/DisplayWidgets.html -%%DATADIR%%-doc/html/gtk3/Gestures.html -%%DATADIR%%-doc/html/gtk3/GtkAboutDialog.html -%%DATADIR%%-doc/html/gtk3/GtkAccelLabel.html -%%DATADIR%%-doc/html/gtk3/GtkAccessible.html -%%DATADIR%%-doc/html/gtk3/GtkAction.html -%%DATADIR%%-doc/html/gtk3/GtkActionBar.html -%%DATADIR%%-doc/html/gtk3/GtkActionGroup.html -%%DATADIR%%-doc/html/gtk3/GtkActionable.html -%%DATADIR%%-doc/html/gtk3/GtkActivatable.html -%%DATADIR%%-doc/html/gtk3/GtkAdjustment.html -%%DATADIR%%-doc/html/gtk3/GtkAlignment.html -%%DATADIR%%-doc/html/gtk3/GtkAppChooser.html -%%DATADIR%%-doc/html/gtk3/GtkAppChooserButton.html -%%DATADIR%%-doc/html/gtk3/GtkAppChooserDialog.html -%%DATADIR%%-doc/html/gtk3/GtkAppChooserWidget.html -%%DATADIR%%-doc/html/gtk3/GtkApplication.html -%%DATADIR%%-doc/html/gtk3/GtkApplicationWindow.html -%%DATADIR%%-doc/html/gtk3/GtkArrow.html -%%DATADIR%%-doc/html/gtk3/GtkAspectFrame.html -%%DATADIR%%-doc/html/gtk3/GtkAssistant.html -%%DATADIR%%-doc/html/gtk3/GtkBin.html -%%DATADIR%%-doc/html/gtk3/GtkBox.html -%%DATADIR%%-doc/html/gtk3/GtkBuildable.html -%%DATADIR%%-doc/html/gtk3/GtkBuilder.html -%%DATADIR%%-doc/html/gtk3/GtkButton.html -%%DATADIR%%-doc/html/gtk3/GtkButtonBox.html -%%DATADIR%%-doc/html/gtk3/GtkCalendar.html -%%DATADIR%%-doc/html/gtk3/GtkCellArea.html -%%DATADIR%%-doc/html/gtk3/GtkCellAreaBox.html -%%DATADIR%%-doc/html/gtk3/GtkCellAreaContext.html -%%DATADIR%%-doc/html/gtk3/GtkCellEditable.html -%%DATADIR%%-doc/html/gtk3/GtkCellLayout.html -%%DATADIR%%-doc/html/gtk3/GtkCellRenderer.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererAccel.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererCombo.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererPixbuf.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererProgress.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererSpin.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererSpinner.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererText.html -%%DATADIR%%-doc/html/gtk3/GtkCellRendererToggle.html -%%DATADIR%%-doc/html/gtk3/GtkCellView.html -%%DATADIR%%-doc/html/gtk3/GtkCheckButton.html -%%DATADIR%%-doc/html/gtk3/GtkCheckMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkColorButton.html -%%DATADIR%%-doc/html/gtk3/GtkColorChooser.html -%%DATADIR%%-doc/html/gtk3/GtkColorChooserDialog.html -%%DATADIR%%-doc/html/gtk3/GtkColorChooserWidget.html -%%DATADIR%%-doc/html/gtk3/GtkColorSelection.html -%%DATADIR%%-doc/html/gtk3/GtkColorSelectionDialog.html -%%DATADIR%%-doc/html/gtk3/GtkComboBox.html -%%DATADIR%%-doc/html/gtk3/GtkComboBoxText.html -%%DATADIR%%-doc/html/gtk3/GtkContainer.html -%%DATADIR%%-doc/html/gtk3/GtkCssProvider.html -%%DATADIR%%-doc/html/gtk3/GtkDialog.html -%%DATADIR%%-doc/html/gtk3/GtkDrawingArea.html -%%DATADIR%%-doc/html/gtk3/GtkEditable.html -%%DATADIR%%-doc/html/gtk3/GtkEntry.html -%%DATADIR%%-doc/html/gtk3/GtkEntryBuffer.html -%%DATADIR%%-doc/html/gtk3/GtkEntryCompletion.html -%%DATADIR%%-doc/html/gtk3/GtkEventBox.html -%%DATADIR%%-doc/html/gtk3/GtkEventController.html -%%DATADIR%%-doc/html/gtk3/GtkEventControllerKey.html -%%DATADIR%%-doc/html/gtk3/GtkEventControllerMotion.html -%%DATADIR%%-doc/html/gtk3/GtkEventControllerScroll.html -%%DATADIR%%-doc/html/gtk3/GtkExpander.html -%%DATADIR%%-doc/html/gtk3/GtkFileChooser.html -%%DATADIR%%-doc/html/gtk3/GtkFileChooserButton.html -%%DATADIR%%-doc/html/gtk3/GtkFileChooserDialog.html -%%DATADIR%%-doc/html/gtk3/GtkFileChooserWidget.html -%%DATADIR%%-doc/html/gtk3/GtkFileFilter.html -%%DATADIR%%-doc/html/gtk3/GtkFixed.html -%%DATADIR%%-doc/html/gtk3/GtkFlowBox.html -%%DATADIR%%-doc/html/gtk3/GtkFontButton.html -%%DATADIR%%-doc/html/gtk3/GtkFontChooser.html -%%DATADIR%%-doc/html/gtk3/GtkFontChooserDialog.html -%%DATADIR%%-doc/html/gtk3/GtkFontChooserWidget.html -%%DATADIR%%-doc/html/gtk3/GtkFontSelection.html -%%DATADIR%%-doc/html/gtk3/GtkFontSelectionDialog.html -%%DATADIR%%-doc/html/gtk3/GtkFrame.html -%%DATADIR%%-doc/html/gtk3/GtkGLArea.html -%%DATADIR%%-doc/html/gtk3/GtkGesture.html -%%DATADIR%%-doc/html/gtk3/GtkGestureDrag.html -%%DATADIR%%-doc/html/gtk3/GtkGestureLongPress.html -%%DATADIR%%-doc/html/gtk3/GtkGestureMultiPress.html -%%DATADIR%%-doc/html/gtk3/GtkGesturePan.html -%%DATADIR%%-doc/html/gtk3/GtkGestureRotate.html -%%DATADIR%%-doc/html/gtk3/GtkGestureSingle.html -%%DATADIR%%-doc/html/gtk3/GtkGestureStylus.html -%%DATADIR%%-doc/html/gtk3/GtkGestureSwipe.html -%%DATADIR%%-doc/html/gtk3/GtkGestureZoom.html -%%DATADIR%%-doc/html/gtk3/GtkGrid.html -%%DATADIR%%-doc/html/gtk3/GtkHBox.html -%%DATADIR%%-doc/html/gtk3/GtkHButtonBox.html -%%DATADIR%%-doc/html/gtk3/GtkHPaned.html -%%DATADIR%%-doc/html/gtk3/GtkHSV.html -%%DATADIR%%-doc/html/gtk3/GtkHScale.html -%%DATADIR%%-doc/html/gtk3/GtkHScrollbar.html -%%DATADIR%%-doc/html/gtk3/GtkHSeparator.html -%%DATADIR%%-doc/html/gtk3/GtkHandleBox.html -%%DATADIR%%-doc/html/gtk3/GtkHeaderBar.html -%%DATADIR%%-doc/html/gtk3/GtkIMContext.html -%%DATADIR%%-doc/html/gtk3/GtkIMContextSimple.html -%%DATADIR%%-doc/html/gtk3/GtkIMMulticontext.html -%%DATADIR%%-doc/html/gtk3/GtkIconTheme.html -%%DATADIR%%-doc/html/gtk3/GtkIconView.html -%%DATADIR%%-doc/html/gtk3/GtkImage.html -%%DATADIR%%-doc/html/gtk3/GtkImageMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkInfoBar.html -%%DATADIR%%-doc/html/gtk3/GtkInvisible.html -%%DATADIR%%-doc/html/gtk3/GtkLabel.html -%%DATADIR%%-doc/html/gtk3/GtkLayout.html -%%DATADIR%%-doc/html/gtk3/GtkLevelBar.html -%%DATADIR%%-doc/html/gtk3/GtkLinkButton.html -%%DATADIR%%-doc/html/gtk3/GtkListBox.html -%%DATADIR%%-doc/html/gtk3/GtkListStore.html -%%DATADIR%%-doc/html/gtk3/GtkLockButton.html -%%DATADIR%%-doc/html/gtk3/GtkMenu.html -%%DATADIR%%-doc/html/gtk3/GtkMenuBar.html -%%DATADIR%%-doc/html/gtk3/GtkMenuButton.html -%%DATADIR%%-doc/html/gtk3/GtkMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkMenuShell.html -%%DATADIR%%-doc/html/gtk3/GtkMenuToolButton.html -%%DATADIR%%-doc/html/gtk3/GtkMessageDialog.html -%%DATADIR%%-doc/html/gtk3/GtkMisc.html -%%DATADIR%%-doc/html/gtk3/GtkModelButton.html -%%DATADIR%%-doc/html/gtk3/GtkNotebook.html -%%DATADIR%%-doc/html/gtk3/GtkNumerableIcon.html -%%DATADIR%%-doc/html/gtk3/GtkOffscreenWindow.html -%%DATADIR%%-doc/html/gtk3/GtkOverlay.html -%%DATADIR%%-doc/html/gtk3/GtkPadController.html -%%DATADIR%%-doc/html/gtk3/GtkPageSetup.html -%%DATADIR%%-doc/html/gtk3/GtkPageSetupUnixDialog.html -%%DATADIR%%-doc/html/gtk3/GtkPaned.html -%%DATADIR%%-doc/html/gtk3/GtkPaperSize.html -%%DATADIR%%-doc/html/gtk3/GtkPlacesSidebar.html -%%DATADIR%%-doc/html/gtk3/GtkPlug.html -%%DATADIR%%-doc/html/gtk3/GtkPopover.html -%%DATADIR%%-doc/html/gtk3/GtkPopoverMenu.html -%%DATADIR%%-doc/html/gtk3/GtkPrintContext.html -%%DATADIR%%-doc/html/gtk3/GtkPrintJob.html -%%DATADIR%%-doc/html/gtk3/GtkPrintSettings.html -%%DATADIR%%-doc/html/gtk3/GtkPrintUnixDialog.html -%%DATADIR%%-doc/html/gtk3/GtkPrinter.html -%%DATADIR%%-doc/html/gtk3/GtkProgressBar.html -%%DATADIR%%-doc/html/gtk3/GtkRadioAction.html -%%DATADIR%%-doc/html/gtk3/GtkRadioButton.html -%%DATADIR%%-doc/html/gtk3/GtkRadioMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkRadioToolButton.html -%%DATADIR%%-doc/html/gtk3/GtkRange.html -%%DATADIR%%-doc/html/gtk3/GtkRecentAction.html -%%DATADIR%%-doc/html/gtk3/GtkRecentChooser.html -%%DATADIR%%-doc/html/gtk3/GtkRecentChooserDialog.html -%%DATADIR%%-doc/html/gtk3/GtkRecentChooserMenu.html -%%DATADIR%%-doc/html/gtk3/GtkRecentChooserWidget.html -%%DATADIR%%-doc/html/gtk3/GtkRecentFilter.html -%%DATADIR%%-doc/html/gtk3/GtkRecentManager.html -%%DATADIR%%-doc/html/gtk3/GtkRevealer.html -%%DATADIR%%-doc/html/gtk3/GtkScale.html -%%DATADIR%%-doc/html/gtk3/GtkScaleButton.html -%%DATADIR%%-doc/html/gtk3/GtkScrollable.html -%%DATADIR%%-doc/html/gtk3/GtkScrollbar.html -%%DATADIR%%-doc/html/gtk3/GtkScrolledWindow.html -%%DATADIR%%-doc/html/gtk3/GtkSearchBar.html -%%DATADIR%%-doc/html/gtk3/GtkSearchEntry.html -%%DATADIR%%-doc/html/gtk3/GtkSeparator.html -%%DATADIR%%-doc/html/gtk3/GtkSeparatorMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkSeparatorToolItem.html -%%DATADIR%%-doc/html/gtk3/GtkSettings.html -%%DATADIR%%-doc/html/gtk3/GtkShortcutsGroup.html -%%DATADIR%%-doc/html/gtk3/GtkShortcutsSection.html -%%DATADIR%%-doc/html/gtk3/GtkShortcutsShortcut.html -%%DATADIR%%-doc/html/gtk3/GtkShortcutsWindow.html -%%DATADIR%%-doc/html/gtk3/GtkSizeGroup.html -%%DATADIR%%-doc/html/gtk3/GtkSocket.html -%%DATADIR%%-doc/html/gtk3/GtkSpinButton.html -%%DATADIR%%-doc/html/gtk3/GtkSpinner.html -%%DATADIR%%-doc/html/gtk3/GtkStack.html -%%DATADIR%%-doc/html/gtk3/GtkStackSidebar.html -%%DATADIR%%-doc/html/gtk3/GtkStackSwitcher.html -%%DATADIR%%-doc/html/gtk3/GtkStatusIcon.html -%%DATADIR%%-doc/html/gtk3/GtkStatusbar.html -%%DATADIR%%-doc/html/gtk3/GtkStyle.html -%%DATADIR%%-doc/html/gtk3/GtkStyleContext.html -%%DATADIR%%-doc/html/gtk3/GtkStyleProvider.html -%%DATADIR%%-doc/html/gtk3/GtkSwitch.html -%%DATADIR%%-doc/html/gtk3/GtkTable.html -%%DATADIR%%-doc/html/gtk3/GtkTearoffMenuItem.html -%%DATADIR%%-doc/html/gtk3/GtkTextBuffer.html -%%DATADIR%%-doc/html/gtk3/GtkTextIter.html -%%DATADIR%%-doc/html/gtk3/GtkTextMark.html -%%DATADIR%%-doc/html/gtk3/GtkTextTag.html -%%DATADIR%%-doc/html/gtk3/GtkTextTagTable.html -%%DATADIR%%-doc/html/gtk3/GtkTextView.html -%%DATADIR%%-doc/html/gtk3/GtkThemingEngine.html -%%DATADIR%%-doc/html/gtk3/GtkToggleAction.html -%%DATADIR%%-doc/html/gtk3/GtkToggleButton.html -%%DATADIR%%-doc/html/gtk3/GtkToggleToolButton.html -%%DATADIR%%-doc/html/gtk3/GtkToolButton.html -%%DATADIR%%-doc/html/gtk3/GtkToolItem.html -%%DATADIR%%-doc/html/gtk3/GtkToolItemGroup.html -%%DATADIR%%-doc/html/gtk3/GtkToolPalette.html -%%DATADIR%%-doc/html/gtk3/GtkToolShell.html -%%DATADIR%%-doc/html/gtk3/GtkToolbar.html -%%DATADIR%%-doc/html/gtk3/GtkTooltip.html -%%DATADIR%%-doc/html/gtk3/GtkTreeModel.html -%%DATADIR%%-doc/html/gtk3/GtkTreeModelFilter.html -%%DATADIR%%-doc/html/gtk3/GtkTreeModelSort.html -%%DATADIR%%-doc/html/gtk3/GtkTreeSelection.html -%%DATADIR%%-doc/html/gtk3/GtkTreeSortable.html -%%DATADIR%%-doc/html/gtk3/GtkTreeStore.html -%%DATADIR%%-doc/html/gtk3/GtkTreeView.html -%%DATADIR%%-doc/html/gtk3/GtkTreeViewColumn.html -%%DATADIR%%-doc/html/gtk3/GtkUIManager.html -%%DATADIR%%-doc/html/gtk3/GtkVBox.html -%%DATADIR%%-doc/html/gtk3/GtkVButtonBox.html -%%DATADIR%%-doc/html/gtk3/GtkVPaned.html -%%DATADIR%%-doc/html/gtk3/GtkVScale.html -%%DATADIR%%-doc/html/gtk3/GtkVScrollbar.html -%%DATADIR%%-doc/html/gtk3/GtkVSeparator.html -%%DATADIR%%-doc/html/gtk3/GtkViewport.html -%%DATADIR%%-doc/html/gtk3/GtkVolumeButton.html -%%DATADIR%%-doc/html/gtk3/GtkWidget.html -%%DATADIR%%-doc/html/gtk3/GtkWindow.html -%%DATADIR%%-doc/html/gtk3/GtkWindowGroup.html -%%DATADIR%%-doc/html/gtk3/LayoutContainers.html -%%DATADIR%%-doc/html/gtk3/MenusAndCombos.html -%%DATADIR%%-doc/html/gtk3/MiscObjects.html -%%DATADIR%%-doc/html/gtk3/NumericEntry.html -%%DATADIR%%-doc/html/gtk3/Ornaments.html -%%DATADIR%%-doc/html/gtk3/PlugSocket.html -%%DATADIR%%-doc/html/gtk3/Printing.html -%%DATADIR%%-doc/html/gtk3/RecentDocuments.html -%%DATADIR%%-doc/html/gtk3/ScrollingWidgets.html -%%DATADIR%%-doc/html/gtk3/SelectorWidgets.html -%%DATADIR%%-doc/html/gtk3/ShortcutsOverview.html -%%DATADIR%%-doc/html/gtk3/TextWidget.html -%%DATADIR%%-doc/html/gtk3/TextWidgetObjects.html -%%DATADIR%%-doc/html/gtk3/TreeWidget.html -%%DATADIR%%-doc/html/gtk3/TreeWidgetObjects.html -%%DATADIR%%-doc/html/gtk3/WindowWidgets.html -%%DATADIR%%-doc/html/gtk3/aboutdialog.png -%%DATADIR%%-doc/html/gtk3/accel-label.png -%%DATADIR%%-doc/html/gtk3/action-bar.png -%%DATADIR%%-doc/html/gtk3/annotation-glossary.html -%%DATADIR%%-doc/html/gtk3/api-index-full.html -%%DATADIR%%-doc/html/gtk3/appchooserbutton.png -%%DATADIR%%-doc/html/gtk3/appchooserdialog.png -%%DATADIR%%-doc/html/gtk3/arrows.png -%%DATADIR%%-doc/html/gtk3/assistant.png *** 960 LINES SKIPPED ***