Remove support for i686 arch. Use patches in prepare(). Add tests.

4 files changed, 87 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0de05f2a670..638f5e9103ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = flif-git
 	pkgdesc = Free Lossless Image Format (git version)
 	pkgver = 0.3.r96.g74ea92b
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/FLIF-hub/FLIF/
-	arch = i686
 	arch = x86_64
 	license = LGPL3
-	license = APACHE
+	license = Apache
 	makedepends = git
 	depends = gcc-libs
 	depends = libpng
@@ -18,7 +17,11 @@ pkgbase = flif-git
 	provides = flif
 	conflicts = flif
 	source = git+https://github.com/FLIF-hub/FLIF.git
+	source = flif-git-fix-makefile-target-install-pixbufloader.patch
+	source = flif-git-remove-apt-get-references-from-tools.patch
 	sha256sums = SKIP
+	sha256sums = 4d166a2f462b6d250202f6adf3b7280871fe98bc5385a851135d2473785d5399
+	sha256sums = c516d92d4724e319af79bb1ac5d3dde81dac359fd4a02af1ee71239a49d58710
 
 pkgname = flif-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f20256100257..1c518d1556c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 pkgname=flif-git
 _srcname=FLIF
 pkgver=0.3.r96.g74ea92b
-pkgrel=1
+pkgrel=2
 pkgdesc='Free Lossless Image Format (git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://github.com/FLIF-hub/FLIF/'
-license=('LGPL3' 'APACHE')
+license=('LGPL3' 'Apache')
 depends=('gcc-libs' 'libpng' 'sdl2' 'gdk-pixbuf2' 'glib2')
 makedepends=('git')
 optdepends=(
@@ -19,20 +19,21 @@ optdepends=(
 )
 provides=('flif')
 conflicts=('flif')
-source=('git+https://github.com/FLIF-hub/FLIF.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/FLIF-hub/FLIF.git'
+        'flif-git-fix-makefile-target-install-pixbufloader.patch'
+        'flif-git-remove-apt-get-references-from-tools.patch')
+sha256sums=('SKIP'
+            '4d166a2f462b6d250202f6adf3b7280871fe98bc5385a851135d2473785d5399'
+            'c516d92d4724e319af79bb1ac5d3dde81dac359fd4a02af1ee71239a49d58710')
 
 prepare() {
-    cd "${_srcname}/src"
+    cd "${_srcname}"
     
     # fix Makefile target install-pixbufloader
-    sed -i 's|/usr/lib|$(PREFIX)/lib|' Makefile
-    sed -i 's|gdk-pixbuf-query-loaders|#&|' Makefile
-    sed -i 's|xdg-mime|#&|' Makefile
+    patch -Np1 -i "${srcdir}/flif-git-fix-makefile-target-install-pixbufloader.patch"
     
     # remove apt-get references from installed tools
-    cd ../tools
-    sed -i '/apt-get/d' gif2flif apng2flif
+    patch -Np1 -i "${srcdir}/flif-git-remove-apt-get-references-from-tools.patch"
 }
 
 pkgver() {
@@ -45,8 +46,27 @@ pkgver() {
 build() {
     cd "${_srcname}/src"
     
-    make all decoder viewflif pixbufloader
+    make all decoder viewflif pixbufloader test-interface
+    
+}
+
+check() {
+    cd "${_srcname}/testFiles"
+    
+    local _image
+    local _images
+    _images=($(find -type f -name '*'))
+    
+    cd "${srcdir}/${_srcname}/src"
+    
+    export LD_LIBRARY_PATH="${srcdir}/${_srcname}/src"
     
+    for _image in "${_images[@]}"
+    do
+        _image="${_image#./}"
+        printf '%s\n' "  -> Testing with image '${_image}'..."
+        ./test-interface "../${_image}"
+    done
 }
 
 package() {
diff --git a/flif-git-fix-makefile-target-install-pixbufloader.patch b/flif-git-fix-makefile-target-install-pixbufloader.patch
new file mode 100644
index 000000000000..b070b8bd91f0
--- /dev/null
+++ b/flif-git-fix-makefile-target-install-pixbufloader.patch
@@ -0,0 +1,27 @@
+diff -Naurp a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2019-06-09 02:07:26.000000000 +0000
++++ b/src/Makefile	2019-06-09 02:07:49.000000000 +0000
+@@ -96,10 +96,10 @@ install-libflif$(LIBEXT): libflif$(LIBEX
+ # There is no prefix here because gdk-pixbuf will not search /usr/local for loadrs
+ # while it sucks, it's the truth
+ install-libpixbufloader-flif$(LIBEXT): libpixbufloader-flif$(LIBEXT) install-libflif$(LIBEXT)
+-	install -c -d /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
+-	install -c -m 755 -s libpixbufloader-flif$(LIBEXT) /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
+-	gdk-pixbuf-query-loaders --update-cache
+-	xdg-mime install --novendor flif-mime.xml
++	install -c -d $(PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
++	install -c -m 755 -s libpixbufloader-flif$(LIBEXT) $(PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/
++	#gdk-pixbuf-query-loaders --update-cache
++	#xdg-mime install --novendor flif-mime.xml
+ 
+ install-pixbufloader: install-libpixbufloader-flif$(LIBEXT)
+ 
+@@ -131,7 +131,7 @@ uninstall:
+ 	rm -f $(PREFIX)/lib/libflif$(LIBEXTV)
+ 	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXTV)
+ 	rm -f $(PREFIX)/share/man/man1/flif.1
+-	rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-flif$(LIBEXT)
++	rm -f $(PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-flif$(LIBEXT)
+ 
+ clean:
+ 	rm -f flif dflif lib*flif*$(LIBEXT)* viewflif flif.asan flif.dbg flif.prof flif.stats test-interface $(FILES_O) flif.o library/flif-interface.o
diff --git a/flif-git-remove-apt-get-references-from-tools.patch b/flif-git-remove-apt-get-references-from-tools.patch
new file mode 100644
index 000000000000..50430beabf13
--- /dev/null
+++ b/flif-git-remove-apt-get-references-from-tools.patch
@@ -0,0 +1,22 @@
+diff -Naurp a/tools/apng2flif b/tools/apng2flif
+--- a/tools/apng2flif	2017-04-28 15:46:54.000000000 +0000
++++ b/tools/apng2flif	2019-03-05 15:42:29.000000000 +0000
+@@ -13,7 +13,6 @@ fi
+ if ! $APNGDIS 2>/dev/null |grep -q APNG
+ then
+    echo "APNG Disassembler not found, please install it first!"
+-   echo "sudo apt-get install apngdis"
+    exit 1
+ fi
+ 
+diff -Naurp a/tools/gif2flif b/tools/gif2flif
+--- a/tools/gif2flif	2017-04-28 15:46:54.000000000 +0000
++++ b/tools/gif2flif	2019-03-05 15:42:29.000000000 +0000
+@@ -13,7 +13,6 @@ fi
+ if ! $CONVERT -version 2>/dev/null >/dev/null
+ then
+    echo "ImageMagick not found, please install it first!"
+-   echo "sudo apt-get install imagemagick"
+    exit 1
+ fi
+