Compare commits

..

1 Commits
rawhide ... f18

Author SHA1 Message Date
Jens Petersen
f69752a22f backport patch from 0.11.2 to sanitize DynamicLog output (potential vulnerability) 2013-07-22 18:15:34 +09:00
13 changed files with 326 additions and 1370 deletions

1
.chain-deps Normal file
View File

@ -0,0 +1 @@
ghc-X11 : xmonad ghc-X11-xft :

10
.gitignore vendored
View File

@ -2,13 +2,3 @@ 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
/xmonad-contrib-0.11.1.tar.gz
/xmonad-contrib-0.11.2.tar.gz
/xmonad-contrib-0.11.3.tar.gz
/xmonad-contrib-0.11.4.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
/xmonad-contrib-0.17.0.tar.gz
/xmonad-contrib-0.17.1.tar.gz

262
changelog
View File

@ -1,262 +0,0 @@
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 0.17.0-2
- rebuild
* Mon May 30 2022 Iurii Mykhalskyi <yriy.pma@gmail.com> - 0.17.0-1
- https://hackage.haskell.org/package/xmonad-contrib-0.17.0/changelog
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Aug 06 2021 Jens Petersen <petersen@redhat.com> - 0.16-6
- rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 10 2020 Jens Petersen <petersen@redhat.com> - 0.16-1
- update to 0.16
* Wed Feb 19 2020 Jens Petersen <petersen@redhat.com> - 0.15-5
- refresh to cabal-rpm-2.0.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 0.15-3
- add doc and prof subpackages (cabal-rpm-1.0.0)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Feb 21 2019 Jens Petersen <petersen@redhat.com> - 0.15-1
- update to 0.15
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.13-9
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.13-7
- rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.13-4
- rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 0.13-1
- update to 0.13
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jun 30 2016 Jens Petersen <petersen@redhat.com> - 0.12-2
- rebuild
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Jul 19 2015 Ben Boeckel <mathstuf@gmail.com> - 0.11.4-1
- Update to 0.11.4
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Aug 29 2014 Jens Petersen <petersen@redhat.com> - 0.11.3-1
- update to 0.11.3
- refresh to cblrpm-0.8.11
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Nov 26 2013 Jens Petersen <petersen@redhat.com> - 0.11.2-3
- XFCE Terminal is now called xfce4-terminal (#1034353)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun Jul 21 2013 Jens Petersen <petersen@redhat.com> - 0.11.2-1
- update to 0.11.2
* Fri Jun 07 2013 Jens Petersen <petersen@redhat.com> - 0.11.1-2
- update to new simplified Haskell Packaging Guidelines
* Thu Mar 21 2013 Jens Petersen <petersen@redhat.com> - 0.11.1-1
- update to 0.11.1
* Tue Mar 19 2013 Jens Petersen <petersen@redhat.com> - 0.11-3
- fix build with X11-1.6.1
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Jan 18 2013 Jens Petersen <petersen@redhat.com> - 0.11-1
- update to 0.11
- BorderResize, X11-1.6, and takeFocus patches no longer needed
* Tue Nov 20 2012 Jens Petersen <petersen@redhat.com> - 0.10-8
- rebuild
* Sat Nov 17 2012 Jens Petersen <petersen@redhat.com> - 0.10-7
- add ICCCMFocus patch from upstream for WM_TAKE_FOCUS move to core (#874855)
- use a patch for use_xft flag
- condition X11-1.6 patch to fedora >= 18
- update packaging with cabal-rpm
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun May 13 2012 Jens Petersen <petersen@redhat.com> - 0.10-5
- patch XMonad.Util.PositionStore to not scale the size of windows
when changing screen unless the window is now larger than the monitor
- allow building with X11-1.6
* Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-4
- add license to ghc_files
* Tue Mar 13 2012 Jens Petersen <petersen@redhat.com> - 0.10-3
- use xft fonts by default
- make ewmh set _NET_WM_STATE property on windows so that gtk3 apps do
not render unfocused
- place BorderResize rectangles within window decor with narrower width
* Fri Jan 6 2012 Jens Petersen <petersen@redhat.com> - 0.10-2
- update to cabal2spec-0.25.2
* Sat Dec 3 2011 Jens Petersen <petersen@redhat.com> - 0.10-1
- update to 0.10
* Mon Oct 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.2-6.3
- rebuild with new gmp without compat lib
* Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.2-6.2
- rebuild with new gmp without compat lib
* Tue Oct 11 2011 Peter Schiffer <pschiffe@redhat.com> - 0.9.2-6.1
- rebuild with new gmp
* Mon Aug 29 2011 Jens Petersen <petersen@redhat.com> - 0.9.2-6
- make sure we build with X11-xft
* Sat Jul 09 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.2-5
- Update to cabal2spec-0.24
* Wed Jun 22 2011 Jens Petersen <petersen@redhat.com> - 0.9.2-4
- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.9.2-3
- Enable build on sparcv9
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jan 15 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.2-1
- Update to 0.9.2
* Sat Jan 15 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.1-11
- Update to cabal2spec-0.22.4
- Rebuild
* Sun Dec 5 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-10
- rebuild for syb-0.3
* Sat Nov 27 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-9
- backport base4 changes from upstream darcs for ghc7
- update url and drop -o obsoletes
* Wed Sep 29 2010 jkeating - 0.9.1-8
- Rebuilt for gcc bug 634757
* Tue Sep 14 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-7
- rebuild against patched xmonad
* Sat Sep 4 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-6
- add hscolour and doc obsolete (cabal2spec-0.22.2)
* Sat Jun 26 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-5
- sync cabal2spec-0.22
* Thu Apr 29 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-4
- rebuild against ghc-6.12.2
- condition ghc_lib_package
- depend on utf8-string again
* Fri Jan 15 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-3
- utf8-string is part of ghc so drop ghc-utf8-string-devel dependency
* Wed Jan 13 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-2
- rebuild against ghc-mtl package
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-1
- update to 0.9.1
- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
- drop doc and prof bcond
- use common_summary and common_description
- use ghc_lib_package and ghc_pkg_deps
- build shared library
- drop redundant buildroot and its install cleaning
* Tue Nov 17 2009 Jens Petersen <petersen@redhat.com> - 0.9-1
- update to 0.9
- use %%ghc_pkg_ver for dep requires versions
* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-8
- added a few more docs
* Thu Aug 27 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-7
- removed bcond since xft will be in fedora soon
* Wed Aug 26 2009 Jens Petersen <petersen@redhat.com> - 0.8.1-6
- drop ghc-X11 deps since already in xmonad
- drop X lib deps since already in ghc-X11
- add ghc-utf8-string deps
- add bcond for X11-xft
- drop base package requires
* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-5
- added -devel to some BRs
* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-4
- updated to latest cabal2spec 0.16
* Mon Mar 2 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-3
- updated to new guidelines ala cabal2spec 0.12
* Tue Feb 24 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-2
- updated package to new guidelines ala cabal2spec 0.7
* Wed Jan 21 2009 ynemoy <ynemoy@fedoraproject.org> - 0.8.1-1
- initial packaging for Fedora created by cabal2spec

View File

@ -1,161 +1,225 @@
# generated by cabal-rpm-2.1.0 --stream hackage
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
# https://fedoraproject.org/wiki/Packaging:Haskell
# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
%global pkg_name xmonad-contrib
%global pkgver %{pkg_name}-%{version}
%bcond_without tests
%global common_summary Third party extensions for xmonad
%global common_description Third party tiling algorithms, configurations and scripts to xmonad,\
a tiling window manager for X.\
\
For an introduction to building, configuring and using xmonad\
extensions, see "XMonad.Doc". In particular:\
\
"XMonad.Doc.Configuring", a guide to configuring xmonad\
"XMonad.Doc.Extending", using the contributed extensions library\
"XMonad.Doc.Developing", introduction to xmonad internals and writing\
your own extensions.
Name: ghc-%{pkg_name}
Version: 0.17.1
Release: %autorelease
Summary: Community-maintained extensions for xmonad
Version: 0.11
Release: 1.1%{?dist}
Summary: %{common_summary}
License: BSD-3-Clause
Url: https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
# End cabal-rpm sources
License: BSD
URL: http://hackage.haskell.org/package/%{pkg_name}
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
Patch0: xmonad-contrib-use_xft-flag.patch
Patch2: xmonad-contrib-ewmh-set-NET_WM_STATE.patch
Patch4: xmonad-contrib-0.17.0-PositionStore-dont-rescale-with-screen.patch
Patch1: xmonad-contrib-0.10-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-DynamicLog-0.11.2.patch
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-X11-devel
BuildRequires: ghc-X11-xft-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-extensible-exceptions-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-old-locale-devel
BuildRequires: ghc-old-time-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-xmonad-devel
%if %{with ghc_prof}
BuildRequires: ghc-X11-prof
BuildRequires: ghc-X11-xft-prof
BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-prof
BuildRequires: ghc-deepseq-prof
BuildRequires: ghc-directory-prof
BuildRequires: ghc-filepath-prof
BuildRequires: ghc-mtl-prof
BuildRequires: ghc-process-prof
BuildRequires: ghc-random-prof
BuildRequires: ghc-time-prof
BuildRequires: ghc-unix-prof
BuildRequires: ghc-utf8-string-prof
BuildRequires: ghc-xmonad-prof
%endif
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-hspec-devel
%endif
# End cabal-rpm deps
%description
Community-maintained tiling algorithms and extension modules for xmonad, an X11
tiling window manager.
For an introduction to building, configuring and using xmonad extensions, see
"XMonad.Doc". In particular:
"XMonad.Doc.Configuring", a guide to configuring xmonad
"XMonad.Doc.Extending", using the contributed extensions library
"XMonad.Doc.Developing", introduction to xmonad internals and writing your own
extensions.
%package devel
Summary: Haskell %{pkg_name} library development files
Provides: %{name}-static = %{version}-%{release}
Provides: %{name}-static%{?_isa} = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version}
%endif
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
%if %{with haddock}
%package doc
Summary: Haskell %{pkg_name} library documentation
BuildArch: noarch
Requires: ghc-filesystem
%description doc
This package provides the Haskell %{pkg_name} library documentation.
%endif
%if %{with ghc_prof}
%package prof
Summary: Haskell %{pkg_name} profiling library
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Supplements: (%{name}-devel and ghc-prof)
%description prof
This package provides the Haskell %{pkg_name} profiling library.
%endif
%{common_description}
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
# End cabal-rpm setup
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1 -b .orig-xft
%patch1 -p1 -b .orig-misc-fixed
%patch2 -p1 -b .orig-NET_WM_STATE
%patch4 -p1 -b .orig-rescale
%patch5 -p1 -b .orig-sanitize
%build
# Begin cabal-rpm build:
%ghc_lib_build
# End cabal-rpm build
%install
# Begin cabal-rpm install
%ghc_lib_install
# End cabal-rpm install
%check
%if %{with tests}
%cabal_test
%endif
%ghc_devel_package
%ghc_devel_description
%files -f %{name}.files
# Begin cabal-rpm files:
%license LICENSE
# End cabal-rpm files
%ghc_devel_post_postun
%files devel -f %{name}-devel.files
%doc CHANGES.md README.md
%if %{with haddock}
%files doc -f %{name}-doc.files
%license LICENSE
%endif
%if %{with ghc_prof}
%files prof -f %{name}-prof.files
%endif
%ghc_files LICENSE
%doc README
%changelog
%autochangelog
* Mon Jul 22 2013 Jens Petersen <petersen@redhat.com> - 0.11-1.1
- backport patch from 0.11.2 to sanitize DynamicLog output
(potential vulnerability)
* Fri Jan 18 2013 Jens Petersen <petersen@redhat.com> - 0.11-1
- update to 0.11
- BorderResize, X11-1.6, and takeFocus patches no longer needed
* Tue Nov 20 2012 Jens Petersen <petersen@redhat.com> - 0.10-8
- rebuild
* Sat Nov 17 2012 Jens Petersen <petersen@redhat.com> - 0.10-7
- add ICCCMFocus patch from upstream for WM_TAKE_FOCUS move to core (#874855)
- use a patch for use_xft flag
- condition X11-1.6 patch to fedora >= 18
- update packaging with cabal-rpm
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun May 13 2012 Jens Petersen <petersen@redhat.com> - 0.10-5
- patch XMonad.Util.PositionStore to not scale the size of windows
when changing screen unless the window is now larger than the monitor
- allow building with X11-1.6
* Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-4
- add license to ghc_files
* Tue Mar 13 2012 Jens Petersen <petersen@redhat.com> - 0.10-3
- use xft fonts by default
- make ewmh set _NET_WM_STATE property on windows so that gtk3 apps do
not render unfocused
- place BorderResize rectangles within window decor with narrower width
* Fri Jan 6 2012 Jens Petersen <petersen@redhat.com> - 0.10-2
- update to cabal2spec-0.25.2
* Sat Dec 3 2011 Jens Petersen <petersen@redhat.com> - 0.10-1
- update to 0.10
* Mon Oct 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.2-6.3
- rebuild with new gmp without compat lib
* Fri Oct 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.2-6.2
- rebuild with new gmp without compat lib
* Tue Oct 11 2011 Peter Schiffer <pschiffe@redhat.com> - 0.9.2-6.1
- rebuild with new gmp
* Mon Aug 29 2011 Jens Petersen <petersen@redhat.com> - 0.9.2-6
- make sure we build with X11-xft
* Sat Jul 09 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.2-5
- Update to cabal2spec-0.24
* Wed Jun 22 2011 Jens Petersen <petersen@redhat.com> - 0.9.2-4
- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.9.2-3
- Enable build on sparcv9
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jan 15 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.2-1
- Update to 0.9.2
* Sat Jan 15 2011 Ben Boeckel <mathstuf@gmail.com> - 0.9.1-11
- Update to cabal2spec-0.22.4
- Rebuild
* Sun Dec 5 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-10
- rebuild for syb-0.3
* Sat Nov 27 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-9
- backport base4 changes from upstream darcs for ghc7
- update url and drop -o obsoletes
* Wed Sep 29 2010 jkeating - 0.9.1-8
- Rebuilt for gcc bug 634757
* Tue Sep 14 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-7
- rebuild against patched xmonad
* Sat Sep 4 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-6
- add hscolour and doc obsolete (cabal2spec-0.22.2)
* Sat Jun 26 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-5
- sync cabal2spec-0.22
* Thu Apr 29 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-4
- rebuild against ghc-6.12.2
- condition ghc_lib_package
- depend on utf8-string again
* Fri Jan 15 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-3
- utf8-string is part of ghc so drop ghc-utf8-string-devel dependency
* Wed Jan 13 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-2
- rebuild against ghc-mtl package
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-1
- update to 0.9.1
- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
- drop doc and prof bcond
- use common_summary and common_description
- use ghc_lib_package and ghc_pkg_deps
- build shared library
- drop redundant buildroot and its install cleaning
* Tue Nov 17 2009 Jens Petersen <petersen@redhat.com> - 0.9-1
- update to 0.9
- use %%ghc_pkg_ver for dep requires versions
* Fri Aug 28 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-8
- added a few more docs
* Thu Aug 27 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-7
- removed bcond since xft will be in fedora soon
* Wed Aug 26 2009 Jens Petersen <petersen@redhat.com> - 0.8.1-6
- drop ghc-X11 deps since already in xmonad
- drop X lib deps since already in ghc-X11
- add ghc-utf8-string deps
- add bcond for X11-xft
- drop base package requires
* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-5
- added -devel to some BRs
* Wed Jun 17 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-4
- updated to latest cabal2spec 0.16
* Mon Mar 2 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-3
- updated to new guidelines ala cabal2spec 0.12
* Tue Feb 24 2009 Yaakov M. Nemoy <ynemoy@fedoraproject.org> - 0.8.1-2
- updated package to new guidelines ala cabal2spec 0.7
* Wed Jan 21 2009 ynemoy <ynemoy@fedoraproject.org> - 0.8.1-1
- initial packaging for Fedora created by cabal2spec

View File

@ -1 +1 @@
SHA512 (xmonad-contrib-0.17.1.tar.gz) = 07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e
05fba258ac6063e49b50786a0869bd1f xmonad-contrib-0.11.tar.gz

View File

@ -1,17 +1,16 @@
diff --git a/XMonad/Util/PositionStore.hs b/XMonad/Util/PositionStore.hs
index f9f51e82..c9056e36 100644
--- a/XMonad/Util/PositionStore.hs
+++ b/XMonad/Util/PositionStore.hs
@@ -35,7 +35,7 @@ import qualified Data.Map as M
diff -rN -u old-XMonadContrib/XMonad/Util/PositionStore.hs new-XMonadContrib/XMonad/Util/PositionStore.hs
--- old-XMonadContrib/XMonad/Util/PositionStore.hs 2012-05-13 20:21:34.785720303 +0900
+++ new-XMonadContrib/XMonad/Util/PositionStore.hs 2012-05-13 20:21:34.814720213 +0900
@@ -36,7 +36,7 @@
newtype PositionStore = PS (M.Map Window PosStoreRectangle)
deriving (Read,Show)
data PositionStore = PS (M.Map Window PosStoreRectangle)
deriving (Read,Show,Typeable)
-data PosStoreRectangle = PSRectangle Double Double Double Double
+data PosStoreRectangle = PSRectangle Double Double Dimension Dimension
deriving (Read,Show)
deriving (Read,Show,Typeable)
instance ExtensionClass PositionStore where
@@ -54,8 +54,7 @@ posStoreInsert (PS posStoreMap) w (Rectangle x y wh ht) (Rectangle srX srY srWh
@@ -55,8 +55,7 @@
offsetY = y - srY
in PS $ M.insert w (PSRectangle (fromIntegral offsetX / fromIntegral srWh)
(fromIntegral offsetY / fromIntegral srHt)
@ -21,7 +20,7 @@ index f9f51e82..c9056e36 100644
posStoreRemove :: PositionStore -> Window -> PositionStore
posStoreRemove (PS posStoreMap) w = PS $ M.delete w posStoreMap
@@ -63,12 +62,9 @@ posStoreRemove (PS posStoreMap) w = PS $ M.delete w posStoreMap
@@ -64,12 +63,9 @@
posStoreQuery :: PositionStore -> Window -> Rectangle -> Maybe Rectangle
posStoreQuery (PS posStoreMap) w (Rectangle srX srY srWh srHt) = do
(PSRectangle x y wh ht) <- M.lookup w posStoreMap

View File

@ -0,0 +1,11 @@
diff -u xmonad-contrib-0.10/XMonad/Hooks/EwmhDesktops.hs\~ xmonad-contrib-0.10/XMonad/Hooks/EwmhDesktops.hs
--- xmonad-contrib-0.10/XMonad/Hooks/EwmhDesktops.hs~ 2011-11-19 08:26:06.000000000 +0900
+++ xmonad-contrib-0.10/XMonad/Hooks/EwmhDesktops.hs 2012-03-09 16:59:48.115503713 +0900
@@ -252,3 +252,7 @@
a <- getAtom "_NET_ACTIVE_WINDOW"
c <- getAtom "WINDOW"
io $ changeProperty32 dpy r a c 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 []

View File

@ -0,0 +1,36 @@
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"

View File

@ -1,462 +0,0 @@
name: xmonad-contrib
version: 0.17.0
-- ^ also update cpp-options: -DXMONAD_CONTRIB_VERSION_*
homepage: https://xmonad.org/
synopsis: Community-maintained extensions extensions for xmonad
description:
Community-maintained tiling algorithms and extension modules for xmonad,
an X11 tiling window manager.
.
For an introduction to building, configuring and using xmonad
extensions, see "XMonad.Doc". In particular:
.
"XMonad.Doc.Configuring", a guide to configuring xmonad
.
"XMonad.Doc.Extending", using the contributed extensions library
.
"XMonad.Doc.Developing", introduction to xmonad internals and writing
your own extensions.
.
category: System
license: BSD3
license-file: LICENSE
author: Spencer Janssen & others
maintainer: xmonad@haskell.org
extra-source-files: README.md CHANGES.md scripts/generate-configs scripts/run-xmonad.sh
scripts/window-properties.sh
scripts/xinitrc scripts/xmonad-acpi.c
scripts/xmonad-clock.c
XMonad/Config/dmwit.xmobarrc
XMonad/Config/Example.hs
cabal-version: 1.12
build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues
tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.4 || == 9.0.1
source-repository head
type: git
location: https://github.com/xmonad/xmonad-contrib
flag use_xft
description: Use Xft to render text
flag pedantic
description: Be pedantic (-Werror and the like)
default: False
manual: True
library
build-depends: base >= 4.11 && < 5,
bytestring >= 0.10 && < 0.12,
containers >= 0.5 && < 0.7,
directory,
filepath,
time >= 1.8 && < 1.13,
process,
random,
mtl >= 1 && < 3,
unix,
X11 >= 1.10 && < 1.11,
xmonad >= 0.16.99999 && < 0.18,
utf8-string
default-language: Haskell2010
cpp-options: -DXMONAD_CONTRIB_VERSION_MAJOR=0
-DXMONAD_CONTRIB_VERSION_MINOR=17
-DXMONAD_CONTRIB_VERSION_PATCH=0
ghc-options: -Wall -Wno-unused-do-bind
if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations
-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
-- don't treat unused-imports warning as errors, they may be necessary
-- for compatibility with older versions of base (or other deps)
ghc-options: -Wwarn=unused-imports
if flag(use_xft)
build-depends: X11-xft >= 0.2
cpp-options: -DXFT
exposed-modules: XMonad.Actions.AfterDrag
XMonad.Actions.BluetileCommands
XMonad.Actions.Commands
XMonad.Actions.ConstrainedResize
XMonad.Actions.CopyWindow
XMonad.Actions.CycleRecentWS
XMonad.Actions.CycleSelectedLayouts
XMonad.Actions.CycleWS
XMonad.Actions.CycleWindows
XMonad.Actions.CycleWorkspaceByScreen
XMonad.Actions.DeManage
XMonad.Actions.DwmPromote
XMonad.Actions.DynamicProjects
XMonad.Actions.DynamicWorkspaceGroups
XMonad.Actions.DynamicWorkspaceOrder
XMonad.Actions.DynamicWorkspaces
XMonad.Actions.EasyMotion
XMonad.Actions.FindEmptyWorkspace
XMonad.Actions.FlexibleManipulate
XMonad.Actions.FlexibleResize
XMonad.Actions.FloatKeys
XMonad.Actions.FloatSnap
XMonad.Actions.FocusNth
XMonad.Actions.GridSelect
XMonad.Actions.GroupNavigation
XMonad.Actions.KeyRemap
XMonad.Actions.Launcher
XMonad.Actions.LinkWorkspaces
XMonad.Actions.MessageFeedback
XMonad.Actions.Minimize
XMonad.Actions.MouseGestures
XMonad.Actions.MouseResize
XMonad.Actions.Navigation2D
XMonad.Actions.NoBorders
XMonad.Actions.OnScreen
XMonad.Actions.PerWindowKeys
XMonad.Actions.PerWorkspaceKeys
XMonad.Actions.PhysicalScreens
XMonad.Actions.Plane
XMonad.Actions.Prefix
XMonad.Actions.Promote
XMonad.Actions.RandomBackground
XMonad.Actions.RotSlaves
XMonad.Actions.RotateSome
XMonad.Actions.Search
XMonad.Actions.ShowText
XMonad.Actions.Sift
XMonad.Actions.SimpleDate
XMonad.Actions.SinkAll
XMonad.Actions.SpawnOn
XMonad.Actions.Submap
XMonad.Actions.SwapPromote
XMonad.Actions.SwapWorkspaces
XMonad.Actions.TagWindows
XMonad.Actions.TiledWindowDragging
XMonad.Actions.TopicSpace
XMonad.Actions.TreeSelect
XMonad.Actions.UpdateFocus
XMonad.Actions.UpdatePointer
XMonad.Actions.Warp
XMonad.Actions.WindowBringer
XMonad.Actions.WindowGo
XMonad.Actions.WindowMenu
XMonad.Actions.WindowNavigation
XMonad.Actions.WithAll
XMonad.Actions.Workscreen
XMonad.Actions.WorkspaceCursors
XMonad.Actions.WorkspaceNames
XMonad.Config.Arossato
XMonad.Config.Azerty
XMonad.Config.Bepo
XMonad.Config.Bluetile
XMonad.Config.Desktop
XMonad.Config.Dmwit
XMonad.Config.Droundy
XMonad.Config.Gnome
XMonad.Config.Kde
XMonad.Config.Mate
XMonad.Config.Prime
XMonad.Config.Sjanssen
XMonad.Config.Xfce
XMonad.Doc
XMonad.Doc.Configuring
XMonad.Doc.Developing
XMonad.Doc.Extending
XMonad.Hooks.CurrentWorkspaceOnTop
XMonad.Hooks.DebugEvents
XMonad.Hooks.DebugKeyEvents
XMonad.Hooks.DebugStack
XMonad.Hooks.DynamicBars
XMonad.Hooks.DynamicHooks
XMonad.Hooks.DynamicIcons
XMonad.Hooks.DynamicLog
XMonad.Hooks.DynamicProperty
XMonad.Hooks.EwmhDesktops
XMonad.Hooks.FadeInactive
XMonad.Hooks.FadeWindows
XMonad.Hooks.FloatNext
XMonad.Hooks.Focus
XMonad.Hooks.ICCCMFocus
XMonad.Hooks.InsertPosition
XMonad.Hooks.ManageDebug
XMonad.Hooks.ManageDocks
XMonad.Hooks.ManageHelpers
XMonad.Hooks.Minimize
XMonad.Hooks.Place
XMonad.Hooks.PositionStoreHooks
XMonad.Hooks.RefocusLast
XMonad.Hooks.Rescreen
XMonad.Hooks.RestoreMinimized
XMonad.Hooks.ScreenCorners
XMonad.Hooks.Script
XMonad.Hooks.ServerMode
XMonad.Hooks.SetWMName
XMonad.Hooks.StatusBar
XMonad.Hooks.StatusBar.PP
XMonad.Hooks.TaffybarPagerHints
XMonad.Hooks.ToggleHook
XMonad.Hooks.UrgencyHook
XMonad.Hooks.WallpaperSetter
XMonad.Hooks.WindowSwallowing
XMonad.Hooks.WorkspaceByPos
XMonad.Hooks.WorkspaceHistory
XMonad.Hooks.XPropManage
XMonad.Layout.Accordion
XMonad.Layout.AutoMaster
XMonad.Layout.AvoidFloats
XMonad.Layout.BinaryColumn
XMonad.Layout.BinarySpacePartition
XMonad.Layout.BorderResize
XMonad.Layout.BoringWindows
XMonad.Layout.ButtonDecoration
XMonad.Layout.CenteredMaster
XMonad.Layout.Circle
XMonad.Layout.Column
XMonad.Layout.Combo
XMonad.Layout.ComboP
XMonad.Layout.Cross
XMonad.Layout.Decoration
XMonad.Layout.DecorationAddons
XMonad.Layout.DecorationMadness
XMonad.Layout.Dishes
XMonad.Layout.DragPane
XMonad.Layout.DraggingVisualizer
XMonad.Layout.Drawer
XMonad.Layout.Dwindle
XMonad.Layout.DwmStyle
XMonad.Layout.FixedAspectRatio
XMonad.Layout.FixedColumn
XMonad.Layout.Fullscreen
XMonad.Layout.Gaps
XMonad.Layout.Grid
XMonad.Layout.GridVariants
XMonad.Layout.Groups
XMonad.Layout.Groups.Examples
XMonad.Layout.Groups.Helpers
XMonad.Layout.Groups.Wmii
XMonad.Layout.Hidden
XMonad.Layout.HintedGrid
XMonad.Layout.HintedTile
XMonad.Layout.IM
XMonad.Layout.IfMax
XMonad.Layout.ImageButtonDecoration
XMonad.Layout.IndependentScreens
XMonad.Layout.LayoutBuilder
XMonad.Layout.LayoutBuilderP
XMonad.Layout.LayoutCombinators
XMonad.Layout.LayoutHints
XMonad.Layout.LayoutModifier
XMonad.Layout.LayoutScreens
XMonad.Layout.LimitWindows
XMonad.Layout.MagicFocus
XMonad.Layout.Magnifier
XMonad.Layout.Master
XMonad.Layout.Maximize
XMonad.Layout.MessageControl
XMonad.Layout.Minimize
XMonad.Layout.Monitor
XMonad.Layout.Mosaic
XMonad.Layout.MosaicAlt
XMonad.Layout.MouseResizableTile
XMonad.Layout.MultiColumns
XMonad.Layout.MultiDishes
XMonad.Layout.MultiToggle
XMonad.Layout.MultiToggle.Instances
XMonad.Layout.MultiToggle.TabBarDecoration
XMonad.Layout.Named
XMonad.Layout.NoBorders
XMonad.Layout.NoFrillsDecoration
XMonad.Layout.OnHost
XMonad.Layout.OneBig
XMonad.Layout.PerScreen
XMonad.Layout.PerWorkspace
XMonad.Layout.PositionStoreFloat
XMonad.Layout.Reflect
XMonad.Layout.Renamed
XMonad.Layout.ResizableThreeColumns
XMonad.Layout.ResizableTile
XMonad.Layout.ResizeScreen
XMonad.Layout.Roledex
XMonad.Layout.ShowWName
XMonad.Layout.SimpleDecoration
XMonad.Layout.SimpleFloat
XMonad.Layout.Simplest
XMonad.Layout.SimplestFloat
XMonad.Layout.SortedLayout
XMonad.Layout.Spacing
XMonad.Layout.Spiral
XMonad.Layout.Square
XMonad.Layout.StackTile
XMonad.Layout.StateFull
XMonad.Layout.Stoppable
XMonad.Layout.SubLayouts
XMonad.Layout.TabBarDecoration
XMonad.Layout.Tabbed
XMonad.Layout.TallMastersCombo
XMonad.Layout.ThreeColumns
XMonad.Layout.ToggleLayouts
XMonad.Layout.TrackFloating
XMonad.Layout.TwoPane
XMonad.Layout.TwoPanePersistent
XMonad.Layout.VoidBorders
XMonad.Layout.WindowArranger
XMonad.Layout.WindowNavigation
XMonad.Layout.WindowSwitcherDecoration
XMonad.Layout.WorkspaceDir
XMonad.Layout.ZoomRow
XMonad.Prelude
XMonad.Prompt
XMonad.Prompt.AppLauncher
XMonad.Prompt.AppendFile
XMonad.Prompt.ConfirmPrompt
XMonad.Prompt.DirExec
XMonad.Prompt.Directory
XMonad.Prompt.Email
XMonad.Prompt.FuzzyMatch
XMonad.Prompt.Input
XMonad.Prompt.Layout
XMonad.Prompt.Man
XMonad.Prompt.OrgMode
XMonad.Prompt.Pass
XMonad.Prompt.RunOrRaise
XMonad.Prompt.Shell
XMonad.Prompt.Ssh
XMonad.Prompt.Theme
XMonad.Prompt.Unicode
XMonad.Prompt.Window
XMonad.Prompt.Workspace
XMonad.Prompt.XMonad
XMonad.Prompt.Zsh
XMonad.Util.ActionCycle
XMonad.Util.ClickableWorkspaces
XMonad.Util.Cursor
XMonad.Util.CustomKeys
XMonad.Util.DebugWindow
XMonad.Util.Dmenu
XMonad.Util.DynamicScratchpads
XMonad.Util.Dzen
XMonad.Util.EZConfig
XMonad.Util.ExclusiveScratchpads
XMonad.Util.ExtensibleConf
XMonad.Util.ExtensibleState
XMonad.Util.Font
XMonad.Util.Hacks
XMonad.Util.Image
XMonad.Util.Invisible
XMonad.Util.Loggers
XMonad.Util.Loggers.NamedScratchpad
XMonad.Util.Minimize
XMonad.Util.NamedActions
XMonad.Util.NamedScratchpad
XMonad.Util.NamedWindows
XMonad.Util.NoTaskbar
XMonad.Util.Paste
XMonad.Util.PositionStore
XMonad.Util.PureX
XMonad.Util.Rectangle
XMonad.Util.RemoteWindows
XMonad.Util.Replace
XMonad.Util.Run
XMonad.Util.Scratchpad
XMonad.Util.SessionStart
XMonad.Util.SpawnNamedPipe
XMonad.Util.SpawnOnce
XMonad.Util.Stack
XMonad.Util.StringProp
XMonad.Util.Themes
XMonad.Util.Timer
XMonad.Util.TreeZipper
XMonad.Util.Types
XMonad.Util.Ungrab
XMonad.Util.WindowProperties
XMonad.Util.WindowState
XMonad.Util.WorkspaceCompare
XMonad.Util.XSelection
XMonad.Util.XUtils
test-suite tests
type: exitcode-stdio-1.0
main-is: Main.hs
other-modules: CycleRecentWS
ExtensibleConf
GridSelect
Instances
ManageDocks
NoBorders
OrgMode
RotateSome
Selective
SwapWorkspaces
Utils
XMonad.Actions.CycleRecentWS
XMonad.Actions.CycleWS
XMonad.Actions.FocusNth
XMonad.Actions.GridSelect
XMonad.Actions.PhysicalScreens
XMonad.Actions.RotateSome
XMonad.Actions.SwapWorkspaces
XMonad.Actions.TagWindows
XMonad.Actions.WindowBringer
XMonad.Hooks.ManageDocks
XMonad.Hooks.ManageHelpers
XMonad.Hooks.UrgencyHook
XMonad.Hooks.WorkspaceHistory
XMonad.Layout.Decoration
XMonad.Layout.LayoutModifier
XMonad.Layout.LimitWindows
XMonad.Layout.NoBorders
XMonad.Layout.WindowArranger
XMonad.Prelude
XMonad.Prompt
XMonad.Prompt.OrgMode
XMonad.Prompt.Shell
XMonad.Util.Dmenu
XMonad.Util.Dzen
XMonad.Util.ExtensibleConf
XMonad.Util.ExtensibleState
XMonad.Util.Font
XMonad.Util.Image
XMonad.Util.Invisible
XMonad.Util.NamedWindows
XMonad.Util.PureX
XMonad.Util.Rectangle
XMonad.Util.Run
XMonad.Util.Stack
XMonad.Util.Timer
XMonad.Util.Types
XMonad.Util.WindowProperties
XMonad.Util.WorkspaceCompare
XMonad.Util.XSelection
XMonad.Util.XUtils
XPrompt
hs-source-dirs: tests, .
build-depends: base
, QuickCheck >= 2
, X11 >= 1.10 && < 1.11
, containers
, directory
, time >= 1.8 && < 1.13
, hspec >= 2.4.0 && < 3
, mtl
, random
, process
, unix
, utf8-string
, xmonad >= 0.16.9999 && < 0.18
cpp-options: -DTESTING
ghc-options: -Wall -Wno-unused-do-bind
default-language: Haskell2010
if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations
-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
-- don't treat unused-imports warning as errors, they may be necessary
-- for compatibility with older versions of base (or other deps)
ghc-options: -Wwarn=unused-imports

View File

@ -1,489 +0,0 @@
name: xmonad-contrib
version: 0.17.1
x-revision: 1
-- ^ also update cpp-options: -DXMONAD_CONTRIB_VERSION_*
homepage: https://xmonad.org/
synopsis: Community-maintained extensions for xmonad
description:
Community-maintained tiling algorithms and extension modules for xmonad,
an X11 tiling window manager.
.
For an introduction to building, configuring and using xmonad
extensions, see "XMonad.Doc". In particular:
.
"XMonad.Doc.Configuring", a guide to configuring xmonad
.
"XMonad.Doc.Extending", using the contributed extensions library
.
"XMonad.Doc.Developing", introduction to xmonad internals and writing
your own extensions.
.
category: System
license: BSD3
license-file: LICENSE
author: Spencer Janssen & others
maintainer: xmonad@haskell.org
extra-source-files: README.md
CHANGES.md
scripts/run-xmonad.sh
scripts/window-properties.sh
scripts/xinitrc
scripts/xmonad-acpi.c
scripts/xmonad-clock.c
scripts/xmonadctl.hs
scripts/xmonadpropread.hs
XMonad/Config/dmwit.xmobarrc
XMonad/Config/Example.hs
cabal-version: 1.12
build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues
tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2
source-repository head
type: git
location: https://github.com/xmonad/xmonad-contrib
flag use_xft
description: Use Xft to render text
flag pedantic
description: Be pedantic (-Werror and the like)
default: False
manual: True
library
build-depends: base >= 4.11 && < 5,
bytestring >= 0.10 && < 0.12,
containers >= 0.5 && < 0.7,
directory,
filepath,
time >= 1.8 && < 1.13,
process,
random,
mtl >= 1 && < 2.3,
unix,
X11 >= 1.10 && < 1.11,
xmonad >= 0.16.99999 && < 0.18,
utf8-string,
deepseq
default-language: Haskell2010
cpp-options: -DXMONAD_CONTRIB_VERSION_MAJOR=0
-DXMONAD_CONTRIB_VERSION_MINOR=17
-DXMONAD_CONTRIB_VERSION_PATCH=1
ghc-options: -Wall -Wno-unused-do-bind
if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations -Wwarn=dodgy-imports
-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
-- don't treat unused-imports warning as errors, they may be necessary
-- for compatibility with older versions of base (or other deps)
ghc-options: -Wwarn=unused-imports
if flag(use_xft)
build-depends: X11-xft >= 0.2
cpp-options: -DXFT
exposed-modules: XMonad.Actions.AfterDrag
XMonad.Actions.BluetileCommands
XMonad.Actions.Commands
XMonad.Actions.ConstrainedResize
XMonad.Actions.CopyWindow
XMonad.Actions.CycleRecentWS
XMonad.Actions.CycleSelectedLayouts
XMonad.Actions.CycleWS
XMonad.Actions.CycleWindows
XMonad.Actions.CycleWorkspaceByScreen
XMonad.Actions.DeManage
XMonad.Actions.DwmPromote
XMonad.Actions.DynamicProjects
XMonad.Actions.DynamicWorkspaceGroups
XMonad.Actions.DynamicWorkspaceOrder
XMonad.Actions.DynamicWorkspaces
XMonad.Actions.EasyMotion
XMonad.Actions.FindEmptyWorkspace
XMonad.Actions.FlexibleManipulate
XMonad.Actions.FlexibleResize
XMonad.Actions.FloatKeys
XMonad.Actions.FloatSnap
XMonad.Actions.FocusNth
XMonad.Actions.GridSelect
XMonad.Actions.GroupNavigation
XMonad.Actions.KeyRemap
XMonad.Actions.Launcher
XMonad.Actions.LinkWorkspaces
XMonad.Actions.MessageFeedback
XMonad.Actions.Minimize
XMonad.Actions.MouseGestures
XMonad.Actions.MouseResize
XMonad.Actions.Navigation2D
XMonad.Actions.NoBorders
XMonad.Actions.OnScreen
XMonad.Actions.PerLayoutKeys
XMonad.Actions.PerWindowKeys
XMonad.Actions.PerWorkspaceKeys
XMonad.Actions.PhysicalScreens
XMonad.Actions.Plane
XMonad.Actions.Prefix
XMonad.Actions.Promote
XMonad.Actions.RandomBackground
XMonad.Actions.RepeatAction
XMonad.Actions.RotSlaves
XMonad.Actions.RotateSome
XMonad.Actions.Search
XMonad.Actions.ShowText
XMonad.Actions.Sift
XMonad.Actions.SimpleDate
XMonad.Actions.SinkAll
XMonad.Actions.SpawnOn
XMonad.Actions.Submap
XMonad.Actions.SwapPromote
XMonad.Actions.SwapWorkspaces
XMonad.Actions.TagWindows
XMonad.Actions.TiledWindowDragging
XMonad.Actions.TopicSpace
XMonad.Actions.TreeSelect
XMonad.Actions.UpdateFocus
XMonad.Actions.UpdatePointer
XMonad.Actions.Warp
XMonad.Actions.WindowBringer
XMonad.Actions.WindowGo
XMonad.Actions.WindowMenu
XMonad.Actions.WindowNavigation
XMonad.Actions.WithAll
XMonad.Actions.Workscreen
XMonad.Actions.WorkspaceCursors
XMonad.Actions.WorkspaceNames
XMonad.Config.Arossato
XMonad.Config.Azerty
XMonad.Config.Bepo
XMonad.Config.Bluetile
XMonad.Config.Desktop
XMonad.Config.Dmwit
XMonad.Config.Droundy
XMonad.Config.Gnome
XMonad.Config.Kde
XMonad.Config.Mate
XMonad.Config.Prime
XMonad.Config.Sjanssen
XMonad.Config.Xfce
XMonad.Doc
XMonad.Doc.Configuring
XMonad.Doc.Developing
XMonad.Doc.Extending
XMonad.Hooks.BorderPerWindow
XMonad.Hooks.CurrentWorkspaceOnTop
XMonad.Hooks.DebugEvents
XMonad.Hooks.DebugKeyEvents
XMonad.Hooks.DebugStack
XMonad.Hooks.DynamicBars
XMonad.Hooks.DynamicHooks
XMonad.Hooks.DynamicIcons
XMonad.Hooks.DynamicLog
XMonad.Hooks.DynamicProperty
XMonad.Hooks.EwmhDesktops
XMonad.Hooks.FadeInactive
XMonad.Hooks.FadeWindows
XMonad.Hooks.FloatNext
XMonad.Hooks.Focus
XMonad.Hooks.ICCCMFocus
XMonad.Hooks.InsertPosition
XMonad.Hooks.ManageDebug
XMonad.Hooks.ManageDocks
XMonad.Hooks.ManageHelpers
XMonad.Hooks.Minimize
XMonad.Hooks.Modal
XMonad.Hooks.Place
XMonad.Hooks.PositionStoreHooks
XMonad.Hooks.RefocusLast
XMonad.Hooks.Rescreen
XMonad.Hooks.RestoreMinimized
XMonad.Hooks.ScreenCorners
XMonad.Hooks.Script
XMonad.Hooks.ServerMode
XMonad.Hooks.SetWMName
XMonad.Hooks.ShowWName
XMonad.Hooks.StatusBar
XMonad.Hooks.StatusBar.PP
XMonad.Hooks.StatusBar.WorkspaceScreen
XMonad.Hooks.TaffybarPagerHints
XMonad.Hooks.ToggleHook
XMonad.Hooks.UrgencyHook
XMonad.Hooks.WallpaperSetter
XMonad.Hooks.WindowSwallowing
XMonad.Hooks.WorkspaceByPos
XMonad.Hooks.WorkspaceHistory
XMonad.Hooks.XPropManage
XMonad.Layout.Accordion
XMonad.Layout.AutoMaster
XMonad.Layout.AvoidFloats
XMonad.Layout.BinaryColumn
XMonad.Layout.BinarySpacePartition
XMonad.Layout.BorderResize
XMonad.Layout.BoringWindows
XMonad.Layout.ButtonDecoration
XMonad.Layout.CenteredIfSingle
XMonad.Layout.CenteredMaster
XMonad.Layout.Circle
XMonad.Layout.Column
XMonad.Layout.Combo
XMonad.Layout.ComboP
XMonad.Layout.Cross
XMonad.Layout.Decoration
XMonad.Layout.DecorationAddons
XMonad.Layout.DecorationMadness
XMonad.Layout.Dishes
XMonad.Layout.DragPane
XMonad.Layout.DraggingVisualizer
XMonad.Layout.Drawer
XMonad.Layout.Dwindle
XMonad.Layout.DwmStyle
XMonad.Layout.FixedAspectRatio
XMonad.Layout.FixedColumn
XMonad.Layout.Fullscreen
XMonad.Layout.Gaps
XMonad.Layout.Grid
XMonad.Layout.GridVariants
XMonad.Layout.Groups
XMonad.Layout.Groups.Examples
XMonad.Layout.Groups.Helpers
XMonad.Layout.Groups.Wmii
XMonad.Layout.Hidden
XMonad.Layout.HintedGrid
XMonad.Layout.HintedTile
XMonad.Layout.IM
XMonad.Layout.IfMax
XMonad.Layout.ImageButtonDecoration
XMonad.Layout.IndependentScreens
XMonad.Layout.LayoutBuilder
XMonad.Layout.LayoutBuilderP
XMonad.Layout.LayoutCombinators
XMonad.Layout.LayoutHints
XMonad.Layout.LayoutModifier
XMonad.Layout.LayoutScreens
XMonad.Layout.LimitWindows
XMonad.Layout.MagicFocus
XMonad.Layout.Magnifier
XMonad.Layout.Master
XMonad.Layout.Maximize
XMonad.Layout.MessageControl
XMonad.Layout.Minimize
XMonad.Layout.Monitor
XMonad.Layout.Mosaic
XMonad.Layout.MosaicAlt
XMonad.Layout.MouseResizableTile
XMonad.Layout.MultiColumns
XMonad.Layout.MultiDishes
XMonad.Layout.MultiToggle
XMonad.Layout.MultiToggle.Instances
XMonad.Layout.MultiToggle.TabBarDecoration
XMonad.Layout.Named
XMonad.Layout.NoBorders
XMonad.Layout.NoFrillsDecoration
XMonad.Layout.OnHost
XMonad.Layout.OneBig
XMonad.Layout.PerScreen
XMonad.Layout.PerWorkspace
XMonad.Layout.PositionStoreFloat
XMonad.Layout.Reflect
XMonad.Layout.Renamed
XMonad.Layout.ResizableThreeColumns
XMonad.Layout.ResizableTile
XMonad.Layout.ResizeScreen
XMonad.Layout.Roledex
XMonad.Layout.ShowWName
XMonad.Layout.SideBorderDecoration
XMonad.Layout.SimpleDecoration
XMonad.Layout.SimpleFloat
XMonad.Layout.Simplest
XMonad.Layout.SimplestFloat
XMonad.Layout.SortedLayout
XMonad.Layout.Spacing
XMonad.Layout.Spiral
XMonad.Layout.Square
XMonad.Layout.StackTile
XMonad.Layout.StateFull
XMonad.Layout.Stoppable
XMonad.Layout.SubLayouts
XMonad.Layout.TabBarDecoration
XMonad.Layout.Tabbed
XMonad.Layout.TallMastersCombo
XMonad.Layout.ThreeColumns
XMonad.Layout.ToggleLayouts
XMonad.Layout.TrackFloating
XMonad.Layout.TwoPane
XMonad.Layout.TwoPanePersistent
XMonad.Layout.VoidBorders
XMonad.Layout.WindowArranger
XMonad.Layout.WindowNavigation
XMonad.Layout.WindowSwitcherDecoration
XMonad.Layout.WorkspaceDir
XMonad.Layout.ZoomRow
XMonad.Prelude
XMonad.Prompt
XMonad.Prompt.AppLauncher
XMonad.Prompt.AppendFile
XMonad.Prompt.ConfirmPrompt
XMonad.Prompt.DirExec
XMonad.Prompt.Directory
XMonad.Prompt.Email
XMonad.Prompt.FuzzyMatch
XMonad.Prompt.Input
XMonad.Prompt.Layout
XMonad.Prompt.Man
XMonad.Prompt.OrgMode
XMonad.Prompt.Pass
XMonad.Prompt.RunOrRaise
XMonad.Prompt.Shell
XMonad.Prompt.Ssh
XMonad.Prompt.Theme
XMonad.Prompt.Unicode
XMonad.Prompt.Window
XMonad.Prompt.Workspace
XMonad.Prompt.XMonad
XMonad.Prompt.Zsh
XMonad.Util.ActionCycle
XMonad.Util.ActionQueue
XMonad.Util.ClickableWorkspaces
XMonad.Util.Cursor
XMonad.Util.CustomKeys
XMonad.Util.DebugWindow
XMonad.Util.Dmenu
XMonad.Util.DynamicScratchpads
XMonad.Util.Dzen
XMonad.Util.EZConfig
XMonad.Util.ExclusiveScratchpads
XMonad.Util.ExtensibleConf
XMonad.Util.ExtensibleState
XMonad.Util.Font
XMonad.Util.Grab
XMonad.Util.Hacks
XMonad.Util.Image
XMonad.Util.Invisible
XMonad.Util.Loggers
XMonad.Util.Loggers.NamedScratchpad
XMonad.Util.Minimize
XMonad.Util.NamedActions
XMonad.Util.NamedScratchpad
XMonad.Util.NamedWindows
XMonad.Util.NoTaskbar
XMonad.Util.Parser
XMonad.Util.Paste
XMonad.Util.PositionStore
XMonad.Util.Process
XMonad.Util.PureX
XMonad.Util.Rectangle
XMonad.Util.RemoteWindows
XMonad.Util.Replace
XMonad.Util.Run
XMonad.Util.Scratchpad
XMonad.Util.SessionStart
XMonad.Util.SpawnNamedPipe
XMonad.Util.SpawnOnce
XMonad.Util.Stack
XMonad.Util.StringProp
XMonad.Util.Themes
XMonad.Util.Timer
XMonad.Util.TreeZipper
XMonad.Util.Types
XMonad.Util.Ungrab
XMonad.Util.WindowProperties
XMonad.Util.WindowState
XMonad.Util.WorkspaceCompare
XMonad.Util.XSelection
XMonad.Util.XUtils
test-suite tests
type: exitcode-stdio-1.0
main-is: Main.hs
other-modules: CycleRecentWS
EZConfig
ExtensibleConf
GridSelect
Instances
ManageDocks
NoBorders
OrgMode
RotateSome
Selective
SwapWorkspaces
Utils
XMonad.Actions.CycleRecentWS
XMonad.Actions.CycleWS
XMonad.Actions.FocusNth
XMonad.Actions.GridSelect
XMonad.Actions.PhysicalScreens
XMonad.Actions.RotateSome
XMonad.Actions.Submap
XMonad.Actions.SwapWorkspaces
XMonad.Actions.TagWindows
XMonad.Actions.WindowBringer
XMonad.Hooks.ManageDocks
XMonad.Hooks.ManageHelpers
XMonad.Hooks.UrgencyHook
XMonad.Hooks.WorkspaceHistory
XMonad.Layout.Decoration
XMonad.Layout.LayoutModifier
XMonad.Layout.LimitWindows
XMonad.Layout.NoBorders
XMonad.Layout.WindowArranger
XMonad.Prelude
XMonad.Prompt
XMonad.Prompt.OrgMode
XMonad.Prompt.Shell
XMonad.Util.Dmenu
XMonad.Util.Dzen
XMonad.Util.EZConfig
XMonad.Util.ExtensibleConf
XMonad.Util.ExtensibleState
XMonad.Util.Font
XMonad.Util.Image
XMonad.Util.Invisible
XMonad.Util.NamedActions
XMonad.Util.NamedWindows
XMonad.Util.Parser
XMonad.Util.Process
XMonad.Util.PureX
XMonad.Util.Rectangle
XMonad.Util.Run
XMonad.Util.Stack
XMonad.Util.Timer
XMonad.Util.Types
XMonad.Util.WindowProperties
XMonad.Util.WorkspaceCompare
XMonad.Util.XSelection
XMonad.Util.XUtils
XPrompt
hs-source-dirs: tests, .
build-depends: base
, QuickCheck >= 2
, X11 >= 1.10 && < 1.11
, bytestring >= 0.10 && < 0.12
, containers
, directory
, time >= 1.8 && < 1.13
, hspec >= 2.4.0 && < 3
, mtl
, random
, process
, unix
, utf8-string
, deepseq
, xmonad >= 0.16.9999 && < 0.18
cpp-options: -DTESTING
ghc-options: -Wall -Wno-unused-do-bind
default-language: Haskell2010
if flag(pedantic)
ghc-options: -Werror -Wwarn=deprecations -Wwarn=dodgy-imports
-- Keep this in sync with the oldest version in 'tested-with'
if impl(ghc > 8.4.4)
-- don't treat unused-imports warning as errors, they may be necessary
-- for compatibility with older versions of base (or other deps)
ghc-options: -Wwarn=unused-imports

View File

@ -0,0 +1,84 @@
diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs
index 0547c80..1d256c6 100644
--- a/XMonad/Hooks/DynamicLog.hs
+++ b/XMonad/Hooks/DynamicLog.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts, PatternGuards #-}
-----------------------------------------------------------------------------
-- |
@@ -57,10 +57,10 @@ module XMonad.Hooks.DynamicLog (
-- Useful imports
import Codec.Binary.UTF8.String (encodeString)
-import Control.Monad (liftM2)
+import Control.Monad (liftM2, msum)
import Data.Char ( isSpace, ord )
-import Data.List (intersperse, isPrefixOf, sortBy)
-import Data.Maybe ( isJust, catMaybes )
+import Data.List (intersperse, stripPrefix, isPrefixOf, sortBy)
+import Data.Maybe ( isJust, catMaybes, mapMaybe )
import Data.Ord ( comparing )
import qualified Data.Map as M
import qualified XMonad.StackSet as S
@@ -279,7 +279,7 @@ dynamicLogString pp = do
return $ encodeString . sepBy (ppSep pp) . ppOrder pp $
[ ws
, ppLayout pp ld
- , ppTitle pp wt
+ , ppTitle pp $ ppTitleSanitize pp wt
]
++ catMaybes extras
@@ -396,14 +396,26 @@ xmobarColor fg bg = wrap t "</fc>"
-- | Strip xmobar markup.
xmobarStrip :: String -> String
-xmobarStrip = strip [] where
+xmobarStrip = xmobarStripTags ["fc","icon","action"] where
+
+xmobarStripTags :: [String] -- ^ tags
+ -> String -> String -- ^ with all <tag>...</tag> removed
+xmobarStripTags tags = strip [] where
+ strip keep [] = keep
strip keep x
- | null x = keep
- | "<fc=" `isPrefixOf` x = strip keep (drop 1 . dropWhile (/= '>') $ x)
- | "</fc>" `isPrefixOf` x = strip keep (drop 5 x)
- | '<' == head x = strip (keep ++ "<") (tail x)
- | otherwise = let (good,x') = span (/= '<') x
- in strip (keep ++ good) x'
+ | rest: _ <- mapMaybe dropTag tags = strip keep rest
+
+
+ | '<':xs <- x = strip (keep ++ "<") xs
+ | (good,x') <- span (/= '<') x = strip (keep ++ good) x' -- this is n^2 bad... but titles have few tags
+ where dropTag :: String -> Maybe String
+ dropTag tag = msum [fmap dropTilClose (openTag tag `stripPrefix` x),
+ closeTag tag `stripPrefix` x]
+
+ dropTilClose, openTag, closeTag :: String -> String
+ dropTilClose = drop 1 . dropWhile (/= '>')
+ openTag str = "<" ++ str ++ "="
+ closeTag str = "</" ++ str ++ ">"
-- | The 'PP' type allows the user to customize the formatting of
-- status information.
@@ -427,6 +439,8 @@ data PP = PP { ppCurrent :: WorkspaceId -> String
-- ^ separator to use between workspace tags
, ppTitle :: String -> String
-- ^ window title format
+ , ppTitleSanitize :: String -> String
+ -- ^ escape / sanitizes input to 'ppTitle'
, ppLayout :: String -> String
-- ^ layout name format
, ppOrder :: [String] -> [String]
@@ -468,6 +482,7 @@ defaultPP = PP { ppCurrent = wrap "[" "]"
, ppSep = " : "
, ppWsSep = " "
, ppTitle = shorten 80
+ , ppTitleSanitize = xmobarStrip . dzenEscape
, ppLayout = id
, ppOrder = id
, ppOutput = putStrLn

View File

@ -1,14 +0,0 @@
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

View File

@ -1,12 +1,10 @@
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
index 4fd93927..ce1fce15 100644
--- a/xmonad-contrib.cabal
+++ b/xmonad-contrib.cabal
@@ -42,6 +42,7 @@ source-repository head
--- xmonad-contrib-0.10/xmonad-contrib.cabal~ 2012-06-11 10:59:49.665575897 +0900
+++ xmonad-contrib-0.10/xmonad-contrib.cabal 2012-11-17 13:14:21.302802620 +0900
@@ -38,6 +38,7 @@
flag use_xft
description: Use Xft to render text
+ default: True
flag pedantic
description: Be pedantic (-Werror and the like)
flag testing
description: Testing mode