pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/hs-X11-xft Fix build with GHC 7.10.x



details:   https://anonhg.NetBSD.org/pkgsrc/rev/67703fd31476
branches:  trunk
changeset: 407213:67703fd31476
user:      pho <pho%pkgsrc.org@localhost>
date:      Thu Jan 02 16:52:57 2020 +0000

description:
Fix build with GHC 7.10.x

diffstat:

 x11/hs-X11-xft/Makefile |   7 ++++++-
 x11/hs-X11-xft/PLIST    |  22 ----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diffs (47 lines):

diff -r d3eb08ff0384 -r 67703fd31476 x11/hs-X11-xft/Makefile
--- a/x11/hs-X11-xft/Makefile   Thu Jan 02 16:52:28 2020 +0000
+++ b/x11/hs-X11-xft/Makefile   Thu Jan 02 16:52:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/03/12 11:15:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/01/02 16:52:57 pho Exp $
 
 DISTNAME=      X11-xft-0.3.1
 PKGREVISION=   4
@@ -8,6 +8,11 @@
 COMMENT=       Bindings to the Xft library, and some Xrender parts
 LICENSE=       gnu-gpl-v2
 
+# Work around a Cabal bug. It ignores "ld-options" in
+# {package}.buildinfo while linking shared libraries:
+# https://github.com/haskell/cabal/issues/4925
+HASKELL_ENABLE_SHARED_LIBRARY= no
+
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../x11/hs-X11/buildlink3.mk"
diff -r d3eb08ff0384 -r 67703fd31476 x11/hs-X11-xft/PLIST
--- a/x11/hs-X11-xft/PLIST      Thu Jan 02 16:52:28 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/22 21:36:32 szptvlfn Exp $
-lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xft.hi
-lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xrender.hi
-lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/HSX11-xft-${PKGVERSION}.o
-lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/libHSX11-xft-${PKGVERSION}.a
-lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/X11-xft-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/Graphics-X11-Xft.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/Graphics-X11-Xrender.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/X11-xft.haddock
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/mini_Graphics-X11-Xft.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/mini_Graphics-X11-Xrender.html
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/synopsis.png



Home | Main Index | Thread Index | Old Index