Date: Friday, October 7, 2016 @ 20:12:39
Author: arojas
Revision: 191605
Boost 1.62 rebuild
Added:
guitarix2/trunk/guitarix2-fix-build.patch
Modified:
guitarix2/trunk/PKGBUILD
Deleted:
guitarix2/trunk/guitarix-abs.patch
---------------------------+
PKGBUILD | 12 +++++++++---
guitarix-abs.patch | 12 ------------
guitarix2-fix-build.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-07 20:11:25 UTC (rev 191604)
+++ PKGBUILD 2016-10-07 20:12:39 UTC (rev 191605)
@@ -3,7 +3,7 @@
pkgname=guitarix2
pkgver=0.35.1
-pkgrel=1
+pkgrel=2
pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
arch=('i686' 'x86_64')
url="http://guitarix.sourceforge.net/";
@@ -15,9 +15,15 @@
provides=('guitarix' 'gx_head')
conflicts=('guitarix' 'gx_head')
replaces=('guitarix' 'gx_head')
-source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.xz";)
-md5sums=('fb7269fe6fdde4c493be65f974819bb4')
+source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.xz";
guitarix2-fix-build.patch)
+md5sums=('fb7269fe6fdde4c493be65f974819bb4'
+ '1a2a417e19652e7eaf1779aff81a9564')
+prepare() {
+ cd guitarix-$pkgver
+ patch -p1 -i ../guitarix2-fix-build.patch # Debian patch
+}
+
build() {
cd guitarix-$pkgver
python2 waf configure --prefix=/usr \
Deleted: guitarix-abs.patch
===================================================================
--- guitarix-abs.patch 2016-10-07 20:11:25 UTC (rev 191604)
+++ guitarix-abs.patch 2016-10-07 20:12:39 UTC (rev 191605)
@@ -1,12 +0,0 @@
-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>
Added: guitarix2-fix-build.patch
===================================================================
--- guitarix2-fix-build.patch (rev 0)
+++ guitarix2-fix-build.patch 2016-10-07 20:12:39 UTC (rev 191605)
@@ -0,0 +1,44 @@
+--- guitarix-0.35.1/src/gx_head/engine/gx_system.cpp.orig 2016-10-07
19:41:19.707493651 +0000
++++ guitarix-0.35.1/src/gx_head/engine/gx_system.cpp 2016-10-07
19:42:18.128197974 +0000
+@@ -349,7 +349,7 @@
+ file->enumerate_children(G_FILE_ATTRIBUTE_STANDARD_NAME
+ "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME);
+ Glib::RefPtr<Gio::FileInfo> file_info;
+- while ((file_info = child_enumeration->next_file()) != 0) {
++ while (file_info = child_enumeration->next_file()) {
+ if (file_info->get_file_type() == Gio::FILE_TYPE_DIRECTORY) {
+ Glib::RefPtr<Gio::File> child = file->get_child(
+
file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME));
+diff --git a/trunk/src/gx_head/engine/ladspaback.cpp
b/trunk/src/gx_head/engine/ladspaback.cpp
+index 2a6bd01..be934a7 100644
+--- guitarix-0.35.1/src/gx_head/engine/ladspaback.cpp
++++ guitarix-0.35.1/src/gx_head/engine/ladspaback.cpp
+@@ -1622,7 +1622,7 @@ void LadspaPluginList::load(gx_system::CmdlineOptions&
options, std::vector<std:
+ ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+ Glib::RefPtr<Gio::FileInfo> file_info;
+
+- while ((file_info = child_enumeration->next_file()) != 0) {
++ while ((file_info = child_enumeration->next_file())) {
+ if
(file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)
== "application/x-sharedlib") {
+ std::string nm =
file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME);
+ if (lib_is_blacklisted(nm)) {
+@@ -1650,7 +1650,7 @@ void LadspaPluginList::load(gx_system::CmdlineOptions&
options, std::vector<std:
+ ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+ Glib::RefPtr<Gio::FileInfo> file_info;
+
+- while ((file_info = child_enumeration->next_file()) != 0) {
++ while ((file_info = child_enumeration->next_file())) {
+ //if not f.endswith((".rdf",".rdfs")):
+ if
(file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)
== "application/rdf+xml") {
+ std::string nm =
file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME);
+--- guitarix-0.35.1/src/gx_head/engine/gx_system.cpp.orig 2016-10-07
19:53:44.599882708 +0000
++++ guitarix-0.35.1/src/gx_head/engine/gx_system.cpp 2016-10-07
19:53:56.963366468 +0000
+@@ -329,7 +329,7 @@
+ ","
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME
+ ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+ Glib::RefPtr<Gio::FileInfo> file_info;
+- while ((file_info = child_enumeration->next_file()) != 0) {
++ while (file_info = child_enumeration->next_file()) {
+ if
(file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)
== "audio/x-wav") {
+ listing.push_back(
+ FileName(
