- Fix build on -current - Support CXXFLAGS properly - Support desktop-file-utils/pathfix New file: files/patch-lib__chardetect__src__entry__impl.cpp files/patch-lib__chardetect__src__prmem.h Remove file: files/patch-free-visibility
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Tue Dec 24 16:03:44 2013 New Revision: 337367 URL: http://svnweb.freebsd.org/changeset/ports/337367 Log: - Fix build on -current - Rescpect CXXFLAGS - Use desktop-file-utils/pathfix - Support staging PR: ports/184909 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp (contents, props changed) head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h (contents, props changed) Deleted: head/audio/osd-lyrics/files/patch-free-visibility Modified: head/audio/osd-lyrics/Makefile Modified: head/audio/osd-lyrics/Makefile ============================================================================== --- head/audio/osd-lyrics/Makefile Tue Dec 24 15:58:58 2013 (r337366) +++ head/audio/osd-lyrics/Makefile Tue Dec 24 16:03:44 2013 (r337367) @@ -3,7 +3,7 @@ PORTNAME= osdlyrics PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio deskutils MASTER_SITES= GOOGLE_CODE PROJECTHOST= osd-lyrics @@ -17,36 +17,48 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/de libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libcurl.so:${PORTSDIR}/ftp/curl +USES= desktop-file-utils gettext gmake iconv pathfix pkgconfig +USE_GNOME= gtk20 +USE_SQLITE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= DATADIRNAME=share # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))', # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814 #CONFIGURE_ARGS= --with-werror -USES= gettext gmake iconv pkgconfig -NO_STAGE= yes -USE_GNOME= gtk20 -USE_SQLITE= yes INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog NEWS README -LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= DOCS MPD XMMS2 AMAROK -MPD_DESC= Enable MPD support -XMMS2_DESC= Enable XMMS2 support -AMAROK_DESC= Enable Amarok 1.4 support +MPD_DESC= MPD support +XMMS2_DESC= XMMS2 support +AMAROK_DESC= Amarok 1.4 support MPD_LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio/libmpd MPD_CONFIGURE_OFF= --disable-mpd + XMMS2_LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 XMMS2_CONFIGURE_OFF= --disable-xmms2 + AMAROK_CONFIGURE_ENABLE= amarok1 .include <bsd.port.options.mk> +post-patch: +.for i in src/Makefile.in src/tests/Makefile.in + @${REINPLACE_CMD} -e \ + '/-lstdc++/d' ${WRKSRC}/${i} +.endfor +.for i in lib/chardetect/Makefile.in + @${REINPLACE_CMD} -e \ + '/-O2/d' ${WRKSRC}/${i} +.endfor + post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in AUTHORS ChangeLog NEWS README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include <bsd.port.mk> Added: head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp Tue Dec 24 16:03:44 2013 (r337367) @@ -0,0 +1,13 @@ +--- lib/chardetect/src/entry/impl.cpp.orig ++++ lib/chardetect/src/entry/impl.cpp +@@ -41,8 +41,10 @@ + #include "chardetect.h" + #include "nscore.h" + #include "nsUniversalDetector.h" ++#pragma GCC visibility push(default) + #include <string.h> + #include <stdlib.h> ++#pragma GCC visibility pop + + #ifdef _WIN32 + # include <windows.h> Added: head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h Tue Dec 24 16:03:44 2013 (r337367) @@ -0,0 +1,12 @@ +--- lib/chardetect/src/prmem.h.orig ++++ lib/chardetect/src/prmem.h +@@ -37,7 +37,9 @@ + #ifndef nsDummyPrmem_h__ + #define nsDummyPrmem_h__ + ++#pragma GCC visibility push(default) + #include <stdlib.h> ++#pragma GCC visibility pop + + inline void* PR_Malloc(size_t len) + { _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: mat Date: Tue Dec 24 16:07:21 2013 New Revision: 337370 URL: http://svnweb.freebsd.org/changeset/ports/337370 Log: MFH: r337367 - Fix build on -current - Rescpect CXXFLAGS - Use desktop-file-utils/pathfix - Support staging PR: ports/184909 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: portmgr (implicit) Added: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp - copied unchanged from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h - copied unchanged from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h Deleted: branches/2014Q1/audio/osd-lyrics/files/patch-free-visibility Modified: branches/2014Q1/audio/osd-lyrics/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/osd-lyrics/Makefile ============================================================================== --- branches/2014Q1/audio/osd-lyrics/Makefile Tue Dec 24 16:05:54 2013 (r337369) +++ branches/2014Q1/audio/osd-lyrics/Makefile Tue Dec 24 16:07:21 2013 (r337370) @@ -3,7 +3,7 @@ PORTNAME= osdlyrics PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio deskutils MASTER_SITES= GOOGLE_CODE PROJECTHOST= osd-lyrics @@ -17,36 +17,48 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/de libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libcurl.so:${PORTSDIR}/ftp/curl +USES= desktop-file-utils gettext gmake iconv pathfix pkgconfig +USE_GNOME= gtk20 +USE_SQLITE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= DATADIRNAME=share # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))', # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814 #CONFIGURE_ARGS= --with-werror -USES= gettext gmake iconv pkgconfig -NO_STAGE= yes -USE_GNOME= gtk20 -USE_SQLITE= yes INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog NEWS README -LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= DOCS MPD XMMS2 AMAROK -MPD_DESC= Enable MPD support -XMMS2_DESC= Enable XMMS2 support -AMAROK_DESC= Enable Amarok 1.4 support +MPD_DESC= MPD support +XMMS2_DESC= XMMS2 support +AMAROK_DESC= Amarok 1.4 support MPD_LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio/libmpd MPD_CONFIGURE_OFF= --disable-mpd + XMMS2_LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 XMMS2_CONFIGURE_OFF= --disable-xmms2 + AMAROK_CONFIGURE_ENABLE= amarok1 .include <bsd.port.options.mk> +post-patch: +.for i in src/Makefile.in src/tests/Makefile.in + @${REINPLACE_CMD} -e \ + '/-lstdc++/d' ${WRKSRC}/${i} +.endfor +.for i in lib/chardetect/Makefile.in + @${REINPLACE_CMD} -e \ + '/-O2/d' ${WRKSRC}/${i} +.endfor + post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in AUTHORS ChangeLog NEWS README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include <bsd.port.mk> Copied: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp (from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp Tue Dec 24 16:07:21 2013 (r337370, copy of r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp) @@ -0,0 +1,13 @@ +--- lib/chardetect/src/entry/impl.cpp.orig ++++ lib/chardetect/src/entry/impl.cpp +@@ -41,8 +41,10 @@ + #include "chardetect.h" + #include "nscore.h" + #include "nsUniversalDetector.h" ++#pragma GCC visibility push(default) + #include <string.h> + #include <stdlib.h> ++#pragma GCC visibility pop + + #ifdef _WIN32 + # include <windows.h> Copied: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h (from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h Tue Dec 24 16:07:21 2013 (r337370, copy of r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h) @@ -0,0 +1,12 @@ +--- lib/chardetect/src/prmem.h.orig ++++ lib/chardetect/src/prmem.h +@@ -37,7 +37,9 @@ + #ifndef nsDummyPrmem_h__ + #define nsDummyPrmem_h__ + ++#pragma GCC visibility push(default) + #include <stdlib.h> ++#pragma GCC visibility pop + + inline void* PR_Malloc(size_t len) + { _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"