From be02cfb68808d166e6beaac001df3f85577dae9908fcde2661226661f0d69ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 4 Aug 2014 19:00:37 +0000 Subject: [PATCH] Accepting request 243638 from home:Kieltux:branches:multimedia:apps - update to 2.2 * Subscriptions context menu: Unsubscribe, Mark as Watched * Added --stop-after-this command line switch * Added Stop After This Video Unity & Gnome 3 action * Fixed painting errors when scrolling playlist on Linux * Fixed bug with dragging playlist items from the thumbnail * Fixed some videos not playing * Updated translations - added patch for disable update check OBS-URL: https://build.opensuse.org/request/show/243638 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=13 --- disable_update_check.patch | 11 +++++++++++ enable_vid_download_again.patch | 4 ++-- inhibit_screensaver_during_playback.patch | 14 +++++++------- minitube-2.1.6.tar.gz | 3 --- minitube-2.2.0.tar.gz | 3 +++ minitube.changes | 13 +++++++++++++ minitube.spec | 9 ++++++--- qtlocalpeer.patch | 4 ++-- 8 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 disable_update_check.patch delete mode 100644 minitube-2.1.6.tar.gz create mode 100644 minitube-2.2.0.tar.gz diff --git a/disable_update_check.patch b/disable_update_check.patch new file mode 100644 index 0000000..9d54c92 --- /dev/null +++ b/disable_update_check.patch @@ -0,0 +1,11 @@ +--- src/mainwindow.cpp.orig 2014-07-20 11:07:09.000000000 +0200 ++++ src/mainwindow.cpp 2014-08-04 20:24:50.755541329 +0200 +@@ -197,7 +197,7 @@ + + JsFunctions::instance(); + +- checkForUpdate(); ++ //checkForUpdate(); + + ChannelAggregator::instance()->start(); + } diff --git a/enable_vid_download_again.patch b/enable_vid_download_again.patch index 1dfce4c..add2f0b 100644 --- a/enable_vid_download_again.patch +++ b/enable_vid_download_again.patch @@ -1,5 +1,5 @@ ---- minitube.pro.orig 2014-02-05 23:39:02.000000000 +0100 -+++ minitube.pro 2014-02-07 17:52:51.412653234 +0100 +--- minitube.pro.orig 2014-08-04 19:58:18.503898547 +0200 ++++ minitube.pro 2014-08-04 19:58:40.847805951 +0200 @@ -12,6 +12,7 @@ DEFINES *= QT_NO_DEBUG_OUTPUT DEFINES *= QT_USE_QSTRINGBUILDER diff --git a/inhibit_screensaver_during_playback.patch b/inhibit_screensaver_during_playback.patch index e28a2e8..fc059ab 100644 --- a/inhibit_screensaver_during_playback.patch +++ b/inhibit_screensaver_during_playback.patch @@ -1,5 +1,5 @@ ---- src/mainwindow.cpp.orig 2014-02-05 23:39:02.000000000 +0100 -+++ src/mainwindow.cpp 2014-02-07 17:59:49.881179373 +0100 +--- src/mainwindow.cpp.orig 2014-07-20 11:07:09.000000000 +0200 ++++ src/mainwindow.cpp 2014-08-04 20:03:32.755652274 +0200 @@ -52,6 +52,7 @@ #else #include "searchlineedit.h" @@ -12,13 +12,13 @@ pauseAct->setText(tr("&Pause")); pauseAct->setStatusTip(tr("Pause playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")"); // stopAct->setEnabled(true); -+ inhibitScreensaver(new QString("suspend")); ++ inhibitScreensaver(new QString("suspend")); break; case Phonon::StoppedState: pauseAct->setEnabled(false); // stopAct->setEnabled(false); -+ inhibitScreensaver(new QString("resume")); ++ inhibitScreensaver(new QString("resume")); break; case Phonon::PausedState: @@ -26,7 +26,7 @@ pauseAct->setText(tr("&Play")); pauseAct->setStatusTip(tr("Resume playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")"); // stopAct->setEnabled(true); -+ inhibitScreensaver(new QString("resume")); ++ inhibitScreensaver(new QString("resume")); break; case Phonon::BufferingState: @@ -45,8 +45,8 @@ void MainWindow::stop() { mediaView->stop(); showHome(); ---- src/mainwindow.h.orig 2014-02-05 23:39:02.000000000 +0100 -+++ src/mainwindow.h 2014-02-07 17:55:56.229563829 +0100 +--- src/mainwindow.h.orig 2014-07-20 11:07:09.000000000 +0200 ++++ src/mainwindow.h 2014-08-04 20:05:37.008172348 +0200 @@ -103,6 +103,7 @@ void setDefinitionMode(QString definitionName); void toggleDefinitionMode(); diff --git a/minitube-2.1.6.tar.gz b/minitube-2.1.6.tar.gz deleted file mode 100644 index e190621..0000000 --- a/minitube-2.1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a9b9386f20e42274c1b13a729268f1cb8e7978d3ae930f8acdff7d3b270c724 -size 870000 diff --git a/minitube-2.2.0.tar.gz b/minitube-2.2.0.tar.gz new file mode 100644 index 0000000..1d074af --- /dev/null +++ b/minitube-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1076981044d62e5c0b52754d34acde46be5e8bdf4813ae7cead7c9ae038133e1 +size 878634 diff --git a/minitube.changes b/minitube.changes index 5d73142..28ee414 100644 --- a/minitube.changes +++ b/minitube.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 4 18:28:36 UTC 2014 - kieltux@gmail.com + +- update to 2.2 + * Subscriptions context menu: Unsubscribe, Mark as Watched + * Added --stop-after-this command line switch + * Added Stop After This Video Unity & Gnome 3 action + * Fixed painting errors when scrolling playlist on Linux + * Fixed bug with dragging playlist items from the thumbnail + * Fixed some videos not playing + * Updated translations +- added patch for disable update check + ------------------------------------------------------------------- Fri Feb 7 17:10:08 UTC 2014 - kieltux@gmail.com diff --git a/minitube.spec b/minitube.spec index 1fcd1cb..c757b5a 100644 --- a/minitube.spec +++ b/minitube.spec @@ -16,7 +16,7 @@ # Name: minitube -Version: 2.1.6 +Version: 2.2.0 Release: 0 License: GPL-3.0+ Summary: Native Youtube Client @@ -26,8 +26,10 @@ Source: http://flavio.tordini.org/files/minitube/%{name}-%{version}.tar. Patch0: qtlocalpeer.patch # https://launchpadlibrarian.net/105980691/inhibit-screensaver-during-playback Patch1: inhibit_screensaver_during_playback.patch +# Disable online update check: from home:jetchko:fedora20 > minitube +Patch2: disable_update_check.patch # YouTube Legal Team asked to remove the download functionality -Patch2: enable_vid_download_again.patch +Patch3: enable_vid_download_again.patch BuildRequires: libqt4-devel >= 4.5.0 BuildRequires: phonon-devel BuildRequires: update-desktop-files @@ -51,8 +53,9 @@ Author: %setup -q -n minitube %patch0 %patch1 +%patch2 # enable this patch to enable video downloads -#%patch2 +#%patch3 %build qmake PREFIX=%{_prefix} diff --git a/qtlocalpeer.patch b/qtlocalpeer.patch index 03850b2..6fcfacf 100644 --- a/qtlocalpeer.patch +++ b/qtlocalpeer.patch @@ -1,5 +1,5 @@ ---- src/qtsingleapplication/qtlocalpeer.cpp.orig 2014-02-05 23:39:02.000000000 +0100 -+++ src/qtsingleapplication/qtlocalpeer.cpp 2014-02-07 17:53:22.356471304 +0100 +--- src/qtsingleapplication/qtlocalpeer.cpp.orig 2014-07-20 11:07:09.000000000 +0200 ++++ src/qtsingleapplication/qtlocalpeer.cpp 2014-08-04 19:59:32.975591970 +0200 @@ -46,6 +46,7 @@