Hello community, here is the log from the commit of package smplayer for openSUSE:Factory checked in at 2016-06-25 02:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smplayer (Old) and /work/SRC/openSUSE:Factory/.smplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/smplayer/smplayer.changes 2016-06-14 23:08:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smplayer.new/smplayer.changes 2016-06-25 02:22:15.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 20:36:30 UTC 2016 - sor.ale...@meowr.ru + +- Add smplayer-16.6.0-colour-scheme.patch from upstream: don't + change colour pallete. +- Build with Qt5 for openSUSE 13.2. +- Drop KDE 4 support in Qt4 builds as well: will be removed + completely in the next version. + +------------------------------------------------------------------- New: ---- smplayer-16.6.0-colour-scheme.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smplayer.spec ++++++ --- /var/tmp/diff_new_pack.uBBcHj/_old 2016-06-25 02:22:16.000000000 +0200 +++ /var/tmp/diff_new_pack.uBBcHj/_new 2016-06-25 02:22:16.000000000 +0200 @@ -32,10 +32,12 @@ Patch2: %{name}-simple-resize.patch # PATCH-FIX-UPSTREAM smplayer-add_kde_protocols_to_desktop_file.patch -- To play network shared video correctly: #PM-48. Patch3: %{name}-add_kde_protocols_to_desktop_file.patch +# PATCH-FIX-UPSTREAM smplayer-16.6.0-colour-scheme.patch r...@users.sourceforge.net -- Don't change colour pallete. +Patch4: %{name}-16.6.0-colour-scheme.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libstdc++-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: zlib-devel # Either mpv >= 0.6.2 or MPlayer >= 1.0rc4_r32607. @@ -43,11 +45,13 @@ Recommends: smplayer-lang Recommends: smplayer-skins Suggests: smplayer-themes +# smplayer-core and smplayer-qt5 was last used in openSUSE 13.2. Provides: smplayer-core = %{version} +Obsoletes: smplayer-core < %{version} Provides: smplayer-qt5 = %{version} Obsoletes: smplayer-qt5 < %{version} Obsoletes: smplayer-qt5-lang < %{version} -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120100 +%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libqt5-qttools-devel BuildRequires: pkgconfig(Qt5Concurrent) @@ -62,7 +66,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %else -BuildRequires: libkde4-devel BuildRequires: libqt4-devel %endif @@ -85,6 +88,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Fix CRLF in .txt files. sed -i 's/\r$//' *.txt @@ -104,22 +108,17 @@ %build make \ MAKEFLAGS="%{?_smp_mflags}" \ - PREFIX=%{_prefix} \ -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120100 +%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) QMAKE=%{_libqt5_bindir}/qmake \ - LRELEASE=%{_libqt5_bindir}/lrelease + LRELEASE=%{_libqt5_bindir}/lrelease \ %else - KDE_SUPPORT=1 + QMAKE=%{_libdir}/qt4/bin/qmake \ + LRELEASE=%{_libdir}/qt4/bin/lrelease \ %endif + PREFIX=%{_prefix} %install %make_install \ -%if 0%{?suse_version} <= 1320 && 0%{?sle_version} < 120100 - KDE_PREFIX=%{_prefix} \ - DOC_PATH=%{_docdir}/%{name} \ - KDE_INCLUDE_PATH=%{_includedir} \ - KDE_LIB_PATH=%{_libdir} \ -%endif PREFIX=%{_prefix} \ DOC_PATH=%{_docdir}/%{name} ++++++ smplayer-16.6.0-colour-scheme.patch ++++++ --- a/src/basegui.cpp +++ b/src/basegui.cpp @@ -5617,7 +5617,9 @@ void BaseGui::applyStyles() { qDebug() << "BaseGui::applyStyles: style:" << style; if (!style.isEmpty()) { qApp->setStyle(style); +#ifdef Q_OS_WIN qApp->setPalette(qApp->style()->standardPalette()); +#endif } #endif }