collabora-online: fix build against poco-1.14

This adds some missing includes for collabora online to actually use the poco-json library. Upstream pull request at CollaboraOnline/online#11175
trofi · Feb 16, 2025 · 348ce3d · 348ce3d
1 parent 6154184
commit 348ce3d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/pkgs/by-name/co/collabora-online/add-missing-poco-includes.patch b/pkgs/by-name/co/collabora-online/add-missing-poco-includes.patch
@@ -0,0 +1,17 @@
+diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp
+index 564812e0e6..b7eb8fe0b4 100644
+--- a/common/JsonUtil.hpp
++++ b/common/JsonUtil.hpp
+@@ -23,6 +23,7 @@
+ #include <Poco/Dynamic/Var.h>
+ #include <Poco/JSON/Object.h>
+ #include <Poco/JSON/Parser.h>
++#include <Poco/JSON/JSONException.h>
+
+ namespace JsonUtil
+ {
+@@ -248,4 +249,3 @@ inline std::string escapeJSONValue(std::string val)
+ } // end namespace JsonUtil
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+-
diff --git a/pkgs/by-name/co/collabora-online/package.nix b/pkgs/by-name/co/collabora-online/package.nix
@@ -63,7 +63,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-lokit-path=${libreoffice-collabora.src}/include"
   ];
 
-  patches = [ ./fix-file-server-regex.patch ];
+  patches = [
+    ./fix-file-server-regex.patch
+    # Work around missing includes in upstream
+    # https://github.com/CollaboraOnline/online/issues/11175
+    ./add-missing-poco-includes.patch
+  ];
 
   postPatch = ''
     cp ${./package-lock.json} ${finalAttrs.npmRoot}/package-lock.json