On Tue, Feb 05, 2013 at 10:36:32AM +0100, David Coppa wrote: > > Hi! > > Here's an update to minitube-2.0. > > Lots of bugfixes and enhancements. Seems faster too... > > See: http://flavio.tordini.org/minitube-2-0
I'll test as soon as my transition to a new harddrive finishes. It reads okay to me and I'm sure happy to see a lot of patches were ditched in the process. > > Ciao, > David > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/minitube/Makefile,v > retrieving revision 1.25 > diff -u -p -r1.25 Makefile > --- Makefile 9 Dec 2012 07:29:57 -0000 1.25 > +++ Makefile 5 Feb 2013 09:23:32 -0000 > @@ -2,8 +2,7 @@ > > COMMENT = standalone YouTube.com video browser/player > > -DISTNAME = minitube-1.9 > -REVISION = 0 > +DISTNAME = minitube-2.0 > CATEGORIES = www multimedia > > HOMEPAGE = http://flavio.tordini.org/minitube > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/minitube/distinfo,v > retrieving revision 1.14 > diff -u -p -r1.14 distinfo > --- distinfo 27 Sep 2012 20:35:49 -0000 1.14 > +++ distinfo 5 Feb 2013 09:23:32 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (minitube-1.9.tar.gz) = i5Q3sQew2K7LyK9GJL4SYxFdRnnMhq489cLOs2rJFnU= > -SIZE (minitube-1.9.tar.gz) = 608884 > +SHA256 (minitube-2.0.tar.gz) = G6HddyXm4MkmU/3ue8+kuDM0bS70wJHZSxgbYLtZJVQ= > +SIZE (minitube-2.0.tar.gz) = 713577 > Index: patches/patch-src_MainWindow_cpp > =================================================================== > RCS file: patches/patch-src_MainWindow_cpp > diff -N patches/patch-src_MainWindow_cpp > --- patches/patch-src_MainWindow_cpp 27 Sep 2012 20:35:49 -0000 1.10 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_MainWindow_cpp,v 1.10 2012/09/27 20:35:49 dcoppa Exp $ > ---- src/MainWindow.cpp.orig Thu Sep 27 12:17:03 2012 > -+++ src/MainWindow.cpp Thu Sep 27 15:34:50 2012 > -@@ -828,7 +828,9 @@ void MainWindow::visitSite() { > - } > - > - void MainWindow::donate() { > -- QUrl url(QString(Constants::WEBSITE) + "#donate"); > -+ QString duh = QString(Constants::WEBSITE); > -+ duh.append("#donate"); > -+ QUrl url(duh); > - statusBar()->showMessage(QString(tr("Opening %1").arg(url.toString()))); > - QDesktopServices::openUrl(url); > - } > Index: patches/patch-src_iconloader_qticonloader_cpp > =================================================================== > RCS file: patches/patch-src_iconloader_qticonloader_cpp > diff -N patches/patch-src_iconloader_qticonloader_cpp > --- patches/patch-src_iconloader_qticonloader_cpp 2 Jan 2012 08:35:48 > -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,41 +0,0 @@ > -$OpenBSD: patch-src_iconloader_qticonloader_cpp,v 1.5 2012/01/02 08:35:48 > 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 Fri Oct 28 22:38:22 2011 > -+++ src/iconloader/qticonloader.cpp Fri Dec 30 11:25:56 2011 > -@@ -107,7 +107,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; > -@@ -115,9 +114,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader > - icon.addPixmap(iconLoaderInstance()->findIcon(size, name)); > - } > - #else > -- icon = QIcon::fromTheme(name); > --#endif > --#else > - icon = Extra::getIcon(name); > - #endif > - > -@@ -178,10 +174,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/"); > - > - 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: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > =================================================================== > RCS file: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > diff -N patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > --- patches/patch-src_qtsingleapplication_qtlocalpeer_cpp 2 Jan 2012 > 08:39:43 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-src_qtsingleapplication_qtlocalpeer_cpp,v 1.2 2012/01/02 > 08:39:43 dcoppa Exp $ > ---- src/qtsingleapplication/qtlocalpeer.cpp.orig Fri Oct 28 22:38:22 2011 > -+++ src/qtsingleapplication/qtlocalpeer.cpp Mon Jan 2 09:36:24 2012 > -@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0 > - #endif > - #if defined(Q_OS_UNIX) > - #include <time.h> > -+#include <unistd.h> > - #endif > - > - namespace QtLP_Private { > Index: patches/patch-src_updatechecker_cpp > =================================================================== > RCS file: patches/patch-src_updatechecker_cpp > diff -N patches/patch-src_updatechecker_cpp > --- patches/patch-src_updatechecker_cpp 10 Mar 2011 22:52:15 -0000 > 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_updatechecker_cpp,v 1.2 2011/03/10 22:52:15 pirofti Exp $ > ---- src/updatechecker.cpp.orig Wed Feb 9 23:15:04 2011 > -+++ src/updatechecker.cpp Wed Feb 9 23:15:07 2011 > -@@ -11,7 +11,9 @@ UpdateChecker::UpdateChecker() { > - } > - > - void UpdateChecker::checkForUpdate() { > -- QUrl updateUrl(QString(Constants::WEBSITE) + "-ws/release.xml"); > -+ QString duh = QString(Constants::WEBSITE); > -+ duh.append("-ws/release.xml"); > -+ QUrl updateUrl(duh); > - updateUrl.addQueryItem("v", Constants::VERSION); > - > - #ifdef APP_MAC > Index: patches/patch-src_utils_cpp > =================================================================== > RCS file: patches/patch-src_utils_cpp > diff -N patches/patch-src_utils_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_utils_cpp 5 Feb 2013 09:23:32 -0000 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Use the gnome icon theme unconditionally: fixes a problem with > +minitube GUI not having icons when executed outside of a Desktop > +Environment > + > +--- src/utils.cpp.orig Tue Feb 5 10:00:26 2013 > ++++ src/utils.cpp Tue Feb 5 10:00:51 2013 > +@@ -5,6 +5,7 @@ > + > + QIcon getIcon(const QString &name) { > + #ifdef Q_WS_X11 > ++ QIcon::setThemeName("gnome"); > + return QIcon::fromTheme(name); > + #else > + return Extra::getIcon(name); > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/minitube/pkg/PLIST,v > retrieving revision 1.15 > diff -u -p -r1.15 PLIST > --- pkg/PLIST 27 Sep 2012 20:35:49 -0000 1.15 > +++ pkg/PLIST 5 Feb 2013 09:23:32 -0000 > @@ -17,6 +17,7 @@ share/minitube/locale/ > share/minitube/locale/ar.qm > share/minitube/locale/ca.qm > share/minitube/locale/ca_ES.qm > +share/minitube/locale/cs_CZ.qm > share/minitube/locale/da.qm > share/minitube/locale/de_DE.qm > share/minitube/locale/el.qm > @@ -27,31 +28,23 @@ share/minitube/locale/es_ES.qm > share/minitube/locale/fi.qm > share/minitube/locale/fi_FI.qm > share/minitube/locale/fr.qm > -share/minitube/locale/gl.qm > share/minitube/locale/he_IL.qm > share/minitube/locale/hr.qm > share/minitube/locale/hu.qm > share/minitube/locale/ia.qm > -share/minitube/locale/id.qm > share/minitube/locale/it.qm > +share/minitube/locale/ja_JP.qm > share/minitube/locale/jv.qm > -share/minitube/locale/ka_GE.qm > -share/minitube/locale/nb.qm > +share/minitube/locale/ky.qm > share/minitube/locale/nl.qm > -share/minitube/locale/nn.qm > share/minitube/locale/pl.qm > share/minitube/locale/pl_PL.qm > -share/minitube/locale/pt.qm > share/minitube/locale/pt_BR.qm > share/minitube/locale/ro.qm > share/minitube/locale/ru.qm > share/minitube/locale/sk.qm > share/minitube/locale/sl.qm > -share/minitube/locale/sq.qm > -share/minitube/locale/sr.qm > -share/minitube/locale/sv_SE.qm > share/minitube/locale/tr.qm > -share/minitube/locale/uk_UA.qm > share/minitube/locale/zh_CN.qm > @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor > @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/minitube/Makefile,v > retrieving revision 1.25 > diff -u -p -r1.25 Makefile > --- Makefile 9 Dec 2012 07:29:57 -0000 1.25 > +++ Makefile 5 Feb 2013 09:23:32 -0000 > @@ -2,8 +2,7 @@ > > COMMENT = standalone YouTube.com video browser/player > > -DISTNAME = minitube-1.9 > -REVISION = 0 > +DISTNAME = minitube-2.0 > CATEGORIES = www multimedia > > HOMEPAGE = http://flavio.tordini.org/minitube > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/minitube/distinfo,v > retrieving revision 1.14 > diff -u -p -r1.14 distinfo > --- distinfo 27 Sep 2012 20:35:49 -0000 1.14 > +++ distinfo 5 Feb 2013 09:23:32 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (minitube-1.9.tar.gz) = i5Q3sQew2K7LyK9GJL4SYxFdRnnMhq489cLOs2rJFnU= > -SIZE (minitube-1.9.tar.gz) = 608884 > +SHA256 (minitube-2.0.tar.gz) = G6HddyXm4MkmU/3ue8+kuDM0bS70wJHZSxgbYLtZJVQ= > +SIZE (minitube-2.0.tar.gz) = 713577 > Index: patches/patch-src_MainWindow_cpp > =================================================================== > RCS file: patches/patch-src_MainWindow_cpp > diff -N patches/patch-src_MainWindow_cpp > --- patches/patch-src_MainWindow_cpp 27 Sep 2012 20:35:49 -0000 1.10 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_MainWindow_cpp,v 1.10 2012/09/27 20:35:49 dcoppa Exp $ > ---- src/MainWindow.cpp.orig Thu Sep 27 12:17:03 2012 > -+++ src/MainWindow.cpp Thu Sep 27 15:34:50 2012 > -@@ -828,7 +828,9 @@ void MainWindow::visitSite() { > - } > - > - void MainWindow::donate() { > -- QUrl url(QString(Constants::WEBSITE) + "#donate"); > -+ QString duh = QString(Constants::WEBSITE); > -+ duh.append("#donate"); > -+ QUrl url(duh); > - statusBar()->showMessage(QString(tr("Opening %1").arg(url.toString()))); > - QDesktopServices::openUrl(url); > - } > Index: patches/patch-src_iconloader_qticonloader_cpp > =================================================================== > RCS file: patches/patch-src_iconloader_qticonloader_cpp > diff -N patches/patch-src_iconloader_qticonloader_cpp > --- patches/patch-src_iconloader_qticonloader_cpp 2 Jan 2012 08:35:48 > -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,41 +0,0 @@ > -$OpenBSD: patch-src_iconloader_qticonloader_cpp,v 1.5 2012/01/02 08:35:48 > 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 Fri Oct 28 22:38:22 2011 > -+++ src/iconloader/qticonloader.cpp Fri Dec 30 11:25:56 2011 > -@@ -107,7 +107,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; > -@@ -115,9 +114,6 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoader > - icon.addPixmap(iconLoaderInstance()->findIcon(size, name)); > - } > - #else > -- icon = QIcon::fromTheme(name); > --#endif > --#else > - icon = Extra::getIcon(name); > - #endif > - > -@@ -178,10 +174,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/"); > - > - 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: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > =================================================================== > RCS file: patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > diff -N patches/patch-src_qtsingleapplication_qtlocalpeer_cpp > --- patches/patch-src_qtsingleapplication_qtlocalpeer_cpp 2 Jan 2012 > 08:39:43 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-src_qtsingleapplication_qtlocalpeer_cpp,v 1.2 2012/01/02 > 08:39:43 dcoppa Exp $ > ---- src/qtsingleapplication/qtlocalpeer.cpp.orig Fri Oct 28 22:38:22 2011 > -+++ src/qtsingleapplication/qtlocalpeer.cpp Mon Jan 2 09:36:24 2012 > -@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0 > - #endif > - #if defined(Q_OS_UNIX) > - #include <time.h> > -+#include <unistd.h> > - #endif > - > - namespace QtLP_Private { > Index: patches/patch-src_updatechecker_cpp > =================================================================== > RCS file: patches/patch-src_updatechecker_cpp > diff -N patches/patch-src_updatechecker_cpp > --- patches/patch-src_updatechecker_cpp 10 Mar 2011 22:52:15 -0000 > 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_updatechecker_cpp,v 1.2 2011/03/10 22:52:15 pirofti Exp $ > ---- src/updatechecker.cpp.orig Wed Feb 9 23:15:04 2011 > -+++ src/updatechecker.cpp Wed Feb 9 23:15:07 2011 > -@@ -11,7 +11,9 @@ UpdateChecker::UpdateChecker() { > - } > - > - void UpdateChecker::checkForUpdate() { > -- QUrl updateUrl(QString(Constants::WEBSITE) + "-ws/release.xml"); > -+ QString duh = QString(Constants::WEBSITE); > -+ duh.append("-ws/release.xml"); > -+ QUrl updateUrl(duh); > - updateUrl.addQueryItem("v", Constants::VERSION); > - > - #ifdef APP_MAC > Index: patches/patch-src_utils_cpp > =================================================================== > RCS file: patches/patch-src_utils_cpp > diff -N patches/patch-src_utils_cpp > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_utils_cpp 5 Feb 2013 09:23:32 -0000 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Use the gnome icon theme unconditionally: fixes a problem with > +minitube GUI not having icons when executed outside of a Desktop > +Environment > + > +--- src/utils.cpp.orig Tue Feb 5 10:00:26 2013 > ++++ src/utils.cpp Tue Feb 5 10:00:51 2013 > +@@ -5,6 +5,7 @@ > + > + QIcon getIcon(const QString &name) { > + #ifdef Q_WS_X11 > ++ QIcon::setThemeName("gnome"); > + return QIcon::fromTheme(name); > + #else > + return Extra::getIcon(name); > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/minitube/pkg/PLIST,v > retrieving revision 1.15 > diff -u -p -r1.15 PLIST > --- pkg/PLIST 27 Sep 2012 20:35:49 -0000 1.15 > +++ pkg/PLIST 5 Feb 2013 09:23:32 -0000 > @@ -17,6 +17,7 @@ share/minitube/locale/ > share/minitube/locale/ar.qm > share/minitube/locale/ca.qm > share/minitube/locale/ca_ES.qm > +share/minitube/locale/cs_CZ.qm > share/minitube/locale/da.qm > share/minitube/locale/de_DE.qm > share/minitube/locale/el.qm > @@ -27,31 +28,23 @@ share/minitube/locale/es_ES.qm > share/minitube/locale/fi.qm > share/minitube/locale/fi_FI.qm > share/minitube/locale/fr.qm > -share/minitube/locale/gl.qm > share/minitube/locale/he_IL.qm > share/minitube/locale/hr.qm > share/minitube/locale/hu.qm > share/minitube/locale/ia.qm > -share/minitube/locale/id.qm > share/minitube/locale/it.qm > +share/minitube/locale/ja_JP.qm > share/minitube/locale/jv.qm > -share/minitube/locale/ka_GE.qm > -share/minitube/locale/nb.qm > +share/minitube/locale/ky.qm > share/minitube/locale/nl.qm > -share/minitube/locale/nn.qm > share/minitube/locale/pl.qm > share/minitube/locale/pl_PL.qm > -share/minitube/locale/pt.qm > share/minitube/locale/pt_BR.qm > share/minitube/locale/ro.qm > share/minitube/locale/ru.qm > share/minitube/locale/sk.qm > share/minitube/locale/sl.qm > -share/minitube/locale/sq.qm > -share/minitube/locale/sr.qm > -share/minitube/locale/sv_SE.qm > share/minitube/locale/tr.qm > -share/minitube/locale/uk_UA.qm > share/minitube/locale/zh_CN.qm > @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor > @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
