From 26f86a76b6720e6c9eaba8aa1088ac40251e937a Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Fri, 3 Feb 2023 09:05:57 -0700 Subject: [PATCH 1/3] Update dendrite-pinecone gobindings build script --- build/gobind-pinecone/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 build/gobind-pinecone/build.sh diff --git a/build/gobind-pinecone/build.sh b/build/gobind-pinecone/build.sh old mode 100644 new mode 100755 index 0f1b1aab9..51844506c --- a/build/gobind-pinecone/build.sh +++ b/build/gobind-pinecone/build.sh @@ -7,7 +7,7 @@ do case "$option" in a) gomobile bind -v -target android -trimpath -ldflags="-s -w" github.com/matrix-org/dendrite/build/gobind-pinecone ;; - i) gomobile bind -v -target ios -trimpath -ldflags="" github.com/matrix-org/dendrite/build/gobind-pinecone ;; + i) gomobile bind -v -target ios -trimpath -ldflags="" -o ~/DendriteBindings/Gobind.xcframework . ;; *) echo "No target specified, specify -a or -i"; exit 1 ;; esac done \ No newline at end of file From 4ed61740abb69b35ac7fcc1fc138dfb3d87f53c0 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Sat, 4 Feb 2023 05:55:59 -0700 Subject: [PATCH 2/3] Disable fulltext search in pinecone builds --- build/gobind-pinecone/monolith.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index e8b22c067..c4408ba18 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -340,6 +340,9 @@ func (m *DendriteMonolith) Start() { cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk)) cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) cfg.Global.JetStream.InMemory = false + // NOTE : disabled for now since there is a 64 bit alignment panic on 32 bit systems + // This isn't actually fixed: https://github.com/blevesearch/zapx/pull/147 + cfg.SyncAPI.Fulltext.Enabled = false enableRelaying := false enableMetrics := false From cf254ba0445e2509f77f41dbec69f632b126b847 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Sat, 4 Feb 2023 06:05:39 -0700 Subject: [PATCH 3/3] Add max frame size to pinecone bindings --- build/gobind-pinecone/monolith.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index c4408ba18..16797eec0 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -46,6 +46,8 @@ const ( PeerTypeMulticast = pineconeRouter.PeerTypeMulticast PeerTypeBluetooth = pineconeRouter.PeerTypeBluetooth PeerTypeBonjour = pineconeRouter.PeerTypeBonjour + + MaxFrameSize = types.MaxFrameSize ) // Re-export Conduit in this package for bindings.