aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvg <vg@FreeBSD.org>2017-12-22 16:54:09 +0800
committervg <vg@FreeBSD.org>2017-12-22 16:54:09 +0800
commitbafe075775b8c0c4dcdce06668c6fb85aa340ef1 (patch)
treeffe0b71aa02dfd74e99ddd53990faa1ca420fd0e
parent26b213c25615bc9c4617d9b39ce9d05eabbfa9f0 (diff)
downloadfreebsd-ports-gnome-bafe075775b8c0c4dcdce06668c6fb85aa340ef1.tar.gz
freebsd-ports-gnome-bafe075775b8c0c4dcdce06668c6fb85aa340ef1.tar.zst
freebsd-ports-gnome-bafe075775b8c0c4dcdce06668c6fb85aa340ef1.zip
- Fix build issue on 11.x+
-rw-r--r--audio/lastfm-desktop/Makefile6
-rw-r--r--audio/lastfm-desktop/files/patch-app_client_Application.cpp11
2 files changed, 12 insertions, 5 deletions
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 8863c5e89478..5a008e8f990b 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lastfm-desktop
PORTVERSION= 2.1.36
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MAINTAINER= vg@FreeBSD.org
@@ -43,10 +43,6 @@ VLC_RUN_DEPENDS= phonon-vlc>=0.6.1:multimedia/phonon-vlc
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 1100000
-BROKEN= does not buld: Application.cpp:433:25: error: ordered comparison between pointer and zero ('void *' and 'int')
-.endif
-
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_SCRIPT} ${WRKDIR}/lastfm-desktop.sh ${STAGEDIR}${PREFIX}/bin/lastfm-desktop
diff --git a/audio/lastfm-desktop/files/patch-app_client_Application.cpp b/audio/lastfm-desktop/files/patch-app_client_Application.cpp
new file mode 100644
index 000000000000..15092c0f1b07
--- /dev/null
+++ b/audio/lastfm-desktop/files/patch-app_client_Application.cpp
@@ -0,0 +1,11 @@
+--- app/client/Application.cpp.orig 2017-12-21 08:34:38 UTC
++++ app/client/Application.cpp
+@@ -430,7 +430,7 @@ Application::showAs( bool showAs )
+ void
+ Application::setRaiseHotKey( Qt::KeyboardModifiers mods, int key )
+ {
+- if( m_raiseHotKeyId >= 0 )
++ if( m_raiseHotKeyId >= (void *)0 )
+ unInstallHotKey( m_raiseHotKeyId );
+
+ m_raiseHotKeyId = installHotKey( mods, key, m_toggle_window_action, SLOT(trigger()));