From 3dd2a9ab6da2ea6250906c14ca6c0efa150f6dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 7 Apr 2019 18:38:38 +0200
Subject: [PATCH] guitarix: upgrade 0.37.3 -> 0.38.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move PV into recipe

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{guitarix_0.37.3.bb => guitarix.bb}       |  6 +--
 .../0002-Fix-build-with-boost-1.69.0.patch    | 38 -------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 rename recipes-musicians/guitarix/{guitarix_0.37.3.bb => guitarix.bb} (86%)
 delete mode 100644 recipes-musicians/guitarix/guitarix/0002-Fix-build-with-boost-1.69.0.patch

diff --git a/recipes-musicians/guitarix/guitarix_0.37.3.bb b/recipes-musicians/guitarix/guitarix.bb
similarity index 86%
rename from recipes-musicians/guitarix/guitarix_0.37.3.bb
rename to recipes-musicians/guitarix/guitarix.bb
index 64faf08..32ccc8d 100644
--- a/recipes-musicians/guitarix/guitarix_0.37.3.bb
+++ b/recipes-musicians/guitarix/guitarix.bb
@@ -3,13 +3,13 @@ HOMEPAGE = "http://guitarix.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
 
+PV = "0.38.0"
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
     file://0001-do-not-perform-link-test-durin-cross-build.patch \
-    file://0002-Fix-build-with-boost-1.69.0.patch \
 "
-SRC_URI[md5sum] = "78ebc879e5cd7a6e4bd43ff8aec562e1"
-SRC_URI[sha256sum] = "4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1"
+SRC_URI[md5sum] = "c533bfd7223c42a7aef0e516f5b4cc01"
+SRC_URI[sha256sum] = "c709ec903b2ae653802bd9327c32a20a086e6a97e8d029c8d79f1a8445dd655b"
 
 inherit wafold fontcache gettext
 
diff --git a/recipes-musicians/guitarix/guitarix/0002-Fix-build-with-boost-1.69.0.patch b/recipes-musicians/guitarix/guitarix/0002-Fix-build-with-boost-1.69.0.patch
deleted file mode 100644
index f19c6c8..0000000
--- a/recipes-musicians/guitarix/guitarix/0002-Fix-build-with-boost-1.69.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d4e6aa415af0b3a836cbfb882a31e960e5e60246 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 15 Mar 2019 21:14:10 +0100
-Subject: [PATCH] Fix build with boost >= 1.69.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| In file included from ../src/headers/engine.h:73,
-|                  from ../src/gx_head/engine/ladspaplugin.cpp:22:
-| ../src/headers/gx_system.h:353:40: error: expected class-name before '{' token
-| class BasicOptions: boost::noncopyable {
-|                                         ^
-
-and more
-
-Upstream-Status: Backport
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/headers/engine.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/headers/engine.h b/src/headers/engine.h
-index 95f4497..2b6155e 100644
---- a/src/headers/engine.h
-+++ b/src/headers/engine.h
-@@ -39,6 +39,7 @@
- #include <sys/stat.h>
- #include <boost/format.hpp>
- #include <boost/thread/mutex.hpp>
-+#include <boost/core/noncopyable.hpp>
- #include <glibmm/i18n.h>     // NOLINT
- #include <glibmm/optioncontext.h>   // NOLINT
- #include <glibmm/dispatcher.h>
--- 
-2.20.1
-