From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CDCwMDUD7WURrwAAe85BDQ:P1 (envelope-from ) for ; Sun, 10 Mar 2024 01:47:50 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CDCwMDUD7WURrwAAe85BDQ (envelope-from ) for ; Sun, 10 Mar 2024 01:47:49 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Zp08D9KZ; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710031669; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=hZbdgKTjkMiPpfYai3fO7kSEkzzi+LSfYqMkxEWksm0=; b=dsCerL2sJboq/AG/MCNIXmRu6T29dylFQH1L4fWNwPDxZBoTk8Ou7lLX/RrVVlviKIGQC2 n2OQDG+h/lyo3xgtQSNes++LN7DbE/Ap/qguz/cY3iEJVmqWMlDUswHVtSgMMH5pKNEiLo tWvEMS11OZqWMlwS/VJgeJxgtsvUvRjPi8droHYPZ7INj2ArJsSwaEP0gbDfxxN4oTk/Sp DbmvW6xgn5dw7pzina6zn4oXhZw1BDyZkgbHLhcwKeOD4WPtBck4Q005h0BYE3sS0EJQCY BENb8fWw/vTmXx5eqTDhjEnidBXKeGvQNZ3HFudvUSkBtUrweyTBKunvhX1fXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Zp08D9KZ; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710031669; a=rsa-sha256; cv=none; b=B44JXjL/fm8mPvwtaCYjhoRUHw7y4AXjAVIo5qijO+p4CsLY2a5VozM6OlD4M8WwkAdfoS 4mjfq3jXsssv4x5LuTc6D1fl+uSrZauTZUgw/6ES1b8X1I/X9aCaL3AYv4TcGvy1/PLCge 2uXSANlMLLP/12grYpVVoZeTuDkhBDT/9+qAPybRLhTjaFzpxrdXXSU63zuhRKG6LotO2f nUOJkJn/8yEuKwd+dfdq0dY5CXXwt0AmFV6SQoECbf6s2g/if+d5LKHOldCrxB+rN2OAVR Gnh+SF/QqEKGCJ/1hM29sosD67Fkuf+S8AYQBm/ZgYiHGFv921k6/k2G0557pA== 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 7B8EF368B4 for ; Sun, 10 Mar 2024 01:47:49 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rj7Lf-0007I6-Oh; Sat, 09 Mar 2024 19:47:31 -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 1rj7Le-0007Hw-8W for guix-patches@gnu.org; Sat, 09 Mar 2024 19:47:30 -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 1rj7Ld-0008GC-SY for guix-patches@gnu.org; Sat, 09 Mar 2024 19:47:29 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rj7MA-0007Rj-0b; Sat, 09 Mar 2024 19:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67257] [PATCH v2 2/2] gnu: Add x2goclient. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org, steve@futurile.net Resent-Date: Sun, 10 Mar 2024 00:48:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: nicolas.debonnaire@gmail.com, 67257@debbugs.gnu.org, Steve George Received: via spool by 67257-submit@debbugs.gnu.org id=B67257.171003163128558 (code B ref 67257); Sun, 10 Mar 2024 00:48:01 +0000 Received: (at 67257) by debbugs.gnu.org; 10 Mar 2024 00:47:11 +0000 Received: from localhost ([127.0.0.1]:34991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rj7LK-0007QY-Qv for submit@debbugs.gnu.org; Sat, 09 Mar 2024 19:47:11 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:43251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rj7LI-0007QK-OJ for 67257@debbugs.gnu.org; Sat, 09 Mar 2024 19:47:09 -0500 Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-42f2009e559so23052911cf.0 for <67257@debbugs.gnu.org>; Sat, 09 Mar 2024 16:46:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710031530; x=1710636330; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hZbdgKTjkMiPpfYai3fO7kSEkzzi+LSfYqMkxEWksm0=; b=Zp08D9KZ9T88+ggXIUC8ur1cN/wWcqs1gmMEQ6A6cnhFyyzAIMmm94NAUDDullqocB JzqM4UTAZzBNCls4+hvzeunWRckv/8iG0ed9Y4qQekPs9PHeMrgb0X8w67OgIp7SzXLh Cn54FOJ1sC9i7sVtfZyGU6YDly3e0H6aC8a+kQzqRwzlcx54eKnq91nq2PG7GA2XSMhb kHBE+wKX5DwdOEh/caaei2HesFRqeP4LeI7mxf23Y1J371eFclQXr3JBV8NrFqrBwk6R oSYw4L8qPH5Tw9hjcJVBTKFbnHGY4Z7ZoJRv8cOPYqe9IpvqwQYAq4MO54RYuwIuzV4F qtHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710031530; x=1710636330; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hZbdgKTjkMiPpfYai3fO7kSEkzzi+LSfYqMkxEWksm0=; b=Lh9lvm5KiJLHgi8yjyRoPMRf8zDFi8nueyGvFXff2avrEmEclolMUR+Hw146hjVDQo hbViXyyZqSXvBqCgaLCFZmtyl66krygm357XOeXC6/mhKEFsvLBM2QIOrVtlWmauQg4v CknM8F1znpW/z7KJFcganYRf5cnwTSca6SFhYtqO61Ol32hxsH6yTAnLtxdk6+DtW2nw QQZ5AIuQhUXXyrgIu3BiQGTBvvzvtou+pssMyUt8ueJu/7O0abf6vk0Edl1arf0rdZB3 otUk0RVo50kzNTQyr13hyI47oA6CLUuZMw/Nh789ivBu2RmzP35+Q5NcO8Sj55qEZtSQ MUug== X-Forwarded-Encrypted: i=1; AJvYcCXu8Utdzw69WjEiIgxN98HgcHUkvde4eolSN8Mf15FsAIOeQam8p5y6DmGIT/9eKlZW7JJ1i2i65381w1qKeE8irFjiVVw= X-Gm-Message-State: AOJu0YysU0kM+RVw+fNdG065KE3+ZZ7P74PcZ2hBDs1IDJuVaxYroMiY u2xc2WNh6KRcti5sk5XE+91aPqbXVSPjHyqcKe6VB6TBOL4OD1l8T5Qu755I+b/hxA== X-Google-Smtp-Source: AGHT+IFxbIL44aBoWPwgzNEHO0XQkscOdNHlbiI2CSl6V1vU12kXGQB5f7Blytmx7q/RvmAJ3f1OUQ== X-Received: by 2002:a05:622a:1741:b0:42e:f5f8:e970 with SMTP id l1-20020a05622a174100b0042ef5f8e970mr5161505qtk.12.1710031529720; Sat, 09 Mar 2024 16:45:29 -0800 (PST) Received: from hurd (dsl-150-134.b2b2c.ca. [66.158.150.134]) by smtp.gmail.com with ESMTPSA id z6-20020ae9e606000000b00787fd080d28sm1365070qkf.74.2024.03.09.16.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 16:45:29 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <87msrmi5ry.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Tue, 27 Feb 2024 11:02:41 +0100") References: <89c8896f76e5c5e3f68dfd7f36cac23ad3a79330.1708638616.git.steve@futurile.net> <87msrmi5ry.fsf@gnu.org> Date: Sat, 09 Mar 2024 19:45:27 -0500 Message-ID: <871q8iewyg.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 4.22 X-Spam-Score: 4.22 X-Migadu-Queue-Id: 7B8EF368B4 X-TUID: NthzaG0xsaH5 Hi, Ludovic Court=C3=A8s writes: > Steve George skribis: > >> From: nicodebo >> >> * gnu/packages/nx.scm (x2goclient): New variable. >> >> Reviewed-by: Steve George >> >> Change-Id: Ib0ff6328ede3fb4a0b48462ac1a003438c53c862 > > [...] > >> + (substitute* "src/onmainwindow.cpp" >> + (("/usr/sbin/sshd") >> + (which "sshd")))))) > > Rather use =E2=80=98search-input-file=E2=80=99 here, as mentioned in my o= ther message. Done. >> + (native-inputs (list pkg-config >> + qttools-5 >> + qtbase-5 >> + qtx11extras >> + qtsvg-5 >> + libssh >> + cups >> + libxpm >> + openldap >> + gcc-toolchain)) > > You can omit =E2=80=98gcc-toolchain=E2=80=99. Most likely, everything bu= t =E2=80=98pkg-config=E2=80=99 > and =E2=80=98qttools-5=E2=80=99 shold be in =E2=80=98inputs=E2=80=99 rath= er than =E2=80=98native-inputs=E2=80=99. Done. >> + (propagated-inputs (list nx-libs >> + openssh)) > > Don=E2=80=99t propagate OpenSSH: it should be up to the user to install i= t if > they want it, to avoid being too intrusive. I've moved it to inputs; its sshd command is substituted in a phase. > =E2=80=98nx-libs=E2=80=99 probably doesn=E2=80=99t need to be propagated = either and can be in > =E2=80=98inputs=E2=80=99, no? Agreed. Here's the diff I've now applied: --8<---------------cut here---------------start------------->8--- modified gnu/packages/nx.scm @@ -35,6 +35,7 @@ (define-module (gnu packages nx) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages ssh) @@ -172,61 +173,72 @@ (define-public x2goclient (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" - (("=3D 4") - "=3D 5") ;use qt5 instead of qt4 - (("-o root -g root") ;from archlinux - "") - (("/usr/local") - out) - (("/etc/x2go") - etc) - ;; Workaround to turn off invoking lrelease beca= use - ;; 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_m= an - (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)) + (list + #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "SHELL=3D" + (search-input-file %build-inputs "bin/bash")) + "QT_VERSION=3D5" + "INSTALL_DIR=3Dinstall -d -m 755" + "INSTALL_FILE=3Dinstall -m 644" + "INSTALL_PROGRAM=3Dinstall -m 755" + (string-append "PREFIX=3D" #$output) + (string-append "ETCDIR=3D" #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/onmainwindow.cpp" + (("/usr/sbin/sshd") + (search-input-file inputs "sbin/sshd")))))))) + (native-inputs + (list man2html + pkg-config + qtbase-5 + qttools-5)) + (inputs + (list cups + libssh + libxpm + nx-libs + openldap + openssh + pulseaudio + qtbase-5 + qtx11extras + qtsvg-5)) (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/") + "X2Go enables you to access a graphical desktop of a computer via +SSH (Secure Shell). This package provides the X2Go Client, which can conn= ect +to the X2Go Server. Basic features of X2Go include: +@itemize +@item +Graphical remote desktop that works well over both low bandwidth and high +bandwidth connections +@item +The ability to disconnect and reconnect to a session, even from another +client +@item +Support for sound +@item +Support for as many simultaneous users as the computer's resources will +allow +@item +Traffic is securely tunneled over SSH +@item +File sharing from client to server +@item +Printer sharing from client to server +@item +Easily select from multiple desktop environments (e.g., MATE, GNOME, KDE) +@item +Remote support possible via desktop sharing +@item +The ability to access single applications by specifying the name of the +desired executable in the client configuration or selecting one of the +pre-defined common applications. +@end itemize") + (home-page "https://wiki.x2go.org/doku.php") (license license:gpl2))) --8<---------------cut here---------------end--------------->8--- Some changes: 1. Use gexps. 2. Use https home-page. 3. Expand description. 4. Add pulseaudio 5. Use make flags instead of modifying the build system 6. Add pulseaudio to inputs 7. Remove workarounds for lrelease; the qttools package is now fixed to avoid this problem I think that's it! Now all that's left is to add x2goserver and an accompanying system service :-). --=20 Thanks, Maxim