Subject: bug#26454: [PATCH 2/2] gnu: add emacs-exwm

From: "Feng Shu" <[email-masked]>, Arun Isaac <[email-masked]>
Date: Sun, 16 Apr 2017 16:04:59 +0800

Arun Isaac <[email-masked]> writes:

Fixed:

>From 7b0b3661de614a8d39ee904d08df5eefde5a14ac Mon Sep 17 00:00:00 2001
From: Feng Shu <[email-masked]>
Date: Fri, 14 Apr 2017 23:06:15 +0800
Subject: [PATCH 1/2] gnu: add emacs-xelb

* gnu/packages/emacs.scm (emacs-xelb): New variable.
---
 gnu/packages/emacs.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 976ea31e0..53a9bec0b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2017 Kyle Meyer <[email-masked]>
 ;;; Copyright © 2017 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2017 George Clemmer <[email-masked]>
+;;; Copyright © 2017 Feng Shu <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4360,3 +4361,47 @@ commands are also offered as part of the AUCTeX package, but it is not
 the same - CDLaTeX focuses on speediness for inserting LaTeX
 constructs.")
     (license license:gpl3+)))
+
+(define-public emacs-xelb
+  (package
+    (name "emacs-xelb")
+    (version "0.12-3.d1d6b6c")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ch11ng/xelb")
+                    (commit "d1d6b6cb48a6a9562252be20ab49f24708b34335")))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0sxx2n3mi90dz66yi4xya89jrznyixfbmnj8b84l6qbkdp9iwd91"))))
+    (build-system emacs-build-system)
+    ;; The following functions and variables needed by emacs-xelb are
+    ;; not included in emacs-minimal:
+    ;; x-display-screens x-keysym-table x-alt-keysym x-meta-keysym
+    ;; x-hyper-keysym x-super-keysym libxml-parse-xml-region
+    ;; x-display-pixel-width x-display-pixel-height
+    (arguments
+     `(#:emacs ,emacs
+       #:phases
+       ;; Generate .el files from the XML description of the XCB bindings.
+       ;; This will be adjusted when xelb developer comment in issue page:
+       ;; https://github.com/ch11ng/xelb/issues/16
+       (modify-phases %standard-phases
+         (add-after 'unpack 'regenerate-el-files
+           (lambda* (#:key inputs #:allow-other-keys)
+             (zero? (system* "make"
+                             (string-append "PROTO_PATH="
+                                            (assoc-ref inputs "xcb-proto")
+                                            "/share/xcb")
+                             (string-append "EMACS_BIN="
+                                            (assoc-ref inputs "emacs")
+                                            "/bin/emacs -Q"))))))))
+    (native-inputs `(("xcb-proto" ,xcb-proto)))
+    (home-page "https://github.com/ch11ng/xelb")
+    (synopsis "X protocol Emacs Lisp Binding")
+    (description "@code{emacs-xelb} is a pure Emacs Lisp implementation
+of the X11 protocol based on the XML description files from the XCB
+project.  It features an object-oriented API and permits a certain degree
+of concurrency.  It should enable you to implement low-level X11 applications.")
+    (license license:gpl3+)))
-- 
2.12.2

>From fc6bdfdd8ca210f556d1f86ed354593902659e72 Mon Sep 17 00:00:00 2001
From: Feng Shu <[email-masked]>
Date: Sat, 15 Apr 2017 20:23:10 +0800
Subject: [PATCH 2/2] gnu: add emacs-exwm

* gnu/packages/emacs.scm (emacs-exwm): New variable
---
 gnu/packages/emacs.scm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 53a9bec0b..a9dcd2af6 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4405,3 +4405,87 @@ of the X11 protocol based on the XML description files from the XCB
 project.  It features an object-oriented API and permits a certain degree
 of concurrency.  It should enable you to implement low-level X11 applications.")
     (license license:gpl3+)))
