diff options
| author | bdunahu <bdunahu@operationnull.com> | 2026-06-09 14:34:56 -0400 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2026-07-24 09:07:10 +0200 |
| commit | 5df0959c9670a02ca60a512a81ffcc31d7de3fca (patch) | |
| tree | 08d67ebe25938829b853ba8a75a518c93cf59f4e | |
| parent | 1184bd06d1e065035eb9de9151b2a4b2c3e79a59 (diff) | |
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 <liliana.prikler@gmail.com>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/games.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch | 28 |
3 files changed, 33 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index b0c3ebc14a2..be8afad0beb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -2650,6 +2650,7 @@ dist_patch_DATA = \ | |||
| 2650 | %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ | 2650 | %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ |
| 2651 | %D%/packages/patches/warzone2100-unbundle-basis-universal.patch \ | 2651 | %D%/packages/patches/warzone2100-unbundle-basis-universal.patch \ |
| 2652 | %D%/packages/patches/warzone2100-unbundle-libs.patch \ | 2652 | %D%/packages/patches/warzone2100-unbundle-libs.patch \ |
| 2653 | %D%/packages/patches/warzone2100-unbundle-sqlitecpp.patch \ | ||
| 2653 | %D%/packages/patches/warzone2100-unbundle-inih.patch \ | 2654 | %D%/packages/patches/warzone2100-unbundle-inih.patch \ |
| 2654 | %D%/packages/patches/warzone2100-unbundle-utfcpp.patch \ | 2655 | %D%/packages/patches/warzone2100-unbundle-utfcpp.patch \ |
| 2655 | %D%/packages/patches/wcstools-extend-makefiles.patch \ | 2656 | %D%/packages/patches/wcstools-extend-makefiles.patch \ |
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 73409bde791..e19319922d0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm | |||
| @@ -139,6 +139,7 @@ | |||
| 139 | #:use-module (gnu packages crypto) | 139 | #:use-module (gnu packages crypto) |
| 140 | #:use-module (gnu packages curl) | 140 | #:use-module (gnu packages curl) |
| 141 | #:use-module (gnu packages cyrus-sasl) | 141 | #:use-module (gnu packages cyrus-sasl) |
| 142 | #:use-module (gnu packages databases) | ||
| 142 | #:use-module (gnu packages dns) | 143 | #:use-module (gnu packages dns) |
| 143 | #:use-module (gnu packages docbook) | 144 | #:use-module (gnu packages docbook) |
| 144 | #:use-module (gnu packages documentation) | 145 | #:use-module (gnu packages documentation) |
| @@ -7420,6 +7421,7 @@ fighting over what remains.") | |||
| 7420 | "inih" | 7421 | "inih" |
| 7421 | "re2" | 7422 | "re2" |
| 7422 | "readerwriterqueue" | 7423 | "readerwriterqueue" |
| 7424 | "SQLiteCpp" | ||
| 7423 | "utf8proc" | 7425 | "utf8proc" |
| 7424 | "utfcpp"))) | 7426 | "utfcpp"))) |
| 7425 | (substitute* (list "src/stdinreader.cpp" | 7427 | (substitute* (list "src/stdinreader.cpp" |
| @@ -7429,6 +7431,7 @@ fighting over what remains.") | |||
| 7429 | (patches (search-patches "warzone2100-unbundle-basis-universal.patch" | 7431 | (patches (search-patches "warzone2100-unbundle-basis-universal.patch" |
| 7430 | "warzone2100-unbundle-libs.patch" | 7432 | "warzone2100-unbundle-libs.patch" |
| 7431 | "warzone2100-unbundle-inih.patch" | 7433 | "warzone2100-unbundle-inih.patch" |
| 7434 | "warzone2100-unbundle-sqlitecpp.patch" | ||
| 7432 | "warzone2100-unbundle-utfcpp.patch")) | 7435 | "warzone2100-unbundle-utfcpp.patch")) |
| 7433 | (sha256 | 7436 | (sha256 |
| 7434 | (base32 | 7437 | (base32 |
| @@ -7527,6 +7530,7 @@ fighting over what remains.") | |||
| 7527 | re2 | 7530 | re2 |
| 7528 | sdl3 | 7531 | sdl3 |
| 7529 | sqlite | 7532 | sqlite |
| 7533 | sqlitecpp | ||
| 7530 | utf8proc | 7534 | utf8proc |
| 7531 | utfcpp | 7535 | utfcpp |
| 7532 | vulkan-headers | 7536 | 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 00000000000..5b7dd280525 --- /dev/null +++ b/gnu/packages/patches/warzone2100-unbundle-sqlitecpp.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | Unbundles sqlitecpp dependency. | ||
| 2 | |||
| 3 | patch by bdunahu <bdunahu@operationnull.com> | ||
| 4 | |||
| 5 | diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt | ||
| 6 | index 46c0c26e1..d4ea7d860 100644 | ||
| 7 | --- a/3rdparty/CMakeLists.txt | ||
| 8 | +++ b/3rdparty/CMakeLists.txt | ||
| 9 | @@ -68,18 +68,7 @@ set(SQLITE_HAS_CODEC OFF CACHE BOOL "Enable database encryption API. Not availab | ||
| 10 | if(SQLite3_VERSION VERSION_LESS 3.19) | ||
| 11 | set(SQLITE_USE_LEGACY_STRUCT ON CACHE BOOL "Fallback to forward declaration of legacy struct sqlite3_value (pre SQLite 3.19)" FORCE) | ||
| 12 | endif() | ||
| 13 | -set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) | ||
| 14 | -set(SQLITECPP_INCLUDE_SCRIPT OFF CACHE BOOL "Include config & script files." FORCE) | ||
| 15 | -set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide." FORCE) | ||
| 16 | -set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis tool." FORCE) | ||
| 17 | -set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples." FORCE) | ||
| 18 | -set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." FORCE) | ||
| 19 | -set(SQLITECPP_INSTALL OFF CACHE BOOL "Enables the install target." FORCE) | ||
| 20 | -if(CMAKE_SYSTEM_NAME MATCHES "Emscripten") | ||
| 21 | - set(SQLITECPP_USE_STACK_PROTECTION OFF CACHE BOOL "USE Stack Protection hardening." FORCE) | ||
| 22 | -endif() | ||
| 23 | -add_subdirectory(SQLiteCpp EXCLUDE_FROM_ALL) | ||
| 24 | -set_property(TARGET SQLiteCpp PROPERTY FOLDER "3rdparty") | ||
| 25 | +find_package(SQLiteCpp REQUIRED) | ||
| 26 | |||
| 27 | # glad library | ||
| 28 | |||
