From 9677ef302eb7a27e0069ac0d5302e2d328ae5b6e Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 13 Jul 2022 20:24:24 +0000 Subject: [PATCH] glade: update to 3.38.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ============ Glade 3.38.2 ============ - Fix windows compatibility issues - Fix build against Python 3.9 (Jan Alexander Steffens) - Fix issue #355 "Make notification text selectable" - Fix issue #53 "Can't choose a FileChooserDialog for a FileChooserButton" - Fix issue #371 "Glade user survey not working (TLS error)" ============ Glade 3.38.1 ============ - Fix issue #471 "XML not updated after adding element" - Fix issue #480 "version field not always updated in XML" - Fix issue #474 "GtkLabel: setup text attribute issues" - Fix issue #479 "Glade 3.36.0 segfaults when opening a file" - Fix issue pasting widget with ctrl+v in GtkGrid ============ Glade 3.38.0 ============ - Load template files as new GTypes and add them to "User templates" widget group automatically without the need of a catalog - Added JavaScript widget support - Use version data from gir to improve deprecation/target tests - Implement survey using new backend at surveys.gnome.org - Keep survey state in config file - Associate with application/x-gtk-builder (Caolán McNamara) - Project properties dialog improvements. (Use headerbar, stack and stach switcher, add warnings textview) - Improve toolkit target version selection in project properties dialog - Improve treemodel char data type handling - Remove autotools (Iñigo Martínez) - New gjs-1.0 1.64 dependency - Bump Gtk dependency to 3.24 - Bump webkit2gtk dependency to 2.28 - Fixed all compiler/gir warnings - Issue #385: GtkCellRendererText causes deprecated warnings for ghost properties - Issue #444: show-emoji-icon is missing "minimum version"/since constraint - Issue #367: Glade removes double/triple slashes from URLs - Issue #452: GtkComboBox cell renderers editor is too hard to discover - Issue #363: Toplevel windows are leaked when closing a project - Issue #462: Crash when creating a new GtkAssistant and pressing it - Issue #463: Specify file on command line - Issue #461: Glade resets number of rows and columns in GtkGrid - Issue #460: 3.37.0: test suite fails because glade uses incorrectly asserts in test units - Issue #412: Fix inconsistent "top-level", "top level", "toplevel" spelling in translatable strings - Issue #281: GladeProperty: Do not replace - with _ - Issue #389: GladeProject: show message on invalid GtkBuilder file - Issue #446: GladeGtkListBox: fix size request issue - Issue #432: GladeStandarStock, GladeStandarStockImage: fix get_type() functions for introspection - Issue #447: GladeGtkWindow: Fix CSD support - Issue #456: Utils: use g_param_spec_uchar() for uchar types - Issue #459: Gtk catalog: add GtkRecentChooserMenu to Display group - Issue #433: Implement survey using new backend at surveys.gnome.org - Build: use gtk-mac-integration only when creating bundle (Tom Schoonjans) - Ignore locale when saving numeric values (Alberto Fanjul) - Remove config for external builds (Alberto Fanjul) - Python plugin: fix linking error - Tests: add python and javascript test case - gtk: Add GtkScrolledWindow propagate-natural-width property (Corentin Noël) - GladeScrolledWindowEditor: Squeeze width/height properties in two columns - Gtk plugin: add missing displayable values - Webkit2gtk plugin: add missing displayable values and sandbox web view - dtd: Make init-function an element, not an attribute (Adrien Plazas) --- devel/glade/Makefile | 12 ++-- devel/glade/PLIST | 70 ++++------------------ devel/glade/distinfo | 11 ++-- devel/glade/patches/patch-configure | 28 --------- devel/glade/patches/patch-data_meson.build | 22 +++++++ devel/glade/patches/patch-help_LINGUAS | 14 +++++ 6 files changed, 59 insertions(+), 98 deletions(-) delete mode 100644 devel/glade/patches/patch-configure create mode 100644 devel/glade/patches/patch-data_meson.build create mode 100644 devel/glade/patches/patch-help_LINGUAS diff --git a/devel/glade/Makefile b/devel/glade/Makefile index f2e3403cc60b..ef7e07910cbf 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.105 2022/04/18 19:09:44 adam Exp $ +# $NetBSD: Makefile,v 1.106 2022/07/13 20:24:24 wiz Exp $ -DISTNAME= glade-3.36.0 -PKGREVISION= 5 +DISTNAME= glade-3.38.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/3.36/} EXTRACT_SUFX= .tar.xz @@ -14,14 +13,13 @@ LICENSE= gnu-gpl-v2 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config intltool gmake msgfmt -USE_TOOLS+= itstool +USE_TOOLS+= itstool msgfmt pkg-config PKGCONFIG_OVERRIDE+= data/gladeui-2.0.pc.in +.include "../../devel/meson/build.mk" .include "../../devel/gettext-tools/msgfmt-desktop.mk" +.include "../../devel/gobject-introspection/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/devel/glade/PLIST b/devel/glade/PLIST index 5f1d3a58e05c..4d5d78e0f8be 100644 --- a/devel/glade/PLIST +++ b/devel/glade/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2020/07/20 14:40:36 maya Exp $ +@comment $NetBSD: PLIST,v 1.13 2022/07/13 20:24:24 wiz Exp $ bin/glade bin/glade-previewer include/libgladeui-2.0/gladeui/glade-adaptor-chooser.h @@ -37,12 +37,18 @@ include/libgladeui-2.0/gladeui/glade-widget-adaptor.h include/libgladeui-2.0/gladeui/glade-widget.h include/libgladeui-2.0/gladeui/glade-xml-utils.h include/libgladeui-2.0/gladeui/glade.h -lib/glade/modules/libgladegtk.la -lib/libgladeui-2.la +lib/girepository-1.0/Gladeui-2.0.typelib +lib/glade/modules/libgladegtk.so +lib/libgladeui-2.so +lib/libgladeui-2.so.13 +lib/libgladeui-2.so.13.0.2 lib/pkgconfig/gladeui-2.0.pc man/man1/glade-previewer.1 man/man1/glade.1 share/applications/org.gnome.Glade.desktop +share/gettext/its/glade-catalog.its +share/gettext/its/glade-catalog.loc +share/gir-1.0/Gladeui-2.0.gir share/glade/catalogs/glade-catalog.dtd share/glade/catalogs/gtk+.xml share/glade/catalogs/gtkunixprint.xml @@ -358,61 +364,6 @@ share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-window.png share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png share/glade/pixmaps/placeholder.png share/glade/pixmaps/plus.png -share/gtk-doc/html/gladeui-2/GladeApp.html -share/gtk-doc/html/gladeui-2/GladeBaseEditor.html -share/gtk-doc/html/gladeui-2/GladeClipboard.html -share/gtk-doc/html/gladeui-2/GladeCommand.html -share/gtk-doc/html/gladeui-2/GladeDesignView.html -share/gtk-doc/html/gladeui-2/GladeEditable.html -share/gtk-doc/html/gladeui-2/GladeEditor.html -share/gtk-doc/html/gladeui-2/GladeEditorProperty.html -share/gtk-doc/html/gladeui-2/GladeInspector.html -share/gtk-doc/html/gladeui-2/GladePalette.html -share/gtk-doc/html/gladeui-2/GladePlaceholder.html -share/gtk-doc/html/gladeui-2/GladeProject.html -share/gtk-doc/html/gladeui-2/GladeProperty.html -share/gtk-doc/html/gladeui-2/GladeSignal.html -share/gtk-doc/html/gladeui-2/GladeSignalEditor.html -share/gtk-doc/html/gladeui-2/GladeWidget.html -share/gtk-doc/html/gladeui-2/GladeWidgetAction.html -share/gtk-doc/html/gladeui-2/GladeWidgetAdaptor.html -share/gtk-doc/html/gladeui-2/annotation-glossary.html -share/gtk-doc/html/gladeui-2/api-index-full.html -share/gtk-doc/html/gladeui-2/catalog.html -share/gtk-doc/html/gladeui-2/catalogintro.html -share/gtk-doc/html/gladeui-2/core.html -share/gtk-doc/html/gladeui-2/dockables.html -share/gtk-doc/html/gladeui-2/gladeui-2.devhelp2 -share/gtk-doc/html/gladeui-2/gladeui-Glade-Utils.html -share/gtk-doc/html/gladeui-2/gladeui-GladeAdaptorChooser.html -share/gtk-doc/html/gladeui-2/gladeui-GladeCatalog.html -share/gtk-doc/html/gladeui-2/gladeui-GladeCellRendererIcon.html -share/gtk-doc/html/gladeui-2/gladeui-GladeFixed.html -share/gtk-doc/html/gladeui-2/gladeui-GladeNameContext.html -share/gtk-doc/html/gladeui-2/gladeui-GladeObjectStub.html -share/gtk-doc/html/gladeui-2/gladeui-GladePreview.html -share/gtk-doc/html/gladeui-2/gladeui-GladePreviewer.html -share/gtk-doc/html/gladeui-2/gladeui-GladePropertyDef.html -share/gtk-doc/html/gladeui-2/gladeui-GladePropertyLabel.html -share/gtk-doc/html/gladeui-2/gladeui-GladePropertyShell.html -share/gtk-doc/html/gladeui-2/gladeui-GladeSignalDef.html -share/gtk-doc/html/gladeui-2/gladeui-GladeSignalModel.html -share/gtk-doc/html/gladeui-2/gladeui-GladeWidgetActionDef.html -share/gtk-doc/html/gladeui-2/gladeui-Initializing-the-library.html -share/gtk-doc/html/gladeui-2/gladeui-Xml-Utils.html -share/gtk-doc/html/gladeui-2/home.png -share/gtk-doc/html/gladeui-2/index.html -share/gtk-doc/html/gladeui-2/left-insensitive.png -share/gtk-doc/html/gladeui-2/left.png -share/gtk-doc/html/gladeui-2/misc.html -share/gtk-doc/html/gladeui-2/properties.html -share/gtk-doc/html/gladeui-2/pythonsupport.html -share/gtk-doc/html/gladeui-2/right-insensitive.png -share/gtk-doc/html/gladeui-2/right.png -share/gtk-doc/html/gladeui-2/style.css -share/gtk-doc/html/gladeui-2/up-insensitive.png -share/gtk-doc/html/gladeui-2/up.png -share/gtk-doc/html/gladeui-2/widgetclasses.html share/help/C/glade/figures/main-window.png share/help/C/glade/index.docbook share/help/C/glade/legal.xml @@ -425,6 +376,9 @@ share/help/ca/glade/legal.xml share/help/cs/glade/figures/main-window.png share/help/cs/glade/index.docbook share/help/cs/glade/legal.xml +share/help/da/glade/figures/main-window.png +share/help/da/glade/index.docbook +share/help/da/glade/legal.xml share/help/de/glade/figures/main-window.png share/help/de/glade/index.docbook share/help/de/glade/legal.xml diff --git a/devel/glade/distinfo b/devel/glade/distinfo index b1c8faa26496..51db37b4a35e 100644 --- a/devel/glade/distinfo +++ b/devel/glade/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.15 2021/10/26 10:14:42 nia Exp $ +$NetBSD: distinfo,v 1.16 2022/07/13 20:24:24 wiz Exp $ -BLAKE2s (glade-3.36.0.tar.xz) = d7be68798998e5b8a43d7c5966245b42357b749fe1ec4bc1d82c7bdd781c3218 -SHA512 (glade-3.36.0.tar.xz) = c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243 -Size (glade-3.36.0.tar.xz) = 4466808 bytes -SHA1 (patch-configure) = 3eb71f9cc8efbc162d69b6d8aee47b10506385ee +BLAKE2s (glade-3.38.2.tar.xz) = 8688bbaae3b81e95ba88f5bc0007a5e4bcad8d7db7cfd81dc3e3db393ccc93c6 +SHA512 (glade-3.38.2.tar.xz) = 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e +Size (glade-3.38.2.tar.xz) = 2709224 bytes +SHA1 (patch-data_meson.build) = 2c9005146dfa0d4a409d15edac072b8ec0d1ba9e +SHA1 (patch-help_LINGUAS) = b37a0296c1dfb1e3d63f713ffc9e4d9e5809e466 diff --git a/devel/glade/patches/patch-configure b/devel/glade/patches/patch-configure deleted file mode 100644 index 11c824677cb9..000000000000 --- a/devel/glade/patches/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2020/07/20 14:40:36 maya Exp $ - -Use portable test(1) operator. - ---- configure.orig 2020-05-06 20:19:58.000000000 +0000 -+++ configure -@@ -16861,7 +16861,7 @@ for d in sc.get_config_var('INCLDIRSTOMA - - print(' '.join(incldirs)) - " --if test "x$PYTHON_INCLUDES" == x; then -+if test "x$PYTHON_INCLUDES" = x; then - PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"` - fi - -@@ -16894,10 +16894,10 @@ print(libs)" - am_python_print_lib_loc="\ - from distutils import sysconfig as sc - print(sc.get_config_var('LIBDIR'))" --if test "x$PYTHON_LIBS" == x; then -+if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"` - fi --if test "x$PYTHON_LIB_LOC" == x; then -+if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"` - fi - diff --git a/devel/glade/patches/patch-data_meson.build b/devel/glade/patches/patch-data_meson.build new file mode 100644 index 000000000000..daf98b47aa29 --- /dev/null +++ b/devel/glade/patches/patch-data_meson.build @@ -0,0 +1,22 @@ +$NetBSD: patch-data_meson.build,v 1.1 2022/07/13 20:24:24 wiz Exp $ + +Fix build with meson-0.62 + +--- data/meson.build.orig 2020-11-20 21:02:11.854337200 +0000 ++++ data/meson.build +@@ -2,7 +2,6 @@ desktop_conf = configuration_data() + desktop_conf.set('VERSION', glade_version) + + i18n.merge_file( +- 'desktop', + type: 'desktop', + input: configure_file( + input: 'org.gnome.Glade.desktop.in.in', +@@ -18,7 +17,6 @@ i18n.merge_file( + appdata = glade_name + '.appdata.xml' + + i18n.merge_file( +- 'appdata', + input: 'org.gnome.Glade.appdata.xml.in', + output: '@BASENAME@', + po_dir: po_dir, diff --git a/devel/glade/patches/patch-help_LINGUAS b/devel/glade/patches/patch-help_LINGUAS new file mode 100644 index 000000000000..9cac826bfabe --- /dev/null +++ b/devel/glade/patches/patch-help_LINGUAS @@ -0,0 +1,14 @@ +$NetBSD: patch-help_LINGUAS,v 1.1 2022/07/13 20:24:24 wiz Exp $ + +Remove duplicate 'da' entry, breaking build. +https://gitlab.gnome.org/GNOME/glade/-/commit/efdd5338b034a11c5d617684d92d11edc600965e + +--- help/LINGUAS.orig 2020-11-20 21:02:11.862337000 +0000 ++++ help/LINGUAS +@@ -1,6 +1,5 @@ + # please keep this list sorted alphabetically + # +-da + bg + ca + cs