[packages/phonon-qt5] - drop qt4 support here, updated files

baggins baggins at pld-linux.org
Sun May 15 16:52:42 CEST 2022


commit f0a974bef6f290e7ebb42836255525dea7f93afe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 15 16:52:19 2022 +0200

    - drop qt4 support here, updated files

 phonon-qt5.spec | 203 +++++++-------------------------------------------------
 1 file changed, 23 insertions(+), 180 deletions(-)
---
diff --git a/phonon-qt5.spec b/phonon-qt5.spec
index c3a50bf..51d7ddf 100644
--- a/phonon-qt5.spec
+++ b/phonon-qt5.spec
@@ -1,25 +1,19 @@
-# NOTE: 4.10.3 is the last version with Qt4 support
 #
 # Conditional build:
-%bcond_without	qt5		# do not build Qt5 version
 %bcond_without	zeitgeist	# enable zeitgeist (via libqzeitgeist) supoort
 
-%define		qt4_ver		4.8.1
 %define		qt5_ver		5.3.1
 
-Summary:	Phonon: multimedia API for Qt4/KDE4
-Summary(pl.UTF-8):	Phonon - biblioteka multimedialna dla Qt4/KDE4
+Summary:	Phonon: multimedia API for Qt5/KDE5
+Summary(pl.UTF-8):	Phonon - biblioteka multimedialna dla Qt5/KDE5
 Name:		phonon-qt5
 Version:	4.11.1
 Release:	0.1
 License:	LGPL v2.1 or LGPL v3
 Group:		X11/Libraries
-Source0:	https://download.kde.org/stable/phonon/%{version}/%{name}-%{version}.tar.xz
+Source0:	https://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.xz
 # Source0-md5:	d3df5ba646e4b3f11623d998caa40e74
-Patch0:		%{name}-pkg.patch
-Patch1:		x32.patch
 URL:		http://phonon.kde.org/
-%if %{with qt5}
 BuildRequires:	Qt5Core-devel >= %{qt5_ver}
 BuildRequires:	Qt5DBus-devel >= %{qt5_ver}
 BuildRequires:	Qt5Declarative-devel >= %{qt5_ver}
@@ -28,99 +22,30 @@ BuildRequires:	Qt5Gui-devel >= %{qt5_ver}
 BuildRequires:	Qt5OpenGL-devel >= %{qt5_ver}
 BuildRequires:	Qt5Qml-devel >= %{qt5_ver}
 BuildRequires:	Qt5Widgets-devel >= %{qt5_ver}
-BuildRequires:	qt5-build >= %{qt5_ver}
-BuildRequires:	qt5-qmake >= %{qt5_ver}
-BuildRequires:	kf5-extra-cmake-modules
-%endif
-BuildRequires:	QtCore-devel >= %{qt4_ver}
-BuildRequires:	QtDBus-devel >= %{qt4_ver}
-BuildRequires:	QtDeclarative-devel >= %{qt4_ver}
-BuildRequires:	QtGui-devel >= %{qt4_ver}
-BuildRequires:	QtNetwork-devel >= %{qt4_ver}
-BuildRequires:	QtOpenGL-devel >= %{qt4_ver}
-BuildRequires:	QtSql-devel >= %{qt4_ver}
-BuildRequires:	QtTest-devel >= %{qt4_ver}
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	kf5-extra-cmake-modules >= 5.60
 %{?with_zeitgeist:BuildRequires:	libqzeitgeist-devel >= 0.8}
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.21
-BuildRequires:	qt4-build >= %{qt4_ver}
-BuildRequires:	qt4-qmake >= %{qt4_ver}
+BuildRequires:	qt5-build >= %{qt5_ver}
+BuildRequires:	qt5-build >= %{qt5_ver}
+BuildRequires:	qt5-qmake >= %{qt5_ver}
+BuildRequires:	qt5-qmake >= %{qt5_ver}
 BuildRequires:	rpmbuild(macros) >= 1.603
