patch for quazip compatibility

3 files changed, 66 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fae582a1489..e972ca852f10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = knossos
 	pkgdesc = A software tool for the visualization and annotation of 3D image data. It was developed for the rapid reconstruction of neural morphology and connectivity.
 	pkgver = 4.1.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.knossostool.org/
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
 	depends = boost
+	depends = curl
+	depends = freeglut
 	depends = glu
 	depends = glut
 	depends = libgl
@@ -16,8 +18,10 @@ pkgbase = knossos
 	depends = snappy
 	source = https://github.com/knossos-project/knossos/archive/v4.1.2.tar.gz
 	source = knossos.desktop
+	source = quazip.patch
 	md5sums = c648b510bcec05a914540eea7f577bfa
 	md5sums = 1a2b3733cf5fcb3e1845ce771abb58e9
+	md5sums = be06cd6e91c80b63b9bfe4184b537d7e
 
 pkgname = knossos
 
diff --git a/PKGBUILD b/PKGBUILD
index ead0354ba3c5..a8ccef32062f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,35 @@
 
 pkgname=knossos
 pkgver=4.1.2
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 pkgdesc="A software tool for the visualization and annotation of 3D image data. It was developed for the rapid reconstruction of neural morphology and connectivity."
 url="http://www.knossostool.org/"
 license=("GPL2")
 depends=("boost"
-    "glu"
-    "glut"
-    "libgl"
-    "qt5-base"
-    "qt5-python27"
-    "quazip-qt5"
-    "snappy"
+	"curl"
+	"freeglut"
+	"glu"
+	"glut"
+	"libgl"
+	"qt5-base"
+	"qt5-python27"
+	"quazip-qt5"
+	"snappy"
 )
 makedepends=("cmake")
 source=("https://github.com/knossos-project/knossos/archive/v$pkgver.tar.gz"
 	"knossos.desktop"
+	"quazip.patch"
 )
 md5sums=('c648b510bcec05a914540eea7f577bfa'
-         '1a2b3733cf5fcb3e1845ce771abb58e9')
+         '1a2b3733cf5fcb3e1845ce771abb58e9'
+         'be06cd6e91c80b63b9bfe4184b537d7e')
+
+prepare() {
+	cd "knossos-$pkgver"
+	patch -p 1 -i ../quazip.patch
+}
 
 build() {
 	mkdir -p "build-$CHOST-$pkgname-$pkgver"
diff --git a/quazip.patch b/quazip.patch
new file mode 100644
index 000000000000..977beb0acfec
--- /dev/null
+++ b/quazip.patch
@@ -0,0 +1,43 @@
+diff --git a/cmake/Modules/FindQuaZip.cmake b/cmake/Modules/FindQuaZip.cmake
+index 2f543c0..d882d23 100644
+--- a/cmake/Modules/FindQuaZip.cmake
++++ b/cmake/Modules/FindQuaZip.cmake
+@@ -2,8 +2,8 @@
+ 
+ find_package(ZLIB REQUIRED)
+ 
+-find_library(QUAZIP_LIBRARY quazip PATH_SUFFIXES "QuaZip")
+-find_path(QUAZIP_INCLUDE_DIR quazip/quazip.h)
++find_library(QUAZIP_LIBRARY NAMES quazip quazip5 PATH_SUFFIXES "QuaZip")
++find_path(QUAZIP_INCLUDE_DIR quazip.h PATH_SUFFIXES quazip quazip5)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(QUAZIP
+diff --git a/file_io.cpp b/file_io.cpp
+index 02673f3..6a62dad 100644
+--- a/file_io.cpp
++++ b/file_io.cpp
+@@ -6,7 +6,7 @@
+ 
+ #include <QStandardPaths>
+ 
+-#include <quazip/quazipfile.h>
++#include <quazipfile.h>
+ 
+ #include "segmentation/segmentation.h"
+ #include "skeleton/skeletonizer.h"
+diff --git a/loader.cpp b/loader.cpp
+index 90ef79f..7e47224 100644
+--- a/loader.cpp
++++ b/loader.cpp
+@@ -29,8 +29,8 @@
+ #include "session.h"
+ #include "viewer.h"
+ 
+-#include <quazip/quazip.h>
+-#include <quazip/quazipfile.h>
++#include <quazip.h>
++#include <quazipfile.h>
+ 
+ #include <snappy.h>
+