From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: [PATCH 2/2] gnu: Add evilwm. Date: Mon, 19 Oct 2015 06:55:41 -0500 Message-ID: <20151019065541.771c7a5e@openmailbox.org> References: <1444948609-29345-1-git-send-email-ericbavier@openmailbox.org> <1444948609-29345-2-git-send-email-ericbavier@openmailbox.org> <87vba7tdig.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/WeWmXa.bja1wJYBXq5SBcI1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoDbw-0000xE-No for guix-devel@gnu.org; Mon, 19 Oct 2015 12:48:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoDbt-0005wh-Db for guix-devel@gnu.org; Mon, 19 Oct 2015 12:48:36 -0400 Received: from smtp28.openmailbox.org ([62.4.1.62]:45089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoDbt-0005wJ-1s for guix-devel@gnu.org; Mon, 19 Oct 2015 12:48:33 -0400 In-Reply-To: <87vba7tdig.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= Cc: guix-devel@gnu.org, Eric Bavier --MP_/WeWmXa.bja1wJYBXq5SBcI1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Fri, 16 Oct 2015 10:37:43 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > ericbavier@openmailbox.org skribis: >=20 > > From: Eric Bavier > > > > * gnu/packages/wm.scm (evilwm): New variable. >=20 > [...] >=20 > > + 'build 'provide-better-default-font > > + (lambda _ > > + ;; The "fixed" font is contained in the set of fo= nts > > + ;; 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\"")) >=20 > What about adding the =E2=80=9Cvariable=E2=80=9D 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. >=20 > > + (license (fsf-free "file:///README")))) >=20 > Since =E2=80=98fsf-free=E2=80=99 is a catch-all thing, could you add a co= mment > 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 --MP_/WeWmXa.bja1wJYBXq5SBcI1 Content-Type: application/octet-stream; name=0002-font-alias-Install-dummy-fonts.dir-files.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-font-alias-Install-dummy-fonts.dir-files.patch RnJvbSAwMjRhNTU2YmRjODJhNTY5YjZjMDc4NzNkZjIyMWFlN2U1MGYxZmIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBNb24sIDE5IE9jdCAyMDE1IDA2OjQ0OjIzIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAyLzRd IGZvbnQtYWxpYXM6IEluc3RhbGwgZHVtbXkgZm9udHMuZGlyIGZpbGVzLgoKKiBnbnUvcGFja2Fn ZXMveG9yZy5zY20gKGZvbnQtYWxpYXMpW2FyZ3VtZW50c106IE5ldyAnaW5zdGFsbC1mb250cy1k aXInCiAgcGhhc2UuCi0tLQogZ251L3BhY2thZ2VzL3hvcmcuc2NtIHwgMTcgKysrKysrKysrKysr KysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL3hvcmcuc2NtIGIvZ251L3BhY2thZ2VzL3hvcmcuc2NtCmluZGV4IDRlNjU3MGEu LmQ5NmE3YmYgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy94b3JnLnNjbQorKysgYi9nbnUvcGFj a2FnZXMveG9yZy5zY20KQEAgLTQxMyw2ICs0MTMsMjMgQEAgcHJvdmlkZWQuIikKICAgICAgICAg ICAgICIxNmljOHdmd3dyM2ppY2FtbDdiNWEwc2s2cGxjZ2Mxa2c4NHcwMjg4MXlod21xbTNuaWNi IikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKG5hdGl2ZS1p bnB1dHMgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAgKGFyZ3VtZW50cworICAg ICBgKCM6cGhhc2VzIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAgICAg ICAgICAgIChhZGQtYWZ0ZXIKKyAgICAgICAgICAgICAgICAgICAnaW5zdGFsbCAnaW5zdGFsbC1m b250cy1kaXIKKyAgICAgICAgICAgICAgICAgICA7OyBUaGUgWCBmb250IHNlcnZlciB3aWxsIG5v dCBhZGQgZGlyZWN0b3JpZXMgdG8gdGhlIGZvbnQKKyAgICAgICAgICAgICAgICAgICA7OyBwYXRo IHVubGVzcyB0aGV5IGNvbnRhaW4gYSAiZm9udHMuZGlyIiBmaWxlLCBzbyBhZGQgc29tZQorICAg ICAgICAgICAgICAgICAgIDs7IGR1bW15IGZpbGVzLgorICAgICAgICAgICAgICAgICAgIChsYW1i ZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAg ICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkpCisgICAgICAgICAgICAg ICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhIChkKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoY2FsbC13aXRoLW91dHB1dC1maWxlCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zaGFyZS9mb250cy9YMTEiCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLyIg ZCAiL2ZvbnRzLmRpciIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxh bWJkYSAocCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmb3JtYXQg cCAiMH4lIikpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcoIjc1ZHBpIiAi MTAwZHBpIiAibWlzYyIgImN5cmlsbGljIikpCisgICAgICAgICAgICAgICAgICAgICAgICN0KSkp KSkpCiAgICAgKGhvbWUtcGFnZSAiaHR0cDovL3d3dy54Lm9yZy93aWtpLyIpCiAgICAgKHN5bm9w c2lzICJYb3JnIGZvbnQgYWxpYXNlcyIpCiAgICAgKGRlc2NyaXB0aW9uCi0tIAoyLjQuMwoK --MP_/WeWmXa.bja1wJYBXq5SBcI1 Content-Type: application/octet-stream; name=0003-services-xorg-Include-font-alias-in-default-FontPath.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-services-xorg-Include-font-alias-in-default-FontPath.patch RnJvbSBkNTQ0NmEwNjBmN2ZmZTZkNDE5ZDY0YmY1YzNhMGE1MTczNmE0N2QwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBNb24sIDE5IE9jdCAyMDE1IDA2OjQ1OjMxIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAzLzRd IHNlcnZpY2VzOiB4b3JnOiBJbmNsdWRlIGZvbnQtYWxpYXMgaW4gZGVmYXVsdCBGb250UGF0aC4K CiogZ251L3NlcnZpY2VzL3hvcmcuc2NtICh4b3JnLWNvbmZpZ3VyYXRpb24tZmlsZSk6IEFkZCBm b250LWFsaWFzIGRpcmVjdG9yaWVzCiAgdG8geHNlcnZlci5jb25mIEZvbnRQYXRoLgotLS0KIGdu dS9zZXJ2aWNlcy94b3JnLnNjbSB8IDQgKysrKwogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9u cygrKQoKZGlmZiAtLWdpdCBhL2dudS9zZXJ2aWNlcy94b3JnLnNjbSBiL2dudS9zZXJ2aWNlcy94 b3JnLnNjbQppbmRleCA5ZWU4ODE3Li43ZTkwNjY1IDEwMDY0NAotLS0gYS9nbnUvc2VydmljZXMv eG9yZy5zY20KKysrIGIvZ251L3NlcnZpY2VzL3hvcmcuc2NtCkBAIC04OSw2ICs4OSwxMCBAQCBF bmRTZWN0aW9uIikpCiAKICAgKGFwcGx5IHRleHQtZmlsZSogInhzZXJ2ZXIuY29uZiIgIgogU2Vj dGlvbiBcIkZpbGVzXCIKKyAgRm9udFBhdGggXCIiIGZvbnQtYWxpYXMgIi9zaGFyZS9mb250cy9Y MTEvNzVkcGlcIgorICBGb250UGF0aCBcIiIgZm9udC1hbGlhcyAiL3NoYXJlL2ZvbnRzL1gxMS8x MDBkcGlcIgorICBGb250UGF0aCBcIiIgZm9udC1hbGlhcyAiL3NoYXJlL2ZvbnRzL1gxMS9taXNj XCIKKyAgRm9udFBhdGggXCIiIGZvbnQtYWxpYXMgIi9zaGFyZS9mb250cy9YMTEvY3lyaWxsaWNc IgogICBGb250UGF0aCBcIiIgZm9udC1hZG9iZTc1ZHBpICIvc2hhcmUvZm9udHMvWDExLzc1ZHBp XCIKICAgTW9kdWxlUGF0aCBcIiIgeGY4Ni12aWRlby12ZXNhICIvbGliL3hvcmcvbW9kdWxlcy9k cml2ZXJzXCIKICAgTW9kdWxlUGF0aCBcIiIgeGY4Ni12aWRlby1mYmRldiAiL2xpYi94b3JnL21v ZHVsZXMvZHJpdmVyc1wiCi0tIAoyLjQuMwoK --MP_/WeWmXa.bja1wJYBXq5SBcI1 Content-Type: application/octet-stream; name=0004-gnu-Add-evilwm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-gnu-Add-evilwm.patch RnJvbSA0NWM1MjQ3MTA3NDI1NTAwMTNhODUxM2I2NDFlOGQ0ODg4MDZmN2M5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBUaHUsIDE1IE9jdCAyMDE1IDE3OjM0OjI2IC0wNTAwClN1YmplY3Q6IFtQQVRDSCA0LzRd IGdudTogQWRkIGV2aWx3bS4KCiogZ251L3BhY2thZ2VzL3dtLnNjbSAoZXZpbHdtKTogTmV3IHZh cmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy93bS5zY20gfCA0MSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvd20uc2NtIGIvZ251L3BhY2thZ2VzL3dtLnNjbQpp bmRleCA5Y2E1Yjk2Li44ZmUwZDZmIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvd20uc2NtCisr KyBiL2dudS9wYWNrYWdlcy93bS5zY20KQEAgLTIyMiwzICsyMjIsNDQgQEAgdGlsZWQgb24gc2V2 ZXJhbCBzY3JlZW5zLiIpCiAgICAgICJUaGlyZCBwYXJ0eSB0aWxpbmcgYWxnb3JpdGhtcywgY29u ZmlndXJhdGlvbnMsIGFuZCBzY3JpcHRzIHRvIFhtb25hZCwgYQogdGlsaW5nIHdpbmRvdyBtYW5h Z2VyIGZvciBYLiIpCiAgICAgKGxpY2Vuc2UgYnNkLTMpKSkKKworKGRlZmluZS1wdWJsaWMgZXZp bHdtCisgIChwYWNrYWdlCisgICAgKG5hbWUgImV2aWx3bSIpCisgICAgKHZlcnNpb24gIjEuMS4x IikKKyAgICAoc291cmNlCisgICAgIChvcmlnaW4KKyAgICAgICAobWV0aG9kIHVybC1mZXRjaCkK KyAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwOi8vd3d3LjY4MDkub3JnLnVrL2V2aWx3 bS9ldmlsd20tIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRhci5neiIp KQorICAgICAgIChzaGEyNTYKKyAgICAgICAgKGJhc2UzMgorICAgICAgICAgIjBhazB5YWp6azN2 NGRnNXdtYWdodjZhY2Y3djAyYTRpdzhxeG1xNXl3NWFyZDhscnFuM3IiKSkpKQorICAgIChidWls ZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKKyAgICAoaW5wdXRzCisgICAgIGAoKCJsaWJ4MTEi ICxsaWJ4MTEpCisgICAgICAgKCJsaWJ4ZXh0IiAsbGlieGV4dCkKKyAgICAgICAoImxpYnhyYW5k ciIgLGxpYnhyYW5kcikpKQorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOm1vZHVsZXMgKChzcmZp IHNyZmktMjYpCisgICAgICAgICAgICAgICAgICAsQCVnbnUtYnVpbGQtc3lzdGVtLW1vZHVsZXMp CisgICAgICAgIzptYWtlLWZsYWdzIChsZXQgKChpbnB1dHMgKG1hcCAoY3V0IGFzc29jLXJlZiAl YnVpbGQtaW5wdXRzIDw+KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg JygibGlieDExIiAibGlieGV4dCIgImxpYnhyYW5kciIpKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgKGpvaW4gKGxhbWJkYSAocHJvYyBzdHJzKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChzdHJpbmctam9pbiAobWFwIHByb2Mgc3RycykgIiAiKSkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgIChkYXNoLUkgKGN1dCBzdHJpbmctYXBwZW5kICItSSIgPD4gIi9pbmNs dWRlIikpCisgICAgICAgICAgICAgICAgICAgICAgICAgIChkYXNoLUwgKGN1dCBzdHJpbmctYXBw ZW5kICItTCIgPD4gIi9saWIiKSkpCisgICAgICAgICAgICAgICAgICAgICAgYCgiZGVza3RvcGZp bGVzZGlyPSQocHJlZml4KS9zaGFyZS94c2Vzc2lvbnMiCisgICAgICAgICAgICAgICAgICAgICAg ICAsKHN0cmluZy1hcHBlbmQgInByZWZpeD0iIChhc3NvYy1yZWYgJW91dHB1dHMgIm91dCIpKQor ICAgICAgICAgICAgICAgICAgICAgICAgLChzdHJpbmctYXBwZW5kICJDUFBGTEFHUz0iIChqb2lu IGRhc2gtSSBpbnB1dHMpKQorICAgICAgICAgICAgICAgICAgICAgICAgLChzdHJpbmctYXBwZW5k ICJMREZMQUdTPSIgKGpvaW4gZGFzaC1MIGlucHV0cykpKSkKKyAgICAgICAjOnRlc3RzPyAjZiAg ICAgICAgICAgICAgICAgICAgICA7bm8gdGVzdHMKKyAgICAgICAjOnBoYXNlcyAobW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAgICAgICAgICAoZGVsZXRlICdjb25maWd1 cmUpKSkpIDtubyBjb25maWd1cmUgc2NyaXB0CisgICAgKGhvbWUtcGFnZSAiaHR0cDovL3d3dy42 ODA5Lm9yZy51ay9ldmlsd20vIikKKyAgICAoc3lub3BzaXMgIk1pbmltYWxpc3Qgd2luZG93IG1h bmFnZXIgZm9yIHRoZSBYIFdpbmRvdyBTeXN0ZW0iKQorICAgIChkZXNjcmlwdGlvbgorICAgICAi ZXZpbHdtIGlzIGEgbWluaW1hbGlzdCB3aW5kb3cgbWFuYWdlciBiYXNlZCBvbiBhZXdtLCBleHRl bmRlZCB0byBmZWF0dXJlCittYW55IGtleWJvYXJkIGNvbnRyb2xzIHdpdGggcmVwb3NpdGlvbmlu ZyBhbmQgbWF4aW1pemUgdG9nZ2xlcywgc29saWQgd2luZG93CitkcmFncywgc25hcC10by1ib3Jk ZXIgc3VwcG9ydCwgYW5kIHZpcnR1YWwgZGVza3RvcHMuIikKKyAgICAobGljZW5zZSAoeDExLXN0 eWxlICJmaWxlOi8vL1JFQURNRSIpKSkpCi0tIAoyLjQuMwoK --MP_/WeWmXa.bja1wJYBXq5SBcI1--