From 3e146c0eaf329b266e75df7903aeb0fa7c749b02 Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Sat, 23 Oct 2010 09:23:09 +0000
Subject: [PATCH] Update to minitube-1.2. While here, fix the problem with
 missing icons.

"go ahead" jasper@
---
 www/minitube/Makefile                         |  8 +--
 www/minitube/distinfo                         | 10 ++--
 www/minitube/patches/patch-src_MainWindow_cpp |  8 +--
 .../patch-src_iconloader_qticonloader_cpp     | 51 +++++++++++++++++++
 www/minitube/pkg/PLIST                        |  3 +-
 5 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 www/minitube/patches/patch-src_iconloader_qticonloader_cpp

diff --git a/www/minitube/Makefile b/www/minitube/Makefile
index 0b9cc720eda..b732e37a3f8 100644
--- a/www/minitube/Makefile
+++ b/www/minitube/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2010/08/26 21:30:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/10/23 09:23:09 dcoppa Exp $
 
 COMMENT =	standalone YouTube.com video browser/player
 
-DISTNAME =	minitube-1.1
-REVISION =	1
+DISTNAME =	minitube-1.2
 CATEGORIES =	www multimedia
 
 HOMEPAGE =	http://flavio.tordini.org/minitube
@@ -38,4 +37,7 @@ FAKE_FLAGS =	INSTALL_ROOT=${WRKINST}
 do-configure:
 	cd ${WRKDIST} && env -i ${CONFIGURE_ENV} qmake4 PREFIX=${PREFIX}
 
+post-configure:
+	${SUBST_CMD} ${WRKSRC}/src/iconloader/qticonloader.cpp
+
 .include <bsd.port.mk>
diff --git a/www/minitube/distinfo b/www/minitube/distinfo
index 89344b52c50..702b6c8fd7e 100644
--- a/www/minitube/distinfo
+++ b/www/minitube/distinfo
@@ -1,5 +1,5 @@
-MD5 (minitube-1.1.tar.gz) = B1hBMiYxSGqLtpV17AX1yg==
-RMD160 (minitube-1.1.tar.gz) = onwuY7j8B/O6Th2iiGGuV7a7oMs=
-SHA1 (minitube-1.1.tar.gz) = RTHkIda63h6EIqqAQaEwBbHqXns=
-SHA256 (minitube-1.1.tar.gz) = E+6kefz032cJK4j3UlILHzmdFHd+skkBiyM1ZnXKYFg=
-SIZE (minitube-1.1.tar.gz) = 206135
+MD5 (minitube-1.2.tar.gz) = wOK643zoT6xQWVDtGysfNg==
+RMD160 (minitube-1.2.tar.gz) = Idf9LzhyR3eqHNW5H+wHzD+heVg=
+SHA1 (minitube-1.2.tar.gz) = +LHf8cuPJHsSChft8xPzBNryDtw=
+SHA256 (minitube-1.2.tar.gz) = V7au4U3T5WNI2Pm8HDkg2MhxLkMtAG0TvQgfE5/R24w=
+SIZE (minitube-1.2.tar.gz) = 231768
diff --git a/www/minitube/patches/patch-src_MainWindow_cpp b/www/minitube/patches/patch-src_MainWindow_cpp
index 11778c5dc48..1430de04ea0 100644
--- a/www/minitube/patches/patch-src_MainWindow_cpp
+++ b/www/minitube/patches/patch-src_MainWindow_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2010/08/02 07:23:04 dcoppa Exp $
---- src/MainWindow.cpp.orig	Tue Jul 27 00:39:16 2010
-+++ src/MainWindow.cpp	Thu Jul 29 19:26:37 2010
-@@ -478,7 +478,9 @@ void MainWindow::visitSite() {
+$OpenBSD: patch-src_MainWindow_cpp,v 1.3 2010/10/23 09:23:09 dcoppa Exp $
+--- src/MainWindow.cpp.orig	Mon Oct 11 23:44:46 2010
++++ src/MainWindow.cpp	Tue Oct 19 09:34:23 2010
+@@ -559,7 +559,9 @@ void MainWindow::visitSite() {
  }
  
  void MainWindow::donate() {
diff --git a/www/minitube/patches/patch-src_iconloader_qticonloader_cpp b/www/minitube/patches/patch-src_iconloader_qticonloader_cpp
new file mode 100644
index 00000000000..357e5914024
--- /dev/null
+++ b/www/minitube/patches/patch-src_iconloader_qticonloader_cpp
@@ -0,0 +1,51 @@
+$OpenBSD: patch-src_iconloader_qticonloader_cpp,v 1.1 2010/10/23 09:23:09 dcoppa Exp $
+
+Use the gnome icon theme unconditionally: fixes a problem with minitube
+GUI not having icons under fvwm/cwm/kde3/...
+
+--- src/iconloader/qticonloader.cpp.orig	Mon Oct 11 23:44:46 2010
++++ src/iconloader/qticonloader.cpp	Fri Oct 22 10:32:08 2010
+@@ -104,7 +104,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader
+     QIcon icon;
+ 
+ #ifdef Q_WS_X11
+-#if QT_VERSION < 0x040600
+     QString pngExtension(QLatin1String(".png"));
+     QList<int> iconSizes;
+     iconSizes << 16 << 22 << 24 << 32 << 48;
+@@ -112,9 +111,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader
+         icon.addPixmap(iconLoaderInstance()->findIcon(size, name));
+     }
+ #else
+-    icon = QIcon::fromTheme(name);
+-#endif
+-#else
+         icon = QIcon(QString(":/images/%1.png").arg(name));
+         if (!icon.isNull()) {
+             icon.addPixmap(QString(":/images/%1_active.png").arg(name), QIcon::Active);
+@@ -179,11 +175,15 @@ void QtIconLoaderImplementation::lookupIconTheme() con
+ #ifdef Q_WS_X11
+     QString dataDirs = QFile::decodeName(getenv("XDG_DATA_DIRS"));
+     if (dataDirs.isEmpty())
+-        dataDirs = QLatin1String("/usr/local/share/:/usr/share/");
++        dataDirs = QLatin1String("${LOCALBASE}/share/:/usr/share/");
+     
+     dataDirs.prepend(QDir::homePath() + QLatin1String("/:"));
+     iconDirs = dataDirs.split(QLatin1Char(':'));
+     
++    if (themeName.isEmpty())
++        themeName = QLatin1String("gnome");
++    return;
++    
+     // If we are running GNOME we resolve and use GConf. In all other
+     // cases we currently use the KDE icon theme
+     
+@@ -228,7 +228,7 @@ void QtIconLoaderImplementation::lookupIconTheme() con
+     
+     // KDE (and others)
+     if (dataDirs.isEmpty())
+-        dataDirs = QLatin1String("/usr/local/share/:/usr/share/");
++        dataDirs = QLatin1String("${LOCALBASE}/share/:/usr/share/");
+     
+     dataDirs += QLatin1Char(':') + kdeHome() + QLatin1String("/share");
+     dataDirs.prepend(QDir::homePath() + QLatin1String("/:"));
diff --git a/www/minitube/pkg/PLIST b/www/minitube/pkg/PLIST
index e6f3c5a8624..584992b3cb3 100644
--- a/www/minitube/pkg/PLIST
+++ b/www/minitube/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/08/02 07:23:04 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/10/23 09:23:09 dcoppa Exp $
 @bin bin/minitube
 share/applications/minitube.desktop
 share/icons/
@@ -34,6 +34,7 @@ share/minitube/locale/bg_BG.qm
 share/minitube/locale/cs_CZ.qm
 share/minitube/locale/de_DE.qm
 share/minitube/locale/el_GR.qm
+share/minitube/locale/en_US.qm
 share/minitube/locale/es.qm
 share/minitube/locale/fi_FI.qm
 share/minitube/locale/fr_FR.qm