Hi all,

Bugfix update to minitube-1.4.2

Somebody erroneously removed a chunk from
patch-src_iconloader_qticonloader_cpp in a previous commit...

Cheers!
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/minitube/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    19 Mar 2011 14:38:44 -0000      1.10
+++ Makefile    26 Apr 2011 12:20:54 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      standalone YouTube.com video browser/player
 
-DISTNAME =     minitube-1.4.1
+DISTNAME =     minitube-1.4.2
 CATEGORIES =   www multimedia
 
 HOMEPAGE =     http://flavio.tordini.org/minitube
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/minitube/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    19 Mar 2011 14:38:44 -0000      1.6
+++ distinfo    26 Apr 2011 12:20:54 -0000
@@ -1,5 +1,5 @@
-MD5 (minitube-1.4.1.tar.gz) = GAukr5TR3kJZm5cgkYfvUQ==
-RMD160 (minitube-1.4.1.tar.gz) = nXpIRAOf3uSMhogbFHRhukmLaSI=
-SHA1 (minitube-1.4.1.tar.gz) = Z1hiPqpibHKkBakCjjvFWF36d58=
-SHA256 (minitube-1.4.1.tar.gz) = MPBPZqp811wHVWhPshC67sZ4M3We8Wl8orqgOP6mtVc=
-SIZE (minitube-1.4.1.tar.gz) = 481945
+MD5 (minitube-1.4.2.tar.gz) = dx1q8X/k5BVn0FZj/g2wPA==
+RMD160 (minitube-1.4.2.tar.gz) = EDzkkGCikgoBSP3p2rtbILl+nRM=
+SHA1 (minitube-1.4.2.tar.gz) = I1TxrS6bBstr5QjIN43gwOBxmIc=
+SHA256 (minitube-1.4.2.tar.gz) = Ppv5noTvAZHkioE0Zq2Jtp6mEwBtFmyFZQQAnKwItvw=
+SIZE (minitube-1.4.2.tar.gz) = 486529
Index: patches/patch-src_iconloader_qticonloader_cpp
===================================================================
RCS file: 
/cvs/ports/www/minitube/patches/patch-src_iconloader_qticonloader_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_iconloader_qticonloader_cpp
--- patches/patch-src_iconloader_qticonloader_cpp       19 Mar 2011 14:38:44 
-0000      1.2
+++ patches/patch-src_iconloader_qticonloader_cpp       26 Apr 2011 12:20:54 
-0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-src_iconloader_qticonloa
 Use the gnome icon theme unconditionally: fixes a problem with minitube
 GUI not having icons under fvwm/cwm/kde3/...
 
---- src/iconloader/qticonloader.cpp.orig       Thu Mar 17 00:07:11 2011
-+++ src/iconloader/qticonloader.cpp    Thu Mar 17 18:31:40 2011
+--- src/iconloader/qticonloader.cpp.orig       Fri Apr 15 17:09:19 2011
++++ src/iconloader/qticonloader.cpp    Tue Apr 26 14:13:20 2011
 @@ -104,7 +104,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader
      QIcon icon;
  
@@ -23,7 +23,12 @@ GUI not having icons under fvwm/cwm/kde3
          icon = QIcon(QString(":/images/%1.png").arg(name));
          if (!icon.isNull()) {
              icon.addPixmap(QString(":/images/%1_active.png").arg(name), 
QIcon::Active);
-@@ -183,6 +179,10 @@ void QtIconLoaderImplementation::lookupIconTheme() con
+@@ -179,10 +175,14 @@ 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(':'));

Reply via email to