Subject: [bug#44342] [PATCH 1/6] gnu: code: Update RTags to 2.38.

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

* gnu/packages/code.scm (rtags): Update to 2.38
* gnu/packages/patches/rtags-separate-rct.patch: Adjust patch accordingly.
---
 gnu/packages/code.scm                         |  5 +-
 gnu/packages/patches/rtags-separate-rct.patch | 52 +++++++------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 4e30dacdf4..15307a1e8b 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2020 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2020 Marius Bakke <[email-masked]>
 ;;; Copyright © 2020 Julien Lepiller <[email-masked]>
+;;; Copyright © 2020 Malte Frank Gerdes <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -597,7 +598,7 @@ possible to collect coverage information without special compiler switches.")
 (define-public rtags
   (package
     (name "rtags")
-    (version "2.18")
+    (version "2.38")
     (source
      (origin
        (method git-fetch)
@@ -619,7 +620,7 @@ possible to collect coverage information without special compiler switches.")
              #t)))
        (sha256
         (base32
-         "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"))))
+         "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"))))
     (build-system cmake-build-system)
     (arguments
      '(#:build-type "RelWithDebInfo"
diff --git a/gnu/packages/patches/rtags-separate-rct.patch b/gnu/packages/patches/rtags-separate-rct.patch
index 533e28b02e..490173eb9b 100644
--- a/gnu/packages/patches/rtags-separate-rct.patch
+++ b/gnu/packages/patches/rtags-separate-rct.patch
@@ -1,21 +1,23 @@
-Unbundle RCT and use our own copy.
-
---- rtags-2.16/src/CMakeLists.txt	2018-01-23 10:36:17.645855140 +0100
-+++ rtags-2.16/src/CMakeLists.txt	2018-01-23 10:38:14.605234740 +0100
-@@ -105,12 +105,6 @@ if (LUA_ENABLED)
-         CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 50883a7a..741ff275 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -135,14 +135,6 @@ if (EXISTS ${CLANG_COMPILATION_INCLUDE})
+     add_definitions(-DHAVE_CXCOMPILATIONDATABASE)
  endif ()
  
 -set(RCT_RTTI_ENABLED 1)
 -set(RCT_NO_INSTALL 1)
--set(RCT_NO_LIBRARY 1)
+-set(RCT_STATIC 1)
+-set(RCT_NO_LIBRARY 0)
 -# Everyting which as been set either in rct/rct.cmake or rct/compiler.cmake
 -# doesn't need to be set in this file again.
 -include(rct/rct.cmake)
- 
+-
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-aliasing=2 -Wcast-qual -fPIC")
-@@ -128,8 +122,7 @@ add_definitions(
+ if (NOT CYGWIN)
+@@ -159,8 +151,7 @@ add_definitions(
      "-DRTAGS_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
      "-DCLANG_LIBDIR=${LIBCLANG_LIBDIR}"
      "-DCLANG_VERSION=${LIBCLANG_VERSION_STRING}"
@@ -25,35 +27,21 @@ Unbundle RCT and use our own copy.
  
  if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
      add_definitions(-D__LONG_LONG_SUPPORTED)
-@@ -172,8 +165,7 @@ set(RTAGS_SOURCES
-     Symbol.cpp
-     SymbolInfoJob.cpp
-     Token.cpp
--    TokensJob.cpp
--    ${RCT_SOURCES})
-+    TokensJob.cpp)
- 
- if (LUA_ENABLED)
-     list(APPEND RTAGS_SOURCES AST.cpp)
-@@ -195,10 +187,10 @@ endif ()
+@@ -214,7 +205,7 @@ if (RTAGS_COTIRE)
+     cotire(rtags)
+ endif ()
  
- include_directories(
-     ${CMAKE_CURRENT_LIST_DIR}
--    ${RCT_INCLUDE_DIRS}
-     ${CMAKE_CURRENT_LIST_DIR}/selene/include
-     ${CMAKE_CURRENT_BINARY_DIR}/lua-prefix/src/lua-build
--    ${CMAKE_CURRENT_LIST_DIR}/lua/src)
-+    ${CMAKE_CURRENT_LIST_DIR}/lua/src
-+    ${CMAKE_CURRENT_BINARY_DIR}/include)
+-include_directories(${CMAKE_CURRENT_LIST_DIR} ${RCT_INCLUDE_DIRS})
++include_directories(${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include)
  
  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
      set(START_GROUP "")
-@@ -223,17 +215,17 @@ else ()
- endif()
+@@ -237,17 +228,17 @@ endif()
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RTAGS_BINARY_ROOT_DIR}/bin)
  
  # RCT_LIBRARIES and stdc++ library must be at the end
--set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES})
-+set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++)
+-set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ ${RCT_LIBRARIES} rct)
++set(RTAGS_LIBRARIES ${RTAGS_LIBRARIES} -lstdc++ rct)
  add_executable(rc rc.cpp)
 -target_link_libraries(rc ${RTAGS_LIBRARIES})
 +target_link_libraries(rc ${RTAGS_LIBRARIES} rct)
-- 
2.29.1