update to 0.17.1
This commit is contained in:
parent
59b0dcdcf7
commit
b0f118f49d
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ xmonad-contrib-0.9.1.tar.gz
|
|||||||
/xmonad-contrib-0.15.tar.gz
|
/xmonad-contrib-0.15.tar.gz
|
||||||
/xmonad-contrib-0.16.tar.gz
|
/xmonad-contrib-0.16.tar.gz
|
||||||
/xmonad-contrib-0.17.0.tar.gz
|
/xmonad-contrib-0.17.0.tar.gz
|
||||||
|
/xmonad-contrib-0.17.1.tar.gz
|
||||||
|
@ -1,26 +1,26 @@
|
|||||||
# generated by cabal-rpm-2.0.9
|
# generated by cabal-rpm-2.0.12 --stream hackage
|
||||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
|
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
|
||||||
|
|
||||||
%global pkg_name xmonad-contrib
|
%global pkg_name xmonad-contrib
|
||||||
%global pkgver %{pkg_name}-%{version}
|
%global pkgver %{pkg_name}-%{version}
|
||||||
|
|
||||||
|
%bcond_without tests
|
||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.17.0
|
Version: 0.17.1
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Community-maintained extensions extensions for xmonad
|
Summary: Community-maintained extensions for xmonad
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
Url: https://hackage.haskell.org/package/%{pkg_name}
|
Url: https://hackage.haskell.org/package/%{pkg_name}
|
||||||
# Begin cabal-rpm sources:
|
# Begin cabal-rpm sources:
|
||||||
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
|
||||||
Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
|
|
||||||
# End cabal-rpm sources
|
# End cabal-rpm sources
|
||||||
Patch0: xmonad-contrib-use_xft-flag.patch
|
Patch0: xmonad-contrib-use_xft-flag.patch
|
||||||
Patch2: xmonad-contrib-0.17.0-ewmh-set-NET_WM_STATE.patch
|
Patch2: xmonad-contrib-ewmh-set-NET_WM_STATE.patch
|
||||||
Patch4: xmonad-contrib-0.17.0-PositionStore-dont-rescale-with-screen.patch
|
Patch4: xmonad-contrib-0.17.0-PositionStore-dont-rescale-with-screen.patch
|
||||||
|
|
||||||
# Begin cabal-rpm deps:
|
# Begin cabal-rpm deps:
|
||||||
BuildRequires: dos2unix
|
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
BuildRequires: ghc-X11-prof
|
BuildRequires: ghc-X11-prof
|
||||||
@ -28,6 +28,7 @@ BuildRequires: ghc-X11-xft-prof
|
|||||||
BuildRequires: ghc-base-prof
|
BuildRequires: ghc-base-prof
|
||||||
BuildRequires: ghc-bytestring-prof
|
BuildRequires: ghc-bytestring-prof
|
||||||
BuildRequires: ghc-containers-prof
|
BuildRequires: ghc-containers-prof
|
||||||
|
BuildRequires: ghc-deepseq-prof
|
||||||
BuildRequires: ghc-directory-prof
|
BuildRequires: ghc-directory-prof
|
||||||
BuildRequires: ghc-filepath-prof
|
BuildRequires: ghc-filepath-prof
|
||||||
BuildRequires: ghc-mtl-prof
|
BuildRequires: ghc-mtl-prof
|
||||||
@ -37,6 +38,10 @@ BuildRequires: ghc-time-prof
|
|||||||
BuildRequires: ghc-unix-prof
|
BuildRequires: ghc-unix-prof
|
||||||
BuildRequires: ghc-utf8-string-prof
|
BuildRequires: ghc-utf8-string-prof
|
||||||
BuildRequires: ghc-xmonad-prof
|
BuildRequires: ghc-xmonad-prof
|
||||||
|
%if %{with tests}
|
||||||
|
BuildRequires: ghc-QuickCheck-devel
|
||||||
|
BuildRequires: ghc-hspec-devel
|
||||||
|
%endif
|
||||||
# End cabal-rpm deps
|
# End cabal-rpm deps
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -90,7 +95,6 @@ This package provides the Haskell %{pkg_name} profiling library.
|
|||||||
%prep
|
%prep
|
||||||
# Begin cabal-rpm setup:
|
# Begin cabal-rpm setup:
|
||||||
%setup -q -n %{pkgver}
|
%setup -q -n %{pkgver}
|
||||||
dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
|
|
||||||
# End cabal-rpm setup
|
# End cabal-rpm setup
|
||||||
%patch0 -p1 -b .orig-xft
|
%patch0 -p1 -b .orig-xft
|
||||||
%patch2 -p1 -b .orig-NET_WM_STATE
|
%patch2 -p1 -b .orig-NET_WM_STATE
|
||||||
@ -109,6 +113,12 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
|
|||||||
# End cabal-rpm install
|
# End cabal-rpm install
|
||||||
|
|
||||||
|
|
||||||
|
%check
|
||||||
|
%if %{with tests}
|
||||||
|
%cabal_test
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.files
|
%files -f %{name}.files
|
||||||
# Begin cabal-rpm files:
|
# Begin cabal-rpm files:
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
@ -131,6 +141,9 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 14 2022 Jens Petersen <petersen@redhat.com> - 0.17.1-1
|
||||||
|
- https://hackage.haskell.org/package/xmonad-contrib-0.17.1/changelog
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-3
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (xmonad-contrib-0.17.0.tar.gz) = 357ef80565690a1e652f79c877964181134c7f02a5d325dbf3890246588ce8a545e91126041bcc2af3d9ebf5b3be28f4866ee9ede76ddbf0fc0387871319a900
|
SHA512 (xmonad-contrib-0.17.1.tar.gz) = 07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs
|
|
||||||
index f6dd58ec..91409931 100644
|
|
||||||
--- a/XMonad/Hooks/EwmhDesktops.hs
|
|
||||||
+++ b/XMonad/Hooks/EwmhDesktops.hs
|
|
||||||
@@ -460,6 +460,10 @@ setActiveWindow w = withDisplay $ \dpy -> do
|
|
||||||
r <- asks theRoot
|
|
||||||
a <- getAtom "_NET_ACTIVE_WINDOW"
|
|
||||||
io $ changeProperty32 dpy r a wINDOW propModeReplace [fromIntegral w]
|
|
||||||
+ -- init _NET_WM_STATE to prevent gtk3 making apps look unfocused
|
|
||||||
+ a' <- getAtom "_NET_WM_STATE"
|
|
||||||
+ c' <- getAtom "ATOM"
|
|
||||||
+ io $ changeProperty32 dpy w a' c' propModeAppend []
|
|
||||||
|
|
||||||
setSupported :: X ()
|
|
||||||
setSupported = withDisplay $ \dpy -> do
|
|
14
xmonad-contrib-ewmh-set-NET_WM_STATE.patch
Normal file
14
xmonad-contrib-ewmh-set-NET_WM_STATE.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs~ xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs
|
||||||
|
--- xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs~ 2001-09-09 09:46:40.000000000 +0800
|
||||||
|
+++ xmonad-contrib-0.17.1/XMonad/Hooks/EwmhDesktops.hs 2022-09-14 20:50:49.173905849 +0800
|
||||||
|
@@ -490,6 +490,10 @@ setActiveWindow w = withDisplay $ \dpy -
|
||||||
|
r <- asks theRoot
|
||||||
|
a <- getAtom "_NET_ACTIVE_WINDOW"
|
||||||
|
io $ changeProperty32 dpy r a wINDOW propModeReplace [fromIntegral w]
|
||||||
|
+ -- init _NET_WM_STATE to prevent gtk3 making apps look unfocused
|
||||||
|
+ a' <- getAtom "_NET_WM_STATE"
|
||||||
|
+ c' <- getAtom "ATOM"
|
||||||
|
+ io $ changeProperty32 dpy w a' c' propModeAppend []
|
||||||
|
|
||||||
|
setDesktopViewport :: [Position] -> X ()
|
||||||
|
setDesktopViewport positions = withDisplay $ \dpy -> do
|
Loading…
Reference in New Issue
Block a user