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

- Update to 2.3
- Removed patch to inihibit screensaver
- Removed disabled patch for video download
- Added manpage written by Jakob Haufe for the Debian project
- Minor specfile clean up

OBS-URL: https://build.opensuse.org/request/show/259739
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=14
This commit is contained in:
Matthias Mailänder
2014-11-05 08:01:05 +00:00
committed by Git OBS Bridge
parent be02cfb688
commit cec74239b9
7 changed files with 58 additions and 91 deletions

View File

@@ -1,10 +0,0 @@
--- 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
DEFINES += QT_STRICT_ITERATORS
+DEFINES += APP_DOWNLOADS
TARGET = $${APP_UNIX_NAME}

View File

@@ -1,57 +0,0 @@
--- 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"
#endif
+#include <QProcess>
#include <iostream>
#ifdef APP_EXTRA
#include "extra.h"
@@ -1035,11 +1036,13 @@
pauseAct->setText(tr("&Pause"));
pauseAct->setStatusTip(tr("Pause playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
// stopAct->setEnabled(true);
+ inhibitScreensaver(new QString("suspend"));
break;
case Phonon::StoppedState:
pauseAct->setEnabled(false);
// stopAct->setEnabled(false);
+ inhibitScreensaver(new QString("resume"));
break;
case Phonon::PausedState:
@@ -1048,6 +1051,7 @@
pauseAct->setText(tr("&Play"));
pauseAct->setStatusTip(tr("Resume playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")");
// stopAct->setEnabled(true);
+ inhibitScreensaver(new QString("resume"));
break;
case Phonon::BufferingState:
@@ -1063,6 +1067,14 @@
}
}
+void MainWindow::inhibitScreensaver(QString *action) {
+ QStringList arguments;
+ QString s = QString::number(winId());
+ arguments << *action << s;
+ QProcess *screensaver = new QProcess();
+ screensaver->start("xdg-screensaver", arguments);
+}
+
void MainWindow::stop() {
mediaView->stop();
showHome();
--- 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();
void clearRecentKeywords();
+ void inhibitScreensaver(QString *action);
// volume shortcuts
void volumeUp();

View File

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

21
minitube.1 Normal file
View File

@@ -0,0 +1,21 @@
.\" Hey, EMACS: -*- nroff -*-
.TH MINITUBE 1 "January 22, 2010"
.SH NAME
minitube \- Native YouTube client
.SH SYNOPSIS
.B minitube
.SH DESCRIPTION
This manual page documents briefly the
.B minitube
command.
.PP
\fBminitube\fP is a native YouTube client. With it you can watch YouTube
videos in a new way: you type a keyword, Minitube gives you an endless
video stream. Minitube does not require the Flash Player.
.SH OPTIONS
Minitube currently does not take any options.
.SH AUTHOR
minitube was written by Flavio Tordini <flavio.tordini@gmail.com>.
.PP
This manual page was written by Jakob Haufe <sur5r@sur5r.net>,
for the Debian project (and may be used by others).

View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Nov 5 07:37:03 UTC 2014 - kieltux@gmail.com
- Update to 2.3
* Take video snapshots at full resolution
* Faster and more reliable seeking
* Faster video start with longer videos
* Slide transition in playlist navigation
* Make the volume handle red when volume is zero
* Enhancements to the search suggestions
* New and updated translations
- Removed patch to inihibit screensaver
- Added manpage written by Jakob Haufe for the Debian project
-------------------------------------------------------------------
Mon Aug 4 18:28:36 UTC 2014 - kieltux@gmail.com

View File

@@ -15,21 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: minitube
Version: 2.2.0
Version: 2.3.0
Release: 0
License: GPL-3.0+
Summary: Native Youtube Client
Url: http://flavio.tordini.org/minitube
License: GPL-3.0+
Group: Productivity/Multimedia/Video/Players
Source: http://flavio.tordini.org/files/minitube/%{name}-%{version}.tar.gz
Url: http://flavio.tordini.org/minitube
# Upstream doesn't provide source tarball with version in its name
Source0: http://flavio.tordini.org/files/minitube/%{name}.tar.gz
# Manpage written by Jakob Haufe <sur5r@sur5r.net> for the Debian project
Source1: minitube.1
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
Patch3: enable_vid_download_again.patch
Patch1: disable_update_check.patch
BuildRequires: libqt4-devel >= 4.5.0
BuildRequires: phonon-devel
BuildRequires: update-desktop-files
@@ -51,11 +50,10 @@ Author:
%prep
%setup -q -n minitube
# Missing unistd.h include in qtlocalpeer.cpp
%patch0
# Disable online update check, from home:jetchko:fedora20 > minitube
%patch1
%patch2
# enable this patch to enable video downloads
#%patch3
%build
qmake PREFIX=%{_prefix}
@@ -63,16 +61,17 @@ make %{?_smp_mflags}
%install
make INSTALL_ROOT=%{buildroot} install
install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
%suse_update_desktop_file -r %{name} Qt AudioVideo Video Player
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS COPYING CHANGES TODO
%{_bindir}/minitube
%{_datadir}/applications/minitube.desktop
%doc AUTHORS CHANGES COPYING TODO
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/*
%dir %{_datadir}/minitube
%{_datadir}/minitube/locale/
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/locale/
%changelog

3
minitube.tar.gz Normal file
View File

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