From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id AI/kGKzrX2MTfgAAbAwnHQ (envelope-from ) for ; Mon, 31 Oct 2022 16:37:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sAb1F6zrX2OG0wAAG6o9tA (envelope-from ) for ; Mon, 31 Oct 2022 16:37:16 +0100 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 DAD4B1C3E4 for ; Mon, 31 Oct 2022 16:37:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opWqV-0000BK-VD; Mon, 31 Oct 2022 11:37:03 -0400 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 1opWqV-0000Ak-42 for guix-patches@gnu.org; Mon, 31 Oct 2022 11:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opWqU-0002zo-SB for guix-patches@gnu.org; Mon, 31 Oct 2022 11:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opWqU-0007ez-NB for guix-patches@gnu.org; Mon, 31 Oct 2022 11:37:02 -0400 Subject: bug#58341: [PATCH] Add x11vnc recipe Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 31 Oct 2022 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 58341 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: Mehmet Tekman Cc: 58341-done@debbugs.gnu.org Mail-Followup-To: 58341@debbugs.gnu.org, maxim.cournoyer@gmail.com, mtekman89@gmail.com Received: via spool by 58341-done@debbugs.gnu.org id=D58341.166723061029423 (code D ref 58341); Mon, 31 Oct 2022 15:37:02 +0000 Received: (at 58341-done) by debbugs.gnu.org; 31 Oct 2022 15:36:50 +0000 Received: from localhost ([127.0.0.1]:41550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWqG-0007eT-BA for submit@debbugs.gnu.org; Mon, 31 Oct 2022 11:36:49 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:40692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWqD-0007eF-6A for 58341-done@debbugs.gnu.org; Mon, 31 Oct 2022 11:36:46 -0400 Received: by mail-qt1-f173.google.com with SMTP id h24so7623080qta.7 for <58341-done@debbugs.gnu.org>; Mon, 31 Oct 2022 08:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=JAsx1ytqyiDnhRuXwk0eHEfX3wTI8UZYd8ykVJQ7GAQ=; b=PdvKQS2QZxhbgybNh7gDpd7JqXxD+fsrOhjWH6D407jScKVdcWwGKl185K6r6DSa5V GGS7++KzB9FQEvLdQhS52mOdXCWP+xfzOPDdO7Bj2IJ7GJeUiS//bdAVCSDtbUqDGusj qlYx3LzBTLwPkRDPIpQMsf+iiVhDYiMxd64+k1ju1qEvXkY0WCtNGp+FAIXAZzPENOzJ Tp17s48iNd2FpU9R6ge3wKnj9YiufZccY5dXHjW/zh6tvhLsgNatTehQTfbU6t3WxeBW A7Teo/b1NouVtthO7g4HH1dQyTP/Xa1b+5xP6B0Nxt6/nwbUlV3I0aqVw4Few+pAnAQT WsqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JAsx1ytqyiDnhRuXwk0eHEfX3wTI8UZYd8ykVJQ7GAQ=; b=Gh5xsUxBQvmK0o4EnQ/YL/x0d05bzRCVeA8ea4atLItgyQZ3Ad1vgPbU6R5JBbCyK2 SnRZhxGLZQwkH2eW5q1Wo6akpuGIMbsPG2QCXdpwlQK3CFHVKCLl8mXnjeNcbED7kG/i MtOHLJ/hx9waU2vAg0wOLytI/Ic2DR7whohHHaFfVdhpvF74OlOoFOUmtc4OX6KTQUsH M/1emowD5VpjC3C6cHzO/RWVJJPIJLwJUV6rMIekUsFSHpfjAt7oYt7zVmJlyBJXVQVP FQWf5MUzQiihx32ud+7ojHAKhjORy6FCktnDHG5woyM9P573fKCxCH5C3KQA+fp9oWQW +e+A== X-Gm-Message-State: ACrzQf30Sc5tuGhEOcmGp8H8k4UGpHqfB/tVT9L+0TVDIWMic6kU1j10 626fMKbOKDHvU5q6GI7dspNTwqkxDuA= X-Google-Smtp-Source: AMsMyM7tkM++favrP/C3NRRB6YeCydcRDRcvDiKoHTW3bysRkPdBh+VhQlJkjSDRs24Uy9mx2Imhbw== X-Received: by 2002:a05:622a:1791:b0:3a4:fafc:1800 with SMTP id s17-20020a05622a179100b003a4fafc1800mr11181232qtk.401.1667230599454; Mon, 31 Oct 2022 08:36:39 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id k26-20020ac8475a000000b00398313f286dsm2119487qtp.40.2022.10.31.08.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 08:36:38 -0700 (PDT) From: Maxim Cournoyer References: <874jwf2atx.fsf@gmail.com> Date: Mon, 31 Oct 2022 11:36:37 -0400 In-Reply-To: (Mehmet Tekman's message of "Mon, 10 Oct 2022 18:05:49 +0200") Message-ID: <878rkwdmyi.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667230636; 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:resent-to: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=JAsx1ytqyiDnhRuXwk0eHEfX3wTI8UZYd8ykVJQ7GAQ=; b=ZWlcTiBuqu3Y2j/QYfZi5EAEYmkxZE8q5pGSOgHvyK403p/Jy0yhGOrH3NygpgJwwxArvY WsDIcoz7t3JiRGO2Q/o5ORnCrS9/+zsuDoFZLS9E8MFzuWSboJbBOITpSiVZQSRLrGeOf/ GHUYBy1TfMQDhZIU1uB4efdisRYOzcGu371PjCgoeK3nHaeS0eJhqt2J71wGZLOSTBpjmO 2pLiYNIhHNCCEAwpjB7U7Az5WlVpOA6gM5vx+U51FRXH1C2p0r7qaXm+isi5KucVZHF02B /jBH8A96frrv3aJ5Wdy6ZWe+rPaG7TGrMlb826ZxMVmFPsHd2NvPLfiCPt8srQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667230636; a=rsa-sha256; cv=none; b=cRPY/0z9m6ma3gUQD3u2o9R/zOUa9ZNmdLXDsaSu6Jn8mAW9UCJjTMhpsPvlKs7pdApyp2 YijtBXkTxK5eJDZqCQ1rX8K8F+R7MFXSATShV4SfNtr8uIcq6uDFUMqqS8oYgOuzd77OSh /W/EC/A7ZJOqTM2UVswWcTkztL8fMP6xKlP3+xwBrLTlryeipei1t233uYdKPbT5X+GtXK Z0tqjV+3f+/9+BeD+j3wBAA2OoWhguyrmV4hLfiMA4lk80JGjtJtK1rmvFyL6FZDUlKf8k 8J0LB7Gs7gosphSmloXcsai62vt3/vn6ur0R5bHstx8c7PG0FYVVEjVPVmMI2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=PdvKQS2Q; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=PdvKQS2Q; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DAD4B1C3E4 X-Spam-Score: 6.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: izekMO/K+lR0 Hi Mehmet, Mehmet Tekman writes: > Hello, thank you for the review! Thanks for the prompt reply, and sorry for the delays on my part! > I've put the recipe into vnc.scm and built to a newer commit that > makes the patches redundant (thanks for the tip, I was basing my > recipe off one from another distro). > > I've fixed the commit message and linted and styled the vnc.scm file. > > I created a new branch and put my changes there, so please disregard > the above changes. > > I attach here the patch file, as I don't quite trust myself to paste > the changes into this email. That's fine. It looks very good! I've made the following cosmetic/nitpicking changes: --8<---------------cut here---------------start------------->8--- modified gnu/packages/vnc.scm @@ -568,11 +568,10 @@ (define-public x11vnc ;; The release version of 0.9.16 requires patches to work, so we pin to the ;; latest working commit (let ((commit "3e4dc8ef2985a6e670e1d9649fe55395c2b31039") - (version "0.9.16") - (revision "1")) + (revision "0")) (package (name "x11vnc") - (version (git-version version revision commit)) + (version (git-version "0.9.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -584,14 +583,15 @@ (define-public x11vnc "0a120gv9h3whiznlddl0j3nz3400jjgl97znaincm5i2m5pnjifs")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'bootstrap 'delete-premature-configure - (lambda _ - (substitute* "./autogen.sh" - ((".*/configure") - ""))))))) + (list #:phases #~(modify-phases %standard-phases + (add-before 'bootstrap 'delete-premature-configure + (lambda _ + (substitute* "./autogen.sh" + ((".*/configure") + ""))))))) (native-inputs (list autoconf automake autobuild pkg-config)) (inputs (list avahi + libjpeg-turbo libvnc libx11 libxcomposite @@ -604,9 +604,8 @@ (define-public x11vnc libxtst openssl xdpyinfo - zlib - libjpeg-turbo - xf86-video-dummy)) + xf86-video-dummy + zlib)) (synopsis "VNC server for real X displays") (home-page "https://github.com/LibVNC/x11vnc") (description @@ -615,7 +614,6 @@ (define-public x11vnc mouse) with any VNC viewer.") (license license:gpl2)))) - (define-public libvnc (package (name "libvnc") --8<---------------cut here---------------end--------------->8--- 1. Do not bind a "version" variable in let; it's bound by the version field of the package record at definition (see: define-record-type* from (guix records)). 2. Used a plain list with a gexp for the phases, which is more forward-looking. 3. Sorted the inputs. 4. Removed an extra newline at the end (we use only one newline between definitions). Before pushing, I've also double checked the license and found that it should be gpl2+, as the COPYING file contains the "any later version" text. x11vnc.h also has in the license notice: x11vnc is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. I made these changes and pushed to master! Thanks again, Maxim