From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SHQCCmfG12WuRwAA62LTzQ:P1 (envelope-from ) for ; Thu, 22 Feb 2024 23:10:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id SHQCCmfG12WuRwAA62LTzQ (envelope-from ) for ; Thu, 22 Feb 2024 23:10:47 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b=X6wB396O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708639825; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=7Tt7SdYH6QU5f7sgN4YK+Didj4veShVuZJJOEdSWiwI=; b=AC17pqkC+NkEp7A32zWdP+gd77UxyHjwbCIQhi/hKs+KQtxS2AfjwAt0u4VrkjgOrw1zLg fSVmtXOaV+vIs2NTuCEk70BPjbCiFS8pybLRN1uQnAJX9eCX+FRFdek30S/F5gEOLOXiVq UVYIp9Gt0ot9hXkN4cFpeOXhWm7HEcbdU0FqMaYfXTtXchU2knnZpfxlLqsAEB5VlO9p6S WRHJZCbrgzi79pt5W+lntDvgtB17YcxUBADWqYaxbRbSk1K1ZuUuyf/v+BRi4OV4/c2ikL v+qtaIFAtH5uPt21sGOVpx0tbKiV9K1TzaLAKAeYHIDw/vPfoXtT+h6j/yMe7g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b=X6wB396O; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708639825; a=rsa-sha256; cv=none; b=T78fVoIcvUf9B95n9WSPXbuTlg7Zq6gAwFvxaHhyvBC6szH0Fx9PRgM57ouSLbZKyH9ds5 4XWVjd0zC2Ny+KBmOhrs6QZhY9oHeripmmL4NcSL1ZxU9U9QJg14uI98YrxGnesZpooTO0 B6IK8sbuN087ZNg/fhj/M1H17BZuS4g4iU56KP9wFBC9PkpU7Zk1a3DEZBTXQ6tuzwALf5 RvnUNau9YSqlYND0D7G08YxqPAhjbw66Pf5mBNbqfPiquC4dkKBQG0B9KLDqgmnNUadqUH bsZGrDTiMgcVJKJsZy/9PFz97M/df2nNC0diSR0d/DqjSRxjNGqpswZXyJYseg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 63EB95C4C8 for ; Thu, 22 Feb 2024 23:10:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdHGI-0004j6-S5; Thu, 22 Feb 2024 17:09:50 -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 1rdHGA-0004f9-0k for guix-patches@gnu.org; Thu, 22 Feb 2024 17:09:42 -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 1rdHG7-0000hL-DB for guix-patches@gnu.org; Thu, 22 Feb 2024 17:09:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdHGU-00023q-E6; Thu, 22 Feb 2024 17:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67257] [PATCH v2 2/2] gnu: Add x2goclient. Resent-From: Steve George Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org, steve@futurile.net Resent-Date: Thu, 22 Feb 2024 22:10:02 +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: nicolas.debonnaire@gmail.com, steve@futurile.net X-Debbugs-Original-Cc: nicodebo , Steve George , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17086397737799 (code B ref -1); Thu, 22 Feb 2024 22:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2024 22:09:33 +0000 Received: from localhost ([127.0.0.1]:35035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdHFz-00021Y-Nb for submit@debbugs.gnu.org; Thu, 22 Feb 2024 17:09:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:57188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdHFw-00021F-PJ for submit@debbugs.gnu.org; Thu, 22 Feb 2024 17:09:30 -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 1rdHFZ-0004Yr-5Z for guix-patches@gnu.org; Thu, 22 Feb 2024 17:09:05 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdHFW-0000df-4R for guix-patches@gnu.org; Thu, 22 Feb 2024 17:09:04 -0500 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rdHFR-008qqk-0h; Thu, 22 Feb 2024 23:08:57 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From; bh=7Tt7SdYH6QU5f7sgN4YK+Didj4veShVuZJJOEdSWiwI=; b=X6wB396OaDbrXAJK1rPYBkTJNf ReUXYaIyqF+dbwzQ4PxxnQmghl+Oc+3Pj3Z2/5zPjLxPZyJPkspfwJsE4d6C3iw1kt31QeMoK9pQs OOG4e0fu8/6pERUvQU3l9AyU9VP2ywDsmgQ6OMB1y+acxnyFr7MmaXoTJO1CeFLMgX0GV3vb4q8N/ zbukZb2csWNSNVQFLZr8GEngTXDGB25qY05etuo8rXIBu3UdtJqvZOOzirq7SDyB1ADBo6waXHQow puuM4gd5qjP3Q1mUqp2Pq6aORTrxwYe1rPDBeVB9sSz88QUnAjZ6+jwJ+RHl3Mz27kxlH6biDAc39 hzDrONNw==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rdHFQ-00080Q-M7; Thu, 22 Feb 2024 23:08:56 +0100 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rdHF8-0022uV-Ew; Thu, 22 Feb 2024 23:08:38 +0100 From: Steve George Date: Thu, 22 Feb 2024 22:08:20 +0000 Message-ID: <89c8896f76e5c5e3f68dfd7f36cac23ad3a79330.1708638616.git.steve@futurile.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: permerror client-ip=2a0c:5a00:149::25; envelope-from=steve@futurile.net; helo=mailtransmit04.runbox.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.07 X-Spam-Score: -4.07 X-Migadu-Queue-Id: 63EB95C4C8 X-Migadu-Scanner: mx11.migadu.com X-TUID: PFSX3i7dI8oY From: nicodebo * gnu/packages/nx.scm (x2goclient): New variable. Reviewed-by: Steve George Change-Id: Ib0ff6328ede3fb4a0b48462ac1a003438c53c862 --- gnu/packages/nx.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/nx.scm b/gnu/packages/nx.scm index 92542c02a7b..be00e466fec 100644 --- a/gnu/packages/nx.scm +++ b/gnu/packages/nx.scm @@ -16,19 +16,25 @@ (define-module (gnu packages nx) #:use-module (guix build utils) #:use-module (guix build-system gnu) + #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #: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)) @@ -139,3 +145,76 @@ (define-public nx-libs developers and TheQVD.") (home-page "https://github.com/ArcticaProject/nx-libs") (license license:gpl2))) + +(define-public x2goclient + (package + (name "x2goclient") + (version "4.1.2.3") + (source + (origin + (method url-fetch) + (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 ; there aren't any tests + #: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) + ;; Workaround to turn off invoking lrelease because + ;; it fails with a warning about qmake spec + (("lrelease") + "true") + (("qmake") + (which "qmake"))) + (substitute* "src/onmainwindow.cpp" + (("/usr/sbin/sshd") + (which "sshd")))))) + ;; Avoid man2html by calling build_client then install_man + (replace 'build + (lambda _ + (invoke "make" "build_client"))) + (add-after 'build 'build-man + (lambda _ + (invoke "make" "install_man"))) + ;; Due to lrelease workaround above: run lrelease on each + ;; individual .ts file + (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 nx-libs + openssh)) + (synopsis "Remote desktop and application solution") + (description + "X2goclient allows you to connect to a remote graphical desktop over the +network through SSH.") + (home-page "http://x2go.org/") + (license license:gpl2))) -- 2.41.0