From patchwork Sun Oct 28 12:40:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 44 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4308116754; Sun, 28 Oct 2018 12:43:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 913C616750 for ; Sun, 28 Oct 2018 12:43:14 +0000 (GMT) Received: from localhost ([::1]:40018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkPR-00024c-Sl for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:43:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOO-0008V5-Bg for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004Yv-0m for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42539) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOJ-0004Yp-SP for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOJ-0007NZ-Pj for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 5/7] gnu: terminals: Change libtsm and kmscon repositories. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048128269 (code B ref 33186); Sun, 28 Oct 2018 12:42:03 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:21 +0000 Received: from localhost ([127.0.0.1]:46788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lr-BT for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:20 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:43273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNY-0007Ks-2d for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:16 -0400 Received: by mail-pf1-f193.google.com with SMTP id h4-v6so2654502pfi.10 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DImC8pVLQ3eS+nlTjcBt8WR5+yrNSzlQ/+V0j6Qmlis=; b=J31JnhpqemyQZgT+MBQ2lzXfkLhZwz4Im8ucJ2i1bPoY5b0Ae2bpU9Qhy9aj/RbV36 U8AdOXM4hb7spRyCfEvPtzxBXc+2/MFUfDn5Fpsxl4vzsmizALFQzRNdV+RFN1P6R6x+ CZVkV1B/3Eyz0eeQrtL5tFmCqCerskNCF/fWBB3rym04vr1ViMloOtEG0OBWKFDcne/y +KamWd8OkpWdod6/gO/CQZ4p+wBxEq9OrUQc3CvpNuI2CAHtlrvtF5o5eQp+EFjH1fBz QC8v109rwkhXA+0smrJSuE3bEOcsiYtu9zMxKRZWNLAEMVPNtPRWuoVugC0X4ZJ8tYEP KntA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DImC8pVLQ3eS+nlTjcBt8WR5+yrNSzlQ/+V0j6Qmlis=; b=eFdHAnCixDJCIS8DsUhLGSeSSfXEs0pHmXlbePkUYQymqhB9X3muvYQoU/3msZBNvZ +y/YQ/kB3fFIjkLVS+zTQId6zOyMfNVGTxp7zs/wKbtZuToyLj/nHuoAXlzOW1tX5lAP CYTSbf9fqrKFe9IBSoquENeZ1T7f4c8ayZ2lOmdl+F5PtNbL9frmyVftNXyCVs+SLCdS A0WqqIk2P40duxwvR7EzfcZjTlRXM4mVuoHQkwMnzswQrLgcksfoJIKbw2YHQYrox6OS ViBhrR5PbtgyOnDMnjfIq9Sp4f3FWnvVZDkbYhB+TLn7dW5SeQzN8zx8DDwLdzimr/oc axFg== X-Gm-Message-State: AGRZ1gJDS46ubqiZTWdZVawQJqndjn3tY3RYnZwkANIXqOCLdYor6wue 5qPkCMXKfZsOIDZZtZrWt47jHARZ X-Google-Smtp-Source: AJdET5eVMYau7EpBOMC/GBLe5bec2oNn6nd+DS24eq6YlPke4C/PnG8/GH/paxZ0e4CRHklhnnDzCg== X-Received: by 2002:a63:c112:: with SMTP id w18-v6mr10323463pgf.429.1540730470004; Sun, 28 Oct 2018 05:41:10 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:09 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:41 +0900 Message-Id: <20181028124043.21773-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. --- gnu/packages/terminals.scm | 176 ++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 81 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 5cdc08139..836cf131d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -187,96 +187,110 @@ text-based approach to terminal recording.") (license license:gpl3))) (define-public libtsm - (package - (name "libtsm") - (version "3") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "libtsm-" version ".tar.xz")) - (sha256 - (base32 - "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libxkbcommon" ,libxkbcommon))) - (synopsis "Xterm state machine library") - (description "TSM is a state machine for DEC VT100-VT520 compatible + (let ((commit "f70e37982f382b03c6939dac3d5f814450bda253") + (revision "1")) + (package + (name "libtsm") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_TESTING=ON"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libxkbcommon" ,libxkbcommon) + ("check" ,check))) + (synopsis "Xterm state machine library") + (description "TSM is a state machine for DEC VT100-VT520 compatible terminal emulators. It tries to support all common standards while keeping compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") - (home-page "https://www.freedesktop.org/wiki/Software/libtsm") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2)))) + (home-page "https://www.freedesktop.org/wiki/Software/libtsm") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2))))) (define-public kmscon - (package - (name "kmscon") - (version "8") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "kmscon-" version ".tar.xz")) - (sha256 - (base32 - "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a")) - (modules '((guix build utils))) - (snippet - ;; Use elogind instead of systemd. - '(begin - (substitute* "configure" - (("libsystemd-daemon libsystemd-login") - "libelogind")) - (substitute* "src/uterm_systemd.c" - (("#include ") - "#include ") - ;; We don't have this header. - (("#include ") - "") - ;; Replace the call to 'sd_booted' by the truth value. - (("sd_booted\\(\\)") - "1")) - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt) ;to build the man page - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("docbook-xsl" ,docbook-xsl))) - (inputs - `(("libdrm" ,libdrm) - ("libtsm" ,libtsm) - ("libxkbcommon" ,libxkbcommon) - ("logind" ,elogind) - ("mesa" ,mesa) - ("pango" ,pango) - ("udev" ,eudev))) - (synopsis "Linux KMS-based terminal emulator") - (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel + (let ((commit "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc") + (revision "1")) + (package + (name "kmscon") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87")) + (modules '((guix build utils))))) + (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. + (add-before 'configure 'remove-systemd + (lambda _ + (substitute* "configure" + (("libsystemd-daemon libsystemd-login") + "libelogind")) + (substitute* "src/uterm_systemd.c" + (("#include ") + "#include ") + ;; We don't have this header. + (("#include ") + "") + ;; Replace the call to 'sd_booted' by the truth value. + (("sd_booted\\(\\)") + "1"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("libxslt" ,libxslt) ;to build the man page + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("docbook-xsl" ,docbook-xsl))) + (inputs + `(("libdrm" ,libdrm) + ("libtsm" ,libtsm) + ("libxkbcommon" ,libxkbcommon) + ("logind" ,elogind) + ("mesa" ,mesa) + ("pango" ,pango) + ("udev" ,eudev))) + (synopsis "Linux KMS-based terminal emulator") + (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel mode setting} (KMS). It can replace the in-kernel virtual terminal (VT) implementation with a user-space console. Compared to the Linux console, kmscon provides enhanced features including XKB-compatible internationalized keyboard support, UTF-8 input/font support, hardware-accelerated rendering, multi-seat support, a replacement for @command{mingetty}, and more.") - (home-page "https://www.freedesktop.org/wiki/Software/kmscon") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed - ;; under the terms of the GNU GPL. - (license (list license:expat license:lgpl2.1+ license:bsd-2 - license:gpl2+)) - (supported-systems (filter (cut string-suffix? "-linux" <>) - %supported-systems)))) + (home-page "https://www.freedesktop.org/wiki/Software/kmscon") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed + ;; under the terms of the GNU GPL. + (license (list license:expat license:lgpl2.1+ license:bsd-2 + license:gpl2+)) + (supported-systems (filter (cut string-suffix? "-linux" <>) + %supported-systems))))) (define-public libtermkey (package