From patchwork Sat Nov 18 07:59:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nicodebo X-Patchwork-Id: 19648 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 7E04C27BBEA; Sat, 18 Nov 2023 10:50:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,T_PDS_PRO_TLD,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5E38727BBE2 for ; Sat, 18 Nov 2023 10:50:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4Ito-0004F0-OC; Sat, 18 Nov 2023 05:50:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4Itn-00049D-69 for guix-patches@gnu.org; Sat, 18 Nov 2023 05:50:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4Itm-0002s5-Ps for guix-patches@gnu.org; Sat, 18 Nov 2023 05:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4Itn-0001PJ-Ho for guix-patches@gnu.org; Sat, 18 Nov 2023 05:50:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67257] [PATCH 2/2] Add x2goclient Resent-From: nicodebo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Nov 2023 10:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67257 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67257@debbugs.gnu.org Cc: nicodebo Received: via spool by 67257-submit@debbugs.gnu.org id=B67257.17003045525315 (code B ref 67257); Sat, 18 Nov 2023 10:50:03 +0000 Received: (at 67257) by debbugs.gnu.org; 18 Nov 2023 10:49:12 +0000 Received: from localhost ([127.0.0.1]:47884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4Isx-0001NY-PH for submit@debbugs.gnu.org; Sat, 18 Nov 2023 05:49:12 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4Gbd-000611-Di for 67257@debbugs.gnu.org; Sat, 18 Nov 2023 03:23:12 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-32ded3eb835so1995140f8f.0 for <67257@debbugs.gnu.org>; Sat, 18 Nov 2023 00:23:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700295782; x=1700900582; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bQIMJ1WvqJOFbNjpHE6eBBCEhQH3+T8YDu1tR01BTlI=; b=dI5MbEKVHm7ZmGMW1FI48QdzjHpJCET1+pZlPhH2MaCbCPZqgnhKX9Rkta4hTglxsH 2pPOUG1HEE8e4yieaaCha/vwTImYSp4sVofaJk5YQG7raEy5wZxQdyyBrQJ0aAR+qfIz gCQ5b5SXItG/acCiVs9LuwzJzLreHIhnrjlvG5d3Qe1CphFjjmNF5rwqAqeuUY5O9uuy VilMhDpSirLTczZmekRxBaMPSjPsV/6f/yAwF+e5zVVxT7U5sl/Rd2djQeZkvd8bmX6j oVYNPgf5wOv8/s3eD8zvC0Uonrpbm8auPq0MLw1U1FTcZtJ6Td0Lvm6jpJ6nxw8J7A4w /mBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700295782; x=1700900582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bQIMJ1WvqJOFbNjpHE6eBBCEhQH3+T8YDu1tR01BTlI=; b=DzzQJ4PM47sCK9NtzBDkld4QmZpijBcKOvoZblzbeAiySUWU5mBgf/R3M1xA7MVecR pBzaJjgS+Se3PDDK16Ug+CuGMgor4tGk0JE/SsBLrO6eiimOMnB6lgyvL6FtOSkTRc2h Al/B/yMg+MymmXdJUkAijv6/PtdR5mXjD3VezuafQPelgWPvG2/z+BR6qpsBHDIvJI+A dXkkO3dGk02lkBjhgkKbmg4mIXQ5l8SbiJqBSVfsRDC64yDNGOOHIB5CPZUBB1zyiYfs mqGiysFdiiMP09NBN6UYGR7yhbng0a9cSEaI4kj8GJu+h9hspIzjxGXrJ1sgEZxb/9qc E6Ag== X-Gm-Message-State: AOJu0YyUYXFDU8PjewT9VYc6qJegimrc1ieGm8kziNCvREPOs0Oua0M7 R+910oGlljOOkGxWYUVm55yr9+ePLBDXeg== X-Google-Smtp-Source: AGHT+IFz5AAxZlS1hrjWeakVQevcrbZIt7+Lv04Pr/v/2jgEmtarPuQzaixU1PhSjUIfcJmJD19cMQ== X-Received: by 2002:a5d:5505:0:b0:331:6e01:2529 with SMTP id b5-20020a5d5505000000b003316e012529mr1308183wrv.24.1700295782385; Sat, 18 Nov 2023 00:23:02 -0800 (PST) Received: from localhost ([2a01:cb19:5a2:5500:7e44:57:c552:8b15]) by smtp.gmail.com with UTF8SMTPSA id e3-20020a5d5943000000b0032db430fb9bsm4664759wri.68.2023.11.18.00.23.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Nov 2023 00:23:02 -0800 (PST) From: nicodebo Date: Sat, 18 Nov 2023 08:59:18 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 18 Nov 2023 05:49:06 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: nicodebo Change-Id: Ib0ff6328ede3fb4a0b48462ac1a003438c53c862 --- gnu/packages/nx.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/gnu/packages/nx.scm b/gnu/packages/nx.scm index 9a2ec68ee9..dd336b309f 100644 --- a/gnu/packages/nx.scm +++ b/gnu/packages/nx.scm @@ -16,19 +16,25 @@ (define-module (gnu packages nx) #:use-module (gnu packages autotools) #:use-module (gnu packages commencement) + #:use-module (gnu packages cups) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages man) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages openldap) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages ssh) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build utils) #:use-module (guix build-system gnu) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix licenses) #:use-module (guix packages)) @@ -138,3 +144,86 @@ (define-public nx-libs developpers and TheQVD.") (home-page "https://github.com/ArcticaProject/nx-libs") (license gpl2))) + +(define-public x2goclient + (package + (name "x2goclient") + (version "4.1.2.3") + (source + (origin + (method url-fetch) + ;; the tar.gz was checked against x2goclient-4.1.2.3.tar.gz.md5 + ;; provided by x2go team + (uri (string-append + "https://code.x2go.org/releases/source/x2goclient/x2goclient-" + version ".tar.gz")) + (sha256 + (base32 "0g6aba8kpsixq4486a8mga945lp31y0mzwa2krs5qqiiip3v72xb")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc"))) + (mkdir-p etc) + (substitute* "Makefile" + (("= 4") + "= 5") ;use qt5 instead of qt4 + (("-o root -g root") ;from archlinux + "") + (("/usr/local") + out) + (("/etc/x2go") + etc) + ;; KLUDGE part1 (from guix package smplayer) + ;; A KLUDGE to turn off invoking lrelease on the + ;; project for now, because it fails consistently + ;; with "WARNING: Could not find qmake spec + ;; 'default'". See below. + (("lrelease") + "true") + (("qmake") + (which "qmake"))) + (substitute* "src/onmainwindow.cpp" + (("/usr/sbin/sshd") + (which "sshd"))) ;x2goclient nix package does this substitution + #t))) + ;; I could not succeed in packaging the man2html program + ;; needed to build the html version of the documentation. + ;; That's why instead of running the bare make which needs + ;; man2html in one of its target, I run build_client then install_man. + (replace 'build + (lambda _ + (invoke "make" "build_client") #t)) + (add-after 'build 'build-man + (lambda _ + (invoke "make" "install_man") #t)) + ;; KLUDGE part2 + ;; Due to the above, we must run lrelease separately on each .ts file + ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire + ;; project, as the Makefile does normally without the above kludge). + (add-after 'build 'compile-ts-files + (lambda _ + (for-each (lambda (file) + (invoke "lrelease" file)) + (find-files "./" "\\.ts$"))))))) + (native-inputs (list pkg-config + qttools-5 + qtbase-5 + qtx11extras + qtsvg-5 + libssh + cups + libxpm + openldap + gcc-toolchain)) + (propagated-inputs (list perl nx-libs openssh xauth)) + (synopsis "Remote Desktop/Remote Application solution") + (description + "x2goclient allows you to connect to a remote graphical desktop over the +network through ssh") + (home-page "http://x2go.org/") + (license gpl2)))