summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--gem-magick6-fixes.patch6
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cca02448d5f2..a71a12aac65f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Sep 25 14:03:07 UTC 2018
+# Mon Oct 1 09:03:23 UTC 2018
pkgbase = purr-data
pkgdesc = Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)
- pkgver = 2.6.0.r4015.ac6d6849
+ pkgver = 2.6.0.r4017.6206059c
pkgrel = 1
url = https://agraef.github.io/purr-data/
install = purr-data.install
@@ -62,7 +62,7 @@ pkgbase = purr-data
source = purr-data::git+https://bitbucket.org/agraef/purr-data.git#branch=release
source = gem-magick6-fixes.patch
md5sums = SKIP
- md5sums = 6f9b87db6e73a35ec63327e97ad95d66
+ md5sums = f6ed0798a5afc17e46bc16ef97e647c1
source_i686 = http://dl.nwjs.io/v0.22.1/nwjs-sdk-v0.22.1-linux-ia32.tar.gz
md5sums_i686 = e4708d59006219eaa2c54cdb1d682794
source_x86_64 = http://dl.nwjs.io/v0.22.1/nwjs-sdk-v0.22.1-linux-x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b509fc3937f2..5c1e45fab43a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@
# /usr/lib/purr-data, so that 3rd party externals know where to find these.
pkgname=purr-data
-pkgver=2.6.0.r4015.ac6d6849
+pkgver=2.6.0.r4017.6206059c
pkgrel=1
pkgdesc="Jonathan Wilkes' nw.js variant of Pd-L2Ork (git version)"
url="https://agraef.github.io/purr-data/"
@@ -60,7 +60,7 @@ options=('!makeflags' '!strip')
source=("$pkgname::git+https://bitbucket.org/agraef/purr-data.git#branch=release"
"gem-magick6-fixes.patch")
md5sums=('SKIP'
- '6f9b87db6e73a35ec63327e97ad95d66')
+ 'f6ed0798a5afc17e46bc16ef97e647c1')
# nw.js sdk binaries
nwjsname=nwjs-sdk
nwjsver=0.22.1
diff --git a/gem-magick6-fixes.patch b/gem-magick6-fixes.patch
index 13a4059e4a50..a6b4541ab456 100644
--- a/gem-magick6-fixes.patch
+++ b/gem-magick6-fixes.patch
@@ -1,11 +1,11 @@
diff --git a/externals/Makefile b/externals/Makefile
-index 414e1e2e..b7cfa952 100644
+index 363736cf..93833acd 100644
--- a/externals/Makefile
+++ b/externals/Makefile
-@@ -667,6 +667,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
+@@ -675,6 +675,10 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
test -s $(gem_src)/Gem.pd_linux || \
cd $(gem_src) && ./configure \
- CXXFLAGS="-DHAVE_S_STUFF_H" \
+ CXXFLAGS="-DHAVE_S_STUFF_H $(CFLAGS_ADD)" \
+ PKG_IMAGEMAGICK___CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags ImageMagick-6.Q16HDRI)" \
+ PKG_IMAGEMAGICK___LIBS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --libs ImageMagick-6.Q16HDRI)" \
+ PKG_MAGICKCORE_CFLAGS="$(shell PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig pkg-config --cflags MagickCore-6.Q16HDRI)" \