Update to musique-1.4

OK bcallah@

audio/musique/Makefile

@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2014/10/03 10:24:42 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2014/12/01 14:35:59 dcoppa Exp $
 
 COMMENT =	graphical music player focused on a clean ui
-DISTNAME =	musique-1.3
-REVISION =	0
+DISTNAME =	musique-1.4
 CATEGORIES =	audio
 
 HOMEPAGE =	http://flavio.tordini.org/musique/

audio/musique/distinfo

@@ -1,2 +1,2 @@
-SHA256 (musique-1.3.tar.gz) = QBZDrZx1AnConUMYBgRMYm3uP+frwU0KxykXGXzdBZI=
-SIZE (musique-1.3.tar.gz) = 399750
+SHA256 (musique-1.4.tar.gz) = CN+0IBqg7cSz/k73eI5hj3VMOSHzp8HNzkDvOZl2BnA=
+SIZE (musique-1.4.tar.gz) = 390031

audio/musique/patches/patch-src_iconutils_cpp

@@ -0,0 +1,25 @@
+$OpenBSD: patch-src_iconutils_cpp,v 1.1 2014/12/01 14:35:59 dcoppa Exp $
+
+Use the Adwaita icon theme unconditionally: fixes a problem with
+minitube GUI not having icons when executed outside of a Desktop
+Environment
+
+Do not use symbolic icons
+
+--- src/iconutils.cpp.orig	Mon Dec  1 05:23:52 2014
++++ src/iconutils.cpp	Mon Dec  1 05:25:00 2014
+@@ -21,12 +21,8 @@ $END_LICENSE */
+ #include "iconutils.h"
+ 
+ QIcon IconUtils::fromTheme(const QString &name) {
+-    const QLatin1String symbolic("-symbolic");
+-    if (name.endsWith(symbolic)) return QIcon::fromTheme(name);
+-    QIcon icon;
+-    icon = QIcon::fromTheme(name + symbolic);
+-    if (icon.isNull()) return QIcon::fromTheme(name);
+-    return icon;
++    QIcon::setThemeName("Adwaita");
++    return QIcon::fromTheme(name);
+ }
+ 
+ QIcon IconUtils::fromResources(const QString &name) {

audio/musique/patches/patch-src_mainwindow_cpp

@@ -1,20 +1,15 @@
-$OpenBSD: patch-src_mainwindow_cpp,v 1.1 2013/11/26 14:53:33 bcallah Exp $
+$OpenBSD: patch-src_mainwindow_cpp,v 1.2 2014/12/01 14:35:59 dcoppa 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() {
+--- src/mainwindow.cpp.orig	Mon Dec  1 05:25:29 2014
++++ src/mainwindow.cpp	Mon Dec  1 05:26:10 2014
+@@ -192,7 +192,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");
+-    QIcon icon = IconUtils::icon(QStringList() << "audio-headphones" << "gtk-info" << "help-about");
++    QIcon icon = IconUtils::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));

audio/musique/patches/patch-src_utils_cpp

@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_utils_cpp,v 1.3 2014/10/03 10:24:42 dcoppa Exp $
-
-Use the Adwaita icon theme unconditionally: fixes a problem with
-musique GUI not having icons when executed outside of a Desktop
-Environment.
-
-This fix is identical to the one in www/minitube, which is by
-the same author.
-
---- 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 Utils::themeIcon(const QString &name) {
-+    QIcon::setThemeName("Adwaita");
-     if (QIcon::hasThemeIcon(name))
-         return QIcon::fromTheme(name);
-     else

audio/musique/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2013/11/26 14:53:33 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.3 2014/12/01 14:35:59 dcoppa Exp $
 @bin bin/musique
 share/applications/musique.desktop
 share/icons/hicolor/128x128/apps/musique.png
@@ -24,6 +24,7 @@ share/musique/locale/da.qm
 share/musique/locale/de.qm
 share/musique/locale/el.qm
 share/musique/locale/en.qm
+share/musique/locale/en_GB.qm
 share/musique/locale/es.qm
 share/musique/locale/es_ES.qm
 share/musique/locale/es_MX.qm