guix_mirror_bot pushed a commit to branch master
in repository guix.
commit b96b576a7f4ffe197adc424420fdbc3669a69f93
Author: bdunahu <[email protected]>
AuthorDate: Tue Jun 9 15:07:49 2026 -0400
gnu: warzone2100: Unbundle embedded-json-signature.
* gnu/packages/patches/warzone2100-unbundle-embedded-json-signature.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/games.scm (warzone2100)[source]<patches>: Apply it.
<snippet> Delete “3rdparty/EmbeddedJSONSignature”.
[inputs]: Add embedded-json-signature.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 3 +++
...zone2100-unbundle-embedded-json-signature.patch | 24 ++++++++++++++++++++++
3 files changed, 28 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index be8afad0be..b6d35d4678 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2649,6 +2649,7 @@ dist_patch_DATA =
\
%D%/packages/patches/vulkan-tools-wayland-1.24.patch \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/warzone2100-unbundle-basis-universal.patch \
+ %D%/packages/patches/warzone2100-unbundle-embedded-json-signature.patch
\
%D%/packages/patches/warzone2100-unbundle-libs.patch \
%D%/packages/patches/warzone2100-unbundle-sqlitecpp.patch \
%D%/packages/patches/warzone2100-unbundle-inih.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e19319922d..46ceaaa849 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7416,6 +7416,7 @@ fighting over what remains.")
"basis_universal_host_build"
"date"
"discord-rpc"
+ "EmbeddedJSONSignature"
"fmt"
"GameNetworkingSockets"
"inih"
@@ -7429,6 +7430,7 @@ fighting over what remains.")
;; Trivially unbundles readerwriterqueue.
(("3rdparty/(readerwriterqueue)" _ f) f))))
(patches (search-patches "warzone2100-unbundle-basis-universal.patch"
+
"warzone2100-unbundle-embedded-json-signature.patch"
"warzone2100-unbundle-libs.patch"
"warzone2100-unbundle-inih.patch"
"warzone2100-unbundle-sqlitecpp.patch"
@@ -7508,6 +7510,7 @@ fighting over what remains.")
(list basis-universal
curl
fmt
+ embedded-json-signature
font-dejavu
font-google-noto-sans-cjk
freetype
diff --git
a/gnu/packages/patches/warzone2100-unbundle-embedded-json-signature.patch
b/gnu/packages/patches/warzone2100-unbundle-embedded-json-signature.patch
new file mode 100644
index 0000000000..c49c4feac1
--- /dev/null
+++ b/gnu/packages/patches/warzone2100-unbundle-embedded-json-signature.patch
@@ -0,0 +1,24 @@
+Unbundles embedded-json-signature dependency.
+
+patch bdunahu <[email protected]>.
+
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index 46c0c26e1..98caaf676 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -54,8 +54,13 @@ set_property(TARGET re2 PROPERTY
XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_FIELD_IN
+ set_property(TARGET re2 PROPERTY XCODE_ATTRIBUTE_GCC_WARN_SHADOW NO) #
-Wshadow
+ set_property(TARGET re2 PROPERTY XCODE_ATTRIBUTE_WARNING_CFLAGS
"-Wno-missing-field-initializers -Wno-shadow")
+
+-add_subdirectory(EmbeddedJSONSignature EXCLUDE_FROM_ALL)
+-set_property(TARGET EmbeddedJSONSignature PROPERTY FOLDER "3rdparty")
++find_path(EJS_INC NAMES EmbeddedJSONSignature.h)
++find_library(EJS_LIB NAMES EmbeddedJSONSignature)
++add_library(EmbeddedJSONSignature UNKNOWN IMPORTED)
++set_target_properties(EmbeddedJSONSignature PROPERTIES
++ IMPORTED_LOCATION "${EJS_LIB}"
++ INTERFACE_INCLUDE_DIRECTORIES "${EJS_INC}"
++)
+
+ if(ENABLE_DISCORD)
+ add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
