From: Animeshz <Animeshz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Date: Sat, 30 Oct 2021 06:04:59 +0200 [thread overview]
Message-ID: <20211030040459.NcZvroXPc-iUcUx4WwbxHaF8IQj_tvwZw5v2uFUAJOQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33809@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
There is an updated pull request by Animeshz against master on the void-packages repository
https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809
Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [x] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 6875 bytes --]
From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 1/4] Carla: update to 2.4.1 (with fix to non-explicit cast
with Python3.10)
---
srcpkgs/Carla/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..81e538623367 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
# Template file for 'Carla'
pkgname=Carla
-version=2.1
+version=2.4.1
revision=4
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
@@ -16,7 +16,7 @@ maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
+checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
python_version=3
case $XBPS_TARGET_MACHINE in
From da0ecb93f475e7c173d463d34c92e3726196ca14 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:00:55 +0530
Subject: [PATCH 2/4] reverts revision to 1
---
srcpkgs/Carla/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 81e538623367..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
# Template file for 'Carla'
pkgname=Carla
version=2.4.1
-revision=4
+revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
pycompile_dirs="usr/share/carla"
From a2e1df43d35af0c92e3afd0c8ca66f48165c845f Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:30:05 +0530
Subject: [PATCH 3/4] remove already fixed patches in upstream
---
srcpkgs/Carla/patches/libmagic.patch | 14 --------------
srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----------
2 files changed, 24 deletions(-)
delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
delete mode 100644 srcpkgs/Carla/patches/qt5-5.15.0.patch
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
deleted file mode 100644
index f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/source/Makefile.mk
-@@ -233,10 +233,7 @@
- # Check for optional libs (special non-pkgconfig tests)
-
- ifneq ($(WIN32),true)
--
--# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it
--HAVE_LIBMAGIC = $(shell echo '\#include <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
-
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/qt5-5.15.0.patch b/srcpkgs/Carla/patches/qt5-5.15.0.patch
deleted file mode 100644
index ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200
-+++ b/source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200
-@@ -22,6 +22,7 @@
-
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- # include <QtGui/QPainter>
-+# include <QtGui/QPainterPath>
- # include <QtGui/QPixmapCache>
- # include <QtWidgets/qdrawutil.h>
- # include <QtWidgets/QApplication>
From ec18971d0f54ae3cd918778e489023345686244d Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sat, 30 Oct 2021 09:34:50 +0530
Subject: [PATCH 4/4] fix musl build
---
srcpkgs/Carla/patches/musl.patch | 73 ++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100644 srcpkgs/Carla/patches/musl.patch
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ #define SMTG_OS_LINUX 1
+ #define SMTG_OS_MACOS 0
+ #define SMTG_OS_WINDOWS 0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+ #include <sys/time.h>
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+- #include <execinfo.h>
+- #endif
+ #endif
+
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+ return result;
+ }
+
+-String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++ return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++ return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++ return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++ return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
+
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+ String result;
+
+- #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++ #if 1
+ jassertfalse; // sorry, not implemented yet!
+
+ #elif JUCE_WINDOWS
next prev parent reply other threads:[~2021-10-30 4:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 12:29 [PR PATCH] " Animeshz
2021-10-29 12:31 ` [PR PATCH] [Updated] " Animeshz
2021-10-29 13:03 ` Animeshz
2021-10-29 14:52 ` Animeshz
2021-10-29 15:56 ` paper42
2021-10-29 17:07 ` Animeshz
2021-10-29 17:36 ` ericonr
2021-10-30 4:04 ` Animeshz [this message]
2021-10-30 4:10 ` Animeshz
2021-10-30 18:47 ` ericonr
2021-10-31 2:45 ` [PR PATCH] [Updated] " Animeshz
2021-10-31 2:47 ` Animeshz
2021-10-31 2:51 ` Animeshz
2021-11-13 3:34 ` ericonr
2021-11-13 6:20 ` [PR PATCH] [Updated] " Animeshz
2021-11-13 6:24 ` Animeshz
2021-11-13 19:15 ` ericonr
2021-12-06 6:25 ` Oreo639
2021-12-06 6:26 ` Oreo639
2021-12-06 14:52 ` ericonr
2021-12-07 3:13 ` [PR PATCH] [Updated] " ericonr
2021-12-07 3:14 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211030040459.NcZvroXPc-iUcUx4WwbxHaF8IQj_tvwZw5v2uFUAJOQ@z \
--to=animeshz@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).