diff --git a/smplayer-16.6.0-colour-scheme.patch b/smplayer-16.6.0-colour-scheme.patch deleted file mode 100644 index 1e496c7..0000000 --- a/smplayer-16.6.0-colour-scheme.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - } diff --git a/smplayer-16.6.0.tar.bz2 b/smplayer-16.6.0.tar.bz2 deleted file mode 100644 index 4c55db7..0000000 --- a/smplayer-16.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10220981f7260ec5f3e7201a5b5b8b534a61056f616811a118d59a8a5696d346 -size 4154300 diff --git a/smplayer-16.7.0.tar.bz2 b/smplayer-16.7.0.tar.bz2 new file mode 100644 index 0000000..4a0f788 --- /dev/null +++ b/smplayer-16.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6989972d5c2d8bacdf66b6db669b3be015a55ba6db0bfdc4180790c02dc4e218 +size 4163002 diff --git a/smplayer-defaults.patch b/smplayer-defaults.patch index 0417913..ad03a0f 100644 --- a/smplayer-defaults.patch +++ b/smplayer-defaults.patch @@ -1,20 +1,6 @@ ---- a/src/basegui.cpp -+++ b/src/basegui.cpp -@@ -204,11 +204,7 @@ BaseGui::BaseGui( QWidget* parent, Qt::W - #if STYLE_SWITCHING - qApp->setStyleSheet(""); - -- #if QT_VERSION >= 0x050000 -- default_style = "fusion"; -- #else - default_style = qApp->style()->objectName(); -- #endif - - #ifdef Q_OS_LINUX - // Some controls aren't displayed correctly with the adwaita style --- a/src/core.cpp +++ b/src/core.cpp -@@ -1715,6 +1715,8 @@ void Core::startMplayer( QString file, d +@@ -1716,6 +1716,8 @@ void Core::startMplayer( QString file, d QString ao = pref->ao; if (!ao.endsWith(",")) ao += ","; proc->setOption("ao", ao); @@ -25,7 +11,19 @@ #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2) --- a/src/preferences.cpp +++ b/src/preferences.cpp -@@ -439,7 +439,7 @@ void Preferences::reset() { +@@ -371,11 +371,7 @@ void Preferences::reset() { + resize_method = Never; + + #if STYLE_SWITCHING +- #if QT_VERSION >= 0x050000 +- style = "Fusion"; +- #else + style=""; +- #endif + #endif + + center_window = false; +@@ -443,7 +439,7 @@ void Preferences::reset() { allow_video_movement = false; gui = "DefaultGUI"; @@ -34,7 +32,7 @@ #if USE_MINIMUMSIZE -@@ -593,7 +593,7 @@ void Preferences::reset() { +@@ -597,7 +593,7 @@ void Preferences::reset() { #ifdef CHECK_UPGRADED smplayer_stable_version = ""; diff --git a/smplayer-makeflags.patch b/smplayer-makeflags.patch index 31a66c5..7406a8e 100644 --- a/smplayer-makeflags.patch +++ b/smplayer-makeflags.patch @@ -1,15 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -31,7 +31,7 @@ ifdef KDE_SUPPORT - # KDE paths, change if necessary - - KDE_INCLUDE_PATH=`kde-config --prefix`/include/ --KDE_LIB_PATH=`kde-config --prefix`/lib/ -+KDE_LIB_PATH=`kde-config --prefix`/lib`kde-config --libsuffix`/ - KDE_LIBS=-lkio - - QMAKE_OPTS=DEFINES+=KDE_SUPPORT INCLUDEPATH+=$(KDE_INCLUDE_PATH) \ -@@ -41,7 +41,7 @@ endif +@@ -23,7 +23,7 @@ DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \ src/smplayer: ./get_svn_revision.sh @@ -18,8 +9,8 @@ cd src && $(LRELEASE) smplayer.pro clean: -@@ -90,7 +90,6 @@ install: src/smplayer - install -m 644 smplayer_enqueue.desktop $(DESTDIR)$(KDE_APPLNK) +@@ -72,7 +72,6 @@ install: src/smplayer + install -m 644 smplayer_enqueue.desktop $(DESTDIR)$(APPLNK_DIR) -install -d $(DESTDIR)$(PREFIX)/share/man/man1/ install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/share/man/man1/ - gzip -9 -f $(DESTDIR)$(PREFIX)/share/man/man1/smplayer.1 diff --git a/smplayer.changes b/smplayer.changes index 7996948..2269fc8 100644 --- a/smplayer.changes +++ b/smplayer.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Jul 3 00:24:02 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 16.7.0: + * (mpv) Update the current position in the seek bar on pause. + * In Qt 5 accelerators in the numeric keypad don't work due to a + bug in Qt 5. Add a workaround. + * Bugfix: (Qt 5) The playlist can be resized when docked to the + main window. + * Don't change the style's palette on Linux. + * Selecting the 'default' style in preferences selects the + system's default style, instead of Fusion. + * Save the hdpi config in the smplayer config dir. + * The names in the playlist are not replaced with the title from + metadata. + * (mpv) Don't pass the URL to youtube-dl if it contains a + multimedia extension. + * Fix YouTube. + * The find subtitles window has a close button in the title bar. +- Remove smplayer-16.6.0-colour-scheme.patch: fixed upstream. +- Rebase smplayer-makeflags.patch, smplayer-defaults.patch. + ------------------------------------------------------------------- Mon Jun 20 20:36:30 UTC 2016 - sor.alexei@meowr.ru diff --git a/smplayer.spec b/smplayer.spec index 2d51dc8..91712cf 100644 --- a/smplayer.spec +++ b/smplayer.spec @@ -17,7 +17,7 @@ Name: smplayer -Version: 16.6.0 +Version: 16.7.0 Release: 0 Summary: Complete frontend for MPV License: GPL-2.0+ @@ -32,8 +32,6 @@ Patch1: %{name}-defaults.patch 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 rvm@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 @@ -88,7 +86,6 @@ settings: audio track, subtitles, volume... %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # Fix CRLF in .txt files. sed -i 's/\r$//' *.txt