guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 5df0959c9670a02ca60a512a81ffcc31d7de3fca
Author: bdunahu <[email protected]>
AuthorDate: Tue Jun 9 14:34:56 2026 -0400
gnu: warzone2100: Unbundle sqlitecpp.
* gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/games.scm (warzone2100)[source]<patches>: Apply it.
<snippet> Delete “3rdparty/SQLiteCpp”.
[inputs]: Add sqlitecpp.
Change-Id: Ibe3948ffd20c3dc96bf49837c13cc0a4d67878d1
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 4 ++++
.../patches/warzone2100-unbundle-sqlitecpp.patch | 28 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index b0c3ebc14a..be8afad0be 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2650,6 +2650,7 @@ dist_patch_DATA =
\
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/warzone2100-unbundle-basis-universal.patch \
%D%/packages/patches/warzone2100-unbundle-libs.patch \
+ %D%/packages/patches/warzone2100-unbundle-sqlitecpp.patch \
%D%/packages/patches/warzone2100-unbundle-inih.patch \
%D%/packages/patches/warzone2100-unbundle-utfcpp.patch \
%D%/packages/patches/wcstools-extend-makefiles.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 73409bde79..e19319922d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -139,6 +139,7 @@
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
+ #:use-module (gnu packages databases)
#:use-module (gnu packages dns)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
@@ -7420,6 +7421,7 @@ fighting over what remains.")
"inih"
"re2"
"readerwriterqueue"
+ "SQLiteCpp"
"utf8proc"
"utfcpp")))
(substitute* (list "src/stdinreader.cpp"
@@ -7429,6 +7431,7 @@ fighting over what remains.")
(patches (search-patches "warzone2100-unbundle-basis-universal.patch"
"warzone2100-unbundle-libs.patch"
"warzone2100-unbundle-inih.patch"
+ "warzone2100-unbundle-sqlitecpp.patch"
"warzone2100-unbundle-utfcpp.patch"))
(sha256
(base32
@@ -7527,6 +7530,7 @@ fighting over what remains.")
re2
sdl3
sqlite
+ sqlitecpp
utf8proc
utfcpp
vulkan-headers
diff --git a/gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch
b/gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch
new file mode 100644
index 0000000000..5b7dd28052
--- /dev/null
+++ b/gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch
@@ -0,0 +1,28 @@
+Unbundles sqlitecpp dependency.
+
+patch by bdunahu <[email protected]>
+
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index 46c0c26e1..d4ea7d860 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -68,18 +68,7 @@ set(SQLITE_HAS_CODEC OFF CACHE BOOL "Enable database
encryption API. Not availab
+ if(SQLite3_VERSION VERSION_LESS 3.19)
+ set(SQLITE_USE_LEGACY_STRUCT ON CACHE BOOL "Fallback to forward
declaration of legacy struct sqlite3_value (pre SQLite 3.19)" FORCE)
+ endif()
+-set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source
to the project." FORCE)
+-set(SQLITECPP_INCLUDE_SCRIPT OFF CACHE BOOL "Include config & script files."
FORCE)
+-set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++
StyleGuide." FORCE)
+-set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis
tool." FORCE)
+-set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples." FORCE)
+-set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." FORCE)
+-set(SQLITECPP_INSTALL OFF CACHE BOOL "Enables the install target." FORCE)
+-if(CMAKE_SYSTEM_NAME MATCHES "Emscripten")
+- set(SQLITECPP_USE_STACK_PROTECTION OFF CACHE BOOL "USE Stack Protection
hardening." FORCE)
+-endif()
+-add_subdirectory(SQLiteCpp EXCLUDE_FROM_ALL)
+-set_property(TARGET SQLiteCpp PROPERTY FOLDER "3rdparty")
++find_package(SQLiteCpp REQUIRED)
+
+ # glad library
+
