Index: head/audio/gogglesmm/Makefile =================================================================== --- head/audio/gogglesmm/Makefile (revision 447010) +++ head/audio/gogglesmm/Makefile (revision 447011) @@ -1,108 +1,107 @@ # Created by: Sascha Klauder # $FreeBSD$ PORTNAME= gogglesmm -PORTVERSION= 1.1.7 -PORTREVISION= 2 +PORTVERSION= 1.1.9 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org COMMENT= Music collection manager and player LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtag.so:audio/taglib \ libexpat.so:textproc/expat2 \ libFOX-1.7.so:x11-toolkits/fox17 BROKEN_powerpc64= fails to compile: ap_mad.cpp:358:2: \#error fixme USE_GITHUB= yes USES= cmake compiler:c++11-lib desktop-file-utils \ localbase:ldflags pkgconfig sqlite USE_XORG= ice sm x11 INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README OPTIONS_DEFINE= A52 ALSA DBUS DCA DOCS FAAD FLAC MAD NLS \ OGG OPENGL OPUS PULSEAUDIO ZLIB OPTIONS_RADIO= SSL VORBISDEC OPTIONS_RADIO_SSL= GCRYPT GNUTLS OPENSSL VORBISDEC_DESC= Vorbis decoder library OPTIONS_RADIO_VORBISDEC= TREMOR VORBIS OPTIONS_DEFAULT= DBUS FAAD FLAC MAD OGG OPENGL OPENSSL OPUS VORBIS ZLIB OPTIONS_SUB= yes A52_LIB_DEPENDS= liba52.so:audio/liba52 A52_CMAKE_BOOL= WITH_A52 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= WITH_DBUS DCA_LIB_DEPENDS= libdca.so:multimedia/libdca DCA_CMAKE_BOOL= WITH_DCA FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CMAKE_BOOL= WITH_FAAD FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= OGG GCRYPT_DESC= MD5 calculation via libgcrypt (no https) GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CMAKE_BOOL= WITH_GCRYPT GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CMAKE_BOOL= WITH_GNUTLS MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CMAKE_BOOL= WITH_MAD NLS_USES= gettext NLS_CMAKE_BOOL= WITH_NLS OGG_LIB_DEPENDS= libogg.so:audio/libogg OGG_CMAKE_BOOL= WITH_OGG OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy OPENGL_USE= GL=gl,glu OPENGL_CMAKE_BOOL= WITH_OPENGL OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= WITH_OPENSSL OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CMAKE_BOOL= WITH_OPUS OPUS_IMPLIES= OGG PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor TREMOR_CMAKE_BOOL= WITH_TREMOR TREMOR_IMPLIES= OGG VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CMAKE_BOOL= WITH_VORBIS VORBIS_IMPLIES= OGG ZLIB_CMAKE_BOOL= WITH_ZLIB .include .if ${PORT_OPTIONS:MOGG} && !${PORT_OPTIONS:MTREMOR} && !${PORT_OPTIONS:MVORBIS} IGNORE= you have selected an option that requires a Vorbis decoder. Run 'make config' and select one .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/audio/gogglesmm/distinfo =================================================================== --- head/audio/gogglesmm/distinfo (revision 447010) +++ head/audio/gogglesmm/distinfo (revision 447011) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491505558 -SHA256 (gogglesmm-gogglesmm-1.1.7_GH0.tar.gz) = 20587b61adcd6d0a9f1cfc026157c963e1308a6d190749d8c4f384c48168985f -SIZE (gogglesmm-gogglesmm-1.1.7_GH0.tar.gz) = 1419429 +TIMESTAMP = 1501574671 +SHA256 (gogglesmm-gogglesmm-1.1.9_GH0.tar.gz) = fb1d4d4d14bfedb21821a41798b9abc81c9c8b2f7e028e6f3d828b6d58059dde +SIZE (gogglesmm-gogglesmm-1.1.9_GH0.tar.gz) = 1419421 Index: head/audio/gogglesmm/files/patch-src-GMDatabase.h =================================================================== --- head/audio/gogglesmm/files/patch-src-GMDatabase.h (revision 447010) +++ head/audio/gogglesmm/files/patch-src-GMDatabase.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/GMDatabase.h.orig 2017-03-29 02:18:22 UTC -+++ src/GMDatabase.h -@@ -21,7 +21,7 @@ - - struct sqlite3_stmt; - struct sqlite3; --typedef struct Mem sqlite3_value; -+typedef struct sqlite3_value sqlite3_value; - struct sqlite3_context; - - Property changes on: head/audio/gogglesmm/files/patch-src-GMDatabase.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/gogglesmm/files/patch-src_CMakeLists.txt =================================================================== --- head/audio/gogglesmm/files/patch-src_CMakeLists.txt (revision 447010) +++ head/audio/gogglesmm/files/patch-src_CMakeLists.txt (revision 447011) @@ -1,28 +1,11 @@ ---- src/CMakeLists.txt.orig 2017-02-08 01:48:39 UTC +--- src/CMakeLists.txt.orig 2017-06-10 02:18:06 UTC +++ src/CMakeLists.txt -@@ -55,13 +55,14 @@ if(WITH_OPENGL) - endif() +@@ -62,7 +62,7 @@ endif() - if(WITH_NLS) -+ find_package(Intl REQUIRED) - set(HAVE_NLS 1) - endif() - - # Detects reswrap version -find_program(RESWRAP NAMES reswrap-1.7 reswrap fox-reswrap) +find_program(RESWRAP NAMES reswrap-1.7 reswrap fox-reswrap PATH_SUFFIXES fox-1.7) if(RESWRAP) message(STATUS "Found reswrap: ${RESWRAP}") execute_process(COMMAND ${RESWRAP} -v OUTPUT_VARIABLE RESWRAP_OUTPUT) -@@ -339,6 +340,7 @@ target_link_libraries(gogglesmm PRIVATE - ${EPOXY_LIBRARIES} - ${X11_LIBRARIES} - ${SM_LIBRARIES} -- ${ICE_LIBRARIES}) -+ ${ICE_LIBRARIES} -+ ${Intl_LIBRARY}) - - install(TARGETS gogglesmm RUNTIME DESTINATION bin) -\ No newline at end of file Index: head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp =================================================================== --- head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp (revision 447010) +++ head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp (revision 447011) @@ -1,23 +1,14 @@ Re-enable tray icon for KDE4 until KDE5 is in the ports tree. Mpris plugin works, but tray icon might be wanted to minimize app in the time being. ---- src/GMPlayerManager.cpp.orig 2017-02-08 01:48:39 UTC +--- src/GMPlayerManager.cpp.orig 2017-06-10 02:18:06 UTC +++ src/GMPlayerManager.cpp -@@ -294,7 +294,7 @@ GMPlayerManager::~GMPlayerManager() { - - myself=nullptr; - --#ifdef HAVE_SSSION -+#ifdef HAVE_SESSION - delete session; - #endif - delete application; -@@ -747,7 +747,7 @@ FXint GMPlayerManager::run(int& argc,cha +@@ -757,7 +757,7 @@ FXint GMPlayerManager::run(int& argc,cha // KDE5 comes with mpris plugin on the toolbar, no need for // tray icon if (gm_desktop_session()==DESKTOP_SESSION_KDE_PLASMA) { - preferences.gui_tray_icon_disabled=true; + preferences.gui_tray_icon_disabled=false; } /// Grab Media Player Keys