From: Eric Bavier <ericbavier@openmailbox.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org, Eric Bavier <bavier@member.fsf.org>
Subject: Re: [PATCH 2/2] gnu: Add evilwm.
Date: Mon, 19 Oct 2015 06:55:41 -0500 [thread overview]
Message-ID: <20151019065541.771c7a5e@openmailbox.org> (raw)
In-Reply-To: <87vba7tdig.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]
On Fri, 16 Oct 2015 10:37:43 +0200
ludo@gnu.org (Ludovic Courtès) wrote:
> ericbavier@openmailbox.org skribis:
>
> > From: Eric Bavier <bavier@member.fsf.org>
> >
> > * gnu/packages/wm.scm (evilwm): New variable.
>
> [...]
>
> > + 'build 'provide-better-default-font
> > + (lambda _
> > + ;; The "fixed" font is contained in the set of fonts
> > + ;; installed with the default xorg-server service, so use
> > + ;; it as the default instead.
> > + (substitute* "evilwm.h"
> > + (("^#define DEF_FONT[[:space:]]*\"variable\"")
> > + "#define DEF_FONT \"fixed\""))
>
> What about adding the “variable” font by default in (gnu services xorg)
> instead?
The attached patches:
0002) patch our font-alias package so that the xserver will honor its
alias definitions.
0003) Add font-alias directories to the default FontPath in our
xorg-server service.
0004) Amends the previous patch to remove the change to evilwm's default
font.
>
> > + (license (fsf-free "file:///README"))))
>
> Since ‘fsf-free’ is a catch-all thing, could you add a comment
> explaining in one line what kind of license this is?
Upon closer reading of the README, I've updated the license field to
'(x11-style "file:///README")'. Of course, second opinions welcome,
especially since http://directory.fsf.org/wiki/Evilwm claims both
"Other" and "GPLv2orlater" licenses, and
http://directory.fsf.org/wiki/Aewm which evilwm is based on claims the
"Expat" license.
`~Eric
[-- Attachment #2: 0002-font-alias-Install-dummy-fonts.dir-files.patch --]
[-- Type: application/octet-stream, Size: 1764 bytes --]
From 024a556bdc82a569b6c07873df221ae7e50f1fb0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 19 Oct 2015 06:44:23 -0500
Subject: [PATCH 2/4] font-alias: Install dummy fonts.dir files.
* gnu/packages/xorg.scm (font-alias)[arguments]: New 'install-fonts-dir'
phase.
---
gnu/packages/xorg.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4e6570a..d96a7bf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -413,6 +413,23 @@ provided.")
"16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after
+ 'install 'install-fonts-dir
+ ;; The X font server will not add directories to the font
+ ;; path unless they contain a "fonts.dir" file, so add some
+ ;; dummy files.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each (lambda (d)
+ (call-with-output-file
+ (string-append out "/share/fonts/X11"
+ "/" d "/fonts.dir")
+ (lambda (p)
+ (format p "0~%"))))
+ '("75dpi" "100dpi" "misc" "cyrillic"))
+ #t))))))
(home-page "http://www.x.org/wiki/")
(synopsis "Xorg font aliases")
(description
--
2.4.3
[-- Attachment #3: 0003-services-xorg-Include-font-alias-in-default-FontPath.patch --]
[-- Type: application/octet-stream, Size: 1053 bytes --]
From d5446a060f7ffe6d419d64bf5c3a0a51736a47d0 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Mon, 19 Oct 2015 06:45:31 -0500
Subject: [PATCH 3/4] services: xorg: Include font-alias in default FontPath.
* gnu/services/xorg.scm (xorg-configuration-file): Add font-alias directories
to xserver.conf FontPath.
---
gnu/services/xorg.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 9ee8817..7e90665 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -89,6 +89,10 @@ EndSection"))
(apply text-file* "xserver.conf" "
Section \"Files\"
+ FontPath \"" font-alias "/share/fonts/X11/75dpi\"
+ FontPath \"" font-alias "/share/fonts/X11/100dpi\"
+ FontPath \"" font-alias "/share/fonts/X11/misc\"
+ FontPath \"" font-alias "/share/fonts/X11/cyrillic\"
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
--
2.4.3
[-- Attachment #4: 0004-gnu-Add-evilwm.patch --]
[-- Type: application/octet-stream, Size: 2544 bytes --]
From 45c524710742550013a8513b641e8d488806f7c9 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 15 Oct 2015 17:34:26 -0500
Subject: [PATCH 4/4] gnu: Add evilwm.
* gnu/packages/wm.scm (evilwm): New variable.
---
gnu/packages/wm.scm | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 9ca5b96..8fe0d6f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -222,3 +222,44 @@ tiled on several screens.")
"Third party tiling algorithms, configurations, and scripts to Xmonad, a
tiling window manager for X.")
(license bsd-3)))
+
+(define-public evilwm
+ (package
+ (name "evilwm")
+ (version "1.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.6809.org.uk/evilwm/evilwm-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0ak0yajzk3v4dg5wmaghv6acf7v02a4iw8qxmq5yw5ard8lrqn3r"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("libx11" ,libx11)
+ ("libxext" ,libxext)
+ ("libxrandr" ,libxrandr)))
+ (arguments
+ `(#:modules ((srfi srfi-26)
+ ,@%gnu-build-system-modules)
+ #:make-flags (let ((inputs (map (cut assoc-ref %build-inputs <>)
+ '("libx11" "libxext" "libxrandr")))
+ (join (lambda (proc strs)
+ (string-join (map proc strs) " ")))
+ (dash-I (cut string-append "-I" <> "/include"))
+ (dash-L (cut string-append "-L" <> "/lib")))
+ `("desktopfilesdir=$(prefix)/share/xsessions"
+ ,(string-append "prefix=" (assoc-ref %outputs "out"))
+ ,(string-append "CPPFLAGS=" (join dash-I inputs))
+ ,(string-append "LDFLAGS=" (join dash-L inputs))))
+ #:tests? #f ;no tests
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)))) ;no configure script
+ (home-page "http://www.6809.org.uk/evilwm/")
+ (synopsis "Minimalist window manager for the X Window System")
+ (description
+ "evilwm is a minimalist window manager based on aewm, extended to feature
+many keyboard controls with repositioning and maximize toggles, solid window
+drags, snap-to-border support, and virtual desktops.")
+ (license (x11-style "file:///README"))))
--
2.4.3
next prev parent reply other threads:[~2015-10-19 16:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 22:36 [PATCH 1/2] gnu: Add xlsfonts ericbavier
2015-10-15 22:36 ` [PATCH 2/2] gnu: Add evilwm ericbavier
2015-10-16 8:37 ` Ludovic Courtès
2015-10-19 11:55 ` Eric Bavier [this message]
2015-10-20 7:56 ` Ludovic Courtès
2015-10-20 19:37 ` Eric Bavier
2015-10-16 8:34 ` [PATCH 1/2] gnu: Add xlsfonts Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151019065541.771c7a5e@openmailbox.org \
--to=ericbavier@openmailbox.org \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).