commit 1e2f85e612618a4a85527cb4b851882bbc8568b3 Author: raveit65 <mate(a)raveit.de&gt; Date: Thu Apr 4 11:20:24 2019 +0200 update to 2.0.16 .gitignore | 1 + buildfix_qt511.patch | 110 --------------------- kaffeine.spec | 30 ++++-- ...-fix-a-regression-with-next-previous-logi.patch | 47 +++++++++ sources | 3 +- 5 files changed, 71 insertions(+), 120 deletions(-) --- diff --git a/.gitignore b/.gitignore index fa0a82e..ca19151 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kaffeine-*.tar.xz +/kaffeine-2.0.16.tar.gz diff --git a/kaffeine.spec b/kaffeine.spec index 46005cf..3d54145 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,11 +1,17 @@ Name: kaffeine -Version: 2.0.15 -Release: 3%{?dist} +Version: 2.0.16 +Release: 1%{?dist} License: GPLv2+ Summary: KDE media player -URL: http://kaffeine.kde.org/ -Source0: https://download.kde.org/%{stable}/%{name}/%{name}-%{version}.tar.xz +# URL: http://kaffeine.kde.org/ +URL: https://github.com/KDE/kaffeine +# Source0: https://download.kde.org/%{stable}/%{name}/%{name}-%{version}.tar.xz +# spectool -g kaffeine.spec +Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz +# tarball from github doesn't have translations! +# take them from https://download.kde.org/%{stable}/%{name}/%{name}-2.0.16-2.tar.xz +Source1: /home/rave/Downloads/f30/kaffeine-po.tar.xz %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -13,9 +19,9 @@ Source0: https://download.kde.org/%{stable}/%{name}/%{name}-%{version}.tar.xz %global stable stable %endif -# Fix breakages with qt5.11-rc2 -# https://github.com/KDE/kaffeine/commit/06b78c5f24891fd38d25ed64f5029106ee... -Patch0: buildfix_qt511.patch +# mediawidget: fix a regression with next/previous logic +# https://cgit.kde.org/kaffeine.git/commit/?id=ab5655e +Patch1: kaffeine_0001-mediawidget-fix-a-regression-with-next-previous-logi.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -50,8 +56,7 @@ Kaffeine is a KDE Frameworks media player. %prep %autosetup -p1 -# Remove broken locale, they can use pt instead till upstream fixes it. -rm -rf po/pt_BR +tar -xf %{SOURCE1} %build mkdir -p %{_target_platform} @@ -86,6 +91,13 @@ appstream-util validate-relax --nonet %{buildroot}/%{_kf5_metainfodir}/org.kde.k %{_kf5_mandir}/man1/kaffeine.1.* %changelog +* Thu Apr 04 2019 Wolfgang Ulbrich <fedora(a)raveit.de&gt; 2.0.16-1 +- update to 2.0.16 +- use tarball from github with fixed versioning +- drop previously applied patch +- add translations from http://kaffeine.kde.org/ +- enable pt_br language again + * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.0.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/kaffeine_0001-mediawidget-fix-a-regression-with-next-previous-logi.patch b/kaffeine_0001-mediawidget-fix-a-regression-with-next-previous-logi.patch new file mode 100644 index 0000000..43f3c91 --- /dev/null +++ b/kaffeine_0001-mediawidget-fix-a-regression-with-next-previous-logi.patch @@ -0,0 +1,47 @@ +From ab5655ef3e9727ad26e7c095d79a64ce4e8b7b28 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org&gt; +Date: Thu, 14 Mar 2019 16:52:49 -0300 +Subject: [PATCH] mediawidget: fix a regression with next/previous logic + +A fix at the CD handing code broke for other sources. + +After this fix, both prev/next buttons work and also the DBUS +equivalent logic: + + qdbus org.mpris.kaffeine /Player Prev + qdbus org.kde.kaffeine /Player Prev + +Thanks to Antoni Bella for identifying the broken commit and +addressing it. + +BUG: 405276 + +Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org&gt; +--- + src/mediawidget.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp +index 91fd961..c34e9c5 100644 +--- a/src/mediawidget.cpp ++++ b/src/mediawidget.cpp +@@ -794,14 +794,14 @@ void MediaWidget::previous() + { + if (source->getType() == MediaSource::Url) + emit playlistPrevious(); +- backend->jumpToPreviousChapter(); ++ source->previous(); + } + + void MediaWidget::next() + { + if (source->getType() == MediaSource::Url) + emit playlistNext(); +- backend->jumpToNextChapter(); ++ source->next(); + } + + void MediaWidget::stop() +-- +2.21.0 + diff --git a/sources b/sources index 1db434c..10e3c8f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -931da4fb86018619110e0f7bec9f3769 kaffeine-2.0.15.tar.xz +14293147a6f6faa35dee27f1f2726e28 kaffeine-2.0.16.tar.gz +99718d1112512fd013bf9e79335af532 kaffeine-po.tar.xz