From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Fri, 29 Oct 2021 17:55:43 +0530 Subject: [PATCH 1/3] 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 " 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 Date: Fri, 29 Oct 2021 18:00:55 +0530 Subject: [PATCH 2/3] 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 Date: Fri, 29 Oct 2021 18:30:05 +0530 Subject: [PATCH 3/3] 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 ' | $(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 -+# include - # include - # include - # include