-Requires:	QtCore >= %{qt4_ver}
-Requires:	QtDBus >= %{qt4_ver}
-Requires:	QtGui >= %{qt4_ver}
-Requires:	QtOpenGL >= %{qt4_ver}
-Requires:	kde-common-dirs >= 0.5
-%{?with_zeitgeist:Requires:	libqzeitgeist >= 0.8}
-Requires:	qt4-phonon-backend
-Provides:	qt4-phonon
-Obsoletes:	qt4-phonon
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-Phonon is the multimedia API for Qt4/KDE4.
-
-Phonon was originally created to allow KDE 4 to be independent of any
-single multimedia framework such as GStreamer or Xine and to provide a
-stable API for KDE4's lifetime. It was done to fix problems of
-frameworks becoming unmaintained, API instability, and to create a
-simple multimedia API.
-
-%description -l pl.UTF-8
-Phonon to biblioteka multimedialna dla Qt4/KDE4.
-
-Pierwotnie powstała, aby pozwolić na niezależność KDE 4 od konkretnego
-środowiska multimedialnego, takiego jak GStreamer czy Xine, oraz
-zapewnić stabilne API na cały czas życia KDE4. Została stworzona w
-celu wyeliminowania problemów z porzucaniem bibliotek i
-niestabilnością ich API, a także w celu stworzenia prostego API
-multimedialnego.
-
-%package devel
-Summary:	Header files for Phonon library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Phonon
-Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	QtCore-devel >= %{qt4_ver}
-Requires:	QtDBus-devel >= %{qt4_ver}
-Requires:	QtGui-devel >= %{qt4_ver}
-Provides:	qt4-phonon-devel
-Obsoletes:	qt4-phonon-devel
-
-%description devel
-Header files for Phonon library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Phonon.
-
-%package -n QtDeclarative-plugin-phonon
-Summary:	Phonon plugin for Qt4 QtDeclarative library
-Summary(pl.UTF-8):	Wtyczka Phonon dla biblioteki Qt4 QtDeclarative
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	QtDeclarative >= %{qt4_ver}
-
-%description -n QtDeclarative-plugin-phonon
-Phonon plugin for Qt4 QtDeclarative library.
-
-%description -n QtDeclarative-plugin-phonon -l pl.UTF-8
-Wtyczka Phonon dla biblioteki Qt4 QtDeclarative.
-
-%package qt5
-Summary:	Phonon: multimedia API for Qt5/KDE5
-Summary(pl.UTF-8):	Phonon - biblioteka multimedialna dla Qt5/KDE5
-Group:		X11/Libraries
 Requires:	Qt5Core >= %{qt5_ver}
 Requires:	Qt5DBus >= %{qt5_ver}
 Requires:	Qt5Gui >= %{qt5_ver}
 Requires:	Qt5OpenGL >= %{qt5_ver}
 Requires:	Qt5Widgets >= %{qt5_ver}
+Requires:	kde-common-dirs >= 0.5
+%{?with_zeitgeist:Requires:	libqzeitgeist >= 0.8}
 Provides:	qt5-phonon
+Obsoletes:	Qt5Declarative-plugin-phonon < 4.11.1
 Obsoletes:	qt5-phonon
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description qt5
+%description
 Phonon is the multimedia API for Qt5/KDE5.
 
 Phonon was originally created to allow KDE 5 to be independent of any
@@ -129,7 +54,7 @@ stable API for KDE5's lifetime. It was done to fix problems of
 frameworks becoming unmaintained, API instability, and to create a
 simple multimedia API.
 
-%description qt5 -l pl.UTF-8
+%description -l pl.UTF-8
 Phonon to biblioteka multimedialna dla Qt5/KDE5.
 
 Pierwotnie powstała, aby pozwolić na niezależność KDE 5 od konkretnego
@@ -139,7 +64,7 @@ celu wyeliminowania problemów z porzucaniem bibliotek i
 niestabilnością ich API, a także w celu stworzenia prostego API
 multimedialnego.
 
-%package qt5-devel
+%package devel
 Summary:	Header files for Phonon library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Phonon
 Group:		X11/Development/Libraries
@@ -150,25 +75,12 @@ Requires:	Qt5Gui-devel >= %{qt5_ver}
 Provides:	qt5-phonon-devel
 Obsoletes:	qt5-phonon-devel
 
-%description qt5-devel
+%description devel
 Header files for Phonon library.
 
-%description qt5-devel -l pl.UTF-8
+%description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Phonon.
 
-%package -n Qt5Declarative-plugin-phonon
-Summary:	Phonon plugin for Qt5 QtDeclarative library
-Summary(pl.UTF-8):	Wtyczka Phonon dla biblioteki Qt5 QtDeclarative
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	Qt5Declarative >= %{qt5_ver}
-
-%description -n Qt5Declarative-plugin-phonon
-Phonon plugin for Qt5 QtDeclarative library.
-
-%description -n Qt5Declarative-plugin-phonon -l pl.UTF-8
-Wtyczka Phonon dla biblioteki Qt5 QtDeclarative.
-
 %package -n Qt5Designer-plugin-phonon
 Summary:	Phonon plugin for Qt5 QtDesigner
 Summary(pl.UTF-8):	Wtyczka Phonon dla Qt5 QtDesignera
@@ -183,51 +95,25 @@ Phonon plugin for Qt5 QtDesigner.
 Wtyczka Phonon dla Qt5 QtDesignera.
 
 %prep
-%setup -q
-#%patch0 -p1
-#%patch1 -p1
+%setup -q -n phonon-%{version}
 
 %build
 install -d build
 cd build
-# disable designer plugin - currently packaged in QtDesigner package
 %cmake .. \
-	-DPHONON_BUILD_DECLARATIVE_PLUGIN=ON \
-	-DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+	-DPHONON_BUILD_DESIGNER_PLUGIN=ON
 %{__make}
 
-cd ..
-%if %{with qt5}
-install -d build5
-cd build5
-%cmake .. \
-	-DPHONON_BUILD_DECLARATIVE_PLUGIN=ON \
-	-DPHONON_BUILD_DESIGNER_PLUGIN=ON \
-	-DPHONON_BUILD_PHONON4QT5=ON \
-	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
-%{__make}
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_includedir}/qt4
-install -d $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/phonon_backend
-install -d $RPM_BUILD_ROOT%{_datadir}/kde4/services/phononbackends
-ln -s ../phonon $RPM_BUILD_ROOT%{_includedir}/qt4/phonon
-ln -s ../KDE/Phonon $RPM_BUILD_ROOT%{_includedir}/phonon/Phonon
-
-%if %{with qt5}
-%{__make} -C build5 install \
-	DESTDIR=$RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_libdir}/qt5/plugins/phonon4qt5_backend
-%endif
 
-%find_lang libphonon_qt --with-qm
+%find_lang libphonon_qt --with-qm --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -235,52 +121,17 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	qt5 -p /sbin/ldconfig
-%postun	qt5 -p /sbin/ldconfig
-
 %files -f libphonon_qt.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libphonon.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libphonon.so.4
-%attr(755,root,root) %{_libdir}/libphononexperimental.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libphononexperimental.so.4
-%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-%dir %{_libdir}/kde4/plugins/phonon_backend
-%dir %{_datadir}/kde4/services/phononbackends
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libphonon.so
-%attr(755,root,root) %{_libdir}/libphononexperimental.so
-%{_includedir}/phonon
-%dir %{_includedir}/KDE
-%{_includedir}/KDE/Phonon
-%{_includedir}/qt4/phonon
-%{_pkgconfigdir}/phonon.pc
-%{_libdir}/cmake/phonon
-%dir %{_datadir}/phonon
-%{_datadir}/phonon/buildsystem
-%{_datadir}/qt4/mkspecs/modules/qt_phonon.pri
-
-%files -n QtDeclarative-plugin-phonon
-%defattr(644,root,root,755)
-%dir %{_libdir}/qt4/imports/Phonon
-%attr(755,root,root) %{_libdir}/qt4/imports/Phonon/libphononqmlplugin.so
-%{_libdir}/qt4/imports/Phonon/VideoPlayer.qml
-%{_libdir}/qt4/imports/Phonon/qmldir
-
-%if %{with qt5}
-%files qt5
-%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
 %attr(755,root,root) %{_libdir}/libphonon4qt5experimental.so.*.*.*
 %dir %{_libdir}/qt5/plugins/phonon4qt5_backend
-%{_datadir}/dbus-1/interfaces/org.kde.Phonon4Qt5.AudioOutput.xml
 %{_datadir}/phonon4qt5
 
-%files qt5-devel
+%files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libphonon4qt5.so
 %attr(755,root,root) %{_libdir}/libphonon4qt5experimental.so
@@ -289,14 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/phonon4qt5
 %{_libdir}/qt5/mkspecs/modules/qt_phonon4qt5.pri
 
-%files -n Qt5Declarative-plugin-phonon
-%defattr(644,root,root,755)
-%dir %{_libdir}/qt5/imports/Phonon
-%attr(755,root,root) %{_libdir}/qt5/imports/Phonon/phononqmlplugin.so
-%{_libdir}/qt5/imports/Phonon/VideoPlayer.qml
-%{_libdir}/qt5/imports/Phonon/qmldir
-
 %files -n Qt5Designer-plugin-phonon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/qt5/plugins/designer/phononwidgets.so
-%endif
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list