Re: [UPDATE] minitube-1.2
On Wed, Oct 20, 2010 at 8:22 PM, Jacob Meuser wrote:
> hmm. is this because we don't have the icons or because the paths
> are hardcoded for /usr instead of /usr/local, or what?
My patch is needed because minitube does some "smart" decisions about
the icon theme it wants to use.
Under gnome, it checks if the GNOME_DESKTOP_SESSION_ID environment
variable is present and then uses GConf to determine which icon theme
to use. Or it checks for KDEHOME to see if you're using KDE and so
on... This doesn't work on "legacy" window managers like fvwm or cwm,
as you've seen. And with kde3 the icons are missing too (maybe kde4
has them but "crystalsvg", the default kde3 icon theme, does not).
So I've patched the code to use the gnome icon theme unconditionally,
since it's already listed as a runtime dependency of the port.
I've attached a shorter version of my patch, if you thought the
previous one was kinda "intrusive"...
ciao,
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 - 1.5
+++ Makefile 21 Oct 2010 18:11:28 -
@@ -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 - 1.2
+++ distinfo 21 Oct 2010 18:11:28 -
@@ -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 - 1.2
+++ patches/patch-src_MainWindow_cpp 21 Oct 2010 18:11:28 -
@@ -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 -
+++ patches/patch-src_iconloader_qticonloader_cpp 21 Oct 2010 18:11:28 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- src/iconloader/qticonloader.cpp.orig Mon Oct 11 23:44:46 2010
src/iconloader/qticonloader.cpp Thu Oct 21 20:04:40 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 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);
+@@ -183,6 +179,10 @@ 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 - 1.2
+++ pkg/PLIST 21 Oct 2010 18:11:28 -
@@ -34,6 +34,7 @@ share/minitube/locale/bg_BG.qm
sha
Re: [UPDATE] minitube-1.2
On Wed, Oct 20, 2010 at 03:06:59PM +0200, David Coppa wrote:
> On Wed, 20 Oct 2010, Jacob Meuser wrote:
>
> > On Tue, Oct 19, 2010 at 11:22:41AM +0200, 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
> >
> > works for me, video downloads too, though I don't see the mute icon.
> > using fvwm if that matters.
>
> Second revision of this diff attached.
>
> Please try this, it fixes missing icons problem for me.
hmm. is this because we don't have the icons or because the paths
are hardcoded for /usr instead of /usr/local, or what?
> 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 - 1.5
> +++ Makefile 20 Oct 2010 13:00:02 -
> @@ -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 - 1.2
> +++ distinfo 20 Oct 2010 13:00:02 -
> @@ -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 - 1.2
> +++ patches/patch-src_MainWindow_cpp 20 Oct 2010 13:00:02 -
> @@ -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 -
> +++ patches/patch-src_iconloader_qticonloader_cpp 20 Oct 2010 13:00:02
> -
> @@ -0,0 +1,164 @@
> +$OpenBSD$
> +
> +Use the gnome icon theme unconditionally: fixes a problem with minitube
> +GUI not having icons.
> +
> +--- src/iconloader/qticonloader.cpp.orig Mon Oct 11 23:44:46 2010
> src/iconloader/qticonloader.cpp Wed Oct 20 14:23:44 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 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);
> +@@ -132,47 +128,6 @@ QtIconLoaderImplementation::QtIconLoaderImplementation
> + lookupIconTheme();
> + }
> +
> +-extern "C" {
> +-struct GConfClient;
> +-struct GError;
> +-typedef void (*Ptr_g_type_init)();
> +-typedef GConfClient* (*Ptr_gconf_client_get_default)();
> +-typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*,
> GError **);
> +-typedef void (*Ptr_g_object_unref)(void *);
> +-typedef void (*Ptr_g_error_free)(GError *);
> +-typedef void (*Ptr_g_free)(void*);
> +-static Ptr_g_type_init p_g_type_init = 0;
> +-static Pt
Re: [UPDATE] minitube-1.2
Works here too. On 10/20/10 11:35, David Coppa wrote: > On Wed, Oct 20, 2010 at 4:30 PM, Antti Harri wrote: >> On Wednesday 20 October 2010 16:06:59 David Coppa wrote: >>> Second revision of this diff attached. >>> >>> Please try this, it fixes missing icons problem for me. >> >> Cool! This works. > > Great news. Thanks for testing it. > -- Sending from my Computer.
Re: [UPDATE] minitube-1.2
On Wed, Oct 20, 2010 at 4:30 PM, Antti Harri wrote: > On Wednesday 20 October 2010 16:06:59 David Coppa wrote: >> Second revision of this diff attached. >> >> Please try this, it fixes missing icons problem for me. > > Cool! This works. Great news. Thanks for testing it.
Re: [UPDATE] minitube-1.2
On Wednesday 20 October 2010 16:06:59 David Coppa wrote: > Second revision of this diff attached. > > Please try this, it fixes missing icons problem for me. Cool! This works. -- Antti Harri
Re: [UPDATE] minitube-1.2
On Wed, 20 Oct 2010, Jacob Meuser wrote:
> On Tue, Oct 19, 2010 at 11:22:41AM +0200, 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
>
> works for me, video downloads too, though I don't see the mute icon.
> using fvwm if that matters.
Second revision of this diff attached.
Please try this, it fixes missing icons problem for me.
Cheers,
david
Index: Makefile
===
RCS file: /cvs/ports/www/minitube/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile26 Aug 2010 21:30:42 - 1.5
+++ Makefile20 Oct 2010 13:00:02 -
@@ -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
--- distinfo2 Aug 2010 07:23:04 - 1.2
+++ distinfo20 Oct 2010 13:00:02 -
@@ -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_cpp2 Aug 2010 07:23:04 - 1.2
+++ patches/patch-src_MainWindow_cpp20 Oct 2010 13:00:02 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2010/08/02 07:23:04 dcoppa Exp $
src/MainWindow.cpp.origTue 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.origMon 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 -
+++ patches/patch-src_iconloader_qticonloader_cpp 20 Oct 2010 13:00:02
-
@@ -0,0 +1,164 @@
+$OpenBSD$
+
+Use the gnome icon theme unconditionally: fixes a problem with minitube
+GUI not having icons.
+
+--- src/iconloader/qticonloader.cpp.orig Mon Oct 11 23:44:46 2010
src/iconloader/qticonloader.cppWed Oct 20 14:23:44 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 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);
+@@ -132,47 +128,6 @@ QtIconLoaderImplementation::QtIconLoaderImplementation
+ lookupIconTheme();
+ }
+
+-extern "C" {
+-struct GConfClient;
+-struct GError;
+-typedef void (*Ptr_g_type_init)();
+-typedef GConfClient* (*Ptr_gconf_client_get_default)();
+-typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*,
GError **);
+-typedef void (*Ptr_g_object_unref)(void *);
+-typedef void (*Ptr_g_error_free)(GError *);
+-typedef void (*Ptr_g_free)(void*);
+-static Ptr_g_type_init p_g_type_init = 0;
+-static Ptr_gconf_client_get_default p_gconf_client_get_default = 0;
+-static Ptr_gconf_client_get_string p_gconf_client_get_string = 0;
+-static Ptr_g_object_unref p_g_object_unref = 0;
+-static Ptr_g_error_free p_g_error_free = 0;
+-static Ptr_g_free p_g_free = 0;
+-}
+-
+-
+-static int kdeVersion()
+-{
+-static int version = qgetenv("KDE_SESSION_VERSION").toInt();
+-return version;
+-}
Re: [UPDATE] minitube-1.2
On Tue, Oct 19, 2010 at 11:22:41AM +0200, 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
works for me, video downloads too, though I don't see the mute icon.
using fvwm if that matters.
> 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 - 1.5
> +++ Makefile 19 Oct 2010 09:13:28 -
> @@ -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 - 1.2
> +++ distinfo 19 Oct 2010 09:13:28 -
> @@ -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 - 1.2
> +++ patches/patch-src_MainWindow_cpp 19 Oct 2010 09:13:28 -
> @@ -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 -
> +++ patches/patch-src_iconloader_qticonloader_cpp 19 Oct 2010 09:13:28
> -
> @@ -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 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 - 1.2
> +++ pkg/PLIST 19 Oct 2010 09:13:28 -
> @@ -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
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Re: [UPDATE] minitube-1.2
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 - 1.5
> +++ Makefile 19 Oct 2010 09:13:28 -
> @@ -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 - 1.2
> +++ distinfo 19 Oct 2010 09:13:28 -
> @@ -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 - 1.2
> +++ patches/patch-src_MainWindow_cpp 19 Oct 2010 09:13:28 -
> @@ -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 -
> +++ patches/patch-src_iconloader_qticonloader_cpp 19 Oct 2010 09:13:28
> - @@ -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 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 - 1.2
> +++ pkg/PLIST 19 Oct 2010 09:13:28 -
> @@ -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
[UPDATE] minitube-1.2
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
cheers,
david
Index: Makefile
===
RCS file: /cvs/ports/www/minitube/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile26 Aug 2010 21:30:42 - 1.5
+++ Makefile19 Oct 2010 09:13:28 -
@@ -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
--- distinfo2 Aug 2010 07:23:04 - 1.2
+++ distinfo19 Oct 2010 09:13:28 -
@@ -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_cpp2 Aug 2010 07:23:04 - 1.2
+++ patches/patch-src_MainWindow_cpp19 Oct 2010 09:13:28 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_MainWindow_cpp,v 1.2 2010/08/02 07:23:04 dcoppa Exp $
src/MainWindow.cpp.origTue 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.origMon 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 -
+++ patches/patch-src_iconloader_qticonloader_cpp 19 Oct 2010 09:13:28
-
@@ -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.cppTue Oct 19 10:48:34 2010
+@@ -85,8 +85,10 @@ class QtIconLoaderImplementation (private)
+ mutable QHash 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 - 1.2
+++ pkg/PLIST 19 Oct 2010 09:13:28 -
@@ -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
