[packages/phonon-qt5] - separated -settings package, renamed libphonon_qt translation files to libphonon_qt5 (allow coexis

qboosh qboosh at pld-linux.org
Mon Jun 9 21:20:43 CEST 2025


commit a903b24055e896db62766cc2bd0ebe9a87ad84c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jun 9 21:13:23 2025 +0200

    - separated -settings package, renamed libphonon_qt translation files to libphonon_qt5 (allow coexist with phonon-qt6)

 phonon-qm-suffix.patch | 11 +++++++++++
 phonon-qt5.spec        | 33 +++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)
---
diff --git a/phonon-qt5.spec b/phonon-qt5.spec
index f85885d..aa89655 100644
--- a/phonon-qt5.spec
+++ b/phonon-qt5.spec
@@ -9,6 +9,7 @@ License:	LGPL v2.1 or LGPL v3
 Group:		X11/Libraries
 Source0:	https://download.kde.org/Attic/phonon/%{version}/phonon-%{version}.tar.xz
 # Source0-md5:	d3df5ba646e4b3f11623d998caa40e74
+Patch0:		phonon-qm-suffix.patch
 URL:		https://userbase.kde.org/Phonon
 BuildRequires:	Qt5Core-devel >= %{qt_ver}
 BuildRequires:	Qt5Designer-devel >= %{qt_ver}
@@ -52,6 +53,21 @@ celu wyeliminowania problemów z porzucaniem bibliotek i
 niestabilnością ich API, a także w celu stworzenia prostego API
 multimedialnego.
 
+%package settings
+Summary:	Phonon settings application
+Summary(pl.UTF-8):	Aplikacja do ustawień Phonona
+Group:		X11/Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+Provides:	phonon-settings = %{version}-%{release}
+Conflicts:	phonon-qt6 < 4.12.0-3
+Conflicts:	phonon-qt6-settings
+
+%description settings
+Phonon settings application.
+
+%description settings -l pl.UTF-8
+Aplikacja do ustawień Phonona.
+
 %package devel
 Summary:	Header files for Phonon library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Phonon
@@ -81,6 +97,11 @@ Wtyczka Phonon dla Qt5 QtDesignera.
 
 %prep
 %setup -q -n phonon-%{version}
+%patch -P0 -p1
+
+for f in po/*/libphonon_qt.po ; do
+	%{__mv} "$f" "${f%.po}5.po"
+done
 
 %build
 install -d build
@@ -88,6 +109,7 @@ cd build
 %cmake .. \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	-DPHONON_BUILD_DESIGNER_PLUGIN=ON
+
 %{__make}
 
 %install
@@ -98,8 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}/qt5/plugins/phonon4qt5_backend
 
-# libphonon_qt.qm and phononsettings_qt.qm files
-%find_lang libphonon_qt --with-qm --all-name
+%find_lang libphonon_qt5 --with-qm
+%find_lang phononsettings_qt --with-qm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,9 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f libphonon_qt.lang
+%files -f libphonon_qt5.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/phononsettings
 %attr(755,root,root) %ghost %{_libdir}/libphonon4qt5.so.4
 %attr(755,root,root) %{_libdir}/libphonon4qt5.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libphonon4qt5experimental.so.4
@@ -117,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/qt5/plugins/phonon4qt5_backend
 %{_datadir}/phonon4qt5
 
+%files settings -f phononsettings_qt.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/phononsettings
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libphonon4qt5.so
diff --git a/phonon-qm-suffix.patch b/phonon-qm-suffix.patch
new file mode 100644
index 0000000..5a41065
--- /dev/null
+++ b/phonon-qm-suffix.patch
@@ -0,0 +1,11 @@
+--- phonon-4.11.1/phonon/CMakeLists.txt.orig	2019-09-26 12:29:38.000000000 +0200
++++ phonon-4.11.1/phonon/CMakeLists.txt	2025-06-09 20:10:58.782368540 +0200
+@@ -67,7 +67,7 @@ set(phonon_LIB_SRCS
+    ${phonon_VGO_SRCS}
+    )
+ 
+-ecm_create_qm_loader(phonon_LIB_SRCS libphonon_qt)
++ecm_create_qm_loader(phonon_LIB_SRCS libphonon_qt${QT_MAJOR_VERSION})
+ 
+ option(PHONON_NO_PLATFORMPLUGIN "Do not use any platform plugin")
+ if (PHONON_NO_PLATFORMPLUGIN)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phonon-qt5.git/commitdiff/a903b24055e896db62766cc2bd0ebe9a87ad84c4



More information about the pld-cvs-commit mailing list