From patchwork Sat Oct 31 14:11:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Malte Frank Gerdes X-Patchwork-Id: 24902 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 1811527BBF4; Sat, 31 Oct 2020 14:12:15 +0000 (GMT) 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_H4, RCVD_IN_MSPIKE_WL,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 ESMTPS id CC89027BBF3 for ; Sat, 31 Oct 2020 14:12:13 +0000 (GMT) Received: from localhost ([::1]:41990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYrc5-000866-12 for patchwork@mira.cbaines.net; Sat, 31 Oct 2020 10:12:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYrbv-0007zP-98 for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYrbv-0008Lt-0H for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYrbu-0006d6-SN for guix-patches@gnu.org; Sat, 31 Oct 2020 10:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44342] [PATCH 2/6] gnu: cpp: Update rct to e706998697b8d48fa9e5b9ab33aeded705129a66. Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Oct 2020 14:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44342@debbugs.gnu.org Cc: Malte Frank Gerdes Received: via spool by 44342-submit@debbugs.gnu.org id=B44342.160415350225413 (code B ref 44342); Sat, 31 Oct 2020 14:12:02 +0000 Received: (at 44342) by debbugs.gnu.org; 31 Oct 2020 14:11:42 +0000 Received: from localhost ([127.0.0.1]:34163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYrbZ-0006bn-Rn for submit@debbugs.gnu.org; Sat, 31 Oct 2020 10:11:42 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:44719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYrbU-0006b0-BZ for 44342@debbugs.gnu.org; Sat, 31 Oct 2020 10:11:37 -0400 Received: by mail-ej1-f53.google.com with SMTP id j24so12447730ejc.11 for <44342@debbugs.gnu.org>; Sat, 31 Oct 2020 07:11:36 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=J7Z9dhzg2+J2a2mPg2TIHvHzlZbkT5bpzbUEmVCV59s=; b=oAgeaHHg4R8UuC184HSur/jgH9vK+gmNaT7+EHaV5B0s+iBN8p0HyPrbIrN0anLqSu 1K5jqKWNQvgcoM8K4MSOxgwb4X3BVCqmcOxrR3iHVKTrprqoCdTY2vQKtJ9Hnhpamof9 jY02eGryT/R8OOsAx3ylGpeju11Xqt1Tczre8yCo5hiIx/S8dsLzIJk06JWXTsp7fZak WbVHnL+RNhhNNcj0DKpVS6Co+fErXSI5VR95dmanVLq34SqW56EVUA1JjmHI9eyBRd63 rdLqzKbSYjMcv0Of2kTeWtdtDX9V+FwSun9JFbxKUOIHCeEp885wH9jO2AT/g69xtYpI LDMA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=J7Z9dhzg2+J2a2mPg2TIHvHzlZbkT5bpzbUEmVCV59s=; b=R3EM1leC4dLFtZxXOI+75OGQaLXt8I2qi02xB2xfHoH1OVn1omYkO2AzMsj3gnS/vt O6dKdTmJOGAik+/rKKRXEkc+3cJGdwyITyeQ6Xs0hRbQNVIbrk53xUoiqOlBK5HUU570 IwvjhHDXbluOBE3a/+tXbO9Ms+/2OxckpNPaltpKvq2cHaMa/CFnp6yLK79OatpZEQtq +B7zLd9pPW2al/2wspNQHbzDP0CPWnhlkhSzcaD8QdmRJe7Tm9L/e0mg5mrrxns/8+vk XigAMoqq+Qn9RJ0cffChkxhJTmeanx1rsVGloi/P1vq0ZZF019JZLgvP0CgF+gbqbk+D NItg== X-Gm-Message-State: AOAM532ah8WROyeEV7eWbZaIrSuaM9+Xj0tCyIVGggYYPp26E2oVNSG/ 7n/Ki8ca+RF2wOq3rzaKEvQKQOIQZys= X-Google-Smtp-Source: ABdhPJwpQoW5LhkkT1l5N5EZD/sg7EG+YCPHugnDbFSyYhrVqxFhuVAB23qeuAKcfYJdUf/wEMFDhQ== X-Received: by 2002:a17:906:19c8:: with SMTP id h8mr7619001ejd.318.1604153490425; Sat, 31 Oct 2020 07:11:30 -0700 (PDT) Received: from Remifentanyl.intus (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id k23sm5125898ejk.0.2020.10.31.07.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Oct 2020 07:11:29 -0700 (PDT) From: Malte Frank Gerdes Date: Sat, 31 Oct 2020 15:11:14 +0100 Message-Id: <20201031141118.21536-2-malte.f.gerdes@gmail.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201031141118.21536-1-malte.f.gerdes@gmail.com> References: <20201031141118.21536-1-malte.f.gerdes@gmail.com> MIME-Version: 1.0 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/cpp.scm (rct): Update variable. * gnu/packages/patches/rct-add-missing-headers.patch: Adjust accordingly. --- gnu/packages/cpp.scm | 9 ++-- .../patches/rct-add-missing-headers.patch | 53 +++++++++++-------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0e563d9c12..a7f4ae0189 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Greg Hogan +;;; Copyright © 2020 Malte Frank Gerdes ;;; ;;; This file is part of GNU Guix. ;;; @@ -132,8 +133,8 @@ the name of the library itself, which is written in C++.") (license license:expat))) (define-public rct - (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") - (revision "2")) + (let* ((commit "e706998697b8d48fa9e5b9ab33aeded705129a66") + (revision "0")) (package (name "rct") (version (git-version "0.0.0" revision commit)) @@ -144,13 +145,13 @@ the name of the library itself, which is written in C++.") (commit commit))) (sha256 (base32 - "1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb")) + "029m8kpvlmklg2yk7hrfxvvpxxvvncqyxml534mqhdn9yl40gm0k")) (patches (search-patches "rct-add-missing-headers.patch")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DWITH_TESTS=ON" ; To run the test suite + '("-DRCT_WITH_TESTS=ON" ; To run the test suite "-DRCT_RTTI_ENABLED=ON"))) (native-inputs `(("cppunit" ,cppunit) diff --git a/gnu/packages/patches/rct-add-missing-headers.patch b/gnu/packages/patches/rct-add-missing-headers.patch index 4d133aa249..099ef8af53 100644 --- a/gnu/packages/patches/rct-add-missing-headers.patch +++ b/gnu/packages/patches/rct-add-missing-headers.patch @@ -1,43 +1,50 @@ -From: fis -Date: Sat, 20 Jan 2018 07:42:38 +0800 -Subject: [PATCH] rct.cmake: Add missing headers. - ---- - rct.cmake | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - diff --git a/rct.cmake b/rct.cmake -index 323e7b9..3e0ac6b 100644 +index daaa05a..aa82f9f 100644 --- a/rct.cmake +++ b/rct.cmake -@@ -339,7 +339,27 @@ if (NOT RCT_NO_INSTALL) - rct/Timer.h - rct/Value.h - rct/WriteLocker.h -+ rct/CpuUsage.h +@@ -336,18 +336,27 @@ if (NOT RCT_NO_INSTALL) + rct/Buffer.h + rct/Config.h + rct/Connection.h + rct/DataFile.h + rct/Date.h + rct/EmbeddedLinkedList.h + rct/EventLoop.h + rct/FileSystemWatcher.h + rct/FinishMessage.h + rct/Flags.h + rct/Hash.h + rct/List.h + rct/LinkedList.h -+ rct/Map.h -+ rct/MemoryMappedFile.h + rct/Log.h + rct/Map.h + rct/MemoryMonitor.h + rct/Message.h + rct/MessageQueue.h + rct/OnDestruction.h + rct/Path.h + rct/Plugin.h + rct/Point.h + rct/Process.h + rct/QuitMessage.h -+ rct/ResponseMessage.h -+ rct/ScriptEngine.h + rct/Rct.h + rct/ReadLocker.h + rct/ReadWriteLock.h +@@ -362,6 +371,7 @@ if (NOT RCT_NO_INSTALL) + rct/Size.h + rct/SocketClient.h + rct/SocketServer.h + rct/StackBuffer.h -+ rct/WindowsUnicodeConversion.h + rct/StopWatch.h + rct/String.h + rct/StringTokenizer.h +@@ -373,5 +383,9 @@ if (NOT RCT_NO_INSTALL) + rct/WriteLocker.h DESTINATION include/rct) - + + install(FILES + json/json.hpp + DESTINATION include/rct/json) + install(EXPORT "rct" DESTINATION lib/cmake) endif () --- -2.13.6 -