soqt-hg: fix up PKGBUILD

- still doesn't work: "generalmsvcgeneration not found"

2 files changed, 38 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16a8c304ea75..a6b9bae55f0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,19 @@
 pkgbase = soqt-hg
-	pkgdesc = SoQt is a library which provides the glue between Coin and Qt. Provides of SoQT and SoQT-Doc
+	pkgdesc = The glue between Coin & Qt
 	pkgver = 20100809
 	pkgrel = 2
-	url = http://www.coin3d.org/lib/soqt/
+	url = https://bitbucket.org/Coin3D/soqt
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = gcc
 	makedepends = doxygen
-	makedepends = coin
 	depends = coin
-	depends = qt
-	depends = libxmu
+	depends = qt4
 	provides = soqt
-	provides = soqt-doc
 	conflicts = soqt
-	conflicts = soqt-doc
-	options = !makeflags
-	source = http://hg.sim.no/SoQt/default/archive/bb2d3916586f.tar.bz2
-	source = http://hg.sim.no/SoGUI/default/archive/239bd7ae533d.tar.bz2
-	source = http://hg.sim.no/SoAnyData/default/archive/fba431fe9560.tar.bz2
-	md5sums = 32a722141d4e50d1cfafe675d5c2cc38
-	md5sums = 5e6c73f965c8f53403ccdfc6ae3f3253
-	md5sums = 5f8f5869de97eedf3f814bdc895d2676
+	options = !libtool
+	source = soqt-hg::hg+https://bitbucket.org/Coin3D/soqt
+	md5sums = SKIP
 
 pkgname = soqt-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index 41ba09b4e099..8585cbb7855d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,41 @@
 pkgname=soqt-hg
 pkgver=20100809
 pkgrel=2
-pkgdesc="SoQt is a library which provides the glue between Coin and Qt. Provides of SoQT and SoQT-Doc"
+pkgdesc="The glue between Coin & Qt"
 arch=('i686' 'x86_64')
-url="http://www.coin3d.org/lib/soqt/"
-license="GPL"
-depends=('coin' 'qt' 'libxmu')
-makedepends=('gcc' 'doxygen' 'coin')
-provides=('soqt' 'soqt-doc')
-conflicts=('soqt' 'soqt-doc')
-replaces=()
-backup=()
-options=('!makeflags')
-install=
-
-_soqtrev=bb2d3916586f
-_soguirev=239bd7ae533d
-_soanydatarev=fba431fe9560
-
-source=("http://hg.sim.no/SoQt/default/archive/${_soqtrev}.tar.bz2" \
-        "http://hg.sim.no/SoGUI/default/archive/${_soguirev}.tar.bz2" \
-        "http://hg.sim.no/SoAnyData/default/archive/${_soanydatarev}.tar.bz2")
-
-md5sums=('32a722141d4e50d1cfafe675d5c2cc38'
-         '5e6c73f965c8f53403ccdfc6ae3f3253'
-         '5f8f5869de97eedf3f814bdc895d2676')
+url="https://bitbucket.org/Coin3D/soqt"
+license=("GPL")
+depends=('coin' 'qt4')
+makedepends=('doxygen')
+provides=('soqt')
+conflicts=('soqt')
+options=('!libtool')
+source=("${pkgname}::hg+https://bitbucket.org/Coin3D/soqt")
+md5sums=('SKIP')
 
+pkgver() {
+	cd "${srcdir}/${pkgname}"
+	echo "$(hg identify -n).$(hg identify -i)"
+}
 
 build() {
-  cd ${srcdir}/default-${_soqtrev}
-  cp -r ${srcdir}/default-${_soguirev} src/Inventor/Qt/common
-  cp -r ${srcdir}/default-${_soanydatarev} data
-
-  cd build
-  ../configure --prefix=/usr --enable-optimization \
-    --enable-threadsafe --enable-html --enable-man --enable-exceptions \
-    --disable-debug --disable-maintainer-mode --disable-dependency-tracking \
-    --enable-shared --disable-static --with-qt=/usr
+	cd "${srcdir}/${pkgname}"
+	./configure --prefix=/usr \
+		--enable-optimization \
+		--enable-man \
+		--enable-exceptions \
+		--disable-debug \
+		--disable-maintainer-mode \
+		--disable-dependency-tracking \
+		--enable-shared \
+		--disable-static \
+		--with-qt=/usr \
+		--enable-threadsafe \
+		--enable-html
+	make
+}
 
-  make DESTDIR=${pkgdir} install || return 1
-  #rm -f ${pkgdir}/usr/lib/libSoQt.la
+package() {
+	cd "${srcdir}/${pkgname}"
+	make DESTDIR=${pkgdir} install
 }