[arch-commits] Commit in giada/trunk (PKGBUILD giada-atomic_include.diff)

[David Runge]

    Date: Sunday, March 10, 2019 @ 15:14:43
  Author: dvzrv
Revision: 439338

upgpkg: giada 0.15.4-1

Upgrading to 0.15.4. Removing fix for atomic include.

Modified:
  giada/trunk/PKGBUILD
Deleted:
  giada/trunk/giada-atomic_include.diff

---------------------------+
 PKGBUILD                  |   12 ++++--------
 giada-atomic_include.diff |   19 -------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-10 14:01:19 UTC (rev 439337)
+++ PKGBUILD	2019-03-10 15:14:43 UTC (rev 439338)
@@ -1,6 +1,6 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=giada
-pkgver=0.15.3
+pkgver=0.15.4
 pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=('x86_64')
@@ -10,10 +10,8 @@
 depends=('fltk' 'jansson' 'libpulse' 'libxpm' 'rtmidi')
 makedepends=('gendesk' 'imagemagick')
 checkdepends=('catch2' 'xorg-server-xvfb')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/monocasual/${pkgname}/archive/v${pkgver}.tar.gz"
-        "$pkgname-atomic_include.diff")
-sha512sums=('05e928bb228e8cf14816558e8d5981fb1457596a6bbae55ae1b1b224d5dd1f64652cc6310e4771e2b4eb1b3384788c3d485110f89103785494d82ee293a8fe34'
-            'dd1164c659e158faabcffe35abd85daf06d1a233c6c017bea6e1221fcf18da2402247757959168bec27252a6fee247939390f1f55b53a938e1a06eb64fb1963f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/monocasual/${pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('53575620d13d2bab57ab2431dfcc8967bcc6a1109e788bc52bef638268f314a75f8c9a6de2301de31fbc0eca578874e641d14bf6e26e02f4c156d970d36345dd')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -24,9 +22,7 @@
           --pkgdesc "${pkgdesc}" \
           --name Giada \
           --categories "AudioVideo;Audio;Midi;Sequencer"
-  # add missing atomic include: https://github.com/monocasual/giada/pull/241
-  patch -Np1 -i ../${pkgname}-atomic_include.diff
-  # fixing broken catch2 include
+  # fixing catch2 include for system library
   sed -e 's|catch\.hpp|catch2/catch\.hpp|g' -i tests/*.cpp
 }
 

Deleted: giada-atomic_include.diff
===================================================================
--- giada-atomic_include.diff	2019-03-10 14:01:19 UTC (rev 439337)
+++ giada-atomic_include.diff	2019-03-10 15:14:43 UTC (rev 439338)
@@ -1,19 +0,0 @@
-diff --git c/src/core/init.cpp w/src/core/init.cpp
-index ef551592..ca5ec023 100644
---- c/src/core/init.cpp
-+++ w/src/core/init.cpp
-@@ -27,6 +27,7 @@
- 
- #include <thread>
- #include <ctime>
-+#include <atomic>
- #ifdef __APPLE__
- 	#include <pwd.h>
- #endif
-@@ -245,4 +246,4 @@ void shutdown()
- 	gu_log("[init] Giada " G_VERSION_STR " closed\n\n");
- 	gu_logClose();
- }
--}}} // giada::m::init
-\ No newline at end of file
-+}}} // giada::m::init