[arch-commits] Commit in guitarix2/trunk (3 files)

[Antonio Rojas]

    Date: Sunday, May 8, 2016 @ 13:30:25
  Author: arojas
Revision: 174307

Hooks

Added:
  guitarix2/trunk/guitarix-abs.patch
Modified:
  guitarix2/trunk/PKGBUILD
Deleted:
  guitarix2/trunk/guitarix2.install

--------------------+
 PKGBUILD           |   14 ++++++++++----
 guitarix-abs.patch |   12 ++++++++++++
 guitarix2.install  |   11 -----------
 3 files changed, 22 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-08 11:12:43 UTC (rev 174306)
+++ PKGBUILD	2016-05-08 11:30:25 UTC (rev 174307)
@@ -3,7 +3,7 @@
 
 pkgname=guitarix2
 pkgver=0.34.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
 arch=('i686' 'x86_64')
 url="http://guitarix.sourceforge.net/"
@@ -15,10 +15,16 @@
 provides=('guitarix' 'gx_head')
 conflicts=('guitarix' 'gx_head')
 replaces=('guitarix' 'gx_head')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2")
-md5sums=('0ac5f18ee738d535b1551ea68ac2fce9')
+source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2" guitarix-abs.patch)
+md5sums=('0ac5f18ee738d535b1551ea68ac2fce9'
+         'a09d63328d248f58c1c605a0071aadda')
 
+prepare() {
+  cd guitarix-$pkgver
+  # Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../guitarix-abs.patch
+}
+
 build() {
   cd guitarix-$pkgver
   python2 waf configure --prefix=/usr \

Added: guitarix-abs.patch
===================================================================
--- guitarix-abs.patch	                        (rev 0)
+++ guitarix-abs.patch	2016-05-08 11:30:25 UTC (rev 174307)
@@ -0,0 +1,12 @@
+diff -Nurp guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h guitarix-0.35.0/libgxwmm/gxwmm/gainline.h
+--- guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h	2016-04-24 06:18:37.000000000 +0200
++++ guitarix-0.35.0/libgxwmm/gxwmm/gainline.h	2016-04-24 21:22:44.846076833 +0200
+@@ -22,7 +22,7 @@
+ #include <gxw/gainpoints.h>
+ #include <vector>
+ 
+-inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
++inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && fabs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
+ inline bool operator!=(const gain_points& p1, const gain_points& p2) { return !(p1 == p2); }
+ 
+ class Gainline: public std::vector<gain_points>

Deleted: guitarix2.install
===================================================================
--- guitarix2.install	2016-05-08 11:12:43 UTC (rev 174306)
+++ guitarix2.install	2016-05-08 11:30:25 UTC (rev 174307)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}