[arch-commits] Commit in haskell-gtk/trunk (PKGBUILD gtk2hs-gtk.install)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 17:23:44
  Author: fyan
Revision: 176981

upgpkg: haskell-gtk 0.14.3-1

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1

Modified:
  haskell-gtk/trunk/PKGBUILD
Deleted:
  haskell-gtk/trunk/gtk2hs-gtk.install

--------------------+
 PKGBUILD           |   15 +++++++--------
 gtk2hs-gtk.install |   18 ------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 15:12:23 UTC (rev 176980)
+++ PKGBUILD	2016-05-25 15:23:44 UTC (rev 176981)
@@ -2,21 +2,19 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=haskell-gtk
-pkgver=0.14.2
-pkgrel=3
+pkgver=0.14.3
+pkgrel=1
 pkgdesc="Binding to the gtk library for Gtk2Hs."
 url="http://hackage.haskell.org/package/gtk3"
 license=('LGPL2.1')
 arch=('i686' 'x86_64')
 depends=('ghc' 'gtk3' "haskell-pango" 'haskell-mtl' 'haskell-text')
-makedepends=('gtk2hs-buildtools' 'haddock')
+makedepends=('haskell-gtk2hs-buildtools')
 provides=('gtk2hs-gtk')
 replaces=('gtk2hs-gtk')
 conflicts=('gtk2hs-gtk')
-options=('strip' 'staticlibs')
-install=gtk2hs-gtk.install
 source=(http://hackage.haskell.org/package/gtk3-$pkgver/gtk3-$pkgver.tar.gz)
-md5sums=('710345a6c55df3380186c66e187b7d05')
+md5sums=('321bfb0492967857ff7c2e4746321e49')
 
 build() {
   cd ${srcdir}/gtk3-${pkgver}
@@ -27,6 +25,7 @@
   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
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
@@ -45,8 +44,8 @@
   _update_deps haskell-pango
 
   cd ${srcdir}/gtk3-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
+  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/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
   runhaskell Setup copy --destdir=${pkgdir}

Deleted: gtk2hs-gtk.install
===================================================================
--- gtk2hs-gtk.install	2016-05-25 15:12:23 UTC (rev 176980)
+++ gtk2hs-gtk.install	2016-05-25 15:23:44 UTC (rev 176981)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}