[packages/pitivi] - fix building with meson 0.60

baggins baggins at pld-linux.org
Mon Apr 4 23:12:46 CEST 2022


commit 3b360780f79bea6c5db0cc785a44492890f9cffd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 4 23:12:27 2022 +0200

    - fix building with meson 0.60

 meson0.60.patch | 29 +++++++++++++++++++++++++++++
 pitivi.spec     |  2 ++
 2 files changed, 31 insertions(+)
---
diff --git a/pitivi.spec b/pitivi.spec
index 89c55a4..d56cc31 100644
--- a/pitivi.spec
+++ b/pitivi.spec
@@ -7,6 +7,7 @@ License:	LGPL v2.1+
 Group:		X11/Applications/Multimedia
 Source0:	https://download.gnome.org/sources/pitivi/2021/%{name}-%{version}.tar.xz
 # Source0-md5:	fec14b7bd1822b414f371e72a4b93cc8
+Patch0:		meson0.60.patch
 URL:		http://www.pitivi.org/
 BuildRequires:	cairo-devel
 BuildRequires:	gettext-tools
@@ -54,6 +55,7 @@ PiTiVi jest programem do edycji wideo używającym GStreamera.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,/usr/bin/python3,' bin/pitivi.in
 
diff --git a/meson0.60.patch b/meson0.60.patch
new file mode 100644
index 0000000..9f931b0
--- /dev/null
+++ b/meson0.60.patch
@@ -0,0 +1,29 @@
+--- pitivi-2021.05/data/meson.build~	2021-05-30 11:41:57.000000000 +0200
++++ pitivi-2021.05/data/meson.build	2022-04-04 23:11:38.818486618 +0200
+@@ -6,7 +6,7 @@
+ install_subdir('videopresets', install_dir: pkgdatadir)
+ install_subdir('gstpresets', install_dir: pkgdatadir)
+ 
+-desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
++desktop_file = i18n.merge_file(
+     type: 'desktop',
+     output : 'org.pitivi.Pitivi.desktop',
+     input : 'org.pitivi.Pitivi.desktop.in',
+@@ -25,7 +25,7 @@
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
++appdata_file = i18n.merge_file(
+     type: 'xml',
+     output : 'org.pitivi.Pitivi.appdata.xml',
+     input : 'org.pitivi.Pitivi.appdata.xml.in',
+@@ -43,7 +43,7 @@
+   )
+ endif
+ 
+-i18n.merge_file('org.pitivi.Pitivi-mime.xml',
++i18n.merge_file(
+     output : 'org.pitivi.Pitivi-mime.xml',
+     input : 'org.pitivi.Pitivi-mime.xml.in',
+     po_dir: podir,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pitivi.git/commitdiff/3b360780f79bea6c5db0cc785a44492890f9cffd



More information about the pld-cvs-commit mailing list