Update Musique to 1.3

Info icon patch from and ok dcoppa@
This commit is contained in:
bcallah 2013-11-26 14:53:33 +00:00
parent 5ebbf9b231
commit c937cb6b74
5 changed files with 45 additions and 17 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2013/05/28 00:12:22 bcallah Exp $
# $OpenBSD: Makefile,v 1.4 2013/11/26 14:53:33 bcallah Exp $
COMMENT = graphical music player focused on a clean ui
DISTNAME = musique-1.2.1
DISTNAME = musique-1.3
CATEGORIES = audio
REVISION = 1
HOMEPAGE = http://flavio.tordini.org/musique/
@ -28,6 +27,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+2,-guic
WRKDIST = ${WRKDIR}/musique
MAKE_FLAGS = CXX="${CXX}"
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (musique-1.2.1.tar.gz) = zA9ibX3pgf9/3Xdvueq2p3UEQ61V9peBMtnJ0Rq9Hzg=
SIZE (musique-1.2.1.tar.gz) = 374601
SHA256 (musique-1.3.tar.gz) = QBZDrZx1AnConUMYBgRMYm3uP+frwU0KxykXGXzdBZI=
SIZE (musique-1.3.tar.gz) = 399750

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_mainwindow_cpp,v 1.1 2013/11/26 14:53:33 bcallah Exp $
Fix "Info" icon
--- src/mainwindow.cpp.orig Tue Nov 26 10:51:54 2013
+++ src/mainwindow.cpp Tue Nov 26 10:52:32 2013
@@ -190,12 +190,7 @@ void MainWindow::createActions() {
actions->insert("back", backAct);
connect(backAct, SIGNAL(triggered()), SLOT(goBack()));
- QIcon icon = Utils::icon("gtk-info");
-#ifdef Q_WS_X11
- if (icon.isNull()) {
- icon = Utils::icon("help-about");
- }
-#endif
+ QIcon icon = Utils::icon("help-about");
contextualAct = new QAction(icon, tr("&Info"), this);
contextualAct->setStatusTip(tr("Show information about the current track"));
contextualAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I));

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_utils_cpp,v 1.1 2013/05/28 00:12:22 bcallah Exp $
$OpenBSD: patch-src_utils_cpp,v 1.2 2013/11/26 14:53:33 bcallah Exp $
Use the gnome icon theme unconditionally: fixes a problem with
musique GUI not having icons when executed outside of a Desktop
@ -7,13 +7,13 @@ Environment.
This fix is identical to the one in www/minitube, which is by
the same author.
--- src/utils.cpp.orig Sun May 26 12:21:35 2013
+++ src/utils.cpp Sun May 26 12:22:32 2013
@@ -5,6 +5,7 @@
--- src/utils.cpp.orig Fri Oct 11 03:42:11 2013
+++ src/utils.cpp Mon Nov 25 17:07:58 2013
@@ -24,6 +24,7 @@ $END_LICENSE */
#endif
QIcon getIcon(const QString &name) {
#ifdef Q_WS_X11
QIcon Utils::themeIcon(const QString &name) {
+ QIcon::setThemeName("gnome");
return QIcon::fromTheme(name);
#else
return Extra::getIcon(name);
if (QIcon::hasThemeIcon(name))
return QIcon::fromTheme(name);
else

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/03/19 14:43:50 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/11/26 14:53:33 bcallah Exp $
@bin bin/musique
share/applications/musique.desktop
share/icons/hicolor/128x128/apps/musique.png
@ -15,7 +15,10 @@ share/icons/hicolor/scalable/apps/musique.svg
share/musique/
share/musique/locale/
share/musique/locale/ast.qm
share/musique/locale/be.qm
share/musique/locale/bg.qm
share/musique/locale/ca.qm
share/musique/locale/ca_ES.qm
share/musique/locale/cs_CZ.qm
share/musique/locale/da.qm
share/musique/locale/de.qm
@ -23,12 +26,16 @@ share/musique/locale/el.qm
share/musique/locale/en.qm
share/musique/locale/es.qm
share/musique/locale/es_ES.qm
share/musique/locale/es_MX.qm
share/musique/locale/fa_IR.qm
share/musique/locale/fi_FI.qm
share/musique/locale/fr.qm
share/musique/locale/gl.qm
share/musique/locale/hu_HU.qm
share/musique/locale/ia.qm
share/musique/locale/it.qm
share/musique/locale/lv.qm
share/musique/locale/ky.qm
share/musique/locale/ms_MY.qm
share/musique/locale/nb.qm
share/musique/locale/nl.qm
share/musique/locale/pl.qm
@ -38,11 +45,12 @@ share/musique/locale/ro.qm
share/musique/locale/ru.qm
share/musique/locale/sk.qm
share/musique/locale/sr.qm
share/musique/locale/te.qm
share/musique/locale/tr.qm
share/musique/locale/tt.qm
share/musique/locale/uk.qm
share/musique/locale/vi.qm
share/musique/locale/zh_CN.qm
share/musique/locale/zh_TW.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
@exec %D/bin/update-desktop-database