- updated to 3.40.0

- removed obsolete meson0.61 patch

diff --git a/glade.spec b/glade.spec
index 7e16f24431469fd4eaa0a9ba278d79b816ffa718..c5479ef0a5d8f8d848051fb87d43a30ee89a97c6 100644 (file)
--- a/glade.spec
+++ b/glade.spec
@@ -6,13 +6,12 @@
 Summary:       User interface builder for GTK+ and GNOME
 Summary(pl.UTF-8):     Budowniczy interfejsów użytkownika dla GTK+ i GNOME
 Name:          glade
-Version:       3.38.2
-Release:       5
+Version:       3.40.0
+Release:       1
 License:       GPL v2+ and LGPL v2.1+
 Group:         X11/Applications
-Source0:       https://download.gnome.org/sources/glade/3.38/%{name}-%{version}.tar.xz
-# Source0-md5: f1ac9d9b6404308efb74adc548289455
-Patch0:                meson0.61.patch
+Source0:       https://download.gnome.org/sources/glade/3.40/%{name}-%{version}.tar.xz
+# Source0-md5: 39393a82949a945d09105d35421c29ce
 URL:           https://glade.gnome.org/
 BuildRequires: gettext-devel >= 0.19.8
 BuildRequires: gjs-devel >= 1.64.0
@@ -125,7 +124,6 @@ Dokumentacja API biblioteki Glade.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if %{with static_libs}
 %{__sed} -i -e '/^libgladeui = / s/shared_library/library/' gladeui/meson.build

diff --git a/meson0.61.patch b/meson0.61.patch
deleted file mode 100644 (file)
index 72f9c0e..0000000
--- a/meson0.61.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:18:09 -0500
-Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
- argument
-
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 9f244566..bfbc514c 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,
--- 
-GitLab
-
-
-From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:19:03 -0500
-Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
-
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index fc3cd4c3..d67e42c8 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -1,6 +1,5 @@
- # please keep this list sorted alphabetically
- #
--da
- bg
- ca
- cs
--- 
-GitLab
-