cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xmonad-0.13.

Browse Source 
Feierabend!
This commit is contained in:
kili 2018-01-22 22:08:42 +00:00
parent 297f6faae3
commit 3b445ceb8b
6 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/xmonad/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.52 2017/11/21 00:02:18 kili Exp $
# $OpenBSD: Makefile,v 1.53 2018/01/22 22:08:42 kili Exp $
COMMENT-main = tiling window manager
COMMENT-lib = libraries for runtime configuration
DISTNAME = xmonad-0.12
DISTNAME = xmonad-0.13
PKGNAME-main = ${DISTNAME}
PKGNAME-lib = ${DISTNAME:S,-,-lib-,}
CATEGORIES = x11
@ -21,7 +21,7 @@ WANTLIB-lib =
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register nort
MODGHC_PACKAGE_KEY = Gx5TWm0BSEJHl229E6kZrP
MODGHC_PACKAGE_KEY = 1dqhBbsPfpPL2BQEiEEfSU
# Required because of the nort tag in MODGHC_BUILD
SUBST_VARS += MODGHC_PACKAGE_KEY
@ -31,7 +31,7 @@ RUN_DEPENDS-lib = devel/hs-data-default \
devel/hs-extensible-exceptions \
devel/hs-mtl \
devel/hs-utf8-string>=0.3,<1.1 \
x11/hs-X11>=1.5,<1.7
x11/hs-X11>=1.8,<1.9
LIB_DEPENDS-main = converters/libiconv
# MODGHC_BUILD contains 'nort', an explicity dependency is needed for

4
x11/xmonad/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ghc/xmonad-0.12.tar.gz) = 6PZJ29So1fdf2snOte44tk/TUZEK3oHBiPXde8Id/dc=
SIZE (ghc/xmonad-0.12.tar.gz) = 61436
SHA256 (ghc/xmonad-0.13.tar.gz) = +fgbY1afGMd3qTl0ECTsOuNOTshAFeXMUPZiIDSjA8o=
SIZE (ghc/xmonad-0.13.tar.gz) = 72034

9
x11/xmonad/patches/patch-XMonad_Core_hs
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-XMonad_Core_hs,v 1.5 2017/11/07 22:46:32 kili Exp $
$OpenBSD: patch-XMonad_Core_hs,v 1.6 2018/01/22 22:08:42 kili Exp $
From Tomas Janousek.
--- src/XMonad/Core.hs.orig Mon Dec 21 20:12:39 2015
+++ src/XMonad/Core.hs Fri Dec 30 11:20:22 2016
@@ -517,7 +517,11 @@ trace = io . hPutStrLn stderr
Index: src/XMonad/Core.hs
--- src/XMonad/Core.hs.orig
+++ src/XMonad/Core.hs
@@ -650,7 +650,11 @@ trace = io . hPutStrLn stderr
installSignalHandlers :: MonadIO m => m ()
installSignalHandlers = io $ do
installHandler openEndedPipe Ignore Nothing

14
x11/xmonad/patches/patch-src_XMonad_Main_hs
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_XMonad_Main_hs,v 1.1 2017/11/21 00:02:19 kili Exp $
$OpenBSD: patch-src_XMonad_Main_hs,v 1.2 2018/01/22 22:08:42 kili Exp $
I don't like the idea of yet another port with nothing than a binding
for setlocale(3), and I don't know which part of xmonad would benefit
@ -9,16 +9,16 @@ Index: src/XMonad/Main.hs
+++ src/XMonad/Main.hs
@@ -15,7 +15,6 @@
module XMonad.Main (xmonad) where
module XMonad.Main (xmonad, launch) where
-import System.Locale.SetLocale
import Control.Arrow (second)
import qualified Control.Exception.Extensible as E
import Data.Bits
import Data.List ((\\))
@@ -153,8 +152,6 @@ xmonadNoargs :: (LayoutClass l Window, Read (l Window)
-> Maybe String -- ^ serialized extensible state
-> IO ()
xmonadNoargs initxmc serializedWinset serializedExtstate = do
@@ -162,8 +161,6 @@ sendReplace = do
-- your custom binary with the resume flag set to @True@.
launch :: (LayoutClass l Window, Read (l Window)) => XConfig l -> IO ()
launch initxmc = do
- -- setup locale information from environment
- setLocale LC_ALL (Just "")
-- ignore SIGPIPE and SIGCHLD

6
x11/xmonad/patches/patch-xmonad_cabal
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-xmonad_cabal,v 1.10 2017/11/21 00:02:19 kili Exp $
$OpenBSD: patch-xmonad_cabal,v 1.11 2018/01/22 22:08:42 kili Exp $
I don't like the idea of yet another port with nothing than a binding
for setlocale(3), and I don't know which part of xmonad would benefit
@ -7,8 +7,8 @@ from it.
Index: xmonad.cabal
--- xmonad.cabal.orig
+++ xmonad.cabal
@@ -66,7 +66,6 @@ library
directory,
@@ -73,7 +73,6 @@ library
directory >= 1.2.3,
extensible-exceptions,
filepath,
- setlocale,

12
x11/xmonad/pkg/PLIST-lib
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lib,v 1.14 2017/11/07 22:46:32 kili Exp $
@comment $OpenBSD: PLIST-lib,v 1.15 2018/01/22 22:08:42 kili Exp $
lib/ghc/
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
@ -69,19 +69,9 @@ share/doc/hs-${DISTNAME}/html/doc-index-W.html
share/doc/hs-${DISTNAME}/html/doc-index-X.html
share/doc/hs-${DISTNAME}/html/doc-index-Z.html
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-Config.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-Core.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-Layout.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-Main.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-ManageHook.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-Operations.html
share/doc/hs-${DISTNAME}/html/mini_XMonad-StackSet.html
share/doc/hs-${DISTNAME}/html/mini_XMonad.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif