mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 03:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg-server@1.19.3: Rename to "xorg-server-for-tests".

Browse source 
...and update to the latest xorg-server.

* gnu/packages/gtk.scm (gtk+, gtkmm, girara): Change XORG-SERVER-1.19.3
references to XORG-SERVER-FOR-TESTS.
* gnu/packages/pdf.scm (zathura)[native-inputs]: Likewise.
* gnu/packages/xorg.scm (xorg-server-1.19.3): Rename to ...
(xorg-server-for-tests): ... this.
This commit is contained in:
Marius Bakke 2018-08-26 16:17:31 +02:00
parent 8ad6584103
commit 60ecc10f18
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/gtk.scm
View file

@ -715,9 +715,9 @@ application suites.")
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
;; By using a special xorg-server for GTK+'s tests, we reduce the impact ;; By using a special xorg-server for GTK+'s tests, we reduce the impact
;; of updating xorg-server directly on the master branch. ;; of updating xorg-server directly on the master branch.
("xorg-server" ,xorg-server-1.19.3))) ("xorg-server" ,xorg-server-for-tests)))
(arguments (arguments
`(#:disallowed-references (,xorg-server-1.19.3) `(#:disallowed-references (,xorg-server-for-tests)
;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
;; to "doc". ;; to "doc".
#:configure-flags (list (string-append "--with-html-dir=" #:configure-flags (list (string-append "--with-html-dir="
@ -1081,7 +1081,7 @@ toolkit.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ;for 'glib-compile-resources' ("glib" ,glib "bin") ;for 'glib-compile-resources'
("xorg-server" ,xorg-server-1.19.3))) ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs (propagated-inputs
`(("pangomm" ,pangomm) `(("pangomm" ,pangomm)
("cairomm" ,cairomm) ("cairomm" ,cairomm)
@ -1092,7 +1092,7 @@ toolkit.")
`(;; XXX: Tests require C++14 or later. Remove this when the default `(;; XXX: Tests require C++14 or later. Remove this when the default
;; compiler is >= GCC6. ;; compiler is >= GCC6.
#:configure-flags '("CXXFLAGS=-std=gnu++14") #:configure-flags '("CXXFLAGS=-std=gnu++14")
#:disallowed-references (,xorg-server-1.19.3) #:disallowed-references (,xorg-server-for-tests)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'check 'run-xvfb (add-before 'check 'run-xvfb
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -1376,7 +1376,7 @@ and routines to assist in editing internationalized text.")
("check" ,check) ("check" ,check)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
("xorg-server" ,xorg-server-1.19.3))) ("xorg-server" ,xorg-server-for-tests)))
;; Listed in 'Requires.private' of 'girara.pc'. ;; Listed in 'Requires.private' of 'girara.pc'.
(propagated-inputs `(("gtk+" ,gtk+))) (propagated-inputs `(("gtk+" ,gtk+)))
(arguments (arguments

2
gnu/packages/pdf.scm
View file

@ -511,7 +511,7 @@ by using the poppler rendering engine.")
;; For tests. ;; For tests.
("check" ,check) ("check" ,check)
("xorg-server" ,xorg-server-1.19.3))) ("xorg-server" ,xorg-server-for-tests)))
(inputs `(("sqlite" ,sqlite))) (inputs `(("sqlite" ,sqlite)))
;; Listed in 'Requires.private' of 'zathura.pc'. ;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs `(("cairo" ,cairo) (propagated-inputs `(("cairo" ,cairo)

15
gnu/packages/xorg.scm
View file

@ -5198,21 +5198,10 @@ draggable titlebars and borders.")
;; This package is intended to be used when building GTK+. ;; This package is intended to be used when building GTK+.
;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; Note: It's currently marked as "hidden" to avoid having two non-eq?
;; packages with the same name and version. ;; packages with the same name and version.
(define-public xorg-server-1.19.3 (define-public xorg-server-for-tests
(hidden-package (hidden-package
(package (package
(inherit xorg-server) (inherit xorg-server))))
(name "xorg-server")
(version "1.19.3")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/xserver/"
name "-" version ".tar.bz2"))
(sha256
(base32
"162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7")))))))
(define-public xorg-server-xwayland (define-public xorg-server-xwayland
(package (package