diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | carla-pr-895.diff | 37 | ||||
-rw-r--r-- | changelog.txt | 5 |
4 files changed, 9 insertions, 50 deletions
@@ -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 @@ -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 35f9a44a9c8d..000000000000 --- 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 720e0ee34fb0..78c2f077e301 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 |