diff options
| author | Leo Famulari <leo@famulari.name> | 2021-11-25 19:02:36 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-11-26 13:36:58 -0500 |
| commit | ef717037c88f2b78c6f8c46c852984e4607327f1 (patch) | |
| tree | ed7e09c6361c0b58f4e9019d843fff3f936afdce | |
| parent | 6034c3599bbddd5ec23b89c1594e4a0ef8a1b79d (diff) | |
| download | guix-ef717037c88f2b78c6f8c46c852984e4607327f1.tar.gz | |
gnu: pitivi: Fix build with Meson 0.60.
* gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (pitivi)[source]: Use it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch | 46 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 1 |
3 files changed, 48 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 706725965b..50f43df1e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1554,6 +1554,7 @@ dist_patch_DATA = \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/pciutils-hurd-fix.patch \ + %D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ diff --git a/gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch b/gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch new file mode 100644 index 0000000000..652a86bff7 --- /dev/null +++ b/gnu/packages/patches/pitivi-fix-build-with-meson-0.60.patch @@ -0,0 +1,46 @@ +From b54da52289f9578d7021f466d731cfd48330e5fe Mon Sep 17 00:00:00 2001 +From: Leo Famulari <leo@famulari.name> +Date: Thu, 25 Nov 2021 18:56:44 -0500 +Subject: [PATCH] Fix build with Meson 0.60. + +https://gitlab.gnome.org/GNOME/pitivi/-/issues/2593 + +* data/meson.build: Adjust to changes in Meson 0.60. +--- + data/meson.build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 2ea82cf..60d2316 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir) + 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 @@ if desktop_file_validate.found() + ) + 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 @@ if appstream_util.found() + ) + 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, +-- +2.33.1 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 128a112848..b6205fa41c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4375,6 +4375,7 @@ tools for styling them, including a built-in real-time video preview.") (url "https://gitlab.gnome.org/GNOME/pitivi.git") (commit %version))) (file-name (git-file-name name version)) + (patches (search-patches "pitivi-fix-build-with-meson-0.60.patch")) (sha256 (base32 "08x2fs2bak1fbmkvjijgx1dsawispv91bpv5j5gkqbv5dfgf7wah")))) (build-system meson-build-system) |