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

[David Runge]

    Date: Monday, February 11, 2019 @ 17:51:21
  Author: dvzrv
Revision: 431747

upgpkg: giada 0.15.3-1

Upgrading to 0.15.3. Adding fix for missing atomic include. Adding check() (running in xvfb). Patching catch.hpp include.

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

---------------------------+
 PKGBUILD                  |   28 ++++++++++++++++++++--------
 giada-atomic_include.diff |   19 +++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-11 15:20:45 UTC (rev 431746)
+++ PKGBUILD	2019-02-11 17:51:21 UTC (rev 431747)
@@ -1,6 +1,6 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=giada
-pkgver=0.15.2
+pkgver=0.15.3
 pkgrel=1
 pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
 arch=('x86_64')
@@ -9,8 +9,11 @@
 groups=('pro-audio')
 depends=('fltk' 'jansson' 'libpulse' 'libxpm' 'rtmidi')
 makedepends=('gendesk' 'imagemagick')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/monocasual/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('3622e0218c53b0dd2dc0e527372cd44f013a7e69e2c99db078ece8f09941505820895dc54157bf56081ff95e89ecaa08f82e51911a4d0de7d40dde29fef9c2db')
+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')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -21,23 +24,32 @@
           --pkgdesc "${pkgdesc}" \
           --name Giada \
           --categories "AudioVideo;Audio;Midi;Sequencer"
-  convert +set date:create +set date:modify \
-    "src/ext/${pkgname}.ico" \
-    "${pkgname}.png"
+  # add missing atomic include: https://github.com/monocasual/giada/pull/241
+  patch -Np1 -i ../${pkgname}-atomic_include.diff
+  # fixing broken catch2 include
+  sed -e 's|catch\.hpp|catch2/catch\.hpp|g' -i tests/*.cpp
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --target=linux
+  ./configure --prefix=/usr \
+              --target=linux \
+              --enable-system-catch
   make
 }
 
+check(){
+  cd "$pkgname-$pkgver"
+  xvfb-run -a make -k check
+}
+
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   # XDG integration
   install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-  install -vDm 644 "${pkgname}.png" -t "${pkgdir}/usr/share/pixmaps"
+  install -vDm 644 "extras/${pkgname}-logo.png" \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
   # docs
   install -vDm 644 {ChangeLog,README.md} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"

Added: giada-atomic_include.diff
===================================================================
--- giada-atomic_include.diff	                        (rev 0)
+++ giada-atomic_include.diff	2019-02-11 17:51:21 UTC (rev 431747)
@@ -0,0 +1,19 @@
+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