From patchwork Sun May 10 15:03:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 21981 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 0229C27BBE3; Sun, 10 May 2020 16:04:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8A84A27BBE1 for ; Sun, 10 May 2020 16:04:07 +0100 (BST) Received: from localhost ([::1]:52540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnUt-00082W-0k for patchwork@mira.cbaines.net; 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 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-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" X-getmail-retrieved-from-mailbox: Patches * 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)))