* [PATCH core-updates 0/6] Wait up!
@ 2017-01-25 17:19 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 1/6] gnu: Add libxfont2 Marius Bakke
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
Sorry for the late series, but I see core-updates isn't fully rolling
yet. This updates xorg and the latter patch has a proper fix for
c254ac32004 (untested, though).
Note: "bdftopcf" is the only package using "libxfont" after this, and
"xorg-server" gains a hard dependency on "libepoxy".
Marius Bakke (6):
gnu: Add libxfont2.
gnu: xorg-server: Use 'modify-phases' syntax.
gnu: xorg-server: Update to 1.19.1.
gnu: xf86-video-qxl: Change to libxfont2 ABI.
gnu: xf86-video-intel: Update to 2.99.917-2-028c946.
utils: Add helper method to make files writable.
gnu/build/activation.scm | 5 ----
gnu/packages/xorg.scm | 56 +++++++++++++++++++++++++++--------------
guix/build/gnu-build-system.scm | 6 +++--
guix/build/utils.scm | 6 +++++
4 files changed, 47 insertions(+), 26 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH core-updates 1/6] gnu: Add libxfont2.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax Marius Bakke
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/xorg.scm (libxfont2): New variable.
---
gnu/packages/xorg.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 7a534592b..eefb24116 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4787,6 +4787,21 @@ not be used by normal X11 clients. X11 clients access fonts via either the
new API's in libXft, or the legacy API's in libX11.")
(license license:x11)))
+;; This package is cut from the libxfont sources, but is distributed
+;; under a new name. See release announcement for details:
+;; https://lists.x.org/archives/xorg-announce/2015-December/002661.html
+(define-public libxfont2
+ (package
+ (inherit libxfont)
+ (name "libxfont2")
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/lib/libXfont2-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"))))))
(define-public libxi
(package
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 1/6] gnu: Add libxfont2 Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 3/6] gnu: xorg-server: Update to 1.19.1 Marius Bakke
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/xorg.scm (xorg-server)[arguments]: Use 'modify-phases'.
---
gnu/packages/xorg.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index eefb24116..0bff1159d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5061,17 +5061,19 @@ over Xlib, including:
"--enable-kdrive"
"--enable-xephyr")
- #:phases (alist-cons-before
- 'configure 'pre-configure
- (lambda _
- (substitute* (find-files "." "\\.c$")
- (("/bin/sh") (which "sh")))
-
- ;; Don't try to 'mkdir /var'.
- (substitute* "hw/xfree86/Makefile.in"
- (("\\$\\(MKDIR_P\\).*logdir.*")
- "true\n")))
- %standard-phases)))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'pre-configure
+ (lambda _
+ (substitute* (find-files "." "\\.c$")
+ (("/bin/sh") (which "sh")))
+
+ ;; Don't try to 'mkdir /var'.
+ (substitute* "hw/xfree86/Makefile.in"
+ (("\\$\\(MKDIR_P\\).*logdir.*")
+ "true\n"))
+ #t)))))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg implementation of the X Window System")
(description
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH core-updates 3/6] gnu: xorg-server: Update to 1.19.1.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 1/6] gnu: Add libxfont2 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 4/6] gnu: xf86-video-qxl: Change to libxfont2 ABI Marius Bakke
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/xorg.scm (xorg-server, xorg-server-xwayland): Update to 1.19.1.
[inputs]: Change from LIBXFONT to LIBXFONT2. Add LIBEPOXY.
---
gnu/packages/xorg.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0bff1159d..5c38685bb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4969,7 +4969,7 @@ over Xlib, including:
(define-public xorg-server
(package
(name "xorg-server")
- (version "1.18.4")
+ (version "1.19.1")
(source
(origin
(method url-fetch)
@@ -4978,7 +4978,7 @@ over Xlib, including:
name "-" version ".tar.bz2"))
(sha256
(base32
- "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"))))
+ "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"))))
(build-system gnu-build-system)
(propagated-inputs
`(("dri2proto" ,dri2proto)
@@ -5007,12 +5007,13 @@ over Xlib, including:
("dbus" ,dbus)
("dmxproto" ,dmxproto)
("libdmx" ,libdmx)
+ ("libepoxy" ,libepoxy)
("libgcrypt" ,libgcrypt)
("libxau" ,libxau)
("libxaw" ,libxaw)
("libxdmcp" ,libxdmcp)
("libxfixes" ,libxfixes)
- ("libxfont" ,libxfont)
+ ("libxfont2" ,libxfont2)
("libxkbfile" ,libxkbfile)
("libxrender" ,libxrender)
("libxres" ,libxres)
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH core-updates 4/6] gnu: xf86-video-qxl: Change to libxfont2 ABI.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
` (2 preceding siblings ...)
2017-01-25 17:19 ` [PATCH core-updates 3/6] gnu: xorg-server: Update to 1.19.1 Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 5/6] gnu: xf86-video-intel: Update to 2.99.917-2-028c946 Marius Bakke
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/xorg.scm (xf86-video-qxl)[inputs]: Change LIBXFONT to LIBXFONT2.
---
gnu/packages/xorg.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 5c38685bb..db9ced9e5 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3047,7 +3047,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.")
(build-system gnu-build-system)
(inputs
`(("fontsproto" ,fontsproto)
- ("libxfont" ,libxfont)
+ ("libxfont2" ,libxfont2)
("spice-protocol" ,spice-protocol)
("xf86dgaproto" ,xf86dgaproto)
("xorg-server" ,xorg-server)
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH core-updates 5/6] gnu: xf86-video-intel: Update to 2.99.917-2-028c946.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
` (3 preceding siblings ...)
2017-01-25 17:19 ` [PATCH core-updates 4/6] gnu: xf86-video-qxl: Change to libxfont2 ABI Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 6/6] utils: Add helper method to make files writable Marius Bakke
2017-01-25 19:05 ` [PATCH core-updates 0/6] Wait up! Leo Famulari
6 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-2-028c946.
[inputs]: Change LIBXFONT to LIBXFONT2.
---
gnu/packages/xorg.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index db9ced9e5..9955ef5b4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2770,10 +2770,10 @@ X server.")
(define-public xf86-video-intel
- (let ((commit "d1672806a5222f00dcc2eb24ccddd03f727f71bc"))
+ (let ((commit "028c946df0855728b2a34d1d588701dc6c5ad4c1"))
(package
(name "xf86-video-intel")
- (version (string-append "2.99.917-1-" (string-take commit 7)))
+ (version (string-append "2.99.917-2-" (string-take commit 7)))
(source
(origin
;; there's no current tarball
@@ -2783,13 +2783,13 @@ X server.")
(commit commit)))
(sha256
(base32
- "16hfcj11lbn6lp0hgrixidbfb7mghm1yn4lynmymm985w1gg0n72"))
+ "1z88lz87ry211mv1s03nvyawi4yrj2cngsq45914njqc0sdbz2af"))
(file-name (string-append name "-" version))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("udev" ,eudev)
("libx11" ,libx11)
- ("libxfont" ,libxfont)
+ ("libxfont2" ,libxfont2)
("xorg-server" ,xorg-server)))
(native-inputs
`(("pkg-config" ,pkg-config)
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH core-updates 6/6] utils: Add helper method to make files writable.
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
` (4 preceding siblings ...)
2017-01-25 17:19 ` [PATCH core-updates 5/6] gnu: xf86-video-intel: Update to 2.99.917-2-028c946 Marius Bakke
@ 2017-01-25 17:19 ` Marius Bakke
2017-01-26 9:50 ` Ludovic Courtès
2017-01-25 19:05 ` [PATCH core-updates 0/6] Wait up! Leo Famulari
6 siblings, 1 reply; 11+ messages in thread
From: Marius Bakke @ 2017-01-25 17:19 UTC (permalink / raw)
To: guix-devel; +Cc: Marius Bakke
* gnu/build/activation.scm (make-file-writable): Move this to ...
* guix/build/utils.scm (make-file-writable): ... here. Export it.
* guix/build/gnu-build-system.scm (strip): Use it.
---
gnu/build/activation.scm | 5 -----
guix/build/gnu-build-system.scm | 6 ++++--
guix/build/utils.scm | 6 ++++++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 1b31dc153..756a6872b 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -78,11 +78,6 @@
(define (dot-or-dot-dot? file)
(member file '("." "..")))
-(define (make-file-writable file)
- "Make FILE writable for its owner.."
- (let ((stat (lstat file))) ;XXX: symlinks
- (chmod file (logior #o600 (stat:perms stat)))))
-
(define* (copy-account-skeletons home
#:optional (directory %skeleton-directory))
"Copy the account skeletons from DIRECTORY to HOME."
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 59394c2ca..e83ec22ae 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -393,8 +393,10 @@ makefiles."
(or (elf-file? file) (ar-file? file))
(or (not debug-output)
(make-debug-file file))
- ;; Ensure libraries are writable.
- (chmod file #o755)
+
+ ;; Ensure the file is writable.
+ (make-file-writable file)
+
(zero? (apply system* strip-command
(append strip-flags (list file))))
(or (not debug-output)
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index cf0932639..021df1bfb 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -48,6 +48,7 @@
with-directory-excursion
mkdir-p
install-file
+ make-file-writable
copy-recursively
delete-file-recursively
file-name-predicate
@@ -237,6 +238,11 @@ name."
(mkdir-p directory)
(copy-file file (string-append directory "/" (basename file))))
+(define (make-file-writable file)
+ "Make FILE writable for its owner.."
+ (let ((stat (lstat file))) ;XXX: symlinks
+ (chmod file (logior #o600 (stat:perms stat)))))
+
(define* (copy-recursively source destination
#:key
(log (current-output-port))
--
2.11.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH core-updates 0/6] Wait up!
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
` (5 preceding siblings ...)
2017-01-25 17:19 ` [PATCH core-updates 6/6] utils: Add helper method to make files writable Marius Bakke
@ 2017-01-25 19:05 ` Leo Famulari
2017-01-26 16:27 ` Marius Bakke
6 siblings, 1 reply; 11+ messages in thread
From: Leo Famulari @ 2017-01-25 19:05 UTC (permalink / raw)
To: Marius Bakke; +Cc: guix-devel
On Wed, Jan 25, 2017 at 06:19:32PM +0100, Marius Bakke wrote:
> Sorry for the late series, but I see core-updates isn't fully rolling
> yet. This updates xorg and the latter patch has a proper fix for
> c254ac32004 (untested, though).
>
> Note: "bdftopcf" is the only package using "libxfont" after this, and
> "xorg-server" gains a hard dependency on "libepoxy".
>
> Marius Bakke (6):
> gnu: Add libxfont2.
> gnu: xorg-server: Use 'modify-phases' syntax.
> gnu: xorg-server: Update to 1.19.1.
> gnu: xf86-video-qxl: Change to libxfont2 ABI.
> gnu: xf86-video-intel: Update to 2.99.917-2-028c946.
> utils: Add helper method to make files writable.
I have a WIP branch for updating the xorg suite:
https://github.com/lfam/guix/tree/contrib-xorg-server
I was waiting for a few drivers to be updated to the new X server, based
on this thread:
https://lists.freedesktop.org/archives/xorg-devel/2016-November/051849.html
Let's combine our efforts :)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH core-updates 6/6] utils: Add helper method to make files writable.
2017-01-25 17:19 ` [PATCH core-updates 6/6] utils: Add helper method to make files writable Marius Bakke
@ 2017-01-26 9:50 ` Ludovic Courtès
2017-01-26 21:21 ` Marius Bakke
0 siblings, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2017-01-26 9:50 UTC (permalink / raw)
To: Marius Bakke; +Cc: guix-devel
Marius Bakke <mbakke@fastmail.com> skribis:
> * gnu/build/activation.scm (make-file-writable): Move this to ...
> * guix/build/utils.scm (make-file-writable): ... here. Export it.
> * guix/build/gnu-build-system.scm (strip): Use it.
[...]
> --- a/guix/build/gnu-build-system.scm
> +++ b/guix/build/gnu-build-system.scm
> @@ -393,8 +393,10 @@ makefiles."
> (or (elf-file? file) (ar-file? file))
> (or (not debug-output)
> (make-debug-file file))
> - ;; Ensure libraries are writable.
> - (chmod file #o755)
> +
> + ;; Ensure the file is writable.
> + (make-file-writable file)
The return value of ‘chmod’ and ‘make-file-writable’ is unspecified, so
you need to write:
(begin (make-file-writable file) #t)
> +(define (make-file-writable file)
> + "Make FILE writable for its owner.."
^
Take it as an opportunity to remove this extra period. :-)
Otherwise LGTM.
Ludo’.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH core-updates 0/6] Wait up!
2017-01-25 19:05 ` [PATCH core-updates 0/6] Wait up! Leo Famulari
@ 2017-01-26 16:27 ` Marius Bakke
0 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-26 16:27 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
Leo Famulari <leo@famulari.name> writes:
> On Wed, Jan 25, 2017 at 06:19:32PM +0100, Marius Bakke wrote:
>> Sorry for the late series, but I see core-updates isn't fully rolling
>> yet. This updates xorg and the latter patch has a proper fix for
>> c254ac32004 (untested, though).
>>
>> Note: "bdftopcf" is the only package using "libxfont" after this, and
>> "xorg-server" gains a hard dependency on "libepoxy".
>>
>> Marius Bakke (6):
>> gnu: Add libxfont2.
>> gnu: xorg-server: Use 'modify-phases' syntax.
>> gnu: xorg-server: Update to 1.19.1.
>> gnu: xf86-video-qxl: Change to libxfont2 ABI.
>> gnu: xf86-video-intel: Update to 2.99.917-2-028c946.
>> utils: Add helper method to make files writable.
>
> I have a WIP branch for updating the xorg suite:
>
> https://github.com/lfam/guix/tree/contrib-xorg-server
>
> I was waiting for a few drivers to be updated to the new X server, based
> on this thread:
> https://lists.freedesktop.org/archives/xorg-devel/2016-November/051849.html
Ah. "xf86-video-modesetting" and "xf86-input-wacom" fails to build with
these commits on current 'master', all other xf86-* packages are fine.
Couldn't see any related activity related to this in the upstream
repositories, so probably won't be ready for 'core-updates'.
> Let's combine our efforts :)
Sounds good. :) Should I create an "xorg-updates" branch?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH core-updates 6/6] utils: Add helper method to make files writable.
2017-01-26 9:50 ` Ludovic Courtès
@ 2017-01-26 21:21 ` Marius Bakke
0 siblings, 0 replies; 11+ messages in thread
From: Marius Bakke @ 2017-01-26 21:21 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> * gnu/build/activation.scm (make-file-writable): Move this to ...
>> * guix/build/utils.scm (make-file-writable): ... here. Export it.
>> * guix/build/gnu-build-system.scm (strip): Use it.
>
> [...]
>
>> --- a/guix/build/gnu-build-system.scm
>> +++ b/guix/build/gnu-build-system.scm
>> @@ -393,8 +393,10 @@ makefiles."
>> (or (elf-file? file) (ar-file? file))
>> (or (not debug-output)
>> (make-debug-file file))
>> - ;; Ensure libraries are writable.
>> - (chmod file #o755)
>> +
>> + ;; Ensure the file is writable.
>> + (make-file-writable file)
>
> The return value of ‘chmod’ and ‘make-file-writable’ is unspecified, so
> you need to write:
>
> (begin (make-file-writable file) #t)
Thanks! Somehow I missed that "and" block... :(
>
>> +(define (make-file-writable file)
>> + "Make FILE writable for its owner.."
> ^
> Take it as an opportunity to remove this extra period. :-)
>
> Otherwise LGTM.
Pushed!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-01-26 21:21 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 1/6] gnu: Add libxfont2 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 3/6] gnu: xorg-server: Update to 1.19.1 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 4/6] gnu: xf86-video-qxl: Change to libxfont2 ABI Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 5/6] gnu: xf86-video-intel: Update to 2.99.917-2-028c946 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 6/6] utils: Add helper method to make files writable Marius Bakke
2017-01-26 9:50 ` Ludovic Courtès
2017-01-26 21:21 ` Marius Bakke
2017-01-25 19:05 ` [PATCH core-updates 0/6] Wait up! Leo Famulari
2017-01-26 16:27 ` Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.