* [PR PATCH] Carla: add patch for gcc 9
@ 2020-01-30 14:27 voidlinux-github
2020-01-30 14:57 ` [PR PATCH] [Updated] " voidlinux-github
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-30 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 1403 bytes --]
From c35ec66fa46f7c6d9be4ecda0931e2f48e1a945a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
@ 2020-01-30 14:57 ` voidlinux-github
2020-01-30 17:49 ` voidlinux-github
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-30 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 1819 bytes --]
From c422a0671a000695f8465b77373e481a5bf7c4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index d4d36a4923d..cf6523ffc5e 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -27,7 +27,7 @@ case $XBPS_TARGET_MACHINE in
make_install_args+=" NOOPT=true";;
esac
-if [ "$CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" Carla-devel"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
2020-01-30 14:57 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-30 17:49 ` voidlinux-github
2020-01-30 23:43 ` voidlinux-github
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-30 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-580373850
Comment:
Package lacks python files, is it ok?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
2020-01-30 14:57 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-30 17:49 ` voidlinux-github
@ 2020-01-30 23:43 ` voidlinux-github
2020-01-31 20:00 ` voidlinux-github
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-30 23:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-580514138
Comment:
On 2020-01-30 09:49:29-0800, Piotr <notifications@github.com> wrote:
> Package lacks python files, is it ok?
Python files are located inside `/usr/share/carla`, as same as before.
It's declared in the template, `pycompile_dirs=usr/share/carla`
--
Danh
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (2 preceding siblings ...)
2020-01-30 23:43 ` voidlinux-github
@ 2020-01-31 20:00 ` voidlinux-github
2020-02-01 1:25 ` voidlinux-github
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-31 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-580888549
Comment:
There isn't even /usr/share, see travis log.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (3 preceding siblings ...)
2020-01-31 20:00 ` voidlinux-github
@ 2020-02-01 1:25 ` voidlinux-github
2020-02-01 1:27 ` voidlinux-github
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-01 1:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-580974949
Comment:
> There isn't even /usr/share, see travis log.
Well, it does show up on x86_64-musl build,
see https://api.travis-ci.org/v3/job/643903206/log.txt
Since I only built for x86_64-musl in my local machine,
I haven't detect this earlier, I will look into a fix later.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (4 preceding siblings ...)
2020-02-01 1:25 ` voidlinux-github
@ 2020-02-01 1:27 ` voidlinux-github
2020-02-01 7:49 ` [PR PATCH] [Updated] " voidlinux-github
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-01 1:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-580974949
Comment:
> There isn't even /usr/share, see travis log.
Well, it does show up on x86_64-musl build,
see https://api.travis-ci.org/v3/job/643903206/log.txt (https://travis-ci.org/void-linux/void-packages/jobs/643903206)
Since I only built for x86_64-musl in my local machine,
I haven't detect this earlier, I will look into a fix later.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (5 preceding siblings ...)
2020-02-01 1:27 ` voidlinux-github
@ 2020-02-01 7:49 ` voidlinux-github
2020-02-03 2:06 ` voidlinux-github
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-01 7:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3320 bytes --]
From 5e177aee2a5e31390fc09c2c776753d0fc22ef58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 8 +++-----
3 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..371a8788db6 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -4,12 +4,10 @@ version=2.0.0
revision=2
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
@@ -27,7 +25,7 @@ case $XBPS_TARGET_MACHINE in
make_install_args+=" NOOPT=true";;
esac
-if [ "$CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" Carla-devel"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (6 preceding siblings ...)
2020-02-01 7:49 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-02-03 2:06 ` voidlinux-github
2020-02-03 2:09 ` voidlinux-github
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-03 2:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3450 bytes --]
From 458429b0be5a82cfb294b9cccfb289ead8f1a416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 10 ++++-----
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..5cc433c57f3 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,15 +1,13 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
@@ -27,7 +25,7 @@ case $XBPS_TARGET_MACHINE in
make_install_args+=" NOOPT=true";;
esac
-if [ "$CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" Carla-devel"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (7 preceding siblings ...)
2020-02-03 2:06 ` voidlinux-github
@ 2020-02-03 2:09 ` voidlinux-github
2020-02-03 20:12 ` voidlinux-github
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-03 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-581208858
Comment:
On 2020-01-31 12:00:21-0800, Piotr <notifications@github.com> wrote:
> There isn't even /usr/share, see travis log.
I fixed that problem, turn out it needs which to detect that
compilation script.
And the cross-compiled packages missed /usr/share from very begining,
since python3-PyQt5-devel-tools should be in the hostdepends
I bumped the revision to trigger the rebuild to correct it.
--
Danh
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (8 preceding siblings ...)
2020-02-03 2:09 ` voidlinux-github
@ 2020-02-03 20:12 ` voidlinux-github
2020-02-04 2:55 ` voidlinux-github
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-03 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-581596701
Comment:
Needs `which` in runtime too, please add it to depends.
Adjust pycompile_version. Pycompile_module controls compilation of files in site-packages, but there are no in package, so no need to set.
Test without -n is preferred here.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (9 preceding siblings ...)
2020-02-03 20:12 ` voidlinux-github
@ 2020-02-04 2:55 ` voidlinux-github
2020-02-04 2:58 ` [PR PATCH] [Updated] " voidlinux-github
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 2:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 633 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-581718586
Comment:
On 2020-02-03 12:12:58-0800, Piotr <notifications@github.com> wrote:
> Needs `which` in runtime too, please add it to depends.
OK, /usr/bin/carla requires which, damn.
>
> Adjust pycompile_version. Pycompile_module controls compilation of
> files in site-packages, but there are no in package, so no need to
> set.
IIUC, remove pycompile_module, and set pycompile_version=$py_ver?
>
> Test without -n is preferred here.
It was added to trigger travis build before,
I'll remove it.
--
Danh
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (10 preceding siblings ...)
2020-02-04 2:55 ` voidlinux-github
@ 2020-02-04 2:58 ` voidlinux-github
2020-02-04 7:35 ` voidlinux-github
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 2:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3473 bytes --]
From 63514a5c6679b6df7927fee5f3839129ae11b4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 10 ++++-----
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..e974af3238b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,19 +1,17 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
-depends="python3 python3-PyQt5 python3-PyQt5-svg"
+depends="python3 python3-PyQt5 python3-PyQt5-svg which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (11 preceding siblings ...)
2020-02-04 2:58 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-02-04 7:35 ` voidlinux-github
2020-02-04 8:06 ` voidlinux-github
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 7:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 1403 bytes --]
From 2ce2df4bdaca2471624c09242979142be60ec001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (12 preceding siblings ...)
2020-02-04 7:35 ` voidlinux-github
@ 2020-02-04 8:06 ` voidlinux-github
2020-02-04 8:07 ` voidlinux-github
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 8:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3473 bytes --]
From 63514a5c6679b6df7927fee5f3839129ae11b4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 10 ++++-----
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..e974af3238b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,19 +1,17 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
-depends="python3 python3-PyQt5 python3-PyQt5-svg"
+depends="python3 python3-PyQt5 python3-PyQt5-svg which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (13 preceding siblings ...)
2020-02-04 8:06 ` voidlinux-github
@ 2020-02-04 8:07 ` voidlinux-github
2020-02-04 10:43 ` voidlinux-github
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3473 bytes --]
From 8a9bdebb4118ce899355016f2c18aaee2ea39cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 10 ++++-----
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..e974af3238b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,19 +1,17 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
-depends="python3 python3-PyQt5 python3-PyQt5-svg"
+depends="python3 python3-PyQt5 python3-PyQt5-svg which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (14 preceding siblings ...)
2020-02-04 8:07 ` voidlinux-github
@ 2020-02-04 10:43 ` voidlinux-github
2020-02-04 18:08 ` voidlinux-github
2020-02-06 20:12 ` [PR PATCH] [Merged]: " voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 10:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages carla-gcc-9-patch
https://github.com/void-linux/void-packages/pull/18662
Carla: add patch for gcc 9
A patch file from https://github.com/void-linux/void-packages/pull/18662.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-gcc-9-patch-18662.patch --]
[-- Type: text/x-diff, Size: 3473 bytes --]
From c86838da248fc71cbf97897964a3e0513811cf2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 30 Jan 2020 21:24:17 +0700
Subject: [PATCH] Carla: add patch for gcc 9
Bump revision to trigger rebuild for platform that were cross-compiled.
---
srcpkgs/Carla/patches/gcc-9.2.0.patch | 29 +++++++++++++++++++++++++++
srcpkgs/Carla/patches/libmagic.patch | 14 +++++++++++++
srcpkgs/Carla/template | 10 ++++-----
3 files changed, 47 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Carla/patches/gcc-9.2.0.patch
create mode 100644 srcpkgs/Carla/patches/libmagic.patch
diff --git a/srcpkgs/Carla/patches/gcc-9.2.0.patch b/srcpkgs/Carla/patches/gcc-9.2.0.patch
new file mode 100644
index 00000000000..b20cc9a6852
--- /dev/null
+++ b/srcpkgs/Carla/patches/gcc-9.2.0.patch
@@ -0,0 +1,29 @@
+--- source/bridges-ui/CarlaBridgeToolkitQt.cpp
++++ source/bridges-ui/CarlaBridgeToolkitQt.cpp
+@@ -256,12 +256,6 @@
+ #endif
+ };
+
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+-# include "CarlaBridgeToolkitQt5.moc"
+-#else
+-# include "CarlaBridgeToolkitQt4.moc"
+-#endif
+-
+ // -------------------------------------------------------------------------
+
+ CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format)
+@@ -279,9 +273,13 @@
+ int qInitResources();
+ int qCleanupResources();
+
++CARLA_BRIDGE_UI_USE_NAMESPACE
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
++# include "CarlaBridgeToolkitQt5.moc"
+ # include "resources.qt5.cpp"
+ #else
++# include "CarlaBridgeToolkitQt4.moc"
+ # include "resources.qt4.cpp"
+ #endif
+
diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch
new file mode 100644
index 00000000000..d53a7c56887
--- /dev/null
+++ b/srcpkgs/Carla/patches/libmagic.patch
@@ -0,0 +1,14 @@
+--- source/Makefile.mk
++++ 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/template b/srcpkgs/Carla/template
index d4d36a4923d..e974af3238b 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,19 +1,17 @@
# Template file for 'Carla'
pkgname=Carla
version=2.0.0
-revision=2
+revision=3
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
-make_build_args="DEFAULT_QT=5"
-make_install_args="DEFAULT_QT=5"
pycompile_module="carla_utils.py carla_backend.py"
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3"
-makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel
+hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+makedepends="python3-PyQt5 libmagic file-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
-depends="python3 python3-PyQt5 python3-PyQt5-svg"
+depends="python3 python3-PyQt5 python3-PyQt5-svg which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (15 preceding siblings ...)
2020-02-04 10:43 ` voidlinux-github
@ 2020-02-04 18:08 ` voidlinux-github
2020-02-06 20:12 ` [PR PATCH] [Merged]: " voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-04 18:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/18662#issuecomment-582041246
Comment:
Yes, use **py3_ver**, and remove pycompile_module. Looks good beside those.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: Carla: add patch for gcc 9
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
` (16 preceding siblings ...)
2020-02-04 18:08 ` voidlinux-github
@ 2020-02-06 20:12 ` voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-02-06 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a merged pull request on the void-packages repository
Carla: add patch for gcc 9
https://github.com/void-linux/void-packages/pull/18662
Description:
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2020-02-06 20:12 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-30 14:27 [PR PATCH] Carla: add patch for gcc 9 voidlinux-github
2020-01-30 14:57 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-30 17:49 ` voidlinux-github
2020-01-30 23:43 ` voidlinux-github
2020-01-31 20:00 ` voidlinux-github
2020-02-01 1:25 ` voidlinux-github
2020-02-01 1:27 ` voidlinux-github
2020-02-01 7:49 ` [PR PATCH] [Updated] " voidlinux-github
2020-02-03 2:06 ` voidlinux-github
2020-02-03 2:09 ` voidlinux-github
2020-02-03 20:12 ` voidlinux-github
2020-02-04 2:55 ` voidlinux-github
2020-02-04 2:58 ` [PR PATCH] [Updated] " voidlinux-github
2020-02-04 7:35 ` voidlinux-github
2020-02-04 8:06 ` voidlinux-github
2020-02-04 8:07 ` voidlinux-github
2020-02-04 10:43 ` voidlinux-github
2020-02-04 18:08 ` voidlinux-github
2020-02-06 20:12 ` [PR PATCH] [Merged]: " voidlinux-github
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).