gnu: xorg-server@1.19.3: Rename to "xorg-server-for-tests".
...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:
parent
8ad6584103
commit
60ecc10f18
|
@ -715,9 +715,9 @@ application suites.")
|
|||
("python-wrapper" ,python-wrapper)
|
||||
;; By using a special xorg-server for GTK+'s tests, we reduce the impact
|
||||
;; of updating xorg-server directly on the master branch.
|
||||
("xorg-server" ,xorg-server-1.19.3)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(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
|
||||
;; to "doc".
|
||||
#:configure-flags (list (string-append "--with-html-dir="
|
||||
|
@ -1081,7 +1081,7 @@ toolkit.")
|
|||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("glib" ,glib "bin") ;for 'glib-compile-resources'
|
||||
("xorg-server" ,xorg-server-1.19.3)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(propagated-inputs
|
||||
`(("pangomm" ,pangomm)
|
||||
("cairomm" ,cairomm)
|
||||
|
@ -1092,7 +1092,7 @@ toolkit.")
|
|||
`(;; XXX: Tests require C++14 or later. Remove this when the default
|
||||
;; compiler is >= GCC6.
|
||||
#:configure-flags '("CXXFLAGS=-std=gnu++14")
|
||||
#:disallowed-references (,xorg-server-1.19.3)
|
||||
#:disallowed-references (,xorg-server-for-tests)
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'check 'run-xvfb
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
@ -1376,7 +1376,7 @@ and routines to assist in editing internationalized text.")
|
|||
("check" ,check)
|
||||
("gettext" ,gettext-minimal)
|
||||
("glib:bin" ,glib "bin")
|
||||
("xorg-server" ,xorg-server-1.19.3)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
;; Listed in 'Requires.private' of 'girara.pc'.
|
||||
(propagated-inputs `(("gtk+" ,gtk+)))
|
||||
(arguments
|
||||
|
|
|
@ -511,7 +511,7 @@ by using the poppler rendering engine.")
|
|||
|
||||
;; For tests.
|
||||
("check" ,check)
|
||||
("xorg-server" ,xorg-server-1.19.3)))
|
||||
("xorg-server" ,xorg-server-for-tests)))
|
||||
(inputs `(("sqlite" ,sqlite)))
|
||||
;; Listed in 'Requires.private' of 'zathura.pc'.
|
||||
(propagated-inputs `(("cairo" ,cairo)
|
||||
|
|
|
@ -5198,21 +5198,10 @@ draggable titlebars and borders.")
|
|||
;; This package is intended to be used when building GTK+.
|
||||
;; Note: It's currently marked as "hidden" to avoid having two non-eq?
|
||||
;; packages with the same name and version.
|
||||
(define-public xorg-server-1.19.3
|
||||
(define-public xorg-server-for-tests
|
||||
(hidden-package
|
||||
(package
|
||||
(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")))))))
|
||||
(inherit xorg-server))))
|
||||
|
||||
(define-public xorg-server-xwayland
|
||||
(package
|
||||
|
|
Loading…
Reference in New Issue