summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Arndt2019-07-12 22:15:21 +0200
committerChristopher Arndt2019-07-12 22:15:21 +0200
commiteadfb79c5778b54f09db5c93701803acded78adf (patch)
tree7beaef80c8ca8986a48ff6cf55a1769d96c22790
parent4b908d2ed619d3c4538dd2849919b5cb54c1e566 (diff)
downloadaur-eadfb79c5778b54f09db5c93701803acded78adf.tar.gz
Remove patch 'carla-pr-895.diff', which is no longer needed
Signed-off-by: Christopher Arndt <chris@chrisarndt.de>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--carla-pr-895.diff37
-rw-r--r--changelog.txt5
4 files changed, 9 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 35ead50f970..9801560ef0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = carla-git
pkgdesc = Audio Plugin Host
- pkgver = 2.1.alpha2.r143.g39960af9
+ pkgver = 2.1.alpha2.r156.ga1f759bc
pkgrel = 1
epoch = 1
url = http://kxstudio.sf.net/carla
@@ -24,9 +24,7 @@ pkgbase = carla-git
provides = carla
conflicts = carla
source = carla::git+https://github.com/falkTX/Carla.git#branch=develop
- source = carla-pr-895.diff
md5sums = SKIP
- md5sums = df18d9b16820c55e31a83be2e432332c
pkgname = carla-git
diff --git a/PKGBUILD b/PKGBUILD
index fce7f1c05ce..4a2e3f71511 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname="carla"
pkgname="${_pkgname}-git"
-pkgver=2.1.alpha2.r143.g39960af9
+pkgver=2.1.alpha2.r156.ga1f759bc
pkgrel=1
epoch=1
pkgdesc="Audio Plugin Host"
@@ -31,10 +31,8 @@ optdepends=(
'python-pyliblo: OSC control support'
'python-rdflib: LADSPA-RDF support'
)
-source=("${_pkgname}::git+https://github.com/falkTX/Carla.git#branch=develop"
- 'carla-pr-895.diff')
-md5sums=('SKIP'
- 'df18d9b16820c55e31a83be2e432332c')
+source=("${_pkgname}::git+https://github.com/falkTX/Carla.git#branch=develop")
+md5sums=('SKIP')
changelog='changelog.txt'
@@ -43,11 +41,6 @@ pkgver() {
git describe --long --tags | sed "s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//"
}
-prepare() {
- cd "${srcdir}/${_pkgname}"
- patch -p1 -N -i "$srcdir/carla-pr-895.diff"
-}
-
build() {
cd "${srcdir}/${_pkgname}"
make \
diff --git a/carla-pr-895.diff b/carla-pr-895.diff
deleted file mode 100644
index 35f9a44a9c8..00000000000
--- a/carla-pr-895.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp
-index 81478fd3b..0fbae9cfe 100644
---- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp
-+++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp
-@@ -263,9 +263,7 @@ class CarlaBridgeToolkitQt: public QObject,
- # pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
- #endif
-
--#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
--# include "CarlaBridgeToolkitQt5.moc"
--#else
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
- # include "CarlaBridgeToolkitQt4.moc"
- #endif
-
-@@ -286,6 +284,21 @@ CARLA_BRIDGE_UI_END_NAMESPACE
-
- // -------------------------------------------------------------------------
-
-+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-+#endif
-+
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-+# include "CarlaBridgeToolkitQt5.moc"
-+#endif
-+
-+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-+# pragma GCC diagnostic pop
-+#endif
-+
-+// -------------------------------------------------------------------------
-+
- #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wmissing-declarations"
diff --git a/changelog.txt b/changelog.txt
index 720e0ee34fb..78c2f077e30 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+2019-07-12 Christopher Arndt <aur -at- chrisarndt -dot- de>
+
+ * 1:2.1.alpha2.r156.ga1f759bc-1
+ Removed patch for Qt >= 5.13 again, as it has been merged upstream.
+
2019-07-10 Christopher Arndt <aur -at- chrisarndt -dot- de>
* 1:2.1.alpha2.r143.g39960af9-1