[arch-commits] Commit in haskell-glib/trunk (PKGBUILD glib2-2.61.2.patch)

[Felix Yan]

    Date: Sunday, October 20, 2019 @ 06:09:33
  Author: felixonmars
Revision: 517627

upgpkg: haskell-glib 0.13.7.1-1

rebuild with glib 0.13.7.1

Modified:
  haskell-glib/trunk/PKGBUILD
Deleted:
  haskell-glib/trunk/glib2-2.61.2.patch

--------------------+
 PKGBUILD           |   16 ++++------------
 glib2-2.61.2.patch |   15 ---------------
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-20 06:05:12 UTC (rev 517626)
+++ PKGBUILD	2019-10-20 06:09:33 UTC (rev 517627)
@@ -1,8 +1,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=haskell-glib
-pkgver=0.13.7.0
-pkgrel=30
+pkgver=0.13.7.1
+pkgrel=1
 pkgdesc="Binding to the GLIB library for Gtk2Hs."
 url="https://hackage.haskell.org/package/glib"
 license=('LGPL2.1')
@@ -12,17 +12,9 @@
 provides=('gtk2hs-glib')
 replaces=('gtk2hs-glib')
 conflicts=('gtk2hs-glib')
-source=(https://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
-        glib2-2.61.2.patch)
-sha512sums=('507fdcc6d686ea25b46d9d6f112aa29ebf751b3db99a19c9938ebd8675a8c167aafe151c96fe115662d15696c79aada93a0b197450159e8f45bc329e3de4455a'
-            'd320c0e29e2624b8c8aed5dde3b0be5617fdda6a253768713cd4ace0a6cca51bab1e5177400986b0d6f72bc87c2e254067694186d429261ed51521a0d47df6d6')
+source=(https://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
+sha512sums=('5bcf10fa8471ffc52daed8f39ed728af730f4cf71d66e2b98540cdb85cf53445a3374f2c170f6859f7aa6deb2543207b6d5399257dfd450d0e5f83b1b4d08eaa')
 
-prepare() {
-    cd glib-$pkgver
-    # https://github.com/gtk2hs/gtk2hs/issues/276
-    patch -p1 -i ../glib2-2.61.2.patch
-}
-
 build() {
     cd "${srcdir}/glib-${pkgver}"
 

Deleted: glib2-2.61.2.patch
===================================================================
--- glib2-2.61.2.patch	2019-10-20 06:05:12 UTC (rev 517626)
+++ glib2-2.61.2.patch	2019-10-20 06:09:33 UTC (rev 517627)
@@ -1,15 +0,0 @@
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
---- haskell-glib-0.13.7.0.orig/glib.cabal
-+++ haskell-glib-0.13.7.0/glib.cabal
-@@ -41,9 +41,9 @@ Library
-                         bytestring >= 0.9.1.10 && < 0.11,
-                         text >= 1.0.0.0 && < 1.3,
-                         containers
--        cpp-options:    -U__BLOCKS__
-+        cpp-options:    -U__BLOCKS__ -D__attribute__(A)=
-         if os(darwin) || os(freebsd)
--          cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull= -D_Noreturn=
-+          cpp-options: -D_Nullable= -D_Nonnull= -D_Noreturn=
-         if flag(closure_signals)
-           cpp-options:  -DUSE_GCLOSURE_SIGNALS_IMPL
-           c-sources: System/Glib/hsgclosure.c