Accepting request 212415 from home:Kieltux:branches:multimedia:apps

- update to minitube 2.1.5
- fix for missing locale files (be.ts, ca_ES.ts, es_MX.ts, hr.ts, pt.ts, vi.ts) in the source package (patch removes these languages from the build process

OBS-URL: https://build.opensuse.org/request/show/212415
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=11
This commit is contained in:
Dr. Werner Fink 2013-12-28 16:26:57 +00:00 committed by Git OBS Bridge
parent e9e9e80272
commit 30a38884ec
8 changed files with 53 additions and 29 deletions

View File

@ -1,10 +1,10 @@
--- minitube.pro.orig 2013-09-06 16:22:58.000000000 +0200
+++ minitube.pro 2013-10-11 17:04:46.794004254 +0200
--- minitube.pro.orig 2013-12-19 00:37:27.000000000 +0100
+++ minitube.pro 2013-12-28 16:22:34.000000000 +0100
@@ -12,6 +12,7 @@
DEFINES *= QT_NO_DEBUG_OUTPUT
DEFINES *= QT_USE_QSTRINGBUILDER
DEFINES += QT_STRICT_ITERATORS
+DEFINES += APP_DOWNLOADS
TARGET = minitube
QT += network xml phonon sql script
TARGET = $${APP_UNIX_NAME}

11
fix_missing_locale.patch Normal file
View File

@ -0,0 +1,11 @@
--- locale/locale.pri.orig 2013-12-19 00:37:27.000000000 +0100
+++ locale/locale.pri 2013-12-28 16:32:36.144548501 +0100
@@ -4,7 +4,7 @@
DEPENDPATH += $$PWD
# ls -1 *.ts | tr '\n' ' '
-TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts
+TRANSLATIONS += ar.ts ast.ts bg_BG.ts ca.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts zh_CN.ts zh_TW.ts
isEmpty(QMAKE_LRELEASE) {
win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease

View File

@ -1,5 +1,5 @@
--- src/mainwindow.cpp.orig 2013-09-06 16:22:58.000000000 +0200
+++ src/mainwindow.cpp 2013-10-11 16:22:09.078721507 +0200
--- src/mainwindow.cpp.orig 2013-12-19 00:37:27.000000000 +0100
+++ src/mainwindow.cpp 2013-12-28 16:20:29.777270651 +0100
@@ -52,6 +52,7 @@
#else
#include "searchlineedit.h"
@ -8,28 +8,28 @@
#include <iostream>
#ifdef APP_EXTRA
#include "extra.h"
@@ -1034,11 +1035,13 @@
pauseAct->setIcon(Utils::icon("media-playback-pause"));
@@ -1035,11 +1036,13 @@
pauseAct->setText(tr("&Pause"));
pauseAct->setStatusTip(tr("Pause playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
+ inhibitScreensaver(new QString("suspend"));
// stopAct->setEnabled(true);
+ inhibitScreensaver(new QString("suspend"));
break;
case Phonon::StoppedState:
pauseAct->setEnabled(false);
+ inhibitScreensaver(new QString("resume"));
// stopAct->setEnabled(false);
+ inhibitScreensaver(new QString("resume"));
break;
@@ -1047,6 +1050,7 @@
pauseAct->setIcon(Utils::icon("media-playback-start"));
case Phonon::PausedState:
@@ -1048,6 +1051,7 @@
pauseAct->setText(tr("&Play"));
pauseAct->setStatusTip(tr("Resume playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
+ inhibitScreensaver(new QString("resume"));
// stopAct->setEnabled(true);
+ inhibitScreensaver(new QString("resume"));
break;
case Phonon::BufferingState:
@@ -1063,6 +1067,14 @@
}
}
@ -45,14 +45,13 @@
void MainWindow::stop() {
mediaView->stop();
showHome();
--- src/mainwindow.h.orig 2013-09-06 16:22:58.000000000 +0200
+++ src/mainwindow.h 2013-10-11 16:23:38.412274795 +0200
@@ -103,7 +103,7 @@
--- src/mainwindow.h.orig 2013-12-19 00:37:27.000000000 +0100
+++ src/mainwindow.h 2013-12-28 16:21:16.579035609 +0100
@@ -103,6 +103,7 @@
void setDefinitionMode(QString definitionName);
void toggleDefinitionMode();
void clearRecentKeywords();
-
+ void inhibitScreensaver(QString *action);
// volume shortcuts
void volumeUp();
void volumeDown();

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8050634d21d09fad52cd0f2aff378acd2f841007c997ace80eb903742d4634a9
size 846554

3
minitube-2.1.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8fc812c007de8998c4d07983a7397a25ff1ec77da07766f155314c05ed14c59
size 819076

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Dec 28 15:44:13 UTC 2013 - kieltux@gmail.com
- fix for missing locale files in source package
- update to 2.1.5
* Fix some videos not playing
* Show video title on hover when playlist is in minimode (thumbs only)
* Lighter font for video title and description on Mac & Ubuntu
* Fixed fonts in Mac OS X Mavericks
* Fixed "busy" mouse cursor at launch on Ubuntu
* Updated translations
-------------------------------------------------------------------
Fri Oct 11 15:23:00 UTC 2013 - kieltux@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package minitube
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,8 @@
#
Name: minitube
Version: 2.1.3
Release: 1.1
Version: 2.1.5
Release: 1
License: GPL-3.0+
Summary: Native Youtube Client
Url: http://flavio.tordini.org/minitube
@ -28,6 +28,8 @@ Patch0: qtlocalpeer.patch
Patch1: inhibit_screensaver_during_playback.patch
# YouTube Legal Team asked to remove the download functionality
Patch2: enable_vid_download_again.patch
# Some locale files (be.ts, ca_ES.ts, es_MX.ts, hr.ts, pt.ts, vi.ts) are missing in source package
Patch3: fix_missing_locale.patch
BuildRequires: libqt4-devel >= 4.5.0
BuildRequires: phonon-devel
BuildRequires: update-desktop-files
@ -52,8 +54,8 @@ Author:
%patch0
%patch1
# enable this patch to enable video downloads
#%patch2
# %patch2
%patch3
%build
qmake PREFIX=%{_prefix}
make %{?_smp_mflags}
@ -72,4 +74,4 @@ rm -rf %{buildroot}
%{_datadir}/applications/minitube.desktop
%{_datadir}/icons/*
%dir %{_datadir}/minitube
%{_datadir}/minitube/locale/
%{_datadir}/minitube/locale/

View File

@ -1,5 +1,5 @@
--- src/qtsingleapplication/qtlocalpeer.cpp.orig 2012-09-27 12:17:03.000000000 +0200
+++ src/qtsingleapplication/qtlocalpeer.cpp 2012-10-02 18:05:01.722583491 +0200
--- src/qtsingleapplication/qtlocalpeer.cpp.orig 2013-12-19 00:37:27.000000000 +0100
+++ src/qtsingleapplication/qtlocalpeer.cpp 2013-12-28 16:22:00.804813546 +0100
@@ -46,6 +46,7 @@