From 92d13d7e17ded9085292b9f05da9430ec0bb1b71 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 18 Jan 2013 18:17:59 +0900 Subject: [PATCH] update to 0.11 release --- .gitignore | 1 + ghc-xmonad-contrib.spec | 16 +++---- sources | 2 +- ...ad-contrib-0.10-BorderResize-smaller.patch | 30 ------------- xmonad-contrib-0.10-X11-1.6.patch | 35 --------------- xmonad-contrib-0.10-takeFocus-core.patch | 45 ------------------- 6 files changed, 8 insertions(+), 121 deletions(-) delete mode 100644 xmonad-contrib-0.10-BorderResize-smaller.patch delete mode 100644 xmonad-contrib-0.10-X11-1.6.patch delete mode 100644 xmonad-contrib-0.10-takeFocus-core.patch diff --git a/.gitignore b/.gitignore index abc83c6..44d2afa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xmonad-contrib-0.9.1.tar.gz /xmonad-contrib-0.9.2.tar.gz /xmonad-contrib-0.10.tar.gz +/xmonad-contrib-0.11.tar.gz diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 4b29a53..73d206a 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -17,8 +17,8 @@ extensions, see "XMonad.Doc". In particular:\ your own extensions. Name: ghc-%{pkg_name} -Version: 0.10 -Release: 8%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: %{common_summary} License: BSD @@ -27,10 +27,7 @@ Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio Patch0: xmonad-contrib-use_xft-flag.patch Patch1: xmonad-contrib-0.10-xft-fonts.patch Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch -Patch3: xmonad-contrib-0.10-BorderResize-smaller.patch Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch -Patch5: xmonad-contrib-0.10-X11-1.6.patch -Patch6: xmonad-contrib-0.10-takeFocus-core.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -59,12 +56,7 @@ BuildRequires: ghc-xmonad-devel %patch0 -p1 -b .orig-xft %patch1 -p1 -b .orig-misc-fixed %patch2 -p1 -b .orig-NET_WM_STATE -%patch3 -p1 -b .orig-mouseborder %patch4 -p1 -b .orig-rescale -%if 0%{?fedora} >= 18 -%patch5 -p1 -b .orig-X11 -%endif -%patch6 -p1 -b .orig-Focus %build @@ -88,6 +80,10 @@ BuildRequires: ghc-xmonad-devel %changelog +* Fri Jan 18 2013 Jens Petersen - 0.11-1 +- update to 0.11 +- BorderResize, X11-1.6, and takeFocus patches no longer needed + * Tue Nov 20 2012 Jens Petersen - 0.10-8 - rebuild diff --git a/sources b/sources index 8a65800..fbe68a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a4353a94ec0ea3a9c4700757ef5ae81 xmonad-contrib-0.10.tar.gz +05fba258ac6063e49b50786a0869bd1f xmonad-contrib-0.11.tar.gz diff --git a/xmonad-contrib-0.10-BorderResize-smaller.patch b/xmonad-contrib-0.10-BorderResize-smaller.patch deleted file mode 100644 index 6d4edb5..0000000 --- a/xmonad-contrib-0.10-BorderResize-smaller.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u xmonad-contrib-0.10/XMonad/Layout/BorderResize.hs.orig-mouseborder xmonad-contrib-0.10/XMonad/Layout/BorderResize.hs ---- xmonad-contrib-0.10/XMonad/Layout/BorderResize.hs.orig-mouseborder 2011-11-19 08:26:06.000000000 +0900 -+++ xmonad-contrib-0.10/XMonad/Layout/BorderResize.hs 2012-03-14 09:46:54.458546418 +0900 -@@ -59,10 +59,8 @@ - - data BorderResize a = BR (M.Map Window RectWithBorders) deriving (Show, Read) - --brBorderOffset :: Position --brBorderOffset = 5 - brBorderSize :: Dimension --brBorderSize = 10 -+brBorderSize = 2 - - borderResize :: l a -> ModifiedLayout BorderResize l a - borderResize = ModifiedLayout (BR M.empty) -@@ -147,10 +145,10 @@ - - prepareBorders :: Rectangle -> [BorderBlueprint] - prepareBorders (Rectangle x y wh ht) = -- [((Rectangle (x + fi wh - brBorderOffset) y brBorderSize ht), xC_right_side , RightSideBorder), -- ((Rectangle (x - brBorderOffset) y brBorderSize ht) , xC_left_side , LeftSideBorder), -- ((Rectangle x (y - brBorderOffset) wh brBorderSize) , xC_top_side , TopSideBorder), -- ((Rectangle x (y + fi ht - brBorderOffset) wh brBorderSize), xC_bottom_side, BottomSideBorder) -+ [((Rectangle (x + fi wh - fi brBorderSize) y brBorderSize ht), xC_right_side , RightSideBorder), -+ ((Rectangle x y brBorderSize ht) , xC_left_side , LeftSideBorder), -+ ((Rectangle x y wh brBorderSize) , xC_top_side , TopSideBorder), -+ ((Rectangle x (y + fi ht - fi brBorderSize) wh brBorderSize), xC_bottom_side, BottomSideBorder) - ] - - handleResize :: [(Window, (BorderType, Window, Rectangle))] -> Event -> X () diff --git a/xmonad-contrib-0.10-X11-1.6.patch b/xmonad-contrib-0.10-X11-1.6.patch deleted file mode 100644 index a16ef9a..0000000 --- a/xmonad-contrib-0.10-X11-1.6.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- xmonad-contrib-0.10/xmonad-contrib.cabal~ 2011-11-19 08:26:06.000000000 +0900 -+++ xmonad-contrib-0.10/xmonad-contrib.cabal 2012-06-11 10:59:49.665575897 +0900 -@@ -61,7 +61,7 @@ - extensions: ForeignFunctionInterface - cpp-options: -DXFT - -- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string -+ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string - - if true - ghc-options: -fwarn-tabs -Wall -diff -u xmonad-contrib-0.10/XMonad/Layout/Spiral.hs\~ xmonad-contrib-0.10/XMonad/Layout/Spiral.hs ---- xmonad-contrib-0.10/XMonad/Layout/Spiral.hs~ 2011-11-19 08:26:06.000000000 +0900 -+++ xmonad-contrib-0.10/XMonad/Layout/Spiral.hs 2012-06-11 11:31:00.123639743 +0900 -@@ -26,7 +26,7 @@ - ) where - - import Data.Ratio --import XMonad -+import XMonad hiding ( Rotation ) - import XMonad.StackSet ( integrate ) - - -- $usage ---- xmonad-contrib-0.10/XMonad/Util/Paste.hs~ 2011-11-19 08:26:06.000000000 +0900 -+++ xmonad-contrib-0.10/XMonad/Util/Paste.hs 2012-06-11 11:49:14.253451338 +0900 -@@ -89,9 +89,3 @@ - sendEvent d w True keyPressMask ev - setEventType ev keyRelease - sendEvent d w True keyReleaseMask ev -- ---- | A null 'KeyMask'. Used when you don't want a character or string shifted, control'd, or what. ---- ---- TODO: This really should be a function in the X11 binding. When noModMask shows up there, remove. --noModMask :: KeyMask --noModMask = 0 diff --git a/xmonad-contrib-0.10-takeFocus-core.patch b/xmonad-contrib-0.10-takeFocus-core.patch deleted file mode 100644 index bc69917..0000000 --- a/xmonad-contrib-0.10-takeFocus-core.patch +++ /dev/null @@ -1,45 +0,0 @@ -Thu Nov 8 14:57:16 PST 2012 Adam Vogt - * Gut H.ICCCMFocus: issue 177 has been merged in core. - - Keep the module for now: the LG3D bit might still be useful - and there's no need to break configs unnecessarily. -diff -rN -u old-XMonadContrib/XMonad/Hooks/ICCCMFocus.hs new-XMonadContrib/XMonad/Hooks/ICCCMFocus.hs ---- old-XMonadContrib/XMonad/Hooks/ICCCMFocus.hs 2012-11-14 23:07:15.699051848 -0800 -+++ new-XMonadContrib/XMonad/Hooks/ICCCMFocus.hs 2012-11-14 23:07:15.982052555 -0800 -@@ -18,6 +18,7 @@ - -- @ - ----------------------------------------------------------------------------- - module XMonad.Hooks.ICCCMFocus -+{-# DEPRECATED "XMonad.Hooks.ICCCMFocus: xmonad>0.10 core merged issue 177" #-} - ( - atom_WM_TAKE_FOCUS - , takeFocusX -@@ -27,27 +28,11 @@ - import XMonad - import XMonad.Hooks.SetWMName - import qualified XMonad.StackSet as W --import Control.Monad -- --atom_WM_TAKE_FOCUS :: -- X Atom --atom_WM_TAKE_FOCUS = -- getAtom "WM_TAKE_FOCUS" - - takeFocusX :: - Window - -> X () --takeFocusX w = -- withWindowSet . const $ do -- dpy <- asks display -- wmtakef <- atom_WM_TAKE_FOCUS -- wmprot <- atom_WM_PROTOCOLS -- protocols <- io $ getWMProtocols dpy w -- when (wmtakef `elem` protocols) $ -- io . allocaXEvent $ \ev -> do -- setEventType ev clientMessage -- setClientMessageEvent ev w wmprot 32 wmtakef currentTime -- sendEvent dpy w False noEventMask ev -+takeFocusX _w = return () - - -- | The value to add to your log hook configuration. - takeTopFocus ::