From 447e0afcb9a3929ff85c903b96d8ce20ec1eff5e Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 4 Nov 2014 16:24:11 +0100 Subject: [PATCH] minitube: clean deps Add patches via OpenBSD to fix a problem with minitube GUI not having icons when executed outside of a desktop environment. --- .../minitube/patches/patch-src_iconutils_cpp | 25 +++++++++++++++++++ .../minitube/patches/patch-src_mainwindow_cpp | 15 +++++++++++ srcpkgs/minitube/template | 8 +++--- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/minitube/patches/patch-src_iconutils_cpp create mode 100644 srcpkgs/minitube/patches/patch-src_mainwindow_cpp diff --git a/srcpkgs/minitube/patches/patch-src_iconutils_cpp b/srcpkgs/minitube/patches/patch-src_iconutils_cpp new file mode 100644 index 00000000000..fa7a269c778 --- /dev/null +++ b/srcpkgs/minitube/patches/patch-src_iconutils_cpp @@ -0,0 +1,25 @@ +$OpenBSD: patch-src_iconutils_cpp,v 1.1 2014/10/29 08:18:23 dcoppa Exp $ + +Use the Adwaita icon theme unconditionally: fixes a problem with +minitube GUI not having icons when executed outside of a Desktop +Environment + +Do not use symbolic icons + +--- src/iconutils.cpp.orig Thu Oct 23 12:47:15 2014 ++++ src/iconutils.cpp Sat Oct 25 19:55:31 2014 +@@ -21,12 +21,8 @@ $END_LICENSE */ + #include "iconutils.h" + + QIcon IconUtils::fromTheme(const QString &name) { +- const QLatin1String symbolic("-symbolic"); +- if (name.endsWith(symbolic)) return QIcon::fromTheme(name); +- QIcon icon; +- icon = QIcon::fromTheme(name + symbolic); +- if (icon.isNull()) return QIcon::fromTheme(name); +- return icon; ++ QIcon::setThemeName("Adwaita"); ++ return QIcon::fromTheme(name); + } + + QIcon IconUtils::fromResources(const QString &name) { diff --git a/srcpkgs/minitube/patches/patch-src_mainwindow_cpp b/srcpkgs/minitube/patches/patch-src_mainwindow_cpp new file mode 100644 index 00000000000..ceb3004c46c --- /dev/null +++ b/srcpkgs/minitube/patches/patch-src_mainwindow_cpp @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_mainwindow_cpp,v 1.3 2014/10/30 13:59:44 dcoppa Exp $ + +Do not use symbolic icons + +--- src/mainwindow.cpp.orig Thu Dec 19 00:37:27 2013 ++++ src/mainwindow.cpp Fri Feb 7 16:50:08 2014 +@@ -565,7 +565,7 @@ void MainWindow::createActions() { + action = new QAction(tr("More..."), this); + actions->insert("more-region", action); + +- action = new QAction(IconUtils::icon("view-list"), tr("&Related Videos"), this); ++ action = new QAction(IconUtils::icon("format-justify-fill"), tr("&Related Videos"), this); + action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + action->setStatusTip(tr("Watch videos related to the current one")); + action->setEnabled(false); diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template index 853754c8851..b8b93c6ba3c 100644 --- a/srcpkgs/minitube/template +++ b/srcpkgs/minitube/template @@ -1,13 +1,13 @@ # Template file for 'minitube' pkgname=minitube version=2.3 -revision=1 +revision=2 wrksrc=$pkgname -makedepends="qt-devel phonon-devel desktop-file-utils hicolor-icon-theme phonon-backend-gstreamer" +makedepends="qt-devel phonon-devel" depends="virtual?phonon-backend desktop-file-utils hicolor-icon-theme" -short_desc="A native YouTube client in QT" +short_desc="A native YouTube client in Qt4" maintainer="Juan RP " -license="GPL-2" +license="GPL-3" homepage="http://flavio.tordini.org/minitube" distfiles="http://flavio.tordini.org/files/$pkgname/${pkgname}-${version}.tar.gz" checksum=7fb24e295dc3e2f4ce41add1ef71c7b1fef57383578f46af8e271710c86c2247