diff --git a/.gitignore b/.gitignore index a45c132..c0184bd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xmonad-contrib-0.9.1.tar.gz /xmonad-contrib-0.12.tar.gz /xmonad-contrib-0.13.tar.gz /xmonad-contrib-0.15.tar.gz +/xmonad-contrib-0.16.tar.gz diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 05c0318..b518958 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 0.15 -Release: 5%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: Third party extensions for xmonad License: BSD @@ -15,7 +15,7 @@ Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources Patch0: xmonad-contrib-use_xft-flag.patch -Patch1: xmonad-contrib-0.12-xft-fonts.patch +Patch1: xmonad-contrib-0.16-xft-fonts.patch Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch Patch5: xmonad-contrib-0.11.2-xfce4-terminal.patch @@ -145,6 +145,9 @@ chmod a-x CHANGES.md README.md %changelog +* Wed Jun 10 2020 Jens Petersen - 0.16-1 +- update to 0.16 + * Wed Feb 19 2020 Jens Petersen - 0.15-5 - refresh to cabal-rpm-2.0.2 diff --git a/sources b/sources index f4fb4d2..7df6e29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmonad-contrib-0.15.tar.gz) = c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a +SHA512 (xmonad-contrib-0.16.tar.gz) = 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25 diff --git a/xmonad-contrib-0.12-xft-fonts.patch b/xmonad-contrib-0.12-xft-fonts.patch deleted file mode 100644 index c438ed0..0000000 --- a/xmonad-contrib-0.12-xft-fonts.patch +++ /dev/null @@ -1,48 +0,0 @@ -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" diff --git a/xmonad-contrib-0.16-xft-fonts.patch b/xmonad-contrib-0.16-xft-fonts.patch new file mode 100644 index 0000000..773d82b --- /dev/null +++ b/xmonad-contrib-0.16-xft-fonts.patch @@ -0,0 +1,36 @@ +diff -up xmonad-contrib-0.16/XMonad/Layout/Decoration.hs.orig-misc-fixed xmonad-contrib-0.16/XMonad/Layout/Decoration.hs +--- xmonad-contrib-0.16/XMonad/Layout/Decoration.hs.orig-misc-fixed 2020-06-10 17:28:41.733456236 +0800 ++++ xmonad-contrib-0.16/XMonad/Layout/Decoration.hs 2020-06-10 17:35:05.219917789 +0800 +@@ -103,7 +103,7 @@ instance Default Theme where + , 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.16/XMonad/Layout/ShowWName.hs.orig-misc-fixed xmonad-contrib-0.16/XMonad/Layout/ShowWName.hs +--- xmonad-contrib-0.16/XMonad/Layout/ShowWName.hs.orig-misc-fixed 2001-09-09 09:46:40.000000000 +0800 ++++ xmonad-contrib-0.16/XMonad/Layout/ShowWName.hs 2020-06-10 17:28:41.734456256 +0800 +@@ -63,7 +63,7 @@ data SWNConfig = + + 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 -up xmonad-contrib-0.16/XMonad/Prompt.hs.orig-misc-fixed xmonad-contrib-0.16/XMonad/Prompt.hs +--- xmonad-contrib-0.16/XMonad/Prompt.hs.orig-misc-fixed 2020-06-10 17:28:41.734456256 +0800 ++++ xmonad-contrib-0.16/XMonad/Prompt.hs 2020-06-10 17:36:37.533715800 +0800 +@@ -303,7 +303,7 @@ instance Default XPColor where + + instance Default XPConfig where + def = +- XPC { font = "-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*" ++ XPC { font = "xft:Monospace:size=12" + , bgColor = bgNormal def + , fgColor = fgNormal def + , bgHLight = bgHighlight def