commit:     28306987b459dbb068bb794fc6b45963838def96
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 13:46:52 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 13:47:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28306987

media-video/smplayer: Bump to version 17.10.0 (bug #614888).

Removed qt4 dependency.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-video/smplayer/Manifest                      |   1 +
 .../files/smplayer-17.1.0-advertisement_crap.patch |  85 ++++++++++++++
 media-video/smplayer/smplayer-17.10.0.ebuild       | 122 +++++++++++++++++++++
 3 files changed, 208 insertions(+)

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 73a33cad5fd..99ae84a1f35 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,2 +1,3 @@
 DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 
d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 
2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed
 WHIRLPOOL 
8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
 DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 
e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 
13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c
 WHIRLPOOL 
eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
+DIST smplayer-17.10.0.tar.bz2 5050760 SHA256 
3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 SHA512 
c06f8e6043a870291cc29eba57b8bb5034fbceb19b24987751467e874a00d4e95f57933708d71375fdc38fdc32de68d77a7d9180c3eee1f9011eb1cfa421bbb0
 WHIRLPOOL 
b4738ce430fadf60c743a05dcf1e491ec37d88a4ff83db75ac238f479a6031efe8bfd1a70af389cf2bd22cfd5236adb4e22e7c7a23321a53966e9a1f738d0db2

diff --git 
a/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch 
b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
new file mode 100644
index 00000000000..2792d189b09
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-17.1.0-advertisement_crap.patch
@@ -0,0 +1,85 @@
+--- smplayer-17.1.0/src/basegui.cpp
++++ smplayer-17.1.0/src/basegui.cpp
+@@ -906,9 +906,11 @@
+       connect( showConfigAct, SIGNAL(triggered()),
+              this, SLOT(helpShowConfig()) );
+ 
++#ifdef DONATE_REMINDER
+       donateAct = new MyAction( this, "donate" );
+       connect( donateAct, SIGNAL(triggered()),
+              this, SLOT(helpDonate()) );
++#endif
+ 
+       aboutThisAct = new MyAction( this, "about_smplayer" );
+       connect( aboutThisAct, SIGNAL(triggered()),
+@@ -1846,8 +1848,10 @@
+ #ifdef SHARE_ACTIONS
+       donateAct->change( Images::icon("donate"), tr("&Donate / Share with 
your friends") );
+ #else
++#ifdef DONATE_REMINDER
+       donateAct->change( Images::icon("donate"), tr("&Donate") );
+ #endif
++#endif
+       aboutThisAct->change( Images::icon("logo"), tr("About &SMPlayer") );
+ 
+ #ifdef SHARE_MENU
+@@ -2993,8 +2997,10 @@
+               helpMenu->addAction(showConfigAct);
+               helpMenu->addSeparator();
+       }
++      #ifdef DONATE_REMINDER
+       helpMenu->addAction(donateAct);
+       helpMenu->addSeparator();
++      #endif
+       helpMenu->addAction(aboutThisAct);
+ 
+       // Access menu
+@@ -4489,6 +4495,7 @@
+       }
+ }
+ #else
++#ifdef DONATE_REMINDER
+ void BaseGui::helpDonate() {
+       qDebug("BaseGui::helpDonate");
+ 
+@@ -4530,6 +4537,7 @@
+       if (accepted != 0) *accepted = result;
+ }
+ #endif
++#endif
+ 
+ void BaseGui::helpAbout() {
+       About d(this);
+--- smplayer-17.1.0/src/basegui.h
++++ smplayer-17.1.0/src/basegui.h
+@@ -73,10 +73,6 @@
+ class ShareWidget;
+ #endif
+ 
+-#ifndef SHARE_WIDGET
+-#define DONATE_REMINDER
+-#endif
+-
+ class BaseGui : public QMainWindow
+ {
+       Q_OBJECT
+@@ -129,8 +125,8 @@
+       virtual void helpFAQ();
+       virtual void helpCLOptions();
+       virtual void helpCheckUpdates();
++#ifdef DONATE_REMINDER
+       virtual void helpDonate();
+-#ifndef SHARE_ACTIONS
+       void showHelpDonateDialog(bool * accepted = 0);
+ #endif
+       virtual void helpShowConfig();
+@@ -574,7 +570,9 @@
+       MyAction * updateYTAct;
+ #endif
+       MyAction * showConfigAct;
++#ifdef DONATE_REMINDER
+       MyAction * donateAct;
++#endif
+       MyAction * aboutThisAct;
+ 
+ #ifdef SHARE_MENU

diff --git a/media-video/smplayer/smplayer-17.10.0.ebuild 
b/media-video/smplayer/smplayer-17.10.0.ebuild
new file mode 100644
index 00000000000..af78153a643
--- /dev/null
+++ b/media-video/smplayer/smplayer-17.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5[ssl]
+       dev-qt/qtscript:5
+       dev-qt/qtsingleapplication[X,qt5]
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+       sys-libs/zlib
+       autoshutdown? ( dev-qt/qtdbus:5 )
+       mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+       || (
+               media-video/mplayer[bidi?,libass,png,X]
+               (
+                       >=media-video/mpv-0.10.0[libass,X]
+                       >=net-misc/youtube-dl-2014.11.26
+               )
+       )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # 
bug 487544
+       "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+)
+
+src_prepare() {
+       use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+       default
+
+       # Upstream Makefile sucks
+       sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+               -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+               -e '/\.\/get_svn_revision\.sh/,+2c\
+       cd src && $(DEFS) $(MAKE)' \
+               Makefile || die
+
+       # Turn off online update checker, bug #479902
+       sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+               -e 's:DEFINES += CHECK_UPGRADED:#&:' \
+               -i src/smplayer.pro || die
+
+       # Turn off intrusive share widget
+       sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+               -i src/smplayer.pro || die
+
+       # Toggle autoshutdown option which pulls in dbus, bug #524392
+       if ! use autoshutdown ; then
+               sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+                       -i src/smplayer.pro || die
+       fi
+
+       # Turn debug message flooding off
+       if ! use debug ; then
+               sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+                       -i src/smplayer.pro || die
+       fi
+
+       # MPRIS2 pulls in dbus, bug #553710
+       if ! use mpris ; then
+               sed -e 's:DEFINES += MPRIS2:#&:' \
+                       -i src/smplayer.pro || die
+       fi
+
+       # Commented out because it gives false positives
+       #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+       cd src || die
+       eqmake5
+}
+
+gen_translation() {
+       local mydir="$(qt5_get_bindir)"
+
+       ebegin "Generating $1 translation"
+       "${mydir}"/lrelease ${PN}_${1}.ts
+       eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+       default
+
+       cd src/translations || die
+       l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+       # remove unneeded copies of the GPL
+       rm -f Copying* docs/*/gpl.html || die
+       # don't install empty dirs
+       rmdir --ignore-fail-on-non-empty docs/* || die
+
+       default
+}

Reply via email to