From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id qLbyOtsXuF7DMwAA0tVLHw (envelope-from ) for ; Sun, 10 May 2020 15:03:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4Ao6IekXuF5QFQAA1q6Kng (envelope-from ) for ; Sun, 10 May 2020 15:04:09 +0000 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 074149400CB for ; Sun, 10 May 2020 15:04:07 +0000 (UTC) Received: from localhost ([::1]:52540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnUt-00082W-Rt for larch@yhetil.org; Sun, 10 May 2020 11:04:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnUo-00082O-Lo for guix-patches@gnu.org; Sun, 10 May 2020 11:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnUo-0001Mz-D4 for guix-patches@gnu.org; Sun, 10 May 2020 11:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXnUo-0002ON-9N for guix-patches@gnu.org; Sun, 10 May 2020 11:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41175] [PATCH] gnu: tigervnc-server: Update to 1.10.1-1.920d9c4. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41175 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41175@debbugs.gnu.org Cc: Oleg Pykhalov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15891230219145 (code B ref -1); Sun, 10 May 2020 15:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 May 2020 15:03:41 +0000 Received: from localhost ([127.0.0.1]:50217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXnUS-0002NQ-S1 for submit@debbugs.gnu.org; Sun, 10 May 2020 11:03:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:57816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXnUQ-0002ND-Rm for submit@debbugs.gnu.org; Sun, 10 May 2020 11:03:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnUQ-000806-Ml for guix-patches@gnu.org; Sun, 10 May 2020 11:03:38 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:43763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnUP-0000vO-Ou for guix-patches@gnu.org; Sun, 10 May 2020 11:03:38 -0400 Received: by mail-lj1-x233.google.com with SMTP id l19so6711245lje.10 for ; Sun, 10 May 2020 08:03:37 -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:mime-version :content-transfer-encoding; bh=uomA36QVatwkNvXfh+fxCbCt8Obtis93Yjdbc9Etj3M=; b=YvHuC/oFcHfOnoiY4kAZxahCyrgdkkQyPaiIzBMGEqtgbPUKtuFY/697KTeVQaBOCN 5IP2axvm9dr0Z5cVbl6Ng0kHgMOLdOOM95SvJ+5qZJbXywDJoxaVEXTUQUnN/iKFVFSQ 8cJnyYwo0sSxbfvuL2ffDPqba2l2c5JhX+6NHAXPDl7IX/AgkNVhT76oRgjX03XXBfcT 1pYuyyS8LxVrIaMh8c/7ueE0Qilu7GXyhIx7UgttPiUluf5PHFkMmcCYHPDvja2tUT77 5n7SV1Tga+w1uiDIHO4CGW1VpO+PmZE6SLxcg5a6sx9LCajSsvvdmfXft7q+NxtG9QCb AqUQ== 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:mime-version :content-transfer-encoding; bh=uomA36QVatwkNvXfh+fxCbCt8Obtis93Yjdbc9Etj3M=; b=dMuJSOk9w/BPNypNiSQrqQMsqpFw89Xstv9iUS/YlurqtGXZxT61cZ+q6ia/NwQsAe w5Hn8FVHPt1YNrhYwBDpRJW6/noOZ2AWolSGpUxLZSvSaxkA9J6n5pLnLqjDKgXjmv6O WIxAICBagtepQBFyv1TE3hBFndsGMTK+jvZ5xoA7G6ZkLWv4smhwMxj2ojtCsM6BLvLM eCfrEvH4YM0tnOSoDNmhyyQkBJ3DHrFfiKashcbd80qdALtaFuQ30qyR22MTzmbUG4sl OfCvbZY75u1jmviDsbGu1aY9OJVcG111/Ce1rluw7ec3oKzY6f2T9Vr18XW0qQMC89Z3 5Fxw== X-Gm-Message-State: AOAM532vaM7YVYo30ZwKzjZy9Vh18AJctPvnBudZFd98mz1yDUjTGEZd JOnLX6RdMm+c98TmzYUVQjLEGUrM X-Google-Smtp-Source: ABdhPJynwqeFUk4PiwO9gj2gc7Z7kWyTddzoylhBOhElw+fl9NVZPXVYxKisrf5Irw8UYMXdw0qAvA== X-Received: by 2002:a2e:9b53:: with SMTP id o19mr7292208ljj.75.1589123014853; Sun, 10 May 2020 08:03:34 -0700 (PDT) Received: from localhost.localdomain (ppp91-122-124-75.pppoe.avangarddsl.ru. [91.122.124.75]) by smtp.gmail.com with ESMTPSA id w9sm6806021ljw.39.2020.05.10.08.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:03:34 -0700 (PDT) From: Oleg Pykhalov Date: Sun, 10 May 2020 18:03:10 +0300 Message-Id: <20200510150310.3184-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=go.wigust@gmail.com; helo=mail-lj1-x233.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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" X-Scanner: scn0 X-Spam-Score: 4.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=YvHuC/oF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [4.09 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53889203025785]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; FREEMAIL_FROM(0.00)[gmail.com]; BROKEN_CONTENT_TYPE(1.50)[]; R_MISSING_CHARSET(2.50)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.08), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DKIM_TRACE(0.00)[gmail.com:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; RECEIVED_SPAMHAUS_PBL(0.00)[91.122.124.75:received]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[gowigust@gmail.com,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_COUNT_SEVEN(0.00)[11]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-TUID: j/H+ozmJtuuK * gnu/packages/vnc.scm (%tigervnc-version, %tigervnc-revision, %tigervnc-commit): New variables. (tigervnc-client): Update to 1.10.1-1.920d9c4. (tigervnc-server)[version]: Update to 1.10.1-1.920d9c4. [arguments]<#:phases>[patch-xserver]: Fix format procedure call. [native-inputs]: Use tigervnc-client package source. --- gnu/packages/vnc.scm | 45 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 2b5adb899a..aceb62767e 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -42,21 +42,25 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xorg)) +(define %tigervnc-version "1.10.1") +(define %tigervnc-revision "1") +(define %tigervnc-commit "920d9c4d6562ecabf79497bc901d50522d4bc661") + (define-public tigervnc-client (package (name "tigervnc-client") - (version "1.10.1") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TigerVNC/tigervnc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr")))) + (version (git-version %tigervnc-version %tigervnc-revision + %tigervnc-commit)) + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TigerVNC/tigervnc.git") + (commit %tigervnc-commit))) + (sha256 + (base32 + "1lp6mxl5dqlkrzx0q145jzgpbwvhsni3fj6x9ngf8v5s63x82q1p")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests that do exists are not automated. @@ -103,17 +107,10 @@ application which is needed to connect to VNC servers.") (package (inherit xorg-server) (name "tigervnc-server") - (version "1.10.1") + (version (git-version %tigervnc-version %tigervnc-revision + %tigervnc-commit)) (native-inputs - `(("tigervnc-src" ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TigerVNC/tigervnc.git") - (commit "v1.9.0"))) - (sha256 - (base32 - "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x")))) + `(("tigervnc-src" ,(package-source tigervnc-client)) ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -183,9 +180,9 @@ application which is needed to connect to VNC servers.") (list-head (string-split xorg-server-version #\.) 2))) - (fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num))) + (fn (format #f "~a/unix/xserver~a.patch" tvnc-src patch-num))) (when (not (file-exists? fn)) - (error (format "Patch file, ~a, + (error (format #f "Patch file, ~a, corresponding to the input xorg-server version, does not exist. Installation will fail. " fn))) -- 2.26.2