+
+(define-public emacs-exwm
+  (package
+    (name "emacs-exwm")
+    (version "0.13-3.7a5bb11")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ch11ng/exwm")
+                    (commit "7a5bb1156d07848e465f55fd31f8ec755b52aa01")))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0cbaq2ls8pivz4h8hwgn9ldvg16pwlisdf047civvilqiqczw31w"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-xelb" ,emacs-xelb)))
+    (inputs
+     `(("xhost" ,xhost)
+       ("dbus" ,dbus)))
+    ;; The following functions and variables needed by emacs-exwm are
+    ;; not included in emacs-minimal:
+    ;; scroll-bar-mode, fringe-mode
+    ;; x-display-pixel-width x-display-pixel-height
+    (arguments
+     `(#:emacs ,emacs
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'build 'install-xsession
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((emacs-path (string-append (assoc-ref inputs "emacs")
+                                               "/bin/emacs"))
+                    (sh-path    (string-append (assoc-ref inputs "bash")
+                                               "/bin/sh"))
+                    (xhost-path (string-append (assoc-ref inputs "xhost")
+                                               "/bin/xhost"))
+                    (dbus-launch-path (string-append (assoc-ref inputs "dbus")
+                                                     "/bin/dbus-launch"))
+                    (output (assoc-ref outputs "out"))
+                    (xsessions-dir (string-append output "/share/xsessions"))
+                    (desktop-file (string-append xsessions-dir "/exwm.desktop"))
+                    (bin-dir (string-append output "/bin"))
+                    (exwm-default-session
+                     (string-append bin-dir "/exwm-default-session")))
+               ;; Add a .desktop file to xsessions.
+               (mkdir-p xsessions-dir)
+               (mkdir-p bin-dir)
+               (with-output-to-file desktop-file
+                 (lambda _
+                   (format #t
+                    "[Desktop Entry]~@
+                     Name=Exwm~@
+                     Comment=Emacs X Window Manager ~@
+                     Exec=~a/bin/exwm-default-session~@
+                     TryExec=~@*~a/bin/exwm-default-session~@
+                     Type=Application~%"
+                    output)))
+               ;; Add a shell wrap file to bin directory.
+               ;; Fixup: Set DISPLAY variable for the reason:
+               ;; https://github.com/ch11ng/exwm/issues/213
+               (with-output-to-file exwm-default-session
+                 (lambda _
+                   (format #t
+                    "#!~a ~@
+                     export DISPLAY=:0 ~@
+                     ~a +SI:localuser:$USER ~@
+                     exec ~a --exit-with-session ~a -q --eval \"~a\" ~%"
+                    sh-path xhost-path dbus-launch-path emacs-path
+                    (string-append
+                     "(if (file-exists-p \\\"~/.exwm.el\\\")"
+                     "(load \\\"~/.exwm.el\\\")"
+                     "(require 'exwm)"
+                     "(require 'exwm-config)"
+                     "(exwm-config-default)"
+                     "(message \\\"EXWM: ~/.exwm.el is not exist. "
+                     "use exwm fallback configure.\\\")"
+                     ")"))))
+               (chmod exwm-default-session #o555)
+               #t))))))
+    (home-page "https://github.com/ch11ng/exwm")
+    (synopsis "Emacs X Window Manager")
+    (description "EXWM (Emacs X Window Manager) is a full-featured
+tiling X window manager for Emacs built on top of XELB.")
+    (license license:gpl3+)))
-- 
2.12.2

> Feng Shu writes:
>
>> Arun Isaac <[email-masked]> writes:
>>
>>> You should be able to do this just using #:make-flags. See
>>> https://www.gnu.org/software/make/manual/html_node/Overriding.html>
>> emacs-build-system seem to have no #:make-flags, I just use
>> "make var1=var1 all" instead.
>
> Ah, yes. I forgot!
>
>> the rest have been fixed, thanks!
>>
>> the below is new patch:
>
> I'm not able to apply your patch. Could you send the patches made
> against the latest master? Thanks!
>
>> +    (arguments
>> +     `(#:emacs ,emacs
>> +       #:phases
>> +       ;; Generate .el files from the XML description of the XCB bindings.
>> +       ;; This will be adjusted when xelb developer comment in issue page:
>> +       ;; https://github.com/ch11ng/xelb/issues/16> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'regenerate-el-files
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             (zero? (system* "make"
>> +                             (string-append "PROTO_PATH="
>> +                                            (assoc-ref inputs "xcb-proto")
>> +                                            "/share/xcb")
>> +                             (string-append "EMACS_BIN="
>> +                                            (assoc-ref inputs "emacs")
>> +                                            "/bin/emacs -Q")
>> +                             "all")))))))
>
> "all" is the default target, isn't it? In the interest of brevity, you
> can drop it.
>
>> +    (native-inputs `(("xcb-proto" ,xcb-proto)))
>> +    (home-page "https://github.com/ch11ng/xelb")> +    (synopsis "X protocol Emacs Lisp Binding")
>> +    (description "@code{emacs-xelb} is a pure Emacs Lisp implementation
>> +of the X11 protocol based on the XML description files from the XCB
>> +project. It features an object-oriented API and permits a certain degree
>> +of concurrency. It should enable you to implement low-level X11 applications.")
>
> There should be two spaces after the full stop '.' at the end of a
> sentence. Do run through 'guix lint'. It will warn you about this.
>
>> +(define-public emacs-exwm
>> +  (package
>> +    (name "emacs-exwm")
>> +    (version "0.13-3.7a5bb11")
>> +    (source (origin
>> +              (method git-fetch)
>> +              (uri (git-reference
>> +                    (url "https://github.com/ch11ng/exwm")> +                    (commit "7a5bb1156d07848e465f55fd31f8ec755b52aa01")))
>> +              (file-name (string-append name "-" version "-checkout"))
>> +              (sha256
>> +               (base32
>> +                "0cbaq2ls8pivz4h8hwgn9ldvg16pwlisdf047civvilqiqczw31w"))))
>> +    (build-system emacs-build-system)
>> +    (propagated-inputs
>> +     `(("emacs-xelb" ,emacs-xelb)))
>> +    (inputs
>> +     `(("xhost" ,xhost)
>> +       ("dbus" ,dbus)))
>> +    ;; The following functions and variables needed by emacs-exwm are
>> +    ;; not included in emacs-minimal:
>> +    ;; scroll-bar-mode, fringe-mode
>> +    ;; x-display-pixel-width x-display-pixel-height
>> +    (arguments
>> +     `(#:emacs ,emacs
>> +       #:phases
>> +       ;; Generate .el files from the XML description of the XCB bindings.
>> +       ;; This will be adjusted when xelb developer comment in issue page:
>> +       ;; https://github.com/ch11ng/xelb/issues/16
>
> This comment is only for emacs-xelb, and shouldn't be here, right?
>
> Everything else LGTM. Please send one last patch set. There may be a few
> more minor corrections. I'll make them and push. I'm eager to try out
> exwm. I didn't know about it before your patch. Thank you! :-)

--