Drop all patches

They were incorporated upstream

7 files changed, 3 insertions, 106 deletions

diff --git a/debian/changelog b/debian/changelog
index 698d0eae..c83dde58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 glade (3.40.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Remove plugins-Define patch; incorporated upstream
 
- -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com>  Tue, 23 Aug 2022 11:39:30 -0300
+ -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com>  Tue, 23 Aug 2022 11:44:40 -0300
 
 glade (3.38.2-7) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4d9461ea..fa136335 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Source: glade
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: at-spi2-core <!nocheck>,
                dbus <!nocheck>,
                debhelper-compat (= 13),
diff --git a/debian/patches/Remove-duplicate-entry-for-da-from-help-LINGUAS.patch b/debian/patches/Remove-duplicate-entry-for-da-from-help-LINGUAS.patch
deleted file mode 100644
index 78979b88..00000000
--- a/debian/patches/Remove-duplicate-entry-for-da-from-help-LINGUAS.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:19:03 -0500
-Subject: Remove duplicate entry for 'da' from help/LINGUAS
-
-https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index fc3cd4c..d67e42c 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -1,6 +1,5 @@
- # please keep this list sorted alphabetically
- #
--da
- bg
- ca
- cs
diff --git a/debian/patches/meson-i18n.merge_file-does-not-take-a-positional-argument.patch b/debian/patches/meson-i18n.merge_file-does-not-take-a-positional-argument.patch
deleted file mode 100644
index fdf82997..00000000
--- a/debian/patches/meson-i18n.merge_file-does-not-take-a-positional-argument.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:18:09 -0500
-Subject: meson: i18n.merge_file() does not take a positional argument
-
-https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 9f24456..bfbc514 100644
---- a/data/meson.build
-+++ b/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/debian/patches/plugins-Define-an-invalid-but-non-null-file-path-as-scrip.patch b/debian/patches/plugins-Define-an-invalid-but-non-null-file-path-as-scrip.patch
deleted file mode 100644
index ee64ce21..00000000
--- a/debian/patches/plugins-Define-an-invalid-but-non-null-file-path-as-scrip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
-Date: Tue, 18 May 2021 19:54:50 +0200
-Subject: 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()
-
-Origin: https://gitlab.gnome.org/GNOME/glade/-/merge_requests/114
----
- 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 e177966..aeae990 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)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9e6ecdaa..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-plugins-Define-an-invalid-but-non-null-file-path-as-scrip.patch
-tests-Do-not-create-a-file-icon-when-no-filename-is-provi.patch
-meson-i18n.merge_file-does-not-take-a-positional-argument.patch
-Remove-duplicate-entry-for-da-from-help-LINGUAS.patch
diff --git a/debian/patches/tests-Do-not-create-a-file-icon-when-no-filename-is-provi.patch b/debian/patches/tests-Do-not-create-a-file-icon-when-no-filename-is-provi.patch
deleted file mode 100644
index 152c2bb6..00000000
--- a/debian/patches/tests-Do-not-create-a-file-icon-when-no-filename-is-provi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
-Date: Wed, 19 May 2021 00:10:29 +0200
-Subject: tests: Do not create a file icon when no filename is provided
-
-This would fail otherwise as GFileIcon requires a GFile parameter on
-construction.
-
-Origin: https://gitlab.gnome.org/GNOME/glade/-/merge_requests/114
----
- tests/create-widgets.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/create-widgets.c b/tests/create-widgets.c
-index 2094059..db8311f 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 */