summaryrefslogtreecommitdiff
path: root/community/gmic
diff options
context:
space:
mode:
Diffstat (limited to 'community/gmic')
-rw-r--r--community/gmic/PKGBUILD18
-rw-r--r--community/gmic/opencv-buildfix.patch9
2 files changed, 8 insertions, 19 deletions
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ccc81c138..8d2981a69 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105557 2014-02-10 11:18:20Z spupykin $
+# $Id: PKGBUILD 107782 2014-03-19 15:31:11Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -6,27 +6,25 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.8.3
+pkgver=1.5.8.4
pkgrel=1
arch=("i686" "x86_64")
url="http://gmic.sourceforge.net"
license=("custom:CeCILL")
makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
- "opencv-buildfix.patch")
-md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b'
- '120319b0d6c81c5af186abe2281b79ca')
+source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz")
+md5sums=('103ffe6606981c5d0bedaffd0f466bc2')
prepare() {
cd "${srcdir}/gmic-${pkgver}"
- patch -p1 -i "${srcdir}/opencv-buildfix.patch"
- sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile
- sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile
+ sed -i -e 's|qmake zart.pro|qmake-qt4 zart.pro|g' \
+ -e 's|/etc/bash_completion.d|/usr/share/bash-completion/completions|g' \
+ src/Makefile
}
build() {
cd "${srcdir}/gmic-${pkgver}"
+ (cd zart && qmake-qt4 -o Makefile zart.pro)
make -C src all
make -C zart all
}
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
index ae6f71487..c45ab09f2 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,15 +1,6 @@
diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400
+++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400
-@@ -296,7 +296,7 @@
-
- zart: lib
- ifneq ($(OS),Darwin)
-- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
-+ cd ../zart && qmake zart.pro && $(MAKE) && strip zart
- else
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
- endif
@@ -403,6 +403,7 @@
mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz