From 46f3c6f65fbfa29af2b2c89a80c81b98c9b1cefb Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Fri, 7 Feb 2025 09:47:24 +1100
Subject: [PATCH] Fix the perms issues with the go dependencies that break
 stripping in Flatpak. This means we don't need to keep build dirs anymore

---
 flatpak/org.onionshare.OnionShare.yaml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/flatpak/org.onionshare.OnionShare.yaml b/flatpak/org.onionshare.OnionShare.yaml
index 9d807260..b3988ba9 100644
--- a/flatpak/org.onionshare.OnionShare.yaml
+++ b/flatpak/org.onionshare.OnionShare.yaml
@@ -66,7 +66,10 @@ modules:
         - --share=network
     build-commands:
       - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-meek.sh && mv onionshare/resources/tor/meek-client /app/bin/meek-client"
-      - "ls -aR $FLATPAK_BUILDER_BUILDDIR"
+      # Some go deps end up with dirs chmod 555 and files chmod 444. This breaks stripping in Flatpak builds, so fix perms.
+      # See https://github.com/flatpak/flatpak/issues/469
+      - "find $FLATPAK_BUILDER_BUILDDIR -type d -perm 555 -print0 | xargs -0 -r chmod 755"
+      - "find $FLATPAK_BUILDER_BUILDDIR -type f -perm 444 -print0 | xargs -0 -r chmod 644"
     sources:
       - type: dir
         path: ..
@@ -77,7 +80,10 @@ modules:
         - --share=network
     build-commands:
       - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-snowflake.sh && mv onionshare/resources/tor/snowflake-client /app/bin/snowflake-client"
-      - "ls -aR $FLATPAK_BUILDER_BUILDDIR"
+      # Some go deps end up with dirs chmod 555 and files chmod 444. This breaks stripping in Flatpak builds, so fix perms.
+      # See https://github.com/flatpak/flatpak/issues/469
+      - "find $FLATPAK_BUILDER_BUILDDIR -type d -perm 555 -print0 | xargs -0 -r chmod 755"
+      - "find $FLATPAK_BUILDER_BUILDDIR -type f -perm 444 -print0 | xargs -0 -r chmod 644"
     sources:
       - type: dir
         path: ..
@@ -88,7 +94,10 @@ modules:
         - --share=network
     build-commands:
       - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-obfs4proxy.sh && mv onionshare/resources/tor/obfs4proxy /app/bin/obfs4proxy"
-      - "ls -aR $FLATPAK_BUILDER_BUILDDIR"
+      # Some go deps end up with dirs chmod 555 and files chmod 444. This breaks stripping in Flatpak builds, so fix perms.
+      # See https://github.com/flatpak/flatpak/issues/469
+      - "find $FLATPAK_BUILDER_BUILDDIR -type d -perm 555 -print0 | xargs -0 -r chmod 755"
+      - "find $FLATPAK_BUILDER_BUILDDIR -type f -perm 444 -print0 | xargs -0 -r chmod 644"
     sources:
       - type: dir
         path: ..