update to 2.0.19 [release 2.0.19-1mamba;Thu Nov 21 2024]

2024-11-22 22:07:38 +01:00 · 2024-11-22 22:07:38 +01:00 · 66b78af830
commit 66b78af830
parent f9d3a5be65
3 changed files with 24 additions and 97 deletions
--- a/kaffeine-1.2.2-gcc-4.7.patch
+++ b/kaffeine-1.2.2-gcc-4.7.patch
@ -1,35 +0,0 @@
-From: Christoph Pfister <christophpfister@gmail.com>
-Date: Wed, 04 Apr 2012 19:22:09 +0000
-Subject: fix build for gcc 4.7
-X-Git-Url: http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e67004c3cfa879578c351300a99f23da1
---
-fix build for gcc 4.7
---
-
-
--- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@
- 	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- 	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
- 
-	for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-	     --entryCount, entry.advance()) {
-+	for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+	     (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- 		DvbEpgEntry epgEntry;
- 		epgEntry.channel = channel;
-		epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-		epgEntry.duration = QTime().addSecs(entry.duration());
-		epgEntry.title = entry.title();
-
-		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+		epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+		epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+		epgEntry.title = eitEntry.title();
-+
-+		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- 		DvbSharedEpgEntry entry = epgEntries.value(id);
- 
- 		if (entry.isValid() && (entry->channel == epgEntry.channel) &&
-
--- a/kaffeine-1.3.1-cmake-3.4.0.patch
+++ b/kaffeine-1.3.1-cmake-3.4.0.patch
@ -1,11 +0,0 @@
--- kaffeine-1.3.1/CMakeLists.txt.orig	2015-11-25 21:38:13.346064201 +0100
-+++ kaffeine-1.3.1/CMakeLists.txt	2015-11-25 21:37:49.592267869 +0100
-@@ -21,7 +21,7 @@
-                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
- endif(STRICT_BUILD)
- 
-check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
-+check_include_file(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
- 
- if(NOT HAVE_DVB)
-   MESSAGE(STATUS "Disabled features:\nDVB  Digital television support for Linux\n")
--- a/kaffeine.spec
+++ b/kaffeine.spec
@ -3,20 +3,28 @@
 %define        pkgver %(echo %version | tr _ -)

 Name:          kaffeine
-Version:       2.0.18
+Version:       2.0.19
 Release:       1mamba
 Summary:       A Media Player for KDE
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Davide Madrisan <davide.madrisan@gmail.com>
-URL:           http://kaffeine.sourceforge.net
-Source:        http://download.kde.org/stable/kaffeine/kaffeine-%{pkgver}.tar.xz
-Patch0:        kaffeine-1.2.2-gcc-4.7.patch
-Patch1:        kaffeine-1.3.1-cmake-3.4.0.patch
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://kaffeine.kde.org/
+Source:        https://invent.kde.org/multimedia/kaffeine.git/v%{version}/kaffeine-%{pkgver}.tar.bz2
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: libQt5Concurrent
+BuildRequires: libQt5Core
+BuildRequires: libQt5DBus
+BuildRequires: libQt5Gui
+BuildRequires: libQt5Network
+BuildRequires: libQt5Sql
+BuildRequires: libQt5Widgets
+BuildRequires: libQt5X11Extras-devel
+BuildRequires: libQt5Xml
+BuildRequires: libX11-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: libgcc
 BuildRequires: libkauth-devel
@ -35,7 +43,6 @@ BuildRequires: libkservice-devel
 BuildRequires: libkwidgetsaddons-devel
 BuildRequires: libkwindowsystem-devel
 BuildRequires: libkxmlgui-devel
-BuildRequires: libqt5-devel
 BuildRequires: libsolid-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libv4l-devel
@ -47,10 +54,9 @@ BuildRequires: libdvdcss-devel
 %endif
 BuildRequires: pkgconfig
 Provides:      kaffeine4
-Obsoletes:     kaffeine4
+Obsoletes:     kaffeine4 < 2.0.19
 Provides:      libkaffeine
-Obsoletes:     libkaffeine
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Obsoletes:     libkaffeine < 2.0.19

 %description
 Kaffeine a Media Player for KDE 4.
@ -58,10 +64,10 @@ It can load local files or URLs and supports most of the existing audio and vide
 It also plays back CDs, DVDs, VCDs and can save screenshots in PNG, BMP, and XBM formats.
 Bookmarks and playlist are available.

+%debug_package
+
 %prep
 %setup -q -n kaffeine-%{pkgver}
-#%patch0 -p1
-#%patch1 -p1

 %build
 %cmake_kde5 -d build
@ -71,62 +77,29 @@ Bookmarks and playlist are available.
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 %makeinstall -C build

-%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang
+%find_lang %{name}_qt --with-qt --with-man --with-html --all-name || touch %{name}_qt.lang

 #echo "InitialPreference=10" >> %{buildroot}%{_kde4_xdgappsdir}/kaffeine.desktop

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}

-%post
-touch --no-create %{_kde5_icondir}/hicolor &>/dev/null
-:
-
-%postun
-if [ $1 -eq 0 ] ; then
-   update-desktop-database -q &>/dev/null
-   touch --no-create %{_kde5_icondir}/hicolor &>/dev/null
-   gtk-update-icon-cache %{_kde5_icondir}/hicolor &>/dev/null
-fi
-:
-
-%posttrans
-update-desktop-database -q &>/dev/null
-gtk-update-icon-cache %{_kde5_icondir}/hicolor &>/dev/null
-:
-
-%files -f %{name}5_qt.lang
+%files -f %{name}_qt.lang
 %defattr(-,root,root)
-#%{_kde5_bindir}/dtvdaemon
 %{_kde5_bindir}/kaffeine
 %dir %{_kde5_datadir}/kaffeine
 %{_kde5_datadir}/kaffeine/scanfile.dvb
-%{_kde5_datadir}/profiles/kaffeine.profile.xml
 %{_kde5_xdgappsdir}/org.kde.kaffeine.desktop
 %{_datadir}/metainfo/org.kde.kaffeine.appdata.xml
 %{_kde5_datadir}/solid/actions/kaffeine_play*.desktop
 %{_kde5_icondir}/hicolor/scalable/*
-%dir %{_datadir}/doc/HTML/en/kaffeine
-%{_datadir}/doc/HTML/en/kaffeine/*
-%lang(ca) %dir %{_datadir}/doc/HTML/ca/kaffeine
-%lang(ca) %{_datadir}/doc/HTML/ca/kaffeine/*
-#%lang(id) %{_datadir}/doc/HTML/id/kaffeine/*
-%lang(it) %{_datadir}/doc/HTML/it/kaffeine/*
-%lang(nl) %dir %{_datadir}/doc/HTML/nl/kaffeine
-%lang(nl) %{_datadir}/doc/HTML/nl/kaffeine/*
-%lang(pt) %dir %{_datadir}/doc/HTML/pt/kaffeine
-%lang(pt) %{_datadir}/doc/HTML/pt/kaffeine/*
-%lang(pt_BR) %dir %{_datadir}/doc/HTML/pt_BR/kaffeine
-%lang(pt_BR) %{_datadir}/doc/HTML/pt_BR/kaffeine/*
-%lang(sv) %dir %{_datadir}/doc/HTML/sv/kaffeine
-%lang(sv) %{_datadir}/doc/HTML/sv/kaffeine/*
-%lang(uk) %dir %{_datadir}/doc/HTML/uk/kaffeine
-%lang(uk) %{_datadir}/doc/HTML/uk/kaffeine/*
 %{_mandir}/man1/kaffeine.1*
 %doc COPYING
-#Changelog NOTES

 %changelog
+* Thu Nov 21 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.19-1mamba
+- update to 2.0.19
+
 * Sun May 26 2019 Automatic Build System <autodist@mambasoft.it> 2.0.18-1mamba
 - automatic version update by autodist

@ -276,5 +249,5 @@ gtk-update-icon-cache %{_kde5_icondir}/hicolor &>/dev/null
 * Tue Oct 07 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.4beta1-2qilnx
 - removed libdvdcss as requirement

-* Sun Oct 04 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.4beta1-1qilnx
+* Sat Oct 04 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.4beta1-1qilnx
 - first build