From nobody Wed May 03 03:30:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QB2Wd6WL8z48p5R; Wed, 3 May 2023 03:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QB2Wd5lxDz4DNp; Wed, 3 May 2023 03:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683084605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrHxU4ShS4Xh7GwomWu/yflChrlvBiNc+BUOZESkI0=; b=Pr2WFHMWV7Ormb0Akkui7RU+a99cNWif2EskjuiwSjo/1s+klkLoA2dd0tZUm/0y0W6rQE yMslDG2KAmd7y40ccjQvumJcjjHTsfIxq0Oh8njgv9pjoJ+YVVRV4j5SkAZ155KePev2BN pHBlpd94eKKrPJ2JslRwVeUGIoOzJNCKnvmv5Tow4S7xptWuVi7yAIoRy+P/Nlwodki5st +dREI06sl/DK3yiR1RZRGt0ytqny802Rj+D3qr6cWoH5UGDHeKVcuXiSR90kgGIKGzd7/X +RzgQoRGkM3cQAbka1Ur0xAj2gnO9wNN21NAxf8m0yer/X7dE+g+81HP0Jovcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683084605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrHxU4ShS4Xh7GwomWu/yflChrlvBiNc+BUOZESkI0=; b=JOOVvgQD8GNpv8crS8dEbK0P7CV+H0uXu2aNIVDziYDsod08LqxlruO/XrjFwoXchqg05y MNnncGlORJnEa1usWhcmJb8yfTPPeTNlMRTqxNfuJEcBlGBIiwsYyDyY0VGIASDEapqMZj QgioPmp9BtiwnvVUaj9ClOgw6zh61H6HN635FNfWjbDY651z4exGynF5PJbb244d4LxGKG Xgd/wPr6RmqgRhtULnu/y4J7SAqUXgGImBJdMdh5NEIZar8HCw6DPTmlMU91RHK3vmEUYR Dwk05A1JIAPqQYN52/uz6vD+sAZbJTZH2dk9IMcXYG+P6eroQGdJnqtbyNYYlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683084605; a=rsa-sha256; cv=none; b=wanVVHyTAOY8fq4R1LKgPqzHa86USjOOvxhPgW5O66e04j0PcfUPn2rYhbXQZDEDLDYAJU tetOOz78oTXHuHOBetPM1AbHLoLxFLhuWENa5jcbzNg13enL4UMm0O/tviz+0atsvHzv+n W3BkYM/5gZe7GhT5gNx+mSfaeHJG6TwaaFW4dDkWW3JB9C4KbAG6kuzc5D8nUkLscmOzaQ JsgeQx0CamWJJrJeHLitRp8rIBv7LXUlFwKhgtBM/GmQkn3ajXKmV2PUaRuy/NAKTb/1DH 23BQnSORi0dn26bSOwv/kJMUQohKZYicHkmKHvhS3nPy+kZmvr8/bWAWxi8omA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QB2Wd4rCQzFGT; Wed, 3 May 2023 03:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3433U5Fl073548; Wed, 3 May 2023 03:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3433U5ll073545; Wed, 3 May 2023 03:30:05 GMT (envelope-from git) Date: Wed, 3 May 2023 03:30:05 GMT Message-Id: <202305030330.3433U5ll073545@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: af126b7f5ab4 - main - audio/gogglesmm: Update to 1.2.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af126b7f5ab438373b1b66656859870f6958036a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=af126b7f5ab438373b1b66656859870f6958036a commit af126b7f5ab438373b1b66656859870f6958036a Author: Jason E. Hale AuthorDate: 2023-05-02 18:34:54 +0000 Commit: Jason E. Hale CommitDate: 2023-05-03 03:29:50 +0000 audio/gogglesmm: Update to 1.2.3 https://github.com/gogglesmm/gogglesmm/releases/tag/1.2.3 --- audio/gogglesmm/Makefile | 5 ++- audio/gogglesmm/distinfo | 6 ++-- audio/gogglesmm/files/patch-CMakeLists.txt | 32 ++---------------- audio/gogglesmm/files/patch-gap_fox.h | 43 ------------------------- audio/gogglesmm/files/patch-src_CMakeLists.txt | 6 ++-- audio/gogglesmm/files/patch-src_GMFilename.cpp | 40 ----------------------- audio/gogglesmm/files/patch-src_GMIconTheme.cpp | 16 --------- audio/gogglesmm/files/patch-src_GMIconTheme.h | 16 --------- audio/gogglesmm/files/patch-src_gmdefs.h | 32 ------------------ audio/gogglesmm/pkg-plist | 2 +- 10 files changed, 11 insertions(+), 187 deletions(-) diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index e3b6791dd871..88660ce99a18 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -1,6 +1,5 @@ PORTNAME= gogglesmm -PORTVERSION= 1.2.2 -PORTREVISION= 11 +PORTVERSION= 1.2.3 CATEGORIES= audio MAINTAINER= jhale@FreeBSD.org @@ -21,7 +20,7 @@ USES= cmake compiler:c++11-lib desktop-file-utils gnome \ USE_GITHUB= yes USE_XORG= ice sm x11 -CMAKE_OFF= WITH_CFOX WITH_IMPORT +CMAKE_OFF= WITH_CFOX PORTDOCS= AUTHORS ChangeLog README diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo index 538fbbadc3e9..e2dca47e86ab 100644 --- a/audio/gogglesmm/distinfo +++ b/audio/gogglesmm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610461380 -SHA256 (gogglesmm-gogglesmm-1.2.2_GH0.tar.gz) = e9d576584ea48346cd3b577967ccb40bf67113b91e8252d62052be3725b9d9fa -SIZE (gogglesmm-gogglesmm-1.2.2_GH0.tar.gz) = 3120591 +TIMESTAMP = 1683051500 +SHA256 (gogglesmm-gogglesmm-1.2.3_GH0.tar.gz) = 4315ea4d9894fa2c7f160c73e5464b91b7a00f22964910adb77e1e9b94273006 +SIZE (gogglesmm-gogglesmm-1.2.3_GH0.tar.gz) = 3153723 diff --git a/audio/gogglesmm/files/patch-CMakeLists.txt b/audio/gogglesmm/files/patch-CMakeLists.txt index 73376258ab1c..6ca5cb382909 100644 --- a/audio/gogglesmm/files/patch-CMakeLists.txt +++ b/audio/gogglesmm/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-12-27 21:40:54 UTC +--- CMakeLists.txt.orig 2023-04-23 15:13:49 UTC +++ CMakeLists.txt -@@ -67,6 +67,11 @@ endif() +@@ -69,6 +69,11 @@ endif() add_compile_options(-Og) endif() @@ -12,31 +12,3 @@ # FIXME Doesn't work on all platforms. #CHECK_CXX_COMPILER_FLAG(-flto HAS_CXX_OPTIMIZE_LINKTIME) if(HAS_CXX_OPTIMIZE_LINKTIME AND NOT CMAKE_BUILD_TYPE MATCHES Debug) -@@ -100,11 +105,13 @@ add_subdirectory(src) - #------------------------------------------------------------------------------- - - # Extra Installation Files --install(PROGRAMS extra/import_banshee_stats.py -- extra/import_gogglesmm12.py -- extra/import_gogglesmm12_stats.py -- DESTINATION -- share/gogglesmm) -+if(WITH_IMPORT) -+ install(PROGRAMS extra/import_banshee_stats.py -+ extra/import_gogglesmm12.py -+ extra/import_gogglesmm12_stats.py -+ DESTINATION -+ share/gogglesmm) -+endif() - - install(FILES icons/gogglesmm_16.png DESTINATION share/icons/hicolor/16x16/apps RENAME gogglesmm.png) - install(FILES extra/gogglesmm_22.png DESTINATION share/icons/hicolor/22x22/apps RENAME gogglesmm.png) -@@ -115,7 +122,7 @@ install(FILES extra/gogglesmm.desktop DESTINATION shar - install(FILES extra/gogglesmm.svg DESTINATION share/icons/hicolor/scalable/apps RENAME gogglesmm.svg) - install(FILES extra/gogglesmm.appdata.xml DESTINATION share/metainfo) - install(FILES extra/gogglesmm.desktop DESTINATION share/applications) --install(FILES extra/gogglesmm.1 DESTINATION share/man/man1) -+install(FILES extra/gogglesmm.1 DESTINATION man/man1) - - # Install translations when native language support has been enabled - if(WITH_NLS) diff --git a/audio/gogglesmm/files/patch-gap_fox.h b/audio/gogglesmm/files/patch-gap_fox.h deleted file mode 100644 index 70dcf116e1c6..000000000000 --- a/audio/gogglesmm/files/patch-gap_fox.h +++ /dev/null @@ -1,43 +0,0 @@ -Fix build with FOX >= 1.7.80 - ---- gap/fox.h.orig 2020-12-27 21:40:54 UTC -+++ gap/fox.h -@@ -35,6 +35,12 @@ - #define FXVERSION(major,minor,release) ((release)+(minor*1000)+(major*100000)) - - #include -+#if FOXVERSION >= FXVERSION(1, 7, 80) -+#include -+#endif -+#if FOXVERSION >= FXVERSION(1, 7, 81) -+#include -+#endif - #include - #include - #include -@@ -121,6 +127,25 @@ constexpr FXTime operator"" _ms(unsigned long long int - { - return value * NANOSECONDS_PER_MILLISECOND; - } -+ -+#if FOXVERSION >= FXVERSION(1, 7, 80) -+#include -+#define FX_ALIAS_SPEC(SPECS, NEW_NAME, ...) \ -+ template \ -+ SPECS auto NEW_NAME(Args &&... args) \ -+ noexcept(noexcept(__VA_ARGS__(std::forward(args)...))) \ -+ -> decltype(__VA_ARGS__(std::forward(args)...)) { \ -+ return __VA_ARGS__(std::forward(args)...); \ -+ } -+ -+#define FX_ALIAS(NEW_NAME, ...) \ -+ FX_ALIAS_SPEC(inline, NEW_NAME, __VA_ARGS__) -+ -+FX_ALIAS(compare, FXString::compare) -+FX_ALIAS(comparecase, FXString::comparecase) -+FX_ALIAS(compareversion, FXString::comparenatural) -+#define FXISFOLLOWUTF8 followUTF8 -+#endif - - #endif - diff --git a/audio/gogglesmm/files/patch-src_CMakeLists.txt b/audio/gogglesmm/files/patch-src_CMakeLists.txt index 1ee1f638832f..4cbca02111dd 100644 --- a/audio/gogglesmm/files/patch-src_CMakeLists.txt +++ b/audio/gogglesmm/files/patch-src_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2018-07-03 11:39:26 UTC +--- src/CMakeLists.txt.orig 2023-04-23 15:13:49 UTC +++ src/CMakeLists.txt -@@ -71,7 +71,7 @@ if(WITH_CFOX) +@@ -71,7 +71,7 @@ else() set(RESWRAP_CPP ${RESWRAP} --keep-ext --source --extern) set(RESWRAP_TEXT ${RESWRAP} --keep-ext -t) else() @@ -9,7 +9,7 @@ if(RESWRAP) message(STATUS "Found reswrap: ${RESWRAP}") execute_process(COMMAND ${RESWRAP} -v OUTPUT_VARIABLE RESWRAP_OUTPUT) -@@ -345,4 +345,4 @@ target_link_libraries(gogglesmm PRIVATE gap ${CFOX} +@@ -362,4 +362,4 @@ target_link_libraries(gogglesmm PRIVATE gap ${CFOX} ${ICE_LIBRARIES} ${Intl_LIBRARIES}) diff --git a/audio/gogglesmm/files/patch-src_GMFilename.cpp b/audio/gogglesmm/files/patch-src_GMFilename.cpp deleted file mode 100644 index 96f978ded968..000000000000 --- a/audio/gogglesmm/files/patch-src_GMFilename.cpp +++ /dev/null @@ -1,40 +0,0 @@ -Fix build with FOX 1.7.80 - ---- src/GMFilename.cpp.orig 2022-10-28 03:22:22 UTC -+++ src/GMFilename.cpp -@@ -102,7 +102,11 @@ FXString TextConverter::apply_filters(const FXString & - else if (modifiers&UPPERCASE) - n+=wc2utf(Unicode::toUpper(src.wc(i))); - else -+#if FOXVERSION >= FXVERSION(1,7, 80) -+ n+=lenUTF8(src[i]); -+#else - n+=src.extent(i); -+#endif - } - } - -@@ -167,7 +171,11 @@ FXString TextConverter::apply_codec(const FXString & s - else if (Unicode::isPrint(src.wc(i))) { - if (codec->wc2mb(&c,1,src.wc(i))==1) { - if (c==undefined_character) { -+#if FOXVERSION >= FXVERSION(1,7,80) -+ FXString dcm = FXString::decompose(src.mid(i,lenUTF8(src[i])),false); -+#else - FXString dcm = FXString::decompose(src.mid(i,src.extent(i)),false); -+#endif - for (FXint j=0;jwc2mb(&c,1,dcm.wc(j)) && c!=0x1a) { - n++; -@@ -190,7 +198,11 @@ FXString TextConverter::apply_codec(const FXString & s - if (c==undefined_character) { - /* If codec didn't contain a mapping to the required character, - do a compatibility decomposition and try mapping those */ -+#if FOXVERSION >= FXVERSION(1,7,80) -+ FXString dcm = FXString::decompose(src.mid(i,lenUTF8(src[i])),false); -+#else - FXString dcm = FXString::decompose(src.mid(i,src.extent(i)),false); -+#endif - for (FXint j=0;jwc2mb(&c,1,dcm.wc(j)) && c!=undefined_character) { - dst[n++]=c; diff --git a/audio/gogglesmm/files/patch-src_GMIconTheme.cpp b/audio/gogglesmm/files/patch-src_GMIconTheme.cpp deleted file mode 100644 index 72d2d976b545..000000000000 --- a/audio/gogglesmm/files/patch-src_GMIconTheme.cpp +++ /dev/null @@ -1,16 +0,0 @@ -Fix build with FOX 1.7.80 - ---- src/GMIconTheme.cpp.orig 2022-10-28 03:25:41 UTC -+++ src/GMIconTheme.cpp -@@ -569,7 +569,11 @@ void GMIconTheme::loadLarge(FXIconPtr & icon,const FXc - loadIcon(icon,FXString::null,largesize,value,blendcolor); - } - -+#if FOXVERSION >= FXVERSION(1, 7, 80) -+void GMIconTheme::loadResource(FXIconPtr & icon,const FXuchar * data,const FXColor blendcolor,const char * type) { -+#else - void GMIconTheme::loadResource(FXIconPtr & icon,const void * data,const FXColor blendcolor,const char * type) { -+#endif - FXIconSource source; - FXIcon * newicon = source.loadIconData(app,data,type); - FXASSERT(newicon); diff --git a/audio/gogglesmm/files/patch-src_GMIconTheme.h b/audio/gogglesmm/files/patch-src_GMIconTheme.h deleted file mode 100644 index 09f947bb85f3..000000000000 --- a/audio/gogglesmm/files/patch-src_GMIconTheme.h +++ /dev/null @@ -1,16 +0,0 @@ -Fix build with FOX 1.7.80 - ---- src/GMIconTheme.h.orig 2022-10-28 03:25:54 UTC -+++ src/GMIconTheme.h -@@ -47,7 +47,11 @@ class GMIconTheme { (protected) - FXImage * loadImage(const FXString & filename); - protected: - void loadIcon(FXIconPtr & icon,const FXString &pathlist,FXint size,const char * value,const FXColor blend); -+#if FOXVERSION >= FXVERSION(1, 7, 80) -+ void loadResource(FXIconPtr & icon,const FXuchar * data,const FXColor blend,const char * type="png"); -+#else - void loadResource(FXIconPtr & icon,const void * data,const FXColor blend,const char * type="png"); -+#endif - protected: - FXbool load_cache(); - void save_cache(); diff --git a/audio/gogglesmm/files/patch-src_gmdefs.h b/audio/gogglesmm/files/patch-src_gmdefs.h deleted file mode 100644 index 20e946110452..000000000000 --- a/audio/gogglesmm/files/patch-src_gmdefs.h +++ /dev/null @@ -1,32 +0,0 @@ -Fix build with FOX 1.7.80 - ---- src/gmdefs.h.orig 2020-12-27 21:40:54 UTC -+++ src/gmdefs.h -@@ -93,5 +93,27 @@ extern const FXchar * fxtr(const FXchar *) FX_FORMAT(1 - // Best Image Scaler in FXImage - #define FOX_SCALE_BEST 2 - -+#if FOXVERSION >= FXVERSION(1, 7, 80) -+#include -+#define FX_ALIAS_SPEC(SPECS, NEW_NAME, ...) \ -+ template \ -+ SPECS auto NEW_NAME(Args &&... args) \ -+ noexcept(noexcept(__VA_ARGS__(std::forward(args)...))) \ -+ -> decltype(__VA_ARGS__(std::forward(args)...)) { \ -+ return __VA_ARGS__(std::forward(args)...); \ -+ } -+ -+#define FX_ALIAS(NEW_NAME, ...) \ -+ FX_ALIAS_SPEC(inline, NEW_NAME, __VA_ARGS__) -+ -+FX_ALIAS(compare, FXString::compare) -+FX_ALIAS(comparecase, FXString::comparecase) -+FX_ALIAS(compareversion, FXString::comparenatural) -+#define FXISFOLLOWUTF8 followUTF8 -+#define FXISLEADUTF16 leadUTF16 -+#define FXISFOLLOWUTF16 followUTF16 -+#define FXISSEQUTF16 seqUTF16 -+#endif -+ - #endif - diff --git a/audio/gogglesmm/pkg-plist b/audio/gogglesmm/pkg-plist index b1264a8c01f0..e36b78048d68 100644 --- a/audio/gogglesmm/pkg-plist +++ b/audio/gogglesmm/pkg-plist @@ -4,7 +4,6 @@ lib/gogglesmm/libgap_oss.so %%PULSEAUDIO%%lib/gogglesmm/libgap_pulse.so %%SNDIO%%lib/gogglesmm/libgap_sndio.so lib/gogglesmm/libgap_wav.so -man/man1/gogglesmm.1.gz share/applications/gogglesmm.desktop share/icons/hicolor/16x16/apps/gogglesmm.png share/icons/hicolor/22x22/apps/gogglesmm.png @@ -20,4 +19,5 @@ share/icons/hicolor/scalable/apps/gogglesmm.svg %%NLS%%share/locale/ko/LC_MESSAGES/gogglesmm.mo %%NLS%%share/locale/pt/LC_MESSAGES/gogglesmm.mo %%NLS%%share/locale/ru/LC_MESSAGES/gogglesmm.mo +share/man/man1/gogglesmm.1.gz share/metainfo/gogglesmm.appdata.xml