commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2020-08-28 21:42:30
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new.3399 (New)
Package is "xmonad"
Fri Aug 28 21:42:30 2020 rev:7 rq:829529 version:0.15
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2020-06-19
17:22:23.967719632 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new.3399/xmonad.changes 2020-08-28
21:42:31.588912638 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:46:55 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.DYHQv0/_old 2020-08-28 21:42:33.236913245 +0200
+++ /var/tmp/diff_new_pack.DYHQv0/_new 2020-08-28 21:42:33.240913247 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xmonad
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -79,7 +79,7 @@
This package provides the Haskell %{name} library development files.
%prep
-%setup -q
+%autosetup
%build
%ghc_lib_build
commit xmonad for openSUSE:Factory
Hello community, here is the log from the commit of package xmonad for openSUSE:Factory checked in at 2020-06-19 17:22:21 Comparing /work/SRC/openSUSE:Factory/xmonad (Old) and /work/SRC/openSUSE:Factory/.xmonad.new.3606 (New) Package is "xmonad" Fri Jun 19 17:22:21 2020 rev:6 rq:815233 version:0.15 Changes: --- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2019-12-27 13:59:43.472842578 +0100 +++ /work/SRC/openSUSE:Factory/.xmonad.new.3606/xmonad.changes 2020-06-19 17:22:23.967719632 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 11:14:57 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +--- Other differences: -- ++ xmonad.spec ++ --- /var/tmp/diff_new_pack.Nd4hQ5/_old 2020-06-19 17:22:24.719721820 +0200 +++ /var/tmp/diff_new_pack.Nd4hQ5/_new 2020-06-19 17:22:24.727721843 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmonad # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2019-12-27 13:59:41
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new.6675 (New)
Package is "xmonad"
Fri Dec 27 13:59:41 2019 rev:5 rq:759578 version:0.15
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2018-10-25
08:20:16.959966730 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new.6675/xmonad.changes 2019-12-27
13:59:43.472842578 +0100
@@ -1,0 +2,5 @@
+Fri Nov 8 16:15:23 UTC 2019 - Peter Simons
+
+- Drop obsolete group attributes.
+
+---
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.YL3Iqy/_old 2019-12-27 13:59:45.608843610 +0100
+++ /var/tmp/diff_new_pack.YL3Iqy/_new 2019-12-27 13:59:45.612843612 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xmonad
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,6 @@
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
-Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Source10: xmonad.desktop
@@ -65,14 +64,12 @@
%package -n ghc-%{name}
Summary:Haskell %{name} library
-Group: System/Libraries
%description -n ghc-%{name}
This package provides the Haskell %{name} shared library.
%package -n ghc-%{name}-devel
Summary:Haskell %{name} library development files
-Group: Development/Libraries/Haskell
Requires: ghc-%{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2018-10-25 08:20:05
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Thu Oct 25 08:20:05 2018 rev:4 rq:642918 version:0.15
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2018-08-27
12:58:27.352757650 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2018-10-25
08:20:16.959966730 +0200
@@ -1,0 +2,19 @@
+Thu Oct 4 09:42:58 UTC 2018 - psim...@suse.com
+
+- Update xmonad to version 0.15.
+ ## 0.15 (September 30, 2018)
+
+* Reimplement `sendMessage` to deal properly with windowset changes made
+ during handling.
+
+* Add new library functions `windowBracket` and `modifyWindowSet` to
+ `XMonad.Operations`.
+
+ ## 0.14.2 (August 21, 2018)
+
+ ### Bug Fixes
+
+* Add the sample configuration file xmonad.hs again to the release tarball.
+ [https://github.com/xmonad/xmonad/issues/181]
+
+---
Old:
xmonad-0.14.2.tar.gz
New:
xmonad-0.15.tar.gz
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.2ZmHVd/_old 2018-10-25 08:20:17.827966344 +0200
+++ /var/tmp/diff_new_pack.2ZmHVd/_new 2018-10-25 08:20:17.831966342 +0200
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global pkg_name xmonad
%bcond_with tests
Name: %{pkg_name}
-Version:0.14.2
+Version:0.15
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
++ xmonad-0.14.2.tar.gz -> xmonad-0.15.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmonad-0.14.2/CHANGES.md new/xmonad-0.15/CHANGES.md
--- old/xmonad-0.14.2/CHANGES.md2018-08-21 10:01:48.0 +0200
+++ new/xmonad-0.15/CHANGES.md 1970-01-01 01:00:00.0 +0100
@@ -2,6 +2,21 @@
## unknown (unknown)
+## 0.15 (September 30, 2018)
+
+ * Reimplement `sendMessage` to deal properly with windowset changes made
+during handling.
+
+ * Add new library functions `windowBracket` and `modifyWindowSet` to
+`XMonad.Operations`.
+
+## 0.14.2 (August 21, 2018)
+
+### Bug Fixes
+
+ * Add the sample configuration file xmonad.hs again to the release tarball.
+[https://github.com/xmonad/xmonad/issues/181]
+
## 0.14.1 (August 20, 2018)
### Breaking Changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmonad-0.14.2/man/xmonad.1
new/xmonad-0.15/man/xmonad.1
--- old/xmonad-0.14.2/man/xmonad.1 2018-08-21 10:01:48.0 +0200
+++ new/xmonad-0.15/man/xmonad.11970-01-01 01:00:00.0 +0100
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 2.2.1
.\"
-.TH "XMONAD" "1" "20 August 2018" "Tiling Window Manager" ""
+.TH "XMONAD" "1" "30 September 2018" "Tiling Window Manager" ""
.hy
.SH Name
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmonad-0.14.2/man/xmonad.1.html
new/xmonad-0.15/man/xmonad.1.html
--- old/xmonad-0.14.2/man/xmonad.1.html 2018-08-21 10:01:48.0 +0200
+++ new/xmonad-0.15/man/xmonad.1.html 1970-01-01 01:00:00.0 +0100
@@ -5,7 +5,7 @@
-
+
XMONAD(1) Tiling Window Manager
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2018-08-27 12:58:25
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Mon Aug 27 12:58:25 2018 rev:3 rq:631369 version:0.14.2
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2018-08-20
16:21:10.412971047 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2018-08-27
12:58:27.352757650 +0200
@@ -1,0 +2,38 @@
+Wed Aug 22 09:14:12 UTC 2018 - psim...@suse.com
+
+- Update xmonad to version 0.14.2.
+ ## unknown (unknown)
+
+ ## 0.14.1 (August 20, 2018)
+
+ ### Breaking Changes
+
+* The cabal build no longer installs xmonad.hs, xmonad.1, and xmonad.1.html
+ as data files. The location cabal picks for chose files isn't useful as
+ standard tools like man(1) won't find them there. Instead, we rely on
+ distributors to pick up the files from the source tarball during the
build
+ and to install them into proper locations where their users expect them.
+ [https://github.com/xmonad/xmonad/pull/127]
+
+ ### Bug Fixes
+
+* Add support for GHC 8.6.x by providing an instance for 'MonadFail X'. A
+ side effect of that change is that our code no longer compiles with GHC
+ versions prior to 8.0.x. We could work around that, no doubt, but the
+ resulting code would require CPP and Cabal flags and whatnot. It feels
more
+ reasonable to just require a moderately recent compiler instead of going
+ through all that trouble.
+
+* xmonad no longer always recompile on startup. Now it only does so if the
+ executable does not have the name that would be used for the compilation
+ output. The purpose of recompiling and executing the results in this
case is
+ so that the `xmonad` executable in the package can be used with custom
+ configurations.
+
+ ### Enhancements
+
+* Whenever xmonad recompiles, it now explains how it is attempting to
+ recompile, by outputting logs to stderr. If you are using xmonad as a
custom
+ X session, then this will end up in a `.xsession-errors` file.
+
+---
Old:
xmonad-0.14.tar.gz
xmonad.cabal
New:
xmonad-0.14.2.tar.gz
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.6et98B/_old 2018-08-27 12:58:28.456758856 +0200
+++ /var/tmp/diff_new_pack.6et98B/_new 2018-08-27 12:58:28.456758856 +0200
@@ -19,14 +19,13 @@
%global pkg_name xmonad
%bcond_with tests
Name: %{pkg_name}
-Version:0.14
+Version:0.14.2
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
Source10: xmonad.desktop
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
@@ -39,7 +38,6 @@
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-rpm-macros
-BuildRequires: ghc-semigroups-devel
BuildRequires: ghc-setlocale-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
@@ -85,22 +83,17 @@
%prep
%setup -q
-cp -p %{SOURCE1} %{name}.cabal
%build
%ghc_lib_build
%install
%ghc_lib_install
-install -d %{buildroot}%{_mandir}/man1/
-mv %{buildroot}%{_datadir}/%{name}-%{version}/man/%{name}.1
%{buildroot}%{_mandir}/man1/
-gzip %{buildroot}%{_mandir}/man1/%{name}.1
-# Gzipping here because when we gzip it in %%build step, it breaks cabal setup
-
+install -m0644 -D man/xmonad.1 %{buildroot}%{_mandir}/man1/xmonad.1
+gzip %{buildroot}%{_mandir}/man1/xmonad.1
%define desktop_src %{buildroot}%{_datadir}/xsessions/xmonad.desktop
install -m0644 -D %{SOURCE10} %{desktop_src}
%suse_update_desktop_file %{desktop_src}
-
%ghc_fix_rpath %{pkg_name}-%{version}
%check
@@ -116,12 +109,8 @@
%license LICENSE
%doc CHANGES.md README.md
%{_bindir}/%{name}
-%dir %{_datadir}/%{name}-%{version}
-%dir %{_datadir}/%{name}-%{version}/man
%{_mandir}/man1/xmonad.1%{?ext_man}
-%{_datadir}/%{name}-%{version}/man/xmonad.1.html
%{_datadir}/xsessions/xmonad.desktop
-%{_datadir}/%{name}-%{version}/man/xmonad.hs
%files -n ghc-%{name} -f ghc-%{name}.files
%license LICENSE
++ xmonad-0.14.tar.gz -> xmonad-0.14.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmonad-0.14/CHANGES.md
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2018-08-20 16:21:07
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Mon Aug 20 16:21:07 2018 rev:2 rq:630379 version:0.14
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2018-08-04
21:53:58.437341527 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2018-08-20
16:21:10.412971047 +0200
@@ -1,0 +2,6 @@
+Fri Aug 17 14:35:50 UTC 2018 - psim...@suse.com
+
+- Update Cabal build information to prevent build attempts with
+ GHC 8.6.x.
+
+---
@@ -5 +10,0 @@
-
New:
xmonad.cabal
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.4ZEQ25/_old 2018-08-20 16:21:11.056971958 +0200
+++ /var/tmp/diff_new_pack.4ZEQ25/_new 2018-08-20 16:21:11.056971958 +0200
@@ -26,6 +26,7 @@
Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:
https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
Source10: xmonad.desktop
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
@@ -84,6 +85,7 @@
%prep
%setup -q
+cp -p %{SOURCE1} %{name}.cabal
%build
%ghc_lib_build
++ xmonad.cabal ++
name: xmonad
version:0.14
x-revision: 1
homepage: http://xmonad.org
synopsis: A tiling window manager
description:
xmonad is a tiling window manager for X. Windows are arranged
automatically to tile the screen without gaps or overlap, maximising
screen use. All features of the window manager are accessible from
the keyboard: a mouse is strictly optional. xmonad is written and
extensible in Haskell. Custom layout algorithms, and other
extensions, may be written by the user in config files. Layouts are
applied dynamically, and different layouts may be used on each
workspace. Xinerama is fully supported, allowing windows to be tiled
on several screens.
category: System
license:BSD3
license-file: LICENSE
author: Spencer Janssen
maintainer: xmo...@haskell.org
extra-source-files: README.md CHANGES.md CONFIG STYLE
tests/*.hs
tests/Properties/*.hs
tests/Properties/Layout/*.hs
man/xmonad.1.markdown man/xmonad.1 man/xmonad.1.html
util/GenerateManpage.hs
util/hpcReport.sh
cabal-version: >= 1.8
bug-reports:https://github.com/xmonad/xmonad/issues
build-type: Simple
tested-with:
GHC==7.6.3,
GHC==7.8.4,
GHC==7.10.3,
GHC==8.0.2,
GHC==8.2.2,
GHC==8.4.3
data-files: man/xmonad.hs, man/xmonad.1, man/xmonad.1.html
source-repository head
type: git
location: https://github.com/xmonad/xmonad
flag testing
description: Testing mode, only build minimal components
default: False
manual: True
flag generatemanpage
description: Build the tool for generating the man page
default: False
manual: True
library
hs-source-dirs: src
exposed-modules:XMonad
XMonad.Main
XMonad.Core
XMonad.Config
XMonad.Layout
XMonad.ManageHook
XMonad.Operations
XMonad.StackSet
other-modules: Paths_xmonad
build-depends: base >= 4.6 && < 4.12,
containers,
data-default,
directory,
extensible-exceptions,
filepath,
setlocale,
mtl,
process,
unix,
utf8-string >= 0.3 && < 1.1,
X11>=1.8 && < 1.10,
semigroups
if true
ghc-options:-funbox-strict-fields -Wall
if impl(ghc >= 6.12.1)
ghc-options:-fno-warn-unused-do-bind
if impl(ghc < 7.0.0)
extensions: UndecidableInstances
-- needed for XMonad.Config's instance Default (XConfig a)
if flag(testing)
buildable: False
executable xmonad
main-is:Main.hs
build-depends: base,
mtl,
unix,
X11,
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2017-09-15 22:30:42
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Fri Sep 15 22:30:42 2017 rev:8 rq:525812 version:0.13
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2017-05-06
18:29:19.342013480 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2017-09-15
22:30:42.916503229 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.rWoGcQ/_old 2017-09-15 22:30:43.824375341 +0200
+++ /var/tmp/diff_new_pack.rWoGcQ/_new 2017-09-15 22:30:43.824375341 +0200
@@ -23,8 +23,8 @@
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
-Group: Development/Languages/Other
-Url:https://hackage.haskell.org/package/%{name}
+Group: Development/Libraries/Haskell
+URL:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Source10: xmonad.desktop
Patch1:
https://github.com/xmonad/xmonad/pull/91.patch#/remove-state-file-after-startup.patch
@@ -50,7 +50,6 @@
# windowmanager is a generic provides for every WM - there are things (like
Xvnc)
# That rely on the prsence of 'a WM', but do not care which one it is
Provides: windowmanager
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
%endif
@@ -74,7 +73,7 @@
%package -n ghc-%{name}-devel
Summary:Haskell %{name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: ghc-%{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -113,7 +112,6 @@
%ghc_pkg_recache
%files
-%defattr(-,root,root,-)
%doc LICENSE
%doc CHANGES.md README.md
%{_bindir}/%{name}
@@ -125,11 +123,9 @@
%{_datadir}/xsessions/xmonad.desktop
%files -n ghc-%{name} -f ghc-%{name}.files
-%defattr(-,root,root,-)
%doc LICENSE
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%defattr(-,root,root,-)
%doc CHANGES.md README.md
%changelog
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2017-05-06 18:29:18
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Sat May 6 18:29:18 2017 rev:7 rq:491534 version:0.13
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2017-03-03
17:53:20.282518344 +0100
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2017-05-06
18:29:19.342013480 +0200
@@ -1,0 +2,8 @@
+Thu Apr 20 07:57:08 UTC 2017 - psim...@suse.com
+
+- Add "remove-state-file-after-startup.patch" to fix issues where
+ xmonad would not start because an incorrect serialized state file
+ was still lying around in the user's home. The patch comes from
+ https://github.com/xmonad/xmonad/pull/91.
+
+---
New:
remove-state-file-after-startup.patch
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.CxHXXM/_old 2017-05-06 18:29:20.565840792 +0200
+++ /var/tmp/diff_new_pack.CxHXXM/_new 2017-05-06 18:29:20.569840228 +0200
@@ -27,6 +27,7 @@
Url:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Source10: xmonad.desktop
+Patch1:
https://github.com/xmonad/xmonad/pull/91.patch#/remove-state-file-after-startup.patch
BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-X11-devel
@@ -84,6 +85,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%ghc_lib_build
++ remove-state-file-after-startup.patch ++
>From 89a8cc88c31163dd35d3182bbba7cdd0630ff54b Mon Sep 17 00:00:00 2001
From: Peter Jones
Date: Thu, 30 Mar 2017 13:42:16 -0700
Subject: [PATCH] Remove the xmonad state file after reading it
Tries to make sure IO is not lazy so the file is processed before it
is removed from the file system.
Fixes #86 and friends.
---
CHANGES.md | 14 ++
src/XMonad/Operations.hs | 16 +---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index fed3bc9..ebb104f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,19 @@
# Change Log / Release Notes
+## 0.14 (Not Yet Released)
+
+### Bug Fixes
+
+ * The state file that xmonad uses while restarting itself is now
+removed after it is processed. This fixes a bug that manifested
+in several different ways:
+
+- Names of old workspaces would be resurrected after a restart
+- Screen sizes would be wrong after changing monitor configuration (#90)
+- `spawnOnce` stopped working (xmonad/xmonad-contrib#155)
+- Focus did not follow when moving between workspaces (#87)
+- etc.
+
## 0.13 (February 10, 2017)
### Breaking Changes
diff --git a/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
index 4b46571..7dbb45c 100644
--- a/src/XMonad/Operations.hs
+++ b/src/XMonad/Operations.hs
@@ -465,14 +465,21 @@ writeStateToFile = do
catchIO (writeFile path $ show stateData)
-- | Read the state of a previous xmonad instance from a file and
--- return that state.
+-- return that state. The state file is removed after reading it.
readStateFile :: (LayoutClass l Window, Read (l Window)) => XConfig l -> X
(Maybe XState)
readStateFile xmc = do
path <- stateFileName
-raw <- userCode $ io (readFile path)
+
+-- I'm trying really hard here to make sure we read the entire
+-- contents of the file before it is removed from the file system.
+sf' <- userCode . io $ do
+raw <- withFile path ReadMode readStrict
+return $! maybeRead reads raw
+
+io (removeFile path)
return $ do
- sf <- maybeRead reads =<< raw
+ sf <- join sf'
let winset = W.ensureTags layout (workspaces xmc) $ W.mapLayout
(fromMaybe layout . maybeRead lreads) (sfWins sf)
extState = M.fromList . map (second Left) $ sfExt sf
@@ -491,6 +498,9 @@ readStateFile xmc = do
[(x, "")] -> Just x
_ -> Nothing
+readStrict :: Handle -> IO String
+readStrict h = hGetContents h >>= \s -> length s `seq` return s
+
-- | Migrate state from a previously running xmonad instance that used
-- the older @--resume@ technique.
{-# DEPRECATED migrateState "will be removed some point in the future." #-}
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2017-03-03 17:53:19
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Fri Mar 3 17:53:19 2017 rev:6 rq:461710 version:0.13
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2016-11-28
15:07:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2017-03-03
17:53:20.282518344 +0100
@@ -1,0 +2,5 @@
+Sun Feb 12 14:19:31 UTC 2017 - psim...@suse.com
+
+- Update to version 0.13 with cabal2obs.
+
+---
Old:
xmonad-0.12.tar.gz
New:
xmonad-0.13.tar.gz
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.dFBgrZ/_old 2017-03-03 17:53:20.822442084 +0100
+++ /var/tmp/diff_new_pack.dFBgrZ/_new 2017-03-03 17:53:20.822442084 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xmonad
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name xmonad
%bcond_with tests
Name: %{pkg_name}
-Version:0.12
+Version:0.13
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
@@ -99,7 +99,7 @@
install -m0644 -D %{SOURCE10} %{desktop_src}
%suse_update_desktop_file %{desktop_src}
-%ghc_fix_dynamic_rpath %{pkg_name}
+%ghc_fix_rpath %{pkg_name}-%{version}
%check
%cabal_test
@@ -113,7 +113,7 @@
%files
%defattr(-,root,root,-)
%doc LICENSE
-%doc README.md TODO
+%doc CHANGES.md README.md
%{_bindir}/%{name}
%dir %{_datadir}/%{name}-%{version}
%dir %{_datadir}/%{name}-%{version}/man
@@ -128,6 +128,6 @@
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)
-%doc README.md TODO
+%doc CHANGES.md README.md
%changelog
++ xmonad-0.12.tar.gz -> xmonad-0.13.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xmonad-0.12/CHANGES.md new/xmonad-0.13/CHANGES.md
--- old/xmonad-0.12/CHANGES.md 2015-12-21 20:12:39.0 +0100
+++ new/xmonad-0.13/CHANGES.md 2017-02-10 23:47:35.0 +0100
@@ -1,5 +1,74 @@
# Change Log / Release Notes
+## 0.13 (February 10, 2017)
+
+### Breaking Changes
+
+ * When restarting xmonad, resume state is no longer passed to the
+next process via the command line. Instead, a temporary state
+file is created and xmonad's state is serialized to that file.
+
+When upgrading to 0.13 from a previous version, the `--resume`
+command line option will automatically migrate to a state file.
+
+This fixes issue #12.
+
+### Enhancements
+
+ * You can now control which directory xmonad uses for finding your
+configuration file and which one is used for storing the compiled
+version of your configuration. In order of preference:
+
+ 1. New environment variables. If you want to use these ensure
+ you set the correct environment variable and also create the
+ directory it references:
+
+ - `XMONAD_CONFIG_DIR`
+ - `XMONAD_CACHE_DIR`
+ - `XMONAD_DATA_DIR`
+
+ 2. The `~/.xmonad` directory.
+
+ 3. XDG Base Directory Specification directories, if they exist:
+
+ - `XDG_CONFIG_HOME/xmonad`
+ - `XDG_CACHE_HOME/xmonad`
+ - `XDG_DATA_HOME/xmonad`
+
+If none of these directories exist then one will be created using
+the following logic: If the relevant environment variable
+mentioned in step (1) above is set, the referent directory will be
+created and used. Otherwise `~/.xmonad` will be created and used.
+
+This fixes a few issues, notably #7 and #56.
+
+ * A custom build script can be used when xmonad is given the
+`--recompile` command line option. If an executable named `build`
+exists in the xmonad configuration directory it will be called
+instead of `ghc`. It takes one argument, the name of the
+executable binary it must produce.
+
+This fixes #8. (One of two possible custom build solutions. See
+the next entry for another solution.)
+
+ * For users who build their xmonad configuration using tools such as
+cabal or stack, there is another option for executing xmonad.
+
+Instead of running the `xmonad` executable directly, arrange to
+have your login manager run your configuration binary instead.
+Then, in your binary, use the new `launch` command instead of
+`xmonad`.
+
+This
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2016-07-21 08:01:22
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2015-12-24
12:17:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2016-07-21
08:01:24.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:30:24 UTC 2016 - psim...@suse.com
+
+- Update to version 0.12 revision 0 with cabal2obs.
+
+---
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.QugLVz/_old 2016-07-21 08:01:25.0 +0200
+++ /var/tmp/diff_new_pack.QugLVz/_new 2016-07-21 08:01:25.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xmonad
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,18 @@
%global pkg_name xmonad
-# no useful debuginfo for Haskell packages without C sources
-%global debug_package %{nil}
-Name: xmonad
+%bcond_with tests
+Name: %{pkg_name}
Version:0.12
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
-Group: System/GUI/Other
+Group: Development/Languages/Other
Url:https://hackage.haskell.org/package/%{name}
-Source0:%{name}-%{version}.tar.gz
-Source1:xmonad.desktop
+Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source10: xmonad.desktop
+# Begin cabal-rpm deps:
+BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-X11-devel
BuildRequires: ghc-containers-devel
@@ -41,11 +42,16 @@
BuildRequires: ghc-setlocale-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
+# End cabal-rpm deps
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(xinerama)
Suggests: ghc-xmonad-contrib-devel
Suggests: ghc-xmonad-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with tests}
+BuildRequires: ghc-QuickCheck-devel
+%endif
%description
Xmonad is a tiling window manager for X. Windows are arranged automatically to
@@ -68,6 +74,9 @@
Summary:Haskell %{name} library development files
Group: Development/Libraries/Other
Requires: ghc-%{name} = %{version}-%{release}
+Requires: ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
%description -n ghc-%{name}-devel
This package provides the Haskell %{name} library development files.
@@ -75,20 +84,32 @@
%prep
%setup -q
+
%build
%ghc_lib_build
+
%install
-%{ghc_lib_install}
+%ghc_lib_install
+
install -d %{buildroot}%{_mandir}/man1/
mv %{buildroot}%{_datadir}/%{name}-%{version}/man/%{name}.1
%{buildroot}%{_mandir}/man1/
gzip %{buildroot}%{_mandir}/man1/%{name}.1
# Gzipping here because when we gzip it in %%build step, it breaks cabal setup
%define desktop_src %{buildroot}%{_datadir}/xsessions/xmonad.desktop
-install -m0644 -D %{SOURCE1} %{desktop_src}
+install -m0644 -D %{SOURCE10} %{desktop_src}
%suse_update_desktop_file %{desktop_src}
+%ghc_fix_dynamic_rpath %{pkg_name}
+
+
+%check
+%if %{with tests}
+%{cabal} test
+%endif
+
+
%post -n ghc-%{name}-devel
%ghc_pkg_recache
@@ -100,8 +121,11 @@
%doc LICENSE
%doc README.md TODO
%{_bindir}/%{name}
-%{_datadir}/%{name}-%{version}
-%{_mandir}/man1/xmonad.1.gz
+%dir %{_datadir}/%{name}-%{version}
+%dir %{_datadir}/%{name}-%{version}/man
+%{_datadir}/%{name}-%{version}/man/xmonad.hs
+%{_mandir}/man1/xmonad.1%{ext_man}
+%{_datadir}/%{name}-%{version}/man/xmonad.1.html
%{_datadir}/xsessions/xmonad.desktop
%files -n ghc-%{name} -f ghc-%{name}.files
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2015-12-24 12:17:00
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2015-09-02
00:36:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2015-12-24
12:17:07.0 +0100
@@ -1,0 +2,14 @@
+Tue Dec 22 09:28:15 UTC 2015 - mimi...@gmail.com
+
+- update to 0.12
+* Use of data-default allows using def where previously you had to write
+defaultConfig, defaultXPConfig, etc.
+* The setlocale package is now used instead of a binding shipped with xmonad
proper
+allowing the use of Main.hs instead of Main.hsc
+* No longer encodes paths for spawnPID
+* The default manageHook no longer floats Gimp windows
+* Doesn't crash when there are fewer workspaces than screens
+* Query is now an instance of Applicative
+* Various improvements to the example configuration file
+
+---
Old:
xmonad-0.11.1.tar.gz
New:
xmonad-0.12.tar.gz
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.Xdkmye/_old 2015-12-24 12:17:09.0 +0100
+++ /var/tmp/diff_new_pack.Xdkmye/_new 2015-12-24 12:17:09.0 +0100
@@ -20,7 +20,7 @@
# no useful debuginfo for Haskell packages without C sources
%global debug_package %{nil}
Name: xmonad
-Version:0.11.1
+Version:0.12
Release:0
Summary:A tiling window manager
License:BSD-3-Clause
@@ -31,12 +31,14 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-X11-devel
BuildRequires: ghc-containers-devel
+BuildRequires: ghc-data-default-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-extensible-exceptions-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-rpm-macros
+BuildRequires: ghc-setlocale-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: update-desktop-files
@@ -72,32 +74,31 @@
%prep
%setup -q
-cabal-tweak-dep-ver utf8-string '< 0.4' '< 1.1'
%build
-%{ghc_lib_build}
+%ghc_lib_build
%install
%{ghc_lib_install}
install -d %{buildroot}%{_mandir}/man1/
mv %{buildroot}%{_datadir}/%{name}-%{version}/man/%{name}.1
%{buildroot}%{_mandir}/man1/
gzip %{buildroot}%{_mandir}/man1/%{name}.1
-# Gzipping here because when we gzip it in %build step, it breaks cabal setup
+# Gzipping here because when we gzip it in %%build step, it breaks cabal setup
%define desktop_src %{buildroot}%{_datadir}/xsessions/xmonad.desktop
install -m0644 -D %{SOURCE1} %{desktop_src}
%suse_update_desktop_file %{desktop_src}
%post -n ghc-%{name}-devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
%postun -n ghc-%{name}-devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
%files
%defattr(-,root,root,-)
%doc LICENSE
-%doc README TODO
+%doc README.md TODO
%{_bindir}/%{name}
%{_datadir}/%{name}-%{version}
%{_mandir}/man1/xmonad.1.gz
@@ -109,6 +110,6 @@
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)
-%doc README TODO
+%doc README.md TODO
%changelog
++ xmonad-0.11.1.tar.gz -> xmonad-0.12.tar.gz ++
9672 lines of diff (skipped)
commit xmonad for openSUSE:Factory
Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2015-09-02 00:35:57
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
Package is "xmonad"
Changes:
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes2015-05-21
08:39:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2015-09-02
00:36:00.0 +0200
@@ -1,0 +2,5 @@
+Sun Aug 30 13:35:30 UTC 2015 - mimi...@gmail.com
+
+- drop relax-utfstring-dep.patch , use of new macros functions instead
+
+---
Old:
relax-utfstring-dep.patch
Other differences:
--
++ xmonad.spec ++
--- /var/tmp/diff_new_pack.fJGROI/_old 2015-09-02 00:36:01.0 +0200
+++ /var/tmp/diff_new_pack.fJGROI/_new 2015-09-02 00:36:01.0 +0200
@@ -19,7 +19,7 @@
%global pkg_name xmonad
# no useful debuginfo for Haskell packages without C sources
%global debug_package %{nil}
-Name: %{pkg_name}
+Name: xmonad
Version:0.11.1
Release:0
Summary:A tiling window manager
@@ -28,8 +28,6 @@
Url:https://hackage.haskell.org/package/%{name}
Source0:%{name}-%{version}.tar.gz
Source1:xmonad.desktop
-# PATCH-FIX-UPSTREAM relax-utfstring-dep.patch relax dep on utf8-string >0.3
-Patch0: relax-utfstring-dep.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-X11-devel
BuildRequires: ghc-containers-devel
@@ -74,7 +72,7 @@
%prep
%setup -q
-%patch0 -p1
+cabal-tweak-dep-ver utf8-string '< 0.4' '< 1.1'
%build
%{ghc_lib_build}
