Subject: [bug#44342] [PATCH 2/6] gnu: cpp: Update rct to e706998697b8d48fa9e5b9ab33aeded705129a66.

From: Malte Frank Gerdes <[email-masked]>
Date: Sat, 31 Oct 2020 15:11:14 +0100

* 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 <[email-masked]>
 ;;; Copyright © 2020 Alexandros Theodotou <[email-masked]>
 ;;; Copyright © 2020 Greg Hogan <[email-masked]>
+;;; Copyright © 2020 Malte Frank Gerdes <[email-masked]>
 ;;;
 ;;; 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 <[email-masked]>
-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
-
-- 
2.29.1