Date: Wednesday, March 23, 2022 @ 12:11:07 Author: dvzrv Revision: 1171293
upgpkg: cardinal 22.03-1: Upgrade to 22.03. Remove already included patches. Fix link to svg for scalable app icon. Modified: cardinal/trunk/PKGBUILD Deleted: cardinal/trunk/cardinal-22.02-remove_glibcxx_assertions.patch ------------------------------------------------+ PKGBUILD | 28 +--- cardinal-22.02-remove_glibcxx_assertions.patch | 134 ----------------------- 2 files changed, 8 insertions(+), 154 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-23 12:10:01 UTC (rev 1171292) +++ PKGBUILD 2022-03-23 12:11:07 UTC (rev 1171293) @@ -2,8 +2,8 @@ pkgbase=cardinal pkgname=(cardinal cardinal-data cardinal-jack cardinal-lv2 cardinal-vst cardinal-vst3) -pkgver=22.02 -pkgrel=4 +pkgver=22.03 +pkgrel=1 pkgdesc="Virtual modular synthesizer" arch=(x86_64) url="https://github.com/DISTRHO/Cardinal"; @@ -16,18 +16,12 @@ options=(debug) source=( https://github.com/DISTRHO/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.xz - $pkgbase.svg::https://github.com/DISTRHO/Cardinal/blob/eb95b5990cf734c10f2caab1a246eac893f0266d/plugins/Cardinal/orig/distrho.svg - $pkgbase-22.02-missing_symlinks.patch::https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch - $pkgbase-22.02-remove_glibcxx_assertions.patch::https://github.com/DISTRHO/Cardinal/compare/d6823af74d3bd1940b1fc2f3c43f0d84f0656a79...79698d1443cfad232413eba61a1e7339d087b238.patch + $pkgbase.svg::https://raw.githubusercontent.com/DISTRHO/Cardinal/eb95b5990cf734c10f2caab1a246eac893f0266d/plugins/Cardinal/orig/distrho.svg ) -sha512sums=('9ec540366f61437f5b7103a08fa7865bfa7e17e92757c3a742ba950eeb6483688be3335fe4ebf830c76a70c18789b698f9121762312aa7cfb3da629730268fe7' - 'e2b68f76aba6847e7fba7ae087f7019dfa129d685a4ffe8af41c69db295603dd03c8fe65deb024f7f3f956253d7dd6bd2c38fdd0a9c61f35c11df9df5e42659a' - '8a84b3fd09d1e3ba401f2f2dd0dd9771520d3579074f06209a5c204feaf244d71d2042d450becfa1dc1918171a0158ba6593b22f66693c0499feb3fa54d28c75' - '17be05ffb3b5807016c5330e45b1e49e20480bc98d6396e46bf9d355a45a7905114b951c30cdb413f6d3d15c0d6e16350dcf3e357c4c988c147f5272b91c8e98') -b2sums=('0b4c2d2ee7cb3b191df25b6f5643db1c923c0d74515f4c2c03665ce16b38c5c11968096b1e6d330bf64f99419039669ebba14ce0a29fafde32d9e07ec4b42c90' - '4dc447e473f30714316a0c6d0e385b3c39145258a13cb7dae83b54a1c8118d3090972505b490bbe97c00171ed9954ab23f5bc18e6a6f4f28929d69dd89e042b4' - '2d76b09441b0499e601d375f4a2a4bd454f2a3c2c365e5675e25b6be51cefbc1366fe95f02d299c04fd26c726eac63339786ca699301e73a6b7bef211a30f2b9' - '53b6b8fb12ae32e1be4a169afcb5b2b8cec232a063e1445a1852523dbb9bf37b0f49a4a4e542927bd3f543653de80f201bacc796f8d46d545447b928aee57521') +sha512sums=('1b0428d7d6a285ef63bd2d6d6a5b2cdc7f7afdb9142393c2bc98d39b260bc00caf3535277819ef89076d6861a8aeb6b8e7e43dcb76be0782aaf53a843a6ab5eb' + '31a7d1e548285af0ead1bc844fbb1d35b50f6284159047cb401a829d4068992fa328770e42c377c08d013f6787e55ac12b94eba4d5af4b90373b157971fc8835') +b2sums=('3e209dead61f01244f54cdcf2e20c9c1ffa308f4134f35d8196897bd5261c091cc4d095fd287ce7bd8b25e455406b9e669ed40a1d5c1761a5eec8c25c4efdd29' + 'd82fefe15234c1ed3a4d487c6082a2e3ac73b60f11041314e99c5a5de5b3ea141efbd5afd18851510bd4f801fd71f7cd89d54d86258d1ba750bbfd762aa37a8d') _pick() { local p="$1" f d; shift @@ -47,12 +41,6 @@ --pkgdesc "$pkgdesc JACK standalone" \ --icon $pkgbase \ --genericname "Virtual modular synthesizer" - - # add missing symlinks for resources - patch -d $pkgname-$pkgver -p1 -i ../$pkgbase-22.02-missing_symlinks.patch - # undo the use of -Wp,-D_GLIBCXX_ASSERTIONS as it crashes hosts: - # https://github.com/DISTRHO/Cardinal/issues/111 - patch -d $pkgname-$pkgver -p1 -i ../$pkgbase-22.02-remove_glibcxx_assertions.patch } build() { @@ -108,7 +96,7 @@ mv -v $pkgbase-jack/* "$pkgdir" install -vDm 644 *.desktop -t "$pkgdir/usr/share/applications" - install -vDm 644 $pkgbase.svg -t "$pkgdir/usr/share/icons/hicolor/scalable/apps" + install -vDm 644 $pkgbase.svg -t "$pkgdir/usr/share/icons/hicolor/scalable/apps/" } package_cardinal-lv2() { Deleted: cardinal-22.02-remove_glibcxx_assertions.patch =================================================================== --- cardinal-22.02-remove_glibcxx_assertions.patch 2022-03-23 12:10:01 UTC (rev 1171292) +++ cardinal-22.02-remove_glibcxx_assertions.patch 2022-03-23 12:11:07 UTC (rev 1171293) @@ -1,134 +0,0 @@ -From e9dc1c87b8f30611b9fb07959288c6acca1b577d Mon Sep 17 00:00:00 2001 -From: falkTX <[email protected]> -Date: Thu, 17 Feb 2022 23:36:23 +0000 -Subject: [PATCH 1/2] Do not allow _GLIBCXX_ASSERTIONS to be enabled, for now - -Signed-off-by: falkTX <[email protected]> ---- - deps/Makefile | 3 +++ - plugins/Makefile | 3 +++ - src/Makefile | 3 +++ - src/Makefile.cardinal.mk | 3 +++ - 4 files changed, 12 insertions(+) - -diff --git a/deps/Makefile b/deps/Makefile -index cb7d300..5a83bfa 100644 ---- a/deps/Makefile -+++ b/deps/Makefile -@@ -57,6 +57,9 @@ endif - BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - -+# Rack code is not tested for this flag, unset it -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+ - # -------------------------------------------------------------- - # override VCV arch.mk stuff so we can build more architectures - -diff --git a/plugins/Makefile b/plugins/Makefile -index 205e0bc..c409aee 100644 ---- a/plugins/Makefile -+++ b/plugins/Makefile -@@ -795,6 +795,9 @@ BUILD_C_FLAGS += -std=gnu11 - BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - -+# Rack code is not tested for this flag, unset it -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+ - # -------------------------------------------------------------- - # lots of warnings from VCV side - -diff --git a/src/Makefile b/src/Makefile -index d676fdf..7d6d561 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -101,6 +101,9 @@ BUILD_CXX_FLAGS += -fno-finite-math-only - # use our custom function to invert some colors - BUILD_CXX_FLAGS += -DnsvgParseFromFile=nsvgParseFromFileCardinal - -+# Rack code is not tested for this flag, unset it -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+ - # -------------------------------------------------------------- - # Rack files to build - -diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk -index 8a5946e..d75f636 100644 ---- a/src/Makefile.cardinal.mk -+++ b/src/Makefile.cardinal.mk -@@ -173,6 +173,9 @@ BUILD_C_FLAGS += -std=gnu11 - BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - -+# Rack code is not tested for this flag, unset it -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+ - # -------------------------------------------------------------- - # FIXME lots of warnings from VCV side - - -From 79698d1443cfad232413eba61a1e7339d087b238 Mon Sep 17 00:00:00 2001 -From: falkTX <[email protected]> -Date: Fri, 18 Feb 2022 08:31:08 +0000 -Subject: [PATCH 2/2] Also use -Wp,-U_GLIBCXX_ASSERTIONS - ---- - deps/Makefile | 2 +- - plugins/Makefile | 2 +- - src/Makefile | 2 +- - src/Makefile.cardinal.mk | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/deps/Makefile b/deps/Makefile -index 5a83bfa..924ea9c 100644 ---- a/deps/Makefile -+++ b/deps/Makefile -@@ -58,7 +58,7 @@ BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - - # Rack code is not tested for this flag, unset it --BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS - - # -------------------------------------------------------------- - # override VCV arch.mk stuff so we can build more architectures -diff --git a/plugins/Makefile b/plugins/Makefile -index c409aee..0a8b220 100644 ---- a/plugins/Makefile -+++ b/plugins/Makefile -@@ -796,7 +796,7 @@ BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - - # Rack code is not tested for this flag, unset it --BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS - - # -------------------------------------------------------------- - # lots of warnings from VCV side -diff --git a/src/Makefile b/src/Makefile -index 7d6d561..e370fa5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -102,7 +102,7 @@ BUILD_CXX_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -DnsvgParseFromFile=nsvgParseFromFileCardinal - - # Rack code is not tested for this flag, unset it --BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS - - # -------------------------------------------------------------- - # Rack files to build -diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk -index d75f636..b3b06d8 100644 ---- a/src/Makefile.cardinal.mk -+++ b/src/Makefile.cardinal.mk -@@ -174,7 +174,7 @@ BUILD_C_FLAGS += -fno-finite-math-only - BUILD_CXX_FLAGS += -fno-finite-math-only - - # Rack code is not tested for this flag, unset it --BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -+BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS - - # -------------------------------------------------------------- - # FIXME lots of warnings from VCV side
