[packages/gnome-music] - fix building with meson 0.60+ and update python packaging
baggins
baggins at pld-linux.org
Sun Apr 3 21:56:42 CEST 2022
commit 1900d96ce4393e0117c4ecf942bca77813dc41b0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Apr 3 21:56:14 2022 +0200
- fix building with meson 0.60+ and update python packaging
gnome-music.spec | 4 +++-
meson0.60.patch | 10 ++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/gnome-music.spec b/gnome-music.spec
index 4d00365..be71f65 100644
--- a/gnome-music.spec
+++ b/gnome-music.spec
@@ -8,6 +8,7 @@ Group: X11/Applications/Multimedia
Source0: https://download.gnome.org/sources/gnome-music/41/%{name}-%{version}.tar.xz
# Source0-md5: db3228b6ce214e98740229b13e2dd4f8
Patch0: %{name}-deps.patch
+Patch1: meson0.60.patch
URL: https://wiki.gnome.org/Apps/Music
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.67.1
@@ -65,6 +66,7 @@ GNOME Music to odtwarzacz muzyki dla GNOME.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' gnome-music.in
@@ -107,4 +109,4 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/org.gnome.Music.desktop
%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
%{_iconsdir}/hicolor/scalable/apps/org.gnome.Music.svg
-%{py3_sitedir}/gnomemusic
+%{py3_sitescriptdir}/gnomemusic
diff --git a/meson0.60.patch b/meson0.60.patch
new file mode 100644
index 0000000..4f001df
--- /dev/null
+++ b/meson0.60.patch
@@ -0,0 +1,10 @@
+--- gnome-music-41.0/data/meson.build~ 2021-09-19 12:11:14.000000000 +0200
++++ gnome-music-41.0/data/meson.build 2022-04-03 21:55:08.588671672 +0200
+@@ -47,7 +47,6 @@
+ appdata_conf.set('package_url', PACKAGE_URL)
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
+ i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ output: PROJECT_RDNN_NAME + '.appdata.xml.in',
+ input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-music.git/commitdiff/1900d96ce4393e0117c4ecf942bca77813dc41b0
More information about the pld-cvs-commit
mailing list