Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at 2016-12-02 16:43:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaffeine (Old) and /work/SRC/openSUSE:Factory/.kaffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kaffeine" Changes: -------- --- /work/SRC/openSUSE:Factory/kaffeine/kaffeine.changes 2016-06-19 12:53:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kaffeine.new/kaffeine.changes 2016-12-02 16:43:20.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Nov 30 18:03:24 UTC 2016 - [email protected] + +- Update to 2.0.5: + * No changelog available + +------------------------------------------------------------------- +Wed Aug 10 18:09:43 UTC 2016 - [email protected] + +- Update to 2.0.4: + - No recent changelog available in tarball. + - Build against kf5 and qt5. + - Removed patches build-fix.diff, crash-on-resume-fix.patch, + initial-preference.diff, kaffeine-cmake34.patch, + kaffeine-gcc47.patch, kaffeine-gcc6.patch, ksuseinstall.diff, + support_for_sundtek_tv_tuners.patch and + support_mimetypes_bnc671581.diff, fixed upstream. + - Fixed patch kaffeine-fixsplitter.patch. + - Removed source kaffeine-icons.tar.bz2, no longer required. + - Changed summary and description because kaffeine now builds + against libvlc, libxine is no longer needed for build. + +------------------------------------------------------------------- Old: ---- build-fix.diff crash-on-resume-fix.patch initial-preference.diff kaffeine-1.2.2.tar.bz2 kaffeine-cmake34.patch kaffeine-gcc47.patch kaffeine-gcc6.patch kaffeine-icons.tar.bz2 ksuseinstall.diff support_for_sundtek_tv_tuners.patch support_mimetypes_bnc671581.diff New: ---- kaffeine-2.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.trQshQ/_old 2016-12-02 16:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.trQshQ/_new 2016-12-02 16:43:21.000000000 +0100 @@ -17,130 +17,94 @@ Name: kaffeine -Version: 1.2.2 -Release: 0 -Summary: Xine-Based Multimedia Player +Summary: Vlc-Based Multimedia Player License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players - +Version: 2.0.5 +Release: 0 Url: http://kaffeine.kde.org/ -# http://sourceforge.net/projects/kaffeine/files/current/kaffeine-1.2.2.tar.gz -Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-icons.tar.bz2 +Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters) Patch0: kaffeine-fixsplitter.patch -# PATCH-FEATURE-OPENSUSE ksuseinstall.diff [email protected] -- Support for on-demand codecs install using ksuseinstall -Patch2: ksuseinstall.diff -# PATCH-FIX-OPENSUSE initial-preference.diff [email protected] -- Add InitialPreference to set it as the default video player -Patch3: initial-preference.diff -# PATCH-FIX-OPENSUSE build-fix.diff -- Build fix for old qt versions -Patch4: build-fix.diff -# PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff bnc#671581 [email protected] -- Support audio/webm and video/x-theora+ogg -Patch5: support_mimetypes_bnc671581.diff -# PATCH-FIX-UPSTREAM -Patch6: crash-on-resume-fix.patch -# PATCH-FIX-UPSTREAM kaffeine-gcc47.patch [email protected] -- Fix build with gcc 4.7 -Patch7: kaffeine-gcc47.patch -# PATCH-FEATURE-UPSTREAM support_for_sundtek_tv_tuners.patch boo#827097 -- Add support for Sundtek DVB Devices -Patch8: support_for_sundtek_tv_tuners.patch -#PATCH-FIX-UPSTREAM kaffeine-cmake34.patch -- Include files containing the functions used by the build system -Patch9: kaffeine-cmake34.patch -# PATCH-FIX-UPSTREAM kaffeine-gcc6.patch boo#985371 [email protected] -- fix build with gcc6 -Patch10: kaffeine-gcc6.patch +Recommends: %{name}-lang = %version +Requires: libQt5Sql5-sqlite +Requires(post): hicolor-icon-theme +Requires(post): update-desktop-files +Requires(postun): hicolor-icon-theme +Requires(postun): update-desktop-files +BuildRequires: extra-cmake-modules +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5XmlGui) +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(libdvbv5) +%endif +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(libvlc) >= 2.2.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xscrnsaver) BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libkde4-devel -%if 0%{?suse_version} > 1120 -BuildRequires: libksuseinstall-devel -%endif -BuildRequires: libxine-devel -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif -Requires: libqt4-sql-sqlite -Provides: kaffeine-lang = %version -Obsoletes: kaffeine-lang < %version -%kde4_runtime_requires - %description -Kaffeine plays all files and devices supported by Xine. For example, -MPEG files, AVI (if the codec being used is supported by Xine), MP3, -and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. +Kaffeine is a media player. +What makes it different from the others is its excellent support of digital TV (DVB). +Kaffeine has user-friendly interface, so that even first time users can start immediately +playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VCD, or a file. + +%lang_package %prep -%setup -q -b 1 +%setup -q %patch0 -%if 0%{?suse_version} > 1120 -%patch2 -%endif -%patch3 -%if 0%{?kde_updatedapps} -%patch4 -p0 -%endif -%if 0%{?suse_version} > 1130 -%patch5 -%endif -%patch6 -p1 -%patch7 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %build -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -pushd build -%kde4_makeinstall -popd +%kf5_makeinstall -C build -%if 0%{?suse_version} # place desktop entry in video and tv -%suse_update_desktop_file -r %{name} Qt KDE AudioVideo Video Player TV -%endif +%suse_update_desktop_file -r org.kde.%{name} Qt KDE AudioVideo Video Player TV -# symlink solid actions into place known to Plasma 5 -mkdir -p %{buildroot}%{_datadir}/solid/actions -pushd %{buildroot}%{_kde4_appsdir}/solid/actions/ -for i in kaffeine_*.desktop; do -ln -s %{_kde4_appsdir}/solid/actions/$i %{buildroot}%{_datadir}/solid/actions/ -done -popd - -%kde_post_install - -# Removed unneeded locales -%if 0%{?suse_version} && 0%{?suse_version} < 1140 -rm -rf %{buildroot}%{_datadir}/locale/ast/LC_MESSAGES/ -rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ -rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ -%endif +%find_lang %{name} --without-kde -%find_lang %{name} +%post +%desktop_database_post +%icon_theme_cache_post -%clean -rm -rf %{buildroot} +%postun +%desktop_database_postun +%icon_theme_cache_postun -%files -f %{name}.lang -%defattr(-,root,root,-) +%files +%defattr(-,root,root) %doc COPYING COPYING-DOCS Changelog NOTES -%{_kde4_bindir}/kaffeine -%{_kde4_bindir}/kaffeine-xbu -%{_kde4_applicationsdir}/kaffeine.desktop -%{_kde4_iconsdir}/hicolor/*/apps/kaffeine.* -%{_kde4_iconsdir}/oxygen/*/actions/audio-radio-encrypted.* -%{_kde4_iconsdir}/oxygen/*/actions/video-television-encrypted.* -%{_kde4_appsdir}/kaffeine/ -%dir %{_kde4_appsdir}/profiles -%{_kde4_appsdir}/profiles/kaffeine.profile.xml -%dir %{_kde4_appsdir}/solid -%dir %{_kde4_appsdir}/solid/actions -%{_kde4_appsdir}/solid/actions/kaffeine_play_audiocd.desktop -%{_kde4_appsdir}/solid/actions/kaffeine_play_dvd.desktop -%{_kde4_appsdir}/solid/actions/kaffeine_play_videocd.desktop -%dir %{_datadir}/solid -%dir %{_datadir}/solid/actions -%{_datadir}/solid/actions/kaffeine_*.desktop +%{_kf5_bindir}/dtvdaemon +%{_kf5_bindir}/kaffeine +%if 0%{?sle_version} == 120100 +%dir %{_kf5_sharedir}/appdata +%endif +%{_kf5_sharedir}/appdata/org.kde.kaffeine.appdata.xml +%{_kf5_applicationsdir}/org.kde.kaffeine.desktop +%{_kf5_iconsdir}/hicolor/*/*/* +%{_kf5_sharedir}/kaffeine/ +%{_kf5_sharedir}/profiles/ +%{_kf5_sharedir}/solid/actions/ +%{_kf5_htmldir}/ +%{_kf5_mandir}/man1/* +%dir %{_kf5_mandir}/uk +%{_kf5_mandir}/*/man1/ + +%files lang -f %{name}.lang %changelog ++++++ kaffeine-fixsplitter.patch ++++++ --- /var/tmp/diff_new_pack.trQshQ/_old 2016-12-02 16:43:21.000000000 +0100 +++ /var/tmp/diff_new_pack.trQshQ/_new 2016-12-02 16:43:21.000000000 +0100 @@ -1,16 +1,14 @@ -Index: src/playlist/playlisttab.cpp -=================================================================== ---- src/playlist/playlisttab.cpp (revision 1134989) -+++ src/playlist/playlisttab.cpp (working copy) -@@ -21,6 +21,7 @@ - #include "playlisttab.h" - +--- src/playlist/playlisttab.cpp.orig 2016-06-30 17:20:32.000000000 +0200 ++++ src/playlist/playlisttab.cpp 2016-08-10 17:26:40.388513777 +0200 +@@ -29,6 +29,7 @@ + #include <QAction> #include <QBoxLayout> + #include <QFileDialog> +#include <QToolBar> #include <QKeyEvent> #include <QListView> - #include <QSplitter> -@@ -447,33 +448,35 @@ + #include <QMenu> +@@ -450,33 +451,35 @@ QBoxLayout *sideLayout = new QVBoxLayout(widget); sideLayout->setMargin(0); @@ -51,7 +49,7 @@ boxLayout->addStretch(); sideLayout->addLayout(boxLayout); -@@ -500,28 +503,30 @@ +@@ -503,28 +506,30 @@ sideLayout = new QVBoxLayout(widget); sideLayout->setMargin(0); @@ -86,11 +84,11 @@ boxLayout->addStretch(); sideLayout->addLayout(boxLayout); -@@ -616,6 +621,7 @@ +@@ -619,6 +624,7 @@ fileWidget->setFilter(MediaWidget::extensionFilter()); fileWidget->setMode(KFile::Files | KFile::ExistingOnly); fileWidgetSplitter->setStretchFactor(1, 1); + fileWidget->setMinimumWidth(40); - // KFileWidget creates a KUrlComboBox without layout (!), which steals the focus: + // KFileWidget creates a QUrlComboBox without layout (!), which steals the focus: // kDebug() << QApplication::focusWidget();
