me
/
guix
Archived
1
0
Fork 0

gnu: terminals: Change libtsm and kmscon repositories.

Those two packages (from the same author) are no longer maintained and do not
even compile. Switch to a fork that is maintained even if it does not have any
release yet.

* gnu/packages/terminals.scm (libtsm)[origin]: Use
"https://github.com/Aetf/libtsm" as new origin and switch to git-fetch method.
(kmscon)[origin]: Use "https://github.com/Aetf/kmscon" as new origin and
switch to git-fetch method.
master
Mathieu Othacehe 2018-10-28 11:27:52 +09:00
parent 2d9dace8c2
commit a7903ca150
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 97 additions and 81 deletions

View File

@ -187,22 +187,28 @@ text-based approach to terminal recording.")
(license license:gpl3))) (license license:gpl3)))
(define-public libtsm (define-public libtsm
(let ((commit "f70e37982f382b03c6939dac3d5f814450bda253")
(revision "1"))
(package (package
(name "libtsm") (name "libtsm")
(version "3") (version (git-version "0.0.0" revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append ;; The freedesktop repository is no longer maintained.
"https://freedesktop.org/software/kmscon/releases/" (uri (git-reference
"libtsm-" version ".tar.xz")) (url (string-append "https://github.com/Aetf/" name))
(commit commit)))
(sha256 (sha256
(base32 (base32
"01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i")))) "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments
`(#:configure-flags '("-DBUILD_TESTING=ON")))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libxkbcommon" ,libxkbcommon))) `(("libxkbcommon" ,libxkbcommon)
("check" ,check)))
(synopsis "Xterm state machine library") (synopsis "Xterm state machine library")
(description "TSM is a state machine for DEC VT100-VT520 compatible (description "TSM is a state machine for DEC VT100-VT520 compatible
terminal emulators. It tries to support all common standards while keeping terminal emulators. It tries to support all common standards while keeping
@ -213,24 +219,33 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
;; derived from ISC. ;; derived from ISC.
;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released
;; under the bsd 2 license. ;; under the bsd 2 license.
(license (list license:expat license:lgpl2.1+ license:isc license:bsd-2)))) (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2)))))
(define-public kmscon (define-public kmscon
(let ((commit "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc")
(revision "1"))
(package (package
(name "kmscon") (name "kmscon")
(version "8") (version (git-version "0.0.0" revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append ;; The freedesktop repository is no longer maintained.
"https://freedesktop.org/software/kmscon/releases/" (uri (git-reference
"kmscon-" version ".tar.xz")) (url (string-append "https://github.com/Aetf/" name))
(commit commit)))
(sha256 (sha256
(base32 (base32
"0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a")) "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87"))
(modules '((guix build utils))) (modules '((guix build utils)))))
(snippet (build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'autogen.sh
(lambda _
(zero? (system* "sh" "autogen.sh"))))
;; Use elogind instead of systemd. ;; Use elogind instead of systemd.
'(begin (add-before 'configure 'remove-systemd
(lambda _
(substitute* "configure" (substitute* "configure"
(("libsystemd-daemon libsystemd-login") (("libsystemd-daemon libsystemd-login")
"libelogind")) "libelogind"))
@ -242,11 +257,12 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
"") "")
;; Replace the call to 'sd_booted' by the truth value. ;; Replace the call to 'sd_booted' by the truth value.
(("sd_booted\\(\\)") (("sd_booted\\(\\)")
"1")) "1")))))))
#t))))
(build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("libxslt" ,libxslt) ;to build the man page ("libxslt" ,libxslt) ;to build the man page
("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("docbook-xsl" ,docbook-xsl))) ("docbook-xsl" ,docbook-xsl)))
@ -276,7 +292,7 @@ multi-seat support, a replacement for @command{mingetty}, and more.")
(license (list license:expat license:lgpl2.1+ license:bsd-2 (license (list license:expat license:lgpl2.1+ license:bsd-2
license:gpl2+)) license:gpl2+))
(supported-systems (filter (cut string-suffix? "-linux" <>) (supported-systems (filter (cut string-suffix? "-linux" <>)
%supported-systems)))) %supported-systems)))))
(define-public libtermkey (define-public libtermkey
(package (package