upgpkg: haskell-gtk2 0.14.7-1

2 files changed, 20 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf2d120d982c..47f28ad135d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = haskell-gtk2
 	pkgdesc = The core library of the Gtk2Hs suite of libraries for Haskell based on Gtk+.
-	pkgver = 0.14.6
-	pkgrel = 2
+	pkgver = 0.14.7
+	pkgrel = 1
 	url = http://hackage.haskell.org/package/gtk
-	arch = i686
 	arch = x86_64
 	license = LGPL-2.1
-	makedepends = haskell-gtk2hs-buildtools>=0.13.2.0
-	depends = ghc>=8.0.1
+	makedepends = ghc
+	makedepends = haskell-gtk2hs-buildtools
+	depends = ghc-libs
 	depends = haskell-mtl
-	depends = haskell-text>=0.11.0.6
-	depends = haskell-glib>=0.13.0.0
-	depends = haskell-pango>=0.13.0.0
-	depends = haskell-cairo>=0.13.0.0
+	depends = haskell-text
+	depends = haskell-glib
+	depends = haskell-pango
+	depends = haskell-cairo
 	depends = gtk2
-	source = https://hackage.haskell.org/packages/archive/gtk/0.14.6/gtk-0.14.6.tar.gz
-	sha256sums = 707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327
+	source = https://hackage.haskell.org/packages/archive/gtk/0.14.7/gtk-0.14.7.tar.gz
+	sha512sums = 9c837342d3dd2977e65dd214cd94b35130792e193b7ad37e26fd327d4d7ec5e24fb7d42b346d1c090925cc8feabe25344384cc48f22c709ba320cb06b5376437
 
 pkgname = haskell-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 84d30d49a91b..70c276f214f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,24 @@
 
 _hkgname=gtk
 pkgname=haskell-gtk2
-pkgver=0.14.6
-pkgrel=2
+pkgver=0.14.7
+pkgrel=1
 pkgdesc="The core library of the Gtk2Hs suite of libraries for Haskell based on Gtk+."
 url="http://hackage.haskell.org/package/${_hkgname}"
+arch=('x86_64')
 license=('LGPL-2.1')
-arch=('i686' 'x86_64')
-makedepends=('haskell-gtk2hs-buildtools>=0.13.2.0')
-depends=('ghc>=8.0.1'
-         'haskell-mtl'
-         'haskell-text>=0.11.0.6'
-         'haskell-glib>=0.13.0.0'
-         'haskell-pango>=0.13.0.0'
-         'haskell-cairo>=0.13.0.0'
-         'gtk2')
+makedepends=('ghc' 'haskell-gtk2hs-buildtools')
+depends=('ghc-libs' 'haskell-mtl' 'haskell-text' 'haskell-glib' 'haskell-pango' 'haskell-cairo' 'gtk2')
 source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha256sums=('707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327')
+sha512sums=('9c837342d3dd2977e65dd214cd94b35130792e193b7ad37e26fd327d4d7ec5e24fb7d42b346d1c090925cc8feabe25344384cc48f22c709ba320cb06b5376437')
 
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
 
-    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
-        --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+        --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
     sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
@@ -38,12 +31,7 @@ package() {
 
     install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
     install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
-    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
-    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"
     install -D -m644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
     rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
-
-    # Remove static libs
-    find "$pkgdir"/usr/lib -name "*.a" -delete
 }