branch master updated: gnu: emacs-exwm: Remove obsolete patch.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

jlicht pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 87e57cb  gnu: emacs-exwm: Remove obsolete patch.
87e57cb is described below

commit 87e57cbecbd166c549283224a28a5c68d2a9800c
Author: Jelle Licht <jlicht@fsfe.org>
AuthorDate: Tue Nov 2 12:12:04 2021 +0100

    gnu: emacs-exwm: Remove obsolete patch.
    
    * gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
    * gnu/packages/emacs-xyz.scm (emacs-exwm)[source]: Remove patch.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/emacs-xyz.scm                         |  7 +---
 .../patches/emacs-exwm-fix-fullscreen-states.patch | 39 ----------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index bbc54ef..b6cc3aa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1024,7 +1024,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/elm-compiler-disable-reactor.patch      \
   %D%/packages/patches/elm-compiler-fix-map-key.patch          \
   %D%/packages/patches/emacs-exec-path.patch                   \
-  %D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch  \
   %D%/packages/patches/emacs-fix-scheme-indent-function.patch  \
   %D%/packages/patches/emacs-ignore-empty-xim-styles.patch     \
   %D%/packages/patches/emacs-json-reformat-fix-tests.patch     \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ea6d84d..4980516 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14064,12 +14064,7 @@ It should enable you to implement low-level X11 
applications.")
        (uri (string-append "https://elpa.gnu.org/packages/";
                            "exwm-" version ".tar"))
        (sha256
-        (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"))
-       (patches
-        ;; Patch fixing fullscreen view.  Applied upstream as
-        ;; edb930005b0ba83051ca8a59b493e9a3c8ef580a.  It can be removed in
-        ;; next release.
-        (search-patches "emacs-exwm-fix-fullscreen-states.patch"))))
+        (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-xelb" ,emacs-xelb)))
diff --git a/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch 
b/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch
deleted file mode 100644
index 6d31021..0000000
--- a/gnu/packages/patches/emacs-exwm-fix-fullscreen-states.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From edb930005b0ba83051ca8a59b493e9a3c8ef580a Mon Sep 17 00:00:00 2001
-From: Chris Feng <chris.w.feng@gmail.com>
-Date: Sun, 14 Jun 2020 00:00:00 +0000
-Subject: [PATCH] Fix fullscreen states
-
-* exwm-layout.el (exwm-layout-set-fullscreen,
-exwm-layout-unset-fullscreen): Use `exwm--id' for interactive use.
-(exwm-layout-unset-fullscreen): Mandatorily clear fullscreen states.
----
- exwm-layout.el | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/exwm-layout.el b/exwm-layout.el
-index 170c2be..79d0c95 100644
---- a/exwm-layout.el
-+++ b/exwm-layout.el
-@@ -205,7 +205,7 @@
-                        :border-width 0
-                        :stack-mode xcb:StackMode:Above))
-     (cl-pushnew xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state)
--    (exwm-layout--set-ewmh-state id)
-+    (exwm-layout--set-ewmh-state exwm--id)
-     (xcb:flush exwm--connection)
-     (set-window-dedicated-p (get-buffer-window) t)
-     (exwm-input--release-keyboard exwm--id)))
-@@ -233,7 +233,9 @@
-       (let ((window (get-buffer-window nil t)))
-         (when window
-           (exwm-layout--show exwm--id window))))
--    (exwm-layout--set-ewmh-state id)
-+    (setq exwm--ewmh-state
-+          (delq xcb:Atom:_NET_WM_STATE_FULLSCREEN exwm--ewmh-state))
-+    (exwm-layout--set-ewmh-state exwm--id)
-     (xcb:flush exwm--connection)
-     (set-window-dedicated-p (get-buffer-window) nil)
-     (when (eq 'line-mode exwm--selected-input-mode)
--- 
-2.26.2
-