CVS commit: pkgsrc/wm/xmonad

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/xmonad
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Sun, 25 Apr 2021 14:19:34 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 25 14:19:34 UTC 2021

Modified Files:
        pkgsrc/wm/xmonad: MESSAGE Makefile distinfo
Added Files:
        pkgsrc/wm/xmonad: PLIST
        pkgsrc/wm/xmonad/patches: patch-src_XMonad_Main.hs

Log Message:
Fix build with GHC 9


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/xmonad/MESSAGE
cvs rdiff -u -r1.13 -r1.14 pkgsrc/wm/xmonad/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/wm/xmonad/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/xmonad/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/xmonad/patches/patch-src_XMonad_Main.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/xmonad/MESSAGE
diff -u pkgsrc/wm/xmonad/MESSAGE:1.1 pkgsrc/wm/xmonad/MESSAGE:1.2
--- pkgsrc/wm/xmonad/MESSAGE:1.1        Mon Jan  4 12:45:36 2016
+++ pkgsrc/wm/xmonad/MESSAGE    Sun Apr 25 14:19:34 2021
@@ -1,5 +1,5 @@
 ===========================================================================
-# $NetBSD: MESSAGE,v 1.1 2016/01/04 12:45:36 szptvlfn Exp $
+$NetBSD: MESSAGE,v 1.2 2021/04/25 14:19:34 pho Exp $
 
     1. create ~/.xmonad/xmonad.hs
     2. $ ghc --make ~/.xmonad/xmonad.hs

Index: pkgsrc/wm/xmonad/Makefile
diff -u pkgsrc/wm/xmonad/Makefile:1.13 pkgsrc/wm/xmonad/Makefile:1.14
--- pkgsrc/wm/xmonad/Makefile:1.13      Sat Jan 11 14:37:18 2020
+++ pkgsrc/wm/xmonad/Makefile   Sun Apr 25 14:19:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/11 14:37:18 pho Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/25 14:19:34 pho Exp $
 
 DISTNAME=      xmonad-0.15
 PKGNAME=       ${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      modified-bsd
 # TODO: This should probably be reconsidered as the default executable
 # is now capable of loading custom configuration files.
 SUBST_CLASSES+=        1
-SUBST_STAGE.1= pre-patch
+SUBST_STAGE.1= post-extract
 SUBST_FILES.1= xmonad.cabal
 SUBST_SED.1=   -e "s|executable xmonad|executable xmonad+  buildable: False|"
 

Index: pkgsrc/wm/xmonad/distinfo
diff -u pkgsrc/wm/xmonad/distinfo:1.5 pkgsrc/wm/xmonad/distinfo:1.6
--- pkgsrc/wm/xmonad/distinfo:1.5       Sat Jan 11 14:01:07 2020
+++ pkgsrc/wm/xmonad/distinfo   Sun Apr 25 14:19:34 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/01/11 14:01:07 pho Exp $
+$NetBSD: distinfo,v 1.6 2021/04/25 14:19:34 pho Exp $
 
 SHA1 (xmonad-0.15.tar.gz) = 817e3235d82652444a3a85debc98f81208c848fb
 RMD160 (xmonad-0.15.tar.gz) = f109498a75c64ac05b47a13d5b5fe241edc95585
 SHA512 (xmonad-0.15.tar.gz) = f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
 Size (xmonad-0.15.tar.gz) = 68822 bytes
+SHA1 (patch-src_XMonad_Main.hs) = a880f203289cd47f99a406ac81ac0b5ed7aeb910

Added files:

Index: pkgsrc/wm/xmonad/PLIST
diff -u /dev/null pkgsrc/wm/xmonad/PLIST:1.4
--- /dev/null   Sun Apr 25 14:19:34 2021
+++ pkgsrc/wm/xmonad/PLIST      Sun Apr 25 14:19:34 2021
@@ -0,0 +1,73 @@
+@comment $NetBSD: PLIST,v 1.4 2021/04/25 14:19:34 pho Exp $
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Config.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Config.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Layout.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Layout.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/ManageHook.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/ManageHook.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/StackSet.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/StackSet.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/${PKGNAME}/${HS_VERSION}/package-description
+lib/${PKGNAME}/${HS_VERSION}/package-id
+man/man1/xmonad.1
+share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Config.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Core.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Layout.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Main.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-ManageHook.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Operations.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-StackSet.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-124.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-45.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-46.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-60.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-61.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-95.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-A.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-All.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-B.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-C.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-D.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-E.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-F.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-G.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-H.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-I.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-J.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-K.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-L.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-U.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-V.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-X.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/xmonad.haddock

Index: pkgsrc/wm/xmonad/patches/patch-src_XMonad_Main.hs
diff -u /dev/null pkgsrc/wm/xmonad/patches/patch-src_XMonad_Main.hs:1.1
--- /dev/null   Sun Apr 25 14:19:34 2021
+++ pkgsrc/wm/xmonad/patches/patch-src_XMonad_Main.hs   Sun Apr 25 14:19:34 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_XMonad_Main.hs,v 1.1 2021/04/25 14:19:34 pho Exp $
+
+Fix build with GHC 9. "as-pattern" can no longer be surrounded by
+whitespace because it's going to make an ambiguity with dependent
+Haskell.
+
+--- src/XMonad/Main.hs.orig    2021-04-25 14:11:38.974316759 +0000
++++ src/XMonad/Main.hs
+@@ -61,7 +61,7 @@ xmonad conf = do
+ 
+     let launch' args = do
+               catchIO buildLaunch
+-              conf' @ XConfig { layoutHook = Layout l }
++              conf'@XConfig { layoutHook = Layout l }
+                   <- handleExtraArgs conf args conf{ layoutHook = Layout (layoutHook conf) }
+               withArgs [] $ launch (conf' { layoutHook = l })
+

Prev by Date: CVS commit: pkgsrc/games/nbsdgames
Next by Date: CVS commit: pkgsrc/wm/xmonad-contrib
Previous by Thread: CVS commit: pkgsrc/games/nbsdgames
Next by Thread: CVS commit: pkgsrc/wm/xmonad-contrib
Indexes:

Home | Main Index | Thread Index | Old Index