From owner-svn-ports-head@FreeBSD.ORG Sun Feb 15 21:46:08 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0717364D; Sun, 15 Feb 2015 21:46:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB345C45; Sun, 15 Feb 2015 21:46:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1FLk7ia075289; Sun, 15 Feb 2015 21:46:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1FLk7Hr075286; Sun, 15 Feb 2015 21:46:07 GMT (envelope-from pgj@FreeBSD.org) Message-Id: <201502152146.t1FLk7Hr075286@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org using -f From: Gabor Pali Date: Sun, 15 Feb 2015 21:46:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379052 - in head/x11-wm: hs-xmonad hs-xmonad-contrib hs-xmonad/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2015 21:46:08 -0000 Author: pgj Date: Sun Feb 15 21:46:06 2015 New Revision: 379052 URL: https://svnweb.freebsd.org/changeset/ports/379052 QAT: https://qat.redports.org/buildarchive/r379052/ Log: - Add a (default) xmonad workaround for losing hotkeys in certain cases. For the details, please see the related bug report or issue #576 in the xmonad bug tracker [1]. [1] https://code.google.com/p/xmonad/issues/detail?id=576 PR: 181049 Submitted by: Dominik Ernst Obtained from: FreeBSD Haskell MFH: 2015Q1 Added: head/x11-wm/hs-xmonad/files/ head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs (contents, props changed) Modified: head/x11-wm/hs-xmonad-contrib/Makefile head/x11-wm/hs-xmonad/Makefile Modified: head/x11-wm/hs-xmonad-contrib/Makefile ============================================================================== --- head/x11-wm/hs-xmonad-contrib/Makefile Sun Feb 15 21:45:52 2015 (r379051) +++ head/x11-wm/hs-xmonad-contrib/Makefile Sun Feb 15 21:46:06 2015 (r379052) @@ -3,7 +3,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org Modified: head/x11-wm/hs-xmonad/Makefile ============================================================================== --- head/x11-wm/hs-xmonad/Makefile Sun Feb 15 21:45:52 2015 (r379051) +++ head/x11-wm/hs-xmonad/Makefile Sun Feb 15 21:46:06 2015 (r379052) @@ -3,7 +3,7 @@ PORTNAME= xmonad PORTVERSION= 0.11 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -19,5 +19,15 @@ MAN1SRC= man EXECUTABLE= xmonad +OPTIONS_DEFINE+= XFORK_FIX +OPTIONS_DEFAULT+= XFORK_FIX + +XFORK_FIX_DESC= Apply workaround for losing hotkeys (XMonad \#576) + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" + +.if ${PORT_OPTIONS:MXFORK_FIX} +EXTRA_PATCHES+= ${PATCHDIR}/nopatch-XMonad_Core.hs +.endif + .include Added: head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs Sun Feb 15 21:46:06 2015 (r379052) @@ -0,0 +1,20 @@ +--- XMonad/Core.hs.orig 2013-01-01 01:31:47 UTC ++++ XMonad/Core.hs +@@ -400,10 +400,13 @@ spawnPID x = xfork $ executeFile "/bin/s + + -- | A replacement for 'forkProcess' which resets default signal handlers. + xfork :: MonadIO m => IO () -> m ProcessID +-xfork x = io . forkProcess . finally nullStdin $ do +- uninstallSignalHandlers +- createSession +- x ++xfork x = do ++ pid <- liftIO $ forkProcess $ finally nullStdin $ do ++ forkProcess $ do ++ uninstallSignalHandlers ++ createSession ++ x ++ return pid + where + nullStdin = do + fd <- openFd "/dev/null" ReadOnly Nothing defaultFileFlags