On Tuesday 19 October 2010 12:22:41 David Coppa wrote: > Hi all, > the following diff updates minitube to version 1.2. > > It should also fix the problem reported by Antti Harri with minitube not > having icons under KDE3. > > Please test
Hi. I did a similar diff myself, but without the iconloader part. The mute button's icon is still missing, although the button works. It's the same with your diff and mine. Am I remembering correctly that the problem was that it tries to load an icon that isn't available in the kde3's theme? -- Antti Harri > > cheers, > david > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/minitube/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- Makefile 26 Aug 2010 21:30:42 -0000 1.5 > +++ Makefile 19 Oct 2010 09:13:28 -0000 > @@ -2,8 +2,7 @@ > > 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 > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/minitube/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 2 Aug 2010 07:23:04 -0000 1.2 > +++ distinfo 19 Oct 2010 09:13:28 -0000 > @@ -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 > Index: patches/patch-src_MainWindow_cpp > =================================================================== > RCS file: /cvs/ports/www/minitube/patches/patch-src_MainWindow_cpp,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-src_MainWindow_cpp > --- patches/patch-src_MainWindow_cpp 2 Aug 2010 07:23:04 -0000 1.2 > +++ patches/patch-src_MainWindow_cpp 19 Oct 2010 09:13:28 -0000 > @@ -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() { > +--- 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() { > Index: patches/patch-src_iconloader_qticonloader_cpp > =================================================================== > RCS file: patches/patch-src_iconloader_qticonloader_cpp > diff -N patches/patch-src_iconloader_qticonloader_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_iconloader_qticonloader_cpp 19 Oct 2010 09:13:28 > -0000 @@ -0,0 +1,30 @@ > +$OpenBSD$ > + > +Use the gnome icon theme unconditionally: fixes a problem with minitube > +appearing without icons under KDE3 > + > +--- src/iconloader/qticonloader.cpp.orig Tue Oct 19 10:44:32 2010 > ++++ src/iconloader/qticonloader.cpp Tue Oct 19 10:48:34 2010 > +@@ -85,8 +85,10 @@ class QtIconLoaderImplementation (private) > + mutable QHash <QString, QIconTheme> themeList; > + }; > + > ++#if QT_VERSION < 0x040600 > + Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoaderInstance) > + #endif > ++#endif > + > + /*! > + > +@@ -183,6 +185,11 @@ void QtIconLoaderImplementation::lookupIconTheme() > con + > + 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 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/minitube/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pkg/PLIST 2 Aug 2010 07:23:04 -0000 1.2 > +++ pkg/PLIST 19 Oct 2010 09:13:28 -0000 > @@ -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
