summaryrefslogtreecommitdiff
path: root/user/thunderbird
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-11-24 22:56:40 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-11-24 22:59:21 -0600
commitc3b800fe454b0839f2e696e77acefceb6cc2970d (patch)
treec1dfc27094af3659dcdef2da9ab7d8b7ee4b61bb /user/thunderbird
parent12f56f81029c0c0720730d2edc85b0c13b00b645 (diff)
downloadpackages-c3b800fe454b0839f2e696e77acefceb6cc2970d.tar.gz
packages-c3b800fe454b0839f2e696e77acefceb6cc2970d.tar.bz2
packages-c3b800fe454b0839f2e696e77acefceb6cc2970d.tar.xz
packages-c3b800fe454b0839f2e696e77acefceb6cc2970d.zip
user/[foxes]: Ensure proper somask on all Moz s/w
Right now, Arctic Fox, Firefox, and Thunderbird all conflict with each other because abuild finds their .so files. These files are local to their respective apps (in /usr/lib/$pkgname) but are picked up because we have to set ldpath or else abuild will complain that libs are missing. Set the somask to all of their installed libs so they stop conflicting. Also, fix Skia build on little endian systems.
Diffstat (limited to 'user/thunderbird')
-rw-r--r--user/thunderbird/APKBUILD3
-rw-r--r--user/thunderbird/skia-unified.patch4
2 files changed, 4 insertions, 3 deletions
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 4a19b165a..526c39bbc 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -51,6 +51,7 @@ somask="liblgpllibs.so
libmozgtk.so
libmozsandbox.so
libmozsqlite3.so
+ libmozwayland.so
libxul.so
"
_mozappdir=/usr/lib/thunderbird
@@ -167,7 +168,7 @@ d40e6c1a6e62d5e1dc350dc0bbaf2b8488b19ea0911532784f1df1199a7a5af0aae81b0b0d77c439
e1c8a85c46a9cc804eb6b5946d35b63fa2cfc7ad8b4f250c5eaf1b590b139a66d9a833246bc26ae2e340fffb81b6761cf51c600181895bd49feb9a3b8fbfe331 rust-32bit.patch
c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8fce08e760fa456e2dd19a8ef7370e5a2c65dc09614526be9 shut-up-warning.patch
11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch
-8e155e5a883e26c9bc67b7d45ca7d36813b07723e0eff9d7bc5b696b6412354906bd645cd890b54de2af19c1f205ea7991bd32cde1a669224beedf539b93bd56 skia-unified.patch
+a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch
9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch
e1d9e30a1c8d1c6bdd3530183400d7d245e437ce18bb5b262bec1d01932b02b8eaededd892efcdd277eaccb357aede4537972382be9f00eedf1785acebbd1ca6 webrender.patch
ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch
diff --git a/user/thunderbird/skia-unified.patch b/user/thunderbird/skia-unified.patch
index cf74c1dcd..cacfe3451 100644
--- a/user/thunderbird/skia-unified.patch
+++ b/user/thunderbird/skia-unified.patch
@@ -381,11 +381,11 @@ diff --git a/gfx/thebes/gfx2DGlue.h b/gfx/thebes/gfx2DGlue.h
case SurfaceFormat::R5G6B5_UINT16:
case SurfaceFormat::B8G8R8X8:
case SurfaceFormat::R8G8B8X8:
-+ case SurfaceFormat::OS_RGBX:
++ case SurfaceFormat::X8R8G8B8:
return gfxContentType::COLOR;
case SurfaceFormat::A8:
return gfxContentType::ALPHA;
-+ case SurfaceFormat::OS_RGBA:
++ case SurfaceFormat::A8R8G8B8:
case SurfaceFormat::B8G8R8A8:
case SurfaceFormat::R8G8B8A8:
default: