[arch-commits] Commit in giada/trunk (3 files)
David Runge
dvzrv at gemini.archlinux.org
Thu Nov 11 18:32:13 UTC 2021
Date: Thursday, November 11, 2021 @ 18:32:12
Author: dvzrv
Revision: 1042354
upgpkg: giada 0.19.0-1: Upgrade to 0.19.0.
Update nlohmann-json devendoring patch.
Add patch to fix the icon name used in the XDG desktop file.
Remove the generation of XDG desktop file (upstream ships one now).
Added:
giada/trunk/giada-0.19.0-devendor_nlohmann_json.patch
Modified:
giada/trunk/PKGBUILD
Deleted:
giada/trunk/giada-0.17.2-devendor_nlohmann_json.patch
-------------------------------------------+
PKGBUILD | 34 ++++++++---------
giada-0.17.2-devendor_nlohmann_json.patch | 55 ----------------------------
giada-0.19.0-devendor_nlohmann_json.patch | 45 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 72 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-11-11 18:10:46 UTC (rev 1042353)
+++ PKGBUILD 2021-11-11 18:32:12 UTC (rev 1042354)
@@ -1,7 +1,7 @@
# Maintainer: David Runge <dvzrv at archlinux.org>
pkgname=giada
-pkgver=0.18.2
+pkgver=0.19.0
pkgrel=1
pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
arch=('x86_64')
@@ -11,29 +11,29 @@
depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libx11' 'libxcursor' 'libxft'
'libxinerama' 'libxpm')
# upstream vendors a hacked rtaudio :(
-makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'imagemagick' 'jack'
-'libpulse' 'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi')
+makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'imagemagick' 'jack' 'libpulse'
+'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi')
checkdepends=('xorg-server-xvfb')
provides=('vst3-host')
-source=("https://www.giadamusic.com/data/${pkgname}-v${pkgver}-src.tar.gz"
- "$pkgname-0.17.2-devendor_nlohmann_json.patch")
-sha512sums=('205b27ecbc8c2fef87908a6f0c2c532c1199fba94e4c65d7ba48c07d022c50b30c180a58860b117977e0089ad26e19adee645a06ce42586a8f7ef2ad93166d23'
- 'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce')
-b2sums=('0a59f68ae2641d7e62d98fc18d7ec9cf18164cf7510f0a3c9558f419ee19b39bcedf7fdc1349dbda055d8d36c8f8d61d31cfe363bccb511996af9ba5c3f0691c'
- 'a482f356969c5d184a1eb0945477040cc7c5d1447fee0159cc5d2da05faea0bd696123b0559bdced148b301181f93726a515df24a814dbd08d207e2959f31305')
+source=(
+ "https://www.giadamusic.com/data/${pkgname}-v${pkgver}-src.tar.gz"
+ "${pkgname}-0.19.0-xdg_icon.patch::https://github.com/monocasual/giada/pull/524/commits/e3e55b9d041cec5938edfae73d627aa5b458633d.patch"
+ "$pkgname-0.19.0-devendor_nlohmann_json.patch"
+)
+sha512sums=('da5e4f319a36db316fbbeb66e2b4153412c73a6bc62672df1c3405aaa6ea11867825e0bf2ec60b2f5b51e5c75630b4bf1f74ecf5228b847c832fdfca5c35dca7'
+ '0ff136460d52a8561b665fc3beebbaa44914b4f0493d6847971093ac40d98fad2b25b23189a7ab023d9542f64691d9195956dbe68b0dadc3f9d77381769c4ef1'
+ '4a6be28c0ba1656e4ce63504c031d6a89ae5fdf10a5652021e5a248e3202526095d097cf1337adf03efa7f618a485aadeb5b6024f15950a7b72cd23ad8cd97d6')
+b2sums=('3ad01405dc02d137ff15043d0e89b75a585c925ed830a797f065d572e0a11379856542c4292fa52640208d8d0e2dbee7ccb42a0910ef70c5bb641f4a80126fcf'
+ '5e8ba847bda8734b11a37b3179eaf512a8bf2956fa0cba01ad2113575a9f7d79eb0863e550da0a80a2c81ecb06762b0d11ced379fda35d60e2cc44ed2514a159'
+ '41fce95d1df10e78c080553184bb078abe30eec7ca85b9d3883ffd2191e4b51decee9c946f0b1aa10852e054c28a4e5f8bde62d4f0093d95e6197df464f61e59')
prepare() {
mv -v "$pkgname-$pkgver-src" "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
- # XDG desktop file
- gendesk -n \
- --pkgname ${pkgname} \
- --pkgdesc "${pkgdesc}" \
- --name Giada \
- --categories "AudioVideo;Audio;Midi;Sequencer"
-
# devendor nlohmann-json
- patch -Np1 -i ../"$pkgname-0.17.2-devendor_nlohmann_json.patch"
+ patch -Np1 -i ../"$pkgname-0.19.0-devendor_nlohmann_json.patch"
+ # fix XDG icon name: https://github.com/monocasual/giada/pull/524
+ patch -Np1 -i ../"${pkgname}-0.19.0-xdg_icon.patch"
}
build() {
Deleted: giada-0.17.2-devendor_nlohmann_json.patch
===================================================================
--- giada-0.17.2-devendor_nlohmann_json.patch 2021-11-11 18:10:46 UTC (rev 1042353)
+++ giada-0.17.2-devendor_nlohmann_json.patch 2021-11-11 18:32:12 UTC (rev 1042354)
@@ -1,55 +0,0 @@
-diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
---- a/src/core/conf.cpp 2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/conf.cpp 2021-04-24 16:18:22.530287443 +0200
-@@ -27,7 +27,7 @@
- #include "conf.h"
- #include "core/const.h"
- #include "core/types.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include <FL/Fl.H>
-@@ -315,4 +315,4 @@
- ofs << j;
- return true;
- }
--} // namespace giada::m::conf
-\ No newline at end of file
-+} // namespace giada::m::conf
-diff -ruN a/src/core/init.cpp b/src/core/init.cpp
---- a/src/core/init.cpp 2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/init.cpp 2021-04-24 16:19:01.257069455 +0200
-@@ -54,7 +54,7 @@
- #include "core/sequencer.h"
- #include "core/wave.h"
- #include "core/waveManager.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "glue/main.h"
- #include "gui/dialogs/mainWindow.h"
- #include "gui/dialogs/warnings.h"
-diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
---- a/src/core/midiMapConf.cpp 2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/midiMapConf.cpp 2021-04-24 16:17:56.890211073 +0200
-@@ -26,7 +26,7 @@
-
- #include "midiMapConf.h"
- #include "const.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include "utils/string.h"
-diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
---- a/src/core/patch.cpp 2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/patch.cpp 2021-04-24 16:19:23.867136797 +0200
-@@ -26,7 +26,7 @@
-
- #include "patch.h"
- #include "core/mixer.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/log.h"
- #include "utils/math.h"
- #include <fstream>
Added: giada-0.19.0-devendor_nlohmann_json.patch
===================================================================
--- giada-0.19.0-devendor_nlohmann_json.patch (rev 0)
+++ giada-0.19.0-devendor_nlohmann_json.patch 2021-11-11 18:32:12 UTC (rev 1042354)
@@ -0,0 +1,45 @@
+diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
+--- a/src/core/conf.cpp 2021-11-06 21:07:22.000000000 +0100
++++ b/src/core/conf.cpp 2021-11-11 18:59:02.203649393 +0100
+@@ -27,9 +27,9 @@
+ #include "core/conf.h"
+ #include "core/const.h"
+ #include "core/types.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
+ #include "utils/fs.h"
+ #include "utils/log.h"
++#include <nlohmann/json.hpp>
+ #include <FL/Fl.H>
+ #include <cassert>
+ #include <fstream>
+@@ -296,4 +296,4 @@
+ data.channelsInCount = std::max(1, data.channelsInCount);
+ data.channelsInStart = std::max(0, data.channelsInStart);
+ }
+-} // namespace giada::m
+\ No newline at end of file
++} // namespace giada::m
+diff -ruN a/src/core/midiMapper.h b/src/core/midiMapper.h
+--- a/src/core/midiMapper.h 2021-11-06 21:07:22.000000000 +0100
++++ b/src/core/midiMapper.h 2021-11-11 18:59:25.850387884 +0100
+@@ -27,7 +27,7 @@
+ #ifndef G_MIDIMAPPER_H
+ #define G_MIDIMAPPER_H
+
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include <string>
+ #include <vector>
+
+diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
+--- a/src/core/patch.cpp 2021-11-06 21:07:22.000000000 +0100
++++ b/src/core/patch.cpp 2021-11-11 18:59:48.867124522 +0100
+@@ -26,7 +26,7 @@
+
+ #include "patch.h"
+ #include "core/mixer.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/log.h"
+ #include "utils/math.h"
+ #include <fstream>
More information about the arch-commits
mailing list