diff options
| author | Jan Palus | 2022-03-31 18:24:52 (GMT) |
|---|---|---|
| committer | Jan Palus | 2022-03-31 18:24:52 (GMT) |
| commit | 04eaf0c116f018f8565e6edf23cb25bb34749144 (patch) | |
| tree | 31ce73ae2c288d1f76c0479ebedda2c95a4288da | |
| parent | fde246a5c853e592bec086574fdeeeb9b104ae79 (diff) | |
| download | glade-04eaf0c116f018f8565e6edf23cb25bb34749144.zip glade-04eaf0c116f018f8565e6edf23cb25bb34749144.tar.gz | |
fix build with meson 0.61 (from gentoo)
| -rw-r--r-- | glade.spec | 2 | ||||
| -rw-r--r-- | meson0.61.patch | 57 |
2 files changed, 59 insertions, 0 deletions
@@ -12,6 +12,7 @@ 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 URL: https://glade.gnome.org/ BuildRequires: gettext-devel >= 0.19.8 BuildRequires: gjs-devel >= 1.64.0 @@ -123,6 +124,7 @@ 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 new file mode 100644 index 0000000..72f9c0e --- /dev/null +++ b/meson0.61.patch @@ -0,0 +1,57 @@ +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 + |