summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorbert Pfeiler2019-05-02 03:21:36 +0200
committerNorbert Pfeiler2019-05-02 03:33:10 +0200
commitca0cad378363bff0031246abf449bac6d1b1a6ce (patch)
tree5b4401f7df4d37a2462bd4c35fb3fd6414caecca
parent7b7929bbc655384986d6a7292c220d46136d24b5 (diff)
downloadaur-knossos4.tar.gz
backport GCC8 fix
-rw-r--r--.SRCINFO10
-rw-r--r--GCC8-combat-K4.patch16
-rw-r--r--PKGBUILD15
3 files changed, 31 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8752c6fba75..0e3f2e51871 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Sun Feb 12 14:00:53 UTC 2017
+# Thu May 2 01:32:33 UTC 2019
pkgbase = knossos4
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 = 10
- url = http://www.knossostool.org/
+ pkgrel = 11
+ url = https://knossos.app
arch = x86_64
license = GPL2
makedepends = boost
@@ -14,7 +14,7 @@ pkgbase = knossos4
depends = curl
depends = glu
depends = glut
- depends = qt5-python27
+ depends = qt5-python27-git
depends = qt5-tools
depends = quazip-qt5
depends = snappy
@@ -23,11 +23,13 @@ pkgbase = knossos4
source = knossos4.desktop
source = qt-5.7.patch
source = quazip.patch
+ source = GCC8-combat-K4.patch
md5sums = c648b510bcec05a914540eea7f577bfa
md5sums = 07e9b7ac1ed5ecd0185ae92e61e97bbb
md5sums = 67a3dfea8d64d8b9eb999f16096819ee
md5sums = 10ac71de3331013293518da4be88cde6
md5sums = be06cd6e91c80b63b9bfe4184b537d7e
+ md5sums = 9e6daa1198b3f819379995d37178e3d1
pkgname = knossos4
diff --git a/GCC8-combat-K4.patch b/GCC8-combat-K4.patch
new file mode 100644
index 00000000000..d38a6d9b691
--- /dev/null
+++ b/GCC8-combat-K4.patch
@@ -0,0 +1,16 @@
+diff --git a/hash_list.h b/hash_list.h
+index 5e817c6e..94921f83 100644
+--- a/hash_list.h
++++ b/hash_list.h
+@@ -42,9 +42,9 @@ class hash_list {
+ using value_type = T;
+ using size_type = std::size_t;
+ using difference_type = std::ptrdiff_t;
+- using reference = reference;
++// using reference = reference;
+ using const_reference = const T &;
+- using iterator = iterator;
++// using iterator = iterator;
+ using const_iterator = typename decltype(data)::const_iterator;
+ using reverse_iterator = std::reverse_iterator<iterator>;
+ using const_reverse_iterator = std::reverse_iterator<const_iterator>;
diff --git a/PKGBUILD b/PKGBUILD
index 31f9277f1cb..501a959943b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@
pkgname=knossos4
pkgver=4.1.2
-pkgrel=10
-arch=('x86_64')
+pkgrel=11
+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/"
+url="https://knossos.app"
license=("GPL2")
depends=("curl"
"glu"
"glut"
- "qt5-python27"
+ "qt5-python27-git" # qt5-python27
"qt5-tools"
"quazip-qt5"
"snappy"
@@ -28,25 +28,28 @@ source=("https://github.com/knossos-project/knossos/archive/v$pkgver.tar.gz"
"knossos4.desktop"
"qt-5.7.patch"
"quazip.patch"
+ "GCC8-combat-K4.patch"
)
md5sums=('c648b510bcec05a914540eea7f577bfa'
'07e9b7ac1ed5ecd0185ae92e61e97bbb'
'67a3dfea8d64d8b9eb999f16096819ee'
'10ac71de3331013293518da4be88cde6'
- 'be06cd6e91c80b63b9bfe4184b537d7e')
+ 'be06cd6e91c80b63b9bfe4184b537d7e'
+ '9e6daa1198b3f819379995d37178e3d1')
prepare() {
cd "knossos-$pkgver"
patch -p 1 -i ../curl.patch
patch -p 1 -i ../quazip.patch
patch -p 1 -i ../qt-5.7.patch
+ patch -p 1 -i ../GCC8-combat-K4.patch
}
build() {
mkdir -p "build-$CHOST-$pkgname-$pkgver"
cd "build-$CHOST-$pkgname-$pkgver"
cmake -G Ninja ../knossos-$pkgver
- ninja
+ cmake --build .
}
package() {