[arch-commits] Commit in guitarix2/trunk (PKGBUILD guitarix2-boost-1.69.patch)

[David Runge]

    Date: Sunday, April 7, 2019 @ 17:43:28
  Author: dvzrv
Revision: 450316

upgpkg: guitarix2 0.38.0-1

Upgrading to 0.38.0. Removing useless set of provides, conflicts, replaces. Only setting guitarix in provides (for future renaming of the package).
Removing unneeded waf configure flags. Adding ldflags (for full RELRO) to waf configure flags. Removing unrequired boost 1.69 patch.

Modified:
  guitarix2/trunk/PKGBUILD
Deleted:
  guitarix2/trunk/guitarix2-boost-1.69.patch

----------------------------+
 PKGBUILD                   |   23 ++++++++---------------
 guitarix2-boost-1.69.patch |   10 ----------
 2 files changed, 8 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-07 16:30:11 UTC (rev 450315)
+++ PKGBUILD	2019-04-07 17:43:28 UTC (rev 450316)
@@ -3,8 +3,8 @@
 
 _name=guitarix
 pkgname=guitarix2
-pkgver=0.37.3
-pkgrel=3
+pkgver=0.38.0
+pkgrel=1
 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
 arch=('x86_64')
 url="https://guitarix.org"
@@ -12,19 +12,13 @@
 groups=('ladspa-plugins' 'lv2-plugins' 'pro-audio')
 depends=('bluez-libs' 'boost-libs' 'gtkmm' 'liblrdf' 'lilv' 'ttf-roboto' 'zita-convolver' 'zita-resampler')
 makedepends=('python2' 'boost' 'eigen' 'gperf' 'intltool' 'lv2')
-optdepends=('meterbridge: sound meters')
-provides=('guitarix' 'gx_head')
-conflicts=('guitarix' 'gx_head')
-replaces=('guitarix' 'gx_head')
-source=("https://download.sourceforge.net/project/guitarix/guitarix/${pkgname}-${pkgver}.tar.xz"
-        guitarix2-boost-1.69.patch)
-sha512sums=('9cdd60dc5ba1a5ae018968a132b06ef8f7470fdfa0749c9a439f7c8adb1dfd3907f9d35be0b32d839645145075f2a0eb168db732ebaef7690e12e337ba9793a5'
-            '19663a64695ea4af18c65744685654312352d12e4d8ce3f2ee516a12236530eb07e65d61ce7aad10e41835b57ee9d6293c4f941ca43140016f8e77d58a2fc57d')
+provides=('guitarix')
+source=("https://download.sourceforge.net/project/guitarix/guitarix/${pkgname}-${pkgver}.tar.xz")
+sha512sums=('277e548c614bd2e5bafa2450fc3c365f7dee7e0ec14bbfb842d91da1aaf4bf8bb859fe94ca689122b20f9cd7bdd0e1ef3fbde02779b7a0dc2bc758dce4f11d75')
 
 prepare() {
   mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
-  patch -p1 -i ../guitarix2-boost-1.69.patch # Fix build with boost 1.69
   # fixing all (hopefully) relevant scripts: https://sourceforge.net/p/guitarix/bugs/43/
   sed -e 's/python/&2/g' \
     -i src/{faust,LV2/*,plugins,ladspa,gx_head}/wscript \
@@ -41,11 +35,10 @@
                         --enable-nls \
                         --ladspa \
                         --new-ladspa \
-                        --no-desktop-update \
-                        --no-ldconfig \
-                        --no-faust \
+                        --faust \
                         --shared-lib \
-                        --lib-dev
+                        --lib-dev \
+                        --ldflags="${LDFLAGS}"
   python2 waf build
 }
 

Deleted: guitarix2-boost-1.69.patch
===================================================================
--- guitarix2-boost-1.69.patch	2019-04-07 16:30:11 UTC (rev 450315)
+++ guitarix2-boost-1.69.patch	2019-04-07 17:43:28 UTC (rev 450316)
@@ -1,10 +0,0 @@
---- a/src/headers/engine.h
-+++ b/src/headers/engine.h
-@@ -38,6 +38,7 @@
- #include <algorithm>
- #include <sys/stat.h>
- #include <boost/format.hpp>
-+#include <boost/noncopyable.hpp>
- #include <boost/thread/mutex.hpp>
- #include <glibmm/i18n.h>     // NOLINT
- #include <glibmm/optioncontext.h>   // NOLINT