From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Carla: add patch for gcc 9
Date: Tue, 04 Feb 2020 03:58:51 +0100 [thread overview]
Message-ID: <20200204025851.laVAT6IJkDHdTzo03c1U97TVIJMX01-Dv5_LDxqdQXE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18662@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2020-02-04 2:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 14:27 [PR PATCH] " 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 ` voidlinux-github [this message]
2020-02-04 7:35 ` [PR PATCH] [Updated] " 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
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=20200204025851.laVAT6IJkDHdTzo03c1U97TVIJMX01-Dv5_LDxqdQXE@z \
--to=voidlinux-github@inbox.vuxu.org \
--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).