Update to new upstream release

3 files changed, 37 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24704d5cdc11..969fef3e9264 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = soqt
 	pkgdesc = A library which provides the glue between Coin and Qt
-	pkgver = 1.6.0a+2014+m872b87e73dfb
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = http://www.coin3d.org/lib/soqt/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = mercurial
 	makedepends = cmake
 	makedepends = doxygen
-	depends = coin>=4.0.0a
+	depends = coin>=4.0.0
 	depends = qt5-base
-	source = soqt::hg+https://bitbucket.org/Coin3D/soqt#revision=872b87e73dfb
-	source = generalmsvcgeneration::hg+https://bitbucket.org/Coin3D/generalmsvcgeneration
-	source = soanydata::hg+https://bitbucket.org/Coin3D/soanydata
-	source = sogui::hg+https://bitbucket.org/Coin3D/sogui
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = https://github.com/coin3d/soqt/archive/SoQt-1.6.0.tar.gz
+	source = soanydata-3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2.tar.gz::https://github.com/coin3d/soanydata/archive/3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2.tar.gz
+	source = sogui-100612bf4016916dd686e2b6fecf8ac23d3db14d.tar.gz::https://github.com/coin3d/sogui/archive/100612bf4016916dd686e2b6fecf8ac23d3db14d.tar.gz
+	source = soqt-remove-cpack.patch::https://github.com/coin3d/soqt/commit/1318402.patch
+	sha256sums = 80bbee01089af754380c48ea435008ea93465149999a545741c410efe8e9bef9
+	sha256sums = ede29d60d1b35e66193aaf115784f87867ab1658cb1d977fe75dfc0d0ffb3241
+	sha256sums = 605c649902c7be3549b9df7bfdd11d80f13f3aa09b8f0654bf99bcf66a1ee914
+	sha256sums = 54df1238fbe412b470e13f2c2f94abba23a283dafb9ca8b14ea31ac348668db5
 
 pkgname = soqt
 
diff --git a/.gitignore b/.gitignore
index 73aa63198ded..f2749e678dd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-soqt/
-generalmsvcgeneration/
-soanydata/
-sogui/
+SoQt-*.tar.gz
+soanydata-*.tar.gz
+sogui-*.tar.gz
 *.pkg.*
+*.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2089c6b67f9f..fde71ab6bee9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,27 +6,39 @@
 # Contributor: marcus fritzsch <fritschy@googlemail.com>
 
 pkgname=soqt
-_count=2014
-_rev=872b87e73dfb
-pkgver=1.6.0a+$_count+m$_rev
+pkgver=1.6.0
+_soanydata_commit=3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2
+_sogui_commit=100612bf4016916dd686e2b6fecf8ac23d3db14d
 pkgrel=1
 pkgdesc='A library which provides the glue between Coin and Qt'
 arch=('i686' 'x86_64')
 url='http://www.coin3d.org/lib/soqt/'
 license=('GPL')
-depends=('coin>=4.0.0a' 'qt5-base')
-makedepends=('mercurial' 'cmake' 'doxygen')
-source=("soqt::hg+https://bitbucket.org/Coin3D/soqt#revision=$_rev"
-        "generalmsvcgeneration::hg+https://bitbucket.org/Coin3D/generalmsvcgeneration"
-        "soanydata::hg+https://bitbucket.org/Coin3D/soanydata"
-        "sogui::hg+https://bitbucket.org/Coin3D/sogui")
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
+depends=('coin>=4.0.0' 'qt5-base')
+makedepends=('cmake' 'doxygen')
+source=("https://github.com/coin3d/soqt/archive/SoQt-$pkgver.tar.gz"
+        "soanydata-$_soanydata_commit.tar.gz::https://github.com/coin3d/soanydata/archive/$_soanydata_commit.tar.gz"
+        "sogui-$_sogui_commit.tar.gz::https://github.com/coin3d/sogui/archive/$_sogui_commit.tar.gz"
+        "soqt-remove-cpack.patch::https://github.com/coin3d/soqt/commit/1318402.patch")
+sha256sums=('80bbee01089af754380c48ea435008ea93465149999a545741c410efe8e9bef9'
+            'ede29d60d1b35e66193aaf115784f87867ab1658cb1d977fe75dfc0d0ffb3241'
+            '605c649902c7be3549b9df7bfdd11d80f13f3aa09b8f0654bf99bcf66a1ee914'
+            '54df1238fbe412b470e13f2c2f94abba23a283dafb9ca8b14ea31ac348668db5')
+
+prepare() {
+    cd soqt-SoQt-$pkgver
+
+    patch -Np1 -i ../soqt-remove-cpack.patch
+
+    ln -rs ../soanydata-$_soanydata_commit data
+    ln -rs ../sogui-$_sogui_commit src/Inventor/Qt/common
+}
 
 build() {
     mkdir -p build
     cd build
 
-    cmake ../soqt \
+    cmake ../soqt-SoQt-$pkgver \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DSOQT_BUILD_DOC_MAN=ON \