- fix building with meson 0.60+

diff --git a/gitg.spec b/gitg.spec
index 4c0da7208b34c80c3122164f85ec520d51bf48df..30fe87d09fd8c431f165f6073aca470a4d033ede 100644 (file)
--- a/gitg.spec
+++ b/gitg.spec
@@ -11,6 +11,7 @@ License:      GPL v2
 Group:         Development/Tools
 Source0:       https://download.gnome.org/sources/gitg/41/%{name}-%{version}.tar.xz
 # Source0-md5: ce7df0f2ce36488291444537df86936d
+Patch0:                meson0.60.patch
 URL:           https://wiki.gnome.org/Apps/Gitg
 BuildRequires: gettext-tools >= 0.17
 %{?with_glade:BuildRequires:   glade-devel >= 3.2}
@@ -133,6 +134,7 @@ API języka Vala do bibliotek Gitg.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
@@ -211,7 +213,7 @@ fi
 
 %files -n python3-gitg
 %defattr(644,root,root,755)
-%{py3_sitedir}/gi/overrides/GitgExt.py
+%{py3_sitescriptdir}/gi/overrides/GitgExt.py
 
 %files -n vala-gitg
 %defattr(644,root,root,755)

diff --git a/meson0.60.patch b/meson0.60.patch
new file mode 100644 (file)
index 0000000..4523bcc
--- /dev/null
+++ b/meson0.60.patch
@@ -0,0 +1,18 @@
+--- gitg-41/data/meson.build~  2021-12-27 14:02:54.000000000 +0100
++++ gitg-41/data/meson.build   2022-04-03 21:41:19.936484001 +0200
+@@ -6,7 +6,6 @@
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',