05/16: gnu: glade: Update to 3.40.0.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit fce9b7c36558e2b81b67889c5f0e4b0c01ceb066
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Sep 1 19:39:49 2022 +0200

    gnu: glade: Update to 3.40.0.
    
    * gnu/packages/gnome.scm (glade3): Update to 3.40.0.
    [source](patches): Remove.
    * gnu/packages/patches/glade-gls-set-script-name.patch,
    gnu/packages/patches/glade-test-widget-null-icon.patch: Delete files.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                       |  2 --
 gnu/packages/gnome.scm                             |  7 ++---
 .../patches/glade-gls-set-script-name.patch        | 32 ----------------------
 .../patches/glade-test-widget-null-icon.patch      | 30 --------------------
 4 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index c93dec9254..ecd60f9c91 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1173,8 +1173,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ghostscript-no-header-uuid.patch                \
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/giara-fix-login.patch                      \
-  %D%/packages/patches/glade-gls-set-script-name.patch         \
-  %D%/packages/patches/glade-test-widget-null-icon.patch       \
   %D%/packages/patches/glib-appinfo-watch.patch                        \
   %D%/packages/patches/glib-networking-gnutls-binding.patch    \
   %D%/packages/patches/glib-networking-32-bit-time.patch       \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6aad3cec32..e8ade54b8c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3121,7 +3121,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
 (define-public glade3
   (package
     (name "glade")
-    (version "3.38.2")
+    (version "3.40.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -3129,10 +3129,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"))
-              (patches (search-patches
-                        "glade-gls-set-script-name.patch"
-                        "glade-test-widget-null-icon.patch"))))
+                "171x7vshhw0nqgnhkcaqfylpr5qrmhclwmkva6wjm5s9m2pavj9i"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/glade-gls-set-script-name.patch 
b/gnu/packages/patches/glade-gls-set-script-name.patch
deleted file mode 100644
index 61fbdf3914..0000000000
--- a/gnu/packages/patches/glade-gls-set-script-name.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Taken from upstream:
-https://gitlab.gnome.org/GNOME/glade/-/commit/eb0429d318c017b57b9e59de1d5b3f142a0f455e.
-
-From 6cf1d3e11d4f8035f33c3003d33f6465896025a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Tue, 18 May 2021 19:54:50 +0200
-Subject: [PATCH] plugins: Define an invalid but non-null file path as script
- path
-
-This is following the gjs applications behaviors, setting a valid string
-as the script path that will be shown in JS stack traces, even though
-won't load a real file through g_file_new_for_commandline_arg()
----
- plugins/gjs/glade-gjs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/gjs/glade-gjs.c b/plugins/gjs/glade-gjs.c
-index e1779665..aeae9906 100644
---- a/plugins/gjs/glade-gjs.c
-+++ b/plugins/gjs/glade-gjs.c
-@@ -93,7 +93,7 @@ glade_gjs_init (const gchar *name)
- 
-   /* Importing the module will create all the GTypes so that glade can use 
them at runtime */
-   retval = gjs_context_eval (gjs_context_get_current (),
--                             import_sentence, -1, NULL,
-+                             import_sentence, -1, "<glade-gjs>",
-                              &exit_status,
-                              &error);
-   if (!retval && error)
--- 
-GitLab
-
diff --git a/gnu/packages/patches/glade-test-widget-null-icon.patch 
b/gnu/packages/patches/glade-test-widget-null-icon.patch
deleted file mode 100644
index 75668a2f68..0000000000
--- a/gnu/packages/patches/glade-test-widget-null-icon.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Taken from upstream:
-https://gitlab.gnome.org/GNOME/glade/-/commit/6cf1d3e11d4f8035f33c3003d33f6465896025a5.
-
-From eb0429d318c017b57b9e59de1d5b3f142a0f455e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
-Date: Wed, 19 May 2021 00:10:29 +0200
-Subject: [PATCH] tests: Do not create a file icon when no filename is provided
-
-This would fail otherwise as GFileIcon requires a GFile parameter on
-construction.
----
- tests/create-widgets.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/create-widgets.c b/tests/create-widgets.c
-index 2094059d..db8311f8 100644
---- a/tests/create-widgets.c
-+++ b/tests/create-widgets.c
-@@ -106,6 +106,8 @@ main (int   argc,
-       if (G_TYPE_IS_INSTANTIATABLE (adaptor_type) && !G_TYPE_IS_ABSTRACT 
(adaptor_type) &&
-           /* FIXME: can not create a themed icon without a name */
-           !g_type_is_a (adaptor_type, G_TYPE_THEMED_ICON) &&
-+          /* FIXME: can not create a file icon without a file name */
-+          !g_type_is_a (adaptor_type, G_TYPE_FILE_ICON) &&
-           /* FIXME: GtkPopoverMenu gives a few warnings */
-           !g_type_is_a (adaptor_type, GTK_TYPE_POPOVER_MENU) &&
-           /* FIXME: GtkFileChooserNative is hard to test here */
--- 
-GitLab
-