rpms
/
ghc-xmonad-contrib
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.12

This commit is contained in:
Ben Boeckel 2016-04-23 13:43:55 -04:00
parent cc73ca061a
commit 668407d0a6
6 changed files with 67 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ xmonad-contrib-0.9.1.tar.gz
/xmonad-contrib-0.11.2.tar.gz /xmonad-contrib-0.11.2.tar.gz
/xmonad-contrib-0.11.3.tar.gz /xmonad-contrib-0.11.3.tar.gz
/xmonad-contrib-0.11.4.tar.gz /xmonad-contrib-0.11.4.tar.gz
/xmonad-contrib-0.12.tar.gz

30
ghc-xmonad-contrib.spec
View File

@ -3,19 +3,18 @@
%global pkg_name xmonad-contrib %global pkg_name xmonad-contrib
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 0.11.4 Version: 0.12
Release: 2%{?dist} Release: 1%{?dist}
Summary: Third party extensions for xmonad Summary: Third party extensions for xmonad
License: BSD License: BSD
Url: https://hackage.haskell.org/package/%{pkg_name} Url: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
Patch0: xmonad-contrib-use_xft-flag.patch Patch0: xmonad-contrib-use_xft-flag.patch
Patch1: xmonad-contrib-0.10-xft-fonts.patch Patch1: xmonad-contrib-0.12-xft-fonts.patch
Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch
Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch
Patch5: xmonad-contrib-0.11.2-xfce4-terminal.patch Patch5: xmonad-contrib-0.11.2-xfce4-terminal.patch
Patch6: xmonad-contrib-0.11.4-applicative-imports.patch
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros BuildRequires: ghc-rpm-macros
@ -25,6 +24,7 @@ BuildRequires: ghc-X11-xft-devel
BuildRequires: ghc-containers-devel BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel BuildRequires: ghc-directory-devel
BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-extensible-exceptions-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-mtl-devel BuildRequires: ghc-mtl-devel
BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-old-time-devel BuildRequires: ghc-old-time-devel
@ -36,16 +36,16 @@ BuildRequires: ghc-xmonad-devel
# End cabal-rpm deps # End cabal-rpm deps
%description %description
Third party tiling algorithms, configurations and scripts to xmonad, Third party tiling algorithms, configurations and scripts to xmonad, a tiling
a tiling window manager for X. window manager for X.
For an introduction to building, configuring and using xmonad For an introduction to building, configuring and using xmonad extensions, see
extensions, see "XMonad.Doc". In particular: "XMonad.Doc". In particular:
"XMonad.Doc.Configuring", a guide to configuring xmonad "XMonad.Doc.Configuring", a guide to configuring xmonad
"XMonad.Doc.Extending", using the contributed extensions library "XMonad.Doc.Extending", using the contributed extensions library
"XMonad.Doc.Developing", introduction to xmonad internals and writing "XMonad.Doc.Developing", introduction to xmonad internals and writing your own
your own extensions. extensions.
%package devel %package devel
@ -67,7 +67,6 @@ This package provides the Haskell %{pkg_name} library development files.
%patch2 -p1 -b .orig-NET_WM_STATE %patch2 -p1 -b .orig-NET_WM_STATE
%patch4 -p1 -b .orig-rescale %patch4 -p1 -b .orig-rescale
%patch5 -p1 -b .orig-Terminal %patch5 -p1 -b .orig-Terminal
%patch6 -p1 -b .applicative-imports
%build %build
@ -77,6 +76,8 @@ This package provides the Haskell %{pkg_name} library development files.
%install %install
%ghc_lib_install %ghc_lib_install
rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
%post devel %post devel
%ghc_pkg_recache %ghc_pkg_recache
@ -87,14 +88,17 @@ This package provides the Haskell %{pkg_name} library development files.
%files -f %{name}.files %files -f %{name}.files
%doc LICENSE %license LICENSE
%files devel -f %{name}-devel.files %files devel -f %{name}-devel.files
%doc README %doc README.md
%changelog %changelog
* Sat Apr 23 2016 Ben Boeckel <mathstuf@gmail.com> - 0.12-1
- update to 0.12
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-2 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
a41c886280a5414105c1cf241f0fd2f4 xmonad-contrib-0.11.4.tar.gz 39345f462f069f2f0e4a488f7e435dbb xmonad-contrib-0.12.tar.gz

36
xmonad-contrib-0.10-xft-fonts.patch
View File

@ -1,36 +0,0 @@
diff -u xmonad-contrib-0.10/XMonad/Layout/Decoration.hs\~ xmonad-contrib-0.10/XMonad/Layout/Decoration.hs
--- xmonad-contrib-0.10/XMonad/Layout/Decoration.hs~ 2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Layout/Decoration.hs 2012-02-20 19:32:05.807316616 +0900
@@ -98,7 +98,7 @@
, activeTextColor = "#FFFFFF"
, inactiveTextColor = "#BFBFBF"
, urgentTextColor = "#FF0000"
- , fontName = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+ , fontName = "xft:Sans:size=10"
, decoWidth = 200
, decoHeight = 20
, windowTitleAddons = []
diff -up xmonad-contrib-0.10/XMonad/Layout/ShowWName.hs~ xmonad-contrib-0.10/XMonad/Layout/ShowWName.hs
--- xmonad-contrib-0.10/XMonad/Layout/ShowWName.hs~ 2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Layout/ShowWName.hs 2012-02-21 18:50:48.586243032 +0900
@@ -62,7 +62,7 @@ data SWNConfig =
defaultSWNConfig :: SWNConfig
defaultSWNConfig =
- SWNC { swn_font = "-misc-fixed-*-*-*-*-20-*-*-*-*-*-*-*"
+ SWNC { swn_font = "xft:Sans:size=20"
, swn_bgcolor = "black"
, swn_color = "white"
, swn_fade = 1
diff -up xmonad-contrib-0.10/XMonad/Prompt.hs~ xmonad-contrib-0.10/XMonad/Prompt.hs
--- xmonad-contrib-0.10/XMonad/Prompt.hs~ 2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Prompt.hs 2012-02-21 18:54:03.643078084 +0900
@@ -203,7 +203,7 @@ data XPPosition = Top
amberXPConfig, defaultXPConfig, greenXPConfig :: XPConfig
defaultXPConfig =
- XPC { font = "-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*"
+ XPC { font = "xft:Monospace:size=12"
, bgColor = "grey22"
, fgColor = "grey80"
, fgHLight = "black"

31
xmonad-contrib-0.11.4-applicative-imports.patch
View File

@ -1,31 +0,0 @@
diff -u -r -U5 --no-dereference xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs xmonad-contrib-0.11.4.applicative/XMonad/Hooks/DebugEvents.hs
--- xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs 2015-03-27 14:00:21.000000000 -0400
+++ xmonad-contrib-0.11.4.applicative/XMonad/Hooks/DebugEvents.hs 2015-07-19 19:30:24.855769466 -0400
@@ -45,10 +45,11 @@
import Foreign.C.Types
import Numeric (showHex)
import System.Exit
import System.IO
import System.Process
+import Control.Applicative
-- | Event hook to dump all received events. You should probably not use this
-- unconditionally; it will produce massive amounts of output.
debugEventsHook :: Event -> X All
debugEventsHook e = debugEventsHook' e >> return (All True)
diff -u -r -U5 --no-dereference xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs xmonad-contrib-0.11.4.applicative/XMonad/Util/Invisible.hs
--- xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs 2015-03-27 14:00:21.000000000 -0400
+++ xmonad-contrib-0.11.4.applicative/XMonad/Util/Invisible.hs 2015-07-19 19:31:04.061816912 -0400
@@ -20,10 +20,12 @@
Invisible (..)
, whenIJust
, fromIMaybe
) where
+import Control.Applicative
+
-- $usage
-- A wrapper data type to store layout state that shouldn't be persisted across
-- restarts. A common wrapped type to use is @Maybe a@.
-- Invisible derives trivial definitions for Read and Show, so the wrapped data
-- type need not do so.

48
xmonad-contrib-0.12-xft-fonts.patch Normal file
View File

@ -0,0 +1,48 @@
diff -u -r -U5 --no-dereference xmonad-contrib-0.12/XMonad/Layout/Decoration.hs xmonad-contrib-0.12.misc-fixed/XMonad/Layout/Decoration.hs
--- xmonad-contrib-0.12/XMonad/Layout/Decoration.hs 2015-12-21 14:15:08.000000000 -0500
+++ xmonad-contrib-0.12.misc-fixed/XMonad/Layout/Decoration.hs 2016-04-23 13:48:11.030239456 -0400
@@ -95,11 +95,11 @@
, inactiveBorderColor = "#BBBBBB"
, urgentBorderColor = "##00FF00"
, activeTextColor = "#FFFFFF"
, inactiveTextColor = "#BFBFBF"
, urgentTextColor = "#FF0000"
- , fontName = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+ , fontName = "xft:Sans:size=10"
, decoWidth = 200
, decoHeight = 20
, windowTitleAddons = []
, windowTitleIcons = []
}
diff -u -r -U5 --no-dereference xmonad-contrib-0.12/XMonad/Layout/ShowWName.hs xmonad-contrib-0.12.misc-fixed/XMonad/Layout/ShowWName.hs
--- xmonad-contrib-0.12/XMonad/Layout/ShowWName.hs 2015-12-21 14:15:08.000000000 -0500
+++ xmonad-contrib-0.12.misc-fixed/XMonad/Layout/ShowWName.hs 2016-04-23 13:48:11.030239456 -0400
@@ -61,11 +61,11 @@
, swn_fade :: Rational -- ^ Time in seconds of the name visibility
} deriving (Read, Show)
instance Default SWNConfig where
def =
- SWNC { swn_font = "-misc-fixed-*-*-*-*-20-*-*-*-*-*-*-*"
+ SWNC { swn_font = "xft:Sans:size=20"
, swn_bgcolor = "black"
, swn_color = "white"
, swn_fade = 1
}
diff -u -r -U5 --no-dereference xmonad-contrib-0.12/XMonad/Prompt.hs xmonad-contrib-0.12.misc-fixed/XMonad/Prompt.hs
--- xmonad-contrib-0.12/XMonad/Prompt.hs 2015-12-21 14:15:08.000000000 -0500
+++ xmonad-contrib-0.12.misc-fixed/XMonad/Prompt.hs 2016-04-23 13:48:11.031239458 -0400
@@ -232,11 +232,11 @@
amberXPConfig, defaultXPConfig, greenXPConfig :: XPConfig
instance Default XPConfig where
def =
- XPC { font = "-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*"
+ XPC { font = "xft:Monospace:size=12"
, bgColor = "grey22"
, fgColor = "grey80"
, fgHLight = "black"
, bgHLight = "grey"
, borderColor = "white"