Received: by mail.netbsd.org (Postfix, from userid 605) id 3982D84D8C; Sun, 1 Jan 2023 21:21:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 654A684D58 for ; Sun, 1 Jan 2023 21:21:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nqWX4aFOZEVy for ; Sun, 1 Jan 2023 21:21:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 26B0A84D27 for ; Sun, 1 Jan 2023 21:21:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 23CBCFA90; Sun, 1 Jan 2023 21:21:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1672608096158070" MIME-Version: 1.0 Date: Sun, 1 Jan 2023 21:21:36 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/x11/gtk3 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230101212136.23CBCFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1672608096158070 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Jan 1 21:21:36 UTC 2023 Modified Files: pkgsrc/x11/gtk3: Makefile PLIST distinfo options.mk Added Files: pkgsrc/x11/gtk3/patches: patch-meson.build patch-meson_options.txt Removed Files: pkgsrc/x11/gtk3/patches: patch-Makefile.in patch-config.h.in patch-configure patch-configure.ac Log Message: gtk3: updated to 3.24.36 Overview of Changes in GTK+ 3.24.36, 12-22-2022 =============================================== This release is the first GTK 3 release to exclusively use the meson build system. * GtkLabel: - Tweak selection behavior * GtkEmojiChooser: - Properly handle empty recent section * GtkFileChooser: - Make ~ key work regardless of dead keys * build: - Improve handling of flaky tests - Drop the autotools build * Wayland: - Fix problems with X<>Wayland DND - Revert cursor changes from 3.24.35 - Fix handling of surrounding text in input * Windows: - Improve handling of line ends in clipboard * MacOS: - Use NSTrackingArea * Translation updates: Abkhazian Basque Brazilian Portuguese Catalan Interlingue Persian To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 pkgsrc/x11/gtk3/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/gtk3/PLIST cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/gtk3/distinfo cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/gtk3/options.mk cvs rdiff -u -r1.1 -r0 pkgsrc/x11/gtk3/patches/patch-Makefile.in cvs rdiff -u -r1.3 -r0 pkgsrc/x11/gtk3/patches/patch-config.h.in cvs rdiff -u -r1.4 -r0 pkgsrc/x11/gtk3/patches/patch-configure cvs rdiff -u -r1.2 -r0 pkgsrc/x11/gtk3/patches/patch-configure.ac cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-meson.build \ pkgsrc/x11/gtk3/patches/patch-meson_options.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1672608096158070 Content-Disposition: inline Content-Length: 18828 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/gtk3/Makefile diff -u pkgsrc/x11/gtk3/Makefile:1.176 pkgsrc/x11/gtk3/Makefile:1.177 --- pkgsrc/x11/gtk3/Makefile:1.176 Wed Nov 23 11:40:28 2022 +++ pkgsrc/x11/gtk3/Makefile Sun Jan 1 21:21:35 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.176 2022/11/23 11:40:28 adam Exp $ +# $NetBSD: Makefile,v 1.177 2023/01/01 21:21:35 adam Exp $ -DISTNAME= gtk+-3.24.35 +DISTNAME= gtk+-3.24.36 PKGNAME= ${DISTNAME:S/gtk/gtk3/} CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} @@ -11,28 +11,24 @@ HOMEPAGE= https://www.gtk.org/ COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces LICENSE= gnu-lgpl-v2.1 +TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools +TOOL_DEPENDS+= gtk-doc>=1.32:../../textproc/gtk-doc + # "error: 'for' loop initial declarations are only allowed in C99 mode" -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes +USE_LANGUAGES= c99 c++ USE_PKGLOCALEDIR= yes USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge USE_TOOLS+= gdbus-codegen -GNU_CONFIGURE= yes PTHREAD_AUTO_VARS= yes -TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools +MESON_ARGS+= -Dgtk_doc=true +MESON_ARGS+= -Dman=true +MESON_ARGS+= --sysconfdir=${PREFIX}/libdata # There is no logic in gettext.mk to detect the native version of xgettext, # and we do need it to be compiled with Glade support. _TOOLS_USE_PKGSRC.xgettext= yes -# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh -CONFIG_SHELL= ${TOOLS_PATH.bash} -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata -# Work around build problems, disable unstable PAPI, PR #41608: -CONFIGURE_ARGS+= --disable-papi -# Avoid regeneration of Makefile.in after configure.ac patch -CONFIGURE_ARGS+= --disable-maintainer-mode MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} TEST_TARGET= check @@ -45,20 +41,8 @@ INSTALLATION_DIRS+= lib/gtk-3.0/immodule INSTALLATION_DIRS+= lib/gtk-3.0/modules INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems -BUILD_DIRS= . demos/gtk-demo - .include "../../mk/bsd.prefs.mk" -# isnan and isinf are part of libc, not libm on DragonFly -# conf tests fail detection due to conflicting definitions, just skip them -CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes -CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes - -# "error: 'for' loop initial declarations are only allowed in C99 mode" -CFLAGS+= -std=gnu99 - -CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" - # We remove the module databases during post-install since we create them # anew in the +INSTALL script as part of the POST-INSTALL action. # @@ -88,7 +72,7 @@ BUILDLINK_API_DEPENDS.gobject-introspect .include "options.mk" .include "../../devel/glib2/schemas.mk" - +.include "../../devel/meson/build.mk" BUILDLINK_API_DEPENDS.pango+= pango>=1.41 .include "../../devel/pango/buildlink3.mk" BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91 @@ -100,6 +84,6 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.1 BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.4 .include "../../graphics/libepoxy/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../lang/python/tool.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" - .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/gtk3/PLIST diff -u pkgsrc/x11/gtk3/PLIST:1.37 pkgsrc/x11/gtk3/PLIST:1.38 --- pkgsrc/x11/gtk3/PLIST:1.37 Wed Nov 23 11:40:28 2022 +++ pkgsrc/x11/gtk3/PLIST Sun Jan 1 21:21:35 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.37 2022/11/23 11:40:28 adam Exp $ +@comment $NetBSD: PLIST,v 1.38 2023/01/01 21:21:35 adam Exp $ bin/gtk-builder-tool bin/gtk-encode-symbolic-svg bin/gtk-launch @@ -56,14 +56,12 @@ ${PLIST.wayland}include/gtk-3.0/gdk/gdkw include/gtk-3.0/gdk/gdkwindow.h ${PLIST.x11}include/gtk-3.0/gdk/gdkx.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartz-cocoa-access.h -${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartz-gtk-only.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzcursor.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevice-core.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevicemanager-core.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdisplay.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdisplaymanager.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdnd.h -${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzglcontext.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzkeys.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzmonitor.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzscreen.h @@ -431,28 +429,35 @@ lib/girepository-1.0/Gdk-3.0.typelib ${PLIST.x11}lib/girepository-1.0/GdkX11-3.0.typelib lib/girepository-1.0/Gtk-3.0.typelib @pkgdir lib/gtk-3.0/3.0.0/filesystems -lib/gtk-3.0/3.0.0/immodules/im-am-et.la -lib/gtk-3.0/3.0.0/immodules/im-cedilla.la -lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.la -lib/gtk-3.0/3.0.0/immodules/im-inuktitut.la -lib/gtk-3.0/3.0.0/immodules/im-ipa.la -lib/gtk-3.0/3.0.0/immodules/im-multipress.la -${PLIST.quartz}lib/gtk-3.0/3.0.0/immodules/im-quartz.la -lib/gtk-3.0/3.0.0/immodules/im-thai.la -lib/gtk-3.0/3.0.0/immodules/im-ti-er.la -lib/gtk-3.0/3.0.0/immodules/im-ti-et.la -lib/gtk-3.0/3.0.0/immodules/im-viqr.la -${PLIST.wayland}lib/gtk-3.0/3.0.0/immodules/im-wayland.la -${PLIST.wayland}lib/gtk-3.0/3.0.0/immodules/im-waylandgtk.la -${PLIST.x11}lib/gtk-3.0/3.0.0/immodules/im-xim.la -${PLIST.cups}lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la -lib/gtk-3.0/3.0.0/printbackends/libprintbackend-file.la -lib/gtk-3.0/3.0.0/printbackends/libprintbackend-lpr.la +lib/gtk-3.0/3.0.0/immodules/im-am-et.so +lib/gtk-3.0/3.0.0/immodules/im-cedilla.so +lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.so +lib/gtk-3.0/3.0.0/immodules/im-inuktitut.so +lib/gtk-3.0/3.0.0/immodules/im-ipa.so +lib/gtk-3.0/3.0.0/immodules/im-multipress.so +${PLIST.quartz}lib/gtk-3.0/3.0.0/immodules/im-quartz.so +lib/gtk-3.0/3.0.0/immodules/im-thai.so +lib/gtk-3.0/3.0.0/immodules/im-ti-er.so +lib/gtk-3.0/3.0.0/immodules/im-ti-et.so +lib/gtk-3.0/3.0.0/immodules/im-viqr.so +${PLIST.wayland}lib/gtk-3.0/3.0.0/immodules/im-wayland.so +${PLIST.wayland}lib/gtk-3.0/3.0.0/immodules/im-waylandgtk.so +${PLIST.x11}lib/gtk-3.0/3.0.0/immodules/im-xim.so +${PLIST.cups}lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.so +lib/gtk-3.0/3.0.0/printbackends/libprintbackend-file.so +lib/gtk-3.0/3.0.0/printbackends/libprintbackend-lpr.so +lib/gtk-3.0/3.0.0/printbackends/libprintbackend-test.so @pkgdir lib/gtk-3.0/immodules @pkgdir lib/gtk-3.0/modules -lib/libgailutil-3.la -lib/libgdk-3.la -lib/libgtk-3.la +lib/libgailutil-3.so +lib/libgailutil-3.so.0 +lib/libgailutil-3.so.0.0.0 +lib/libgdk-3.so +lib/libgdk-3.so.0 +lib/libgdk-3.so.0.2404.32 +lib/libgtk-3.so +lib/libgtk-3.so.0 +lib/libgtk-3.so.0.2404.32 lib/pkgconfig/gail-3.0.pc lib/pkgconfig/gdk-3.0.pc ${PLIST.quartz}lib/pkgconfig/gdk-quartz-3.0.pc @@ -464,7 +469,6 @@ lib/pkgconfig/gtk+-unix-print-3.0.pc ${PLIST.wayland}lib/pkgconfig/gtk+-wayland-3.0.pc ${PLIST.x11}lib/pkgconfig/gtk+-x11-3.0.pc libdata/gtk-3.0/im-multipress.conf -man/man1/broadwayd.1 man/man1/gtk-builder-tool.1 man/man1/gtk-encode-symbolic-svg.1 man/man1/gtk-launch.1 @@ -489,6 +493,11 @@ share/glib-2.0/schemas/org.gtk.Settings. share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml +share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml +share/gtk-3.0/emoji/de.gresource +share/gtk-3.0/emoji/es.gresource +share/gtk-3.0/emoji/fr.gresource +share/gtk-3.0/emoji/zh.gresource share/gtk-3.0/gtkbuilder.rng share/gtk-3.0/valgrind/gtk.supp share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html @@ -519,6 +528,20 @@ share/gtk-doc/html/gdk3/X_cursor.png share/gtk-doc/html/gdk3/alias_cursor.png share/gtk-doc/html/gdk3/all_scroll_cursor.png share/gtk-doc/html/gdk3/annotation-glossary.html +share/gtk-doc/html/gdk3/api-index-3-0.html +share/gtk-doc/html/gdk3/api-index-3-10.html +share/gtk-doc/html/gdk3/api-index-3-12.html +share/gtk-doc/html/gdk3/api-index-3-14.html +share/gtk-doc/html/gdk3/api-index-3-16.html +share/gtk-doc/html/gdk3/api-index-3-18.html +share/gtk-doc/html/gdk3/api-index-3-2.html +share/gtk-doc/html/gdk3/api-index-3-20.html +share/gtk-doc/html/gdk3/api-index-3-22.html +share/gtk-doc/html/gdk3/api-index-3-24.html +share/gtk-doc/html/gdk3/api-index-3-4.html +share/gtk-doc/html/gdk3/api-index-3-6.html +share/gtk-doc/html/gdk3/api-index-3-8.html +share/gtk-doc/html/gdk3/api-index-deprecated.html share/gtk-doc/html/gdk3/api-index-full.html share/gtk-doc/html/gdk3/arrow.png share/gtk-doc/html/gdk3/based_arrow_down.png @@ -807,7 +830,7 @@ share/gtk-doc/html/gtk3/GtkPageSetupUnix share/gtk-doc/html/gtk3/GtkPaned.html share/gtk-doc/html/gtk3/GtkPaperSize.html share/gtk-doc/html/gtk3/GtkPlacesSidebar.html -share/gtk-doc/html/gtk3/GtkPlug.html +${PLIST.x11}share/gtk-doc/html/gtk3/GtkPlug.html share/gtk-doc/html/gtk3/GtkPopover.html share/gtk-doc/html/gtk3/GtkPopoverMenu.html share/gtk-doc/html/gtk3/GtkPrintContext.html @@ -845,7 +868,7 @@ share/gtk-doc/html/gtk3/GtkShortcutsSect share/gtk-doc/html/gtk3/GtkShortcutsShortcut.html share/gtk-doc/html/gtk3/GtkShortcutsWindow.html share/gtk-doc/html/gtk3/GtkSizeGroup.html -share/gtk-doc/html/gtk3/GtkSocket.html +${PLIST.x11}share/gtk-doc/html/gtk3/GtkSocket.html share/gtk-doc/html/gtk3/GtkSpinButton.html share/gtk-doc/html/gtk3/GtkSpinner.html share/gtk-doc/html/gtk3/GtkStack.html @@ -916,6 +939,20 @@ share/gtk-doc/html/gtk3/aboutdialog.png share/gtk-doc/html/gtk3/accel-label.png share/gtk-doc/html/gtk3/action-bar.png share/gtk-doc/html/gtk3/annotation-glossary.html +share/gtk-doc/html/gtk3/api-index-3-0.html +share/gtk-doc/html/gtk3/api-index-3-10.html +share/gtk-doc/html/gtk3/api-index-3-12.html +share/gtk-doc/html/gtk3/api-index-3-14.html +share/gtk-doc/html/gtk3/api-index-3-16.html +share/gtk-doc/html/gtk3/api-index-3-18.html +share/gtk-doc/html/gtk3/api-index-3-2.html +share/gtk-doc/html/gtk3/api-index-3-20.html +share/gtk-doc/html/gtk3/api-index-3-22.html +share/gtk-doc/html/gtk3/api-index-3-24.html +share/gtk-doc/html/gtk3/api-index-3-4.html +share/gtk-doc/html/gtk3/api-index-3-6.html +share/gtk-doc/html/gtk3/api-index-3-8.html +share/gtk-doc/html/gtk3/api-index-deprecated.html share/gtk-doc/html/gtk3/api-index-full.html share/gtk-doc/html/gtk3/appchooserbutton.png share/gtk-doc/html/gtk3/appchooserdialog.png @@ -1049,6 +1086,8 @@ share/gtk-doc/html/gtk3/gtk3-General.htm share/gtk-doc/html/gtk3/gtk3-GtkFileChooserNative.html share/gtk-doc/html/gtk3/gtk3-GtkGradient.html share/gtk-doc/html/gtk3/gtk3-GtkNativeDialog.html +${PLIST.quartz}share/gtk-doc/html/gtk3/gtk3-GtkPlug.html +${PLIST.quartz}share/gtk-doc/html/gtk3/gtk3-GtkSocket.html share/gtk-doc/html/gtk3/gtk3-GtkStyleProperties.html share/gtk-doc/html/gtk3/gtk3-GtkSymbolicColor.html share/gtk-doc/html/gtk3/gtk3-GtkTreeView-drag-and-drop.html @@ -1116,7 +1155,6 @@ share/gtk-doc/html/gtk3/panes.png share/gtk-doc/html/gtk3/placessidebar.png share/gtk-doc/html/gtk3/platform-support.html share/gtk-doc/html/gtk3/popup-anchors.png -share/gtk-doc/html/gtk3/popup-at.svg share/gtk-doc/html/gtk3/popup-flip.png share/gtk-doc/html/gtk3/popup-slide.png share/gtk-doc/html/gtk3/printdialog.png @@ -1183,6 +1221,7 @@ share/icons/hicolor/48x48/apps/gtk3-demo share/icons/hicolor/48x48/apps/gtk3-demo.png share/icons/hicolor/48x48/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/48x48/apps/gtk3-widget-factory.png +share/locale/ab/LC_MESSAGES/gtk30-properties.mo share/locale/ab/LC_MESSAGES/gtk30.mo share/locale/af/LC_MESSAGES/gtk30-properties.mo share/locale/af/LC_MESSAGES/gtk30.mo @@ -1282,6 +1321,8 @@ share/locale/ia/LC_MESSAGES/gtk30-proper share/locale/ia/LC_MESSAGES/gtk30.mo share/locale/id/LC_MESSAGES/gtk30-properties.mo share/locale/id/LC_MESSAGES/gtk30.mo +share/locale/ie/LC_MESSAGES/gtk30-properties.mo +share/locale/ie/LC_MESSAGES/gtk30.mo share/locale/io/LC_MESSAGES/gtk30-properties.mo share/locale/io/LC_MESSAGES/gtk30.mo share/locale/is/LC_MESSAGES/gtk30-properties.mo Index: pkgsrc/x11/gtk3/distinfo diff -u pkgsrc/x11/gtk3/distinfo:1.96 pkgsrc/x11/gtk3/distinfo:1.97 --- pkgsrc/x11/gtk3/distinfo:1.96 Wed Nov 23 11:40:28 2022 +++ pkgsrc/x11/gtk3/distinfo Sun Jan 1 21:21:35 2023 @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.96 2022/11/23 11:40:28 adam Exp $ +$NetBSD: distinfo,v 1.97 2023/01/01 21:21:35 adam Exp $ -BLAKE2s (gtk+-3.24.35.tar.xz) = 90281f2e58420621b762f824686f9fd3a63dcbd350b1ad792266b8c3c7357fe4 -SHA512 (gtk+-3.24.35.tar.xz) = 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade -Size (gtk+-3.24.35.tar.xz) = 17913328 bytes -SHA1 (patch-Makefile.in) = 8edcfe2ff492d90138a24b680fe39814c3848d80 -SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f -SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 -SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 +BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f +SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a +Size (gtk+-3.24.36.tar.xz) = 12540184 bytes SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 @@ -14,3 +10,5 @@ SHA1 (patch-gtk_a11y_gtkaccessibility.c) SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149 SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 +SHA1 (patch-meson.build) = e5e3ca8a42876fae22a2dad5cf63571b28d36812 +SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f Index: pkgsrc/x11/gtk3/options.mk diff -u pkgsrc/x11/gtk3/options.mk:1.24 pkgsrc/x11/gtk3/options.mk:1.25 --- pkgsrc/x11/gtk3/options.mk:1.24 Wed Oct 19 10:36:59 2022 +++ pkgsrc/x11/gtk3/options.mk Sun Jan 1 21:21:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.24 2022/10/19 10:36:59 jperkin Exp $ +# $NetBSD: options.mk,v 1.25 2023/01/01 21:21:35 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 -PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug +PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups PKG_SUPPORTED_OPTIONS+= wayland x11 .if exists(/System/Library/Frameworks/Quartz.framework) PKG_SUPPORTED_OPTIONS+= quartz @@ -17,43 +17,39 @@ PKG_SUGGESTED_OPTIONS+= gtk3-atk-bridge .include "../../mk/bsd.options.mk" -PLIST_VARS+= cups +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/libcups/buildlink3.mk" -PLIST.cups= yes +PLIST.cups= yes +MESON_ARGS+= -Dprint_backends=cups,file,lpr,test .else -CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no +MESON_ARGS+= -Dprint_backends=file,lpr,test .endif -.if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -PLIST_VARS+= quartz +PLIST_VARS+= quartz .if !empty(PKG_OPTIONS:Mquartz) -CONFIGURE_ARGS+= --enable-quartz-backend -PLIST.quartz= yes +PLIST.quartz= yes +MESON_ARGS+= -Dquartz_backend=true .else -CONFIGURE_ARGS+= --disable-quartz-backend +MESON_ARGS+= -Dquartz_backend=false .endif -PLIST_VARS+= wayland +PLIST_VARS+= wayland .if !empty(PKG_OPTIONS:Mwayland) -PLIST.wayland= yes +PLIST.wayland= yes .include "../../devel/wayland/buildlink3.mk" .include "../../devel/wayland-protocols/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" -CONFIGURE_ARGS+= --enable-wayland-backend +MESON_ARGS+= -Dwayland_backend=true .else -CONFIGURE_ARGS+= --disable-wayland-backend +MESON_ARGS+= -Dwayland_backend=false .endif -PLIST_VARS+= x11 +PLIST_VARS+= x11 .if !empty(PKG_OPTIONS:Mx11) -CONFIGURE_ARGS+= --enable-x11-backend -CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no -CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no -PLIST.x11= yes +MESON_ARGS+= -Dx11_backend=true +MESON_ARGS+= -Dxinerama=yes +PLIST.x11= yes . if !empty(PKG_OPTIONS:Mgtk3-atk-bridge) BUILDLINK_API_DEPENDS.at-spi2-atk+= at-spi2-atk>=2.6.1 @@ -77,5 +73,5 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-x11-backend +MESON_ARGS+= -Dx11_backend=false .endif Added files: Index: pkgsrc/x11/gtk3/patches/patch-meson.build diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-meson.build:1.1 --- /dev/null Sun Jan 1 21:21:36 2023 +++ pkgsrc/x11/gtk3/patches/patch-meson.build Sun Jan 1 21:21:35 2023 @@ -0,0 +1,24 @@ +$NetBSD: patch-meson.build,v 1.1 2023/01/01 21:21:35 adam Exp $ + +Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. + +--- meson.build.orig 2023-01-01 19:10:33.000000000 +0000 ++++ meson.build +@@ -137,6 +137,7 @@ wayland_enabled = get_option('way + 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,9 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) ++ if atkbridge_enabled + atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ endif + + backend_immodules += ['xim'] + Index: pkgsrc/x11/gtk3/patches/patch-meson_options.txt diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-meson_options.txt:1.1 --- /dev/null Sun Jan 1 21:21:36 2023 +++ pkgsrc/x11/gtk3/patches/patch-meson_options.txt Sun Jan 1 21:21:35 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-meson_options.txt,v 1.1 2023/01/01 21:21:35 adam Exp $ + +Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. + +--- meson_options.txt.orig 2023-01-01 19:12:35.000000000 +0000 ++++ meson_options.txt +@@ -9,6 +9,8 @@ option('win32_backend', type: 'boolean', + 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('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', --_----------=_1672608096158070--