diff --git a/testing/fluffychat/APKBUILD b/testing/fluffychat/APKBUILD index 8c0c36f02b1..554ee5c1da4 100644 --- a/testing/fluffychat/APKBUILD +++ b/testing/fluffychat/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda pkgname=fluffychat pkgver=1.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="Open source, nonprofit and cute Matrix messenger app" url="https://fluffychat.im/" arch="aarch64 x86_64" # flutter @@ -66,6 +66,8 @@ source=" wrapper.patch.webrtc gcc13.patch.webrtc use-alpine-target.patch.webrtc + no-upgrade-debug-info.patch.webrtc + toolhack.patch.webrtc fluffychat.desktop " @@ -237,8 +239,8 @@ build() { custom_toolchain=\"//build/toolchain/linux/unbundle:default\" is_cfi=false is_clang=true - is_debug=true - is_official_build=false + is_debug=false + is_official_build=true host_toolchain=\"//build/toolchain/linux/unbundle:default\" libwebrtc_desktop_capture=false proprietary_codecs=true @@ -252,7 +254,7 @@ build() { rtc_link_pipewire=true rtc_use_pipewire=true rtc_use_x11=false - symbol_level=2 + symbol_level=0 use_custom_libcxx=false use_sysroot=false " @@ -305,5 +307,7 @@ ea1034b5faa9574c48f30ca988212946771f4248254b0ed577d784a73c60326481dc483cb84baf04 158360223539c6d80b32f17d2277473292e579255609a231719d1eaddb5f258fe36421801e5ce0fedb6fe86e01e46a7a77421abc800bdfaad59ffdcfe5273aa2 wrapper.patch.webrtc 70251f951c4477e602c2e21a1a092e48e47133968fbfeb369178bc888b69c91027560ebb2c925d6b25a6b2ba6a6007523c2c42fa46fc7fbc27e727793ab52034 gcc13.patch.webrtc d9988e1c381030a79d0fa6567e098ee94234b66af96dbf2d0a2af7a33bdd98d4dd08bbe2eeaf4f08e44f1d22319464f9b0ed5bc96cdb76c238086f9ef4af6b76 use-alpine-target.patch.webrtc +72fc71028a46f23c4d494eae22e100f048cd04071518532d5a839642d19cf8718592e7b93b4d15d40502c1a5e88d55cb3212c0edec8a3598f2d9fb2cb4f287c5 no-upgrade-debug-info.patch.webrtc +2db3cf7759bd6902e0ce4d64441318bee7436aa272501113a3b6f0ebcf810d72760f875a3bd309fd612d6d4fde9e92e7319fa053fd0f34a793cfa026ced08fc5 toolhack.patch.webrtc c4b3c2ab656da666623a8269ae47d841bfa58153097106efbef7b7895e7845bfed0513442ac355b42b6804b4a68c597079bf4147e72c57a1906ba5b65e3150f8 fluffychat.desktop " diff --git a/testing/fluffychat/no-upgrade-debug-info.patch.webrtc b/testing/fluffychat/no-upgrade-debug-info.patch.webrtc new file mode 100644 index 00000000000..04a57fd5197 --- /dev/null +++ b/testing/fluffychat/no-upgrade-debug-info.patch.webrtc @@ -0,0 +1,11 @@ +--- ./build/config/compiler/BUILD.gn.orig ++++ ./build/config/compiler/BUILD.gn +@@ -732,7 +732,7 @@ + # toolchain has this flag. + # We only use one version of LLVM within a build so there's no need to + # upgrade debug info, which can be expensive since it runs the verifier. +- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] ++ #ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] + } + } + diff --git a/testing/fluffychat/toolhack.patch.webrtc b/testing/fluffychat/toolhack.patch.webrtc new file mode 100644 index 00000000000..4028fe2d896 --- /dev/null +++ b/testing/fluffychat/toolhack.patch.webrtc @@ -0,0 +1,22 @@ +this breaks the clang include path +-- +--- a/build/config/compiler/BUILD.gn ++++ a/build/config/compiler/BUILD.gn +@@ -1310,7 +1310,7 @@ + # paths to the tools it invokes. We don't want this because we don't + # really need it and it can mess up the goma cache entries. + if (is_clang && (!is_nacl || is_nacl_saigo)) { +- cflags += [ "-no-canonical-prefixes" ] ++ #cflags += [ "-no-canonical-prefixes" ] + + # Same for links: Let the compiler driver invoke the linker + # with a relative path and pass relative paths to built-in +@@ -1319,7 +1319,7 @@ + # We don't link on goma, so this change is just for cleaner + # internal linker invocations, for people who work on the build. + if (!is_win) { +- ldflags += [ "-no-canonical-prefixes" ] ++ #ldflags += [ "-no-canonical-prefixes" ] + } + } + }