3 files changed, 10 insertions, 30 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index a3a9eddbb0..b4666dadf7 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -361,7 +361,7 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3
 88928afcc33843e17daa082435a4b88c2106b0252a202ad19f684021c027859366a0c12970700c0d1b010211eef95d295362dc6afdea1b00199dd8d2efbdcfe7  gcc6.patch
 0a15b178fadffdc31f1f7bc814b95817cbcea9dd90b1ed84f7bab2d840f36453573742bd8501d79edecfa38c0ec2147843aef03c7b2c9bcfd0e3d22b72c25c4b  gn_bootstrap.patch
 8fbfd67a0b6bbdf08364e810bd85b4a80dda9af73fefe3aba8010d9b33022d458a785c628515bbda9c743b8a0293d57cfe18fcc5aa2313c845c6fb948c2335f9  last-commit-position.patch
-e265bc7322572401bf5b741372f43a74d3c315b61f357632a99d89780d34fc153070775c53caf7a901dba7725fb02beb6232bb7b1ed47366d2f33410ffb60cd2  musl-fixes.patch
+6b4225ce8971db5a8fa86099c7399ba06509f6056772948f9a1ececaa501a7e9b19b568ea59f315cd66c8dc7869b70f363f0af9a42a0282381888da6b0b1c7a9  musl-fixes.patch
 17164a6b38409f466bd7da6bf0d4e71f3114bec38950414c924f57da6b7f536203e368100c7f3d8239ae52a8edf6f588e7b07281a71b5fc5847460da409af0e3  musl-hacks.patch
 ce8276bb35a8d72cf58868a6331e85286b350a1aad694525ebf637499819219dd4d87ab67dd3b938830a6bd3e7172fc9bcd9c8971820d0ed95c0d141867a24fe  musl-sandbox.patch
 7230e468931da704d5f3e19d9ef2b123e1ac5194b1858bd9ddcf21acc6c4eb22639c13119f1243769872ab96093c8ce3b5a1167ca689fc269cf1466b6a6565f2  no-execinfo.patch
@@ -369,4 +369,4 @@ a57858e45cfbb7e97f77b3b308502e377543d61d3d0085798ed73bc53da456828f5e010308d0de05
 bd3645eb466e7bb3696fec5e71782b5db0a6ae7a0cca5c8e58781d9a29432cbbbea70129038726ad93b9d2332a66e8b99797ff481765314c20647c54a37a5c59  no-mallinfo.patch
 d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe  resolver.patch
 27dd7916be3324294a0a913c43c856e9c00be767a2aec4f3da2455fb84e74ebb0017d1aa586b40dd9d989ada6b60fc531522f503d57e04324726a2171bf3a85e  unset-madv_free.patch
-eaf126fede7ea27a0a33defdd134621b6aed107e06c2f54fb56b4898f7bb13c13d79a1de903bee25a26e98043411c817cccc1bea95e3e37999ea1be963dd0ebe  swiftshader.patch"
+6b0812725a0fc562527f3556dc4979fec72d1ba92f26a5e78ff2016c39bb2c155a0ff95fc22101f9c097d14b84182d6615276f4247f60ae7833ab45da8366e6d  swiftshader.patch"
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch
index 633d7a6894..48d8563454 100644
--- a/community/chromium/musl-fixes.patch
+++ b/community/chromium/musl-fixes.patch
@@ -217,15 +217,3 @@ index a80ea16..55a2abf 100644
    pthread_attr_t attr;
    int error;
  #if OS(FREEBSD)
-diff --git a/third_party/swiftshader/src/Common/Socket.cpp b/third_party/swiftshader/src/Common/Socket.cpp
-index a19f574..3e6655d 100644
---- a/third_party/swiftshader/src/Common/Socket.cpp
-+++ b/third_party/swiftshader/src/Common/Socket.cpp
-@@ -17,6 +17,7 @@
- #if defined(_WIN32)
- 	#include <ws2tcpip.h>
- #else
-+	#include <sys/select.h>
- 	#include <unistd.h>
- 	#include <netdb.h>
- 	#include <netinet/in.h>
diff --git a/community/chromium/swiftshader.patch b/community/chromium/swiftshader.patch
index bb133d1cc2..75f161593f 100644
--- a/community/chromium/swiftshader.patch
+++ b/community/chromium/swiftshader.patch
@@ -1,7 +1,5 @@
-diff --git a/third_party/swiftshader/src/Common/Socket.cpp b/third_party/swiftshader/src/Common/Socket.cpp
-index a19f574..3e6655d 100644
---- a/third_party/swiftshader/src/Common/Socket.cpp
-+++ third_party/swiftshader/src/Common/Socket.cpp
+--- ./third_party/swiftshader/src/Common/Socket.cpp
++++ ./third_party/swiftshader/src/Common/Socket.cpp
 @@ -17,6 +17,7 @@
  #if defined(_WIN32)
  	#include <ws2tcpip.h>
@@ -10,10 +8,8 @@ index a19f574..3e6655d 100644
  	#include <unistd.h>
  	#include <netdb.h>
  	#include <netinet/in.h>
-diff --git a/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h b/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
-index 509bc26..6522713 100644
---- a/third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
-+++ third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
+--- ./third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
++++ ./third_party/swiftshader/third_party/LLVM/include-linux/llvm/Config/config.h
 @@ -125,7 +125,7 @@
  #define HAVE_ERROR_T 1
  
@@ -36,10 +32,8 @@ index 509bc26..6522713 100644
  
  /* Define to 1 if you have the <malloc/malloc.h> header file. */
  /* #undef HAVE_MALLOC_MALLOC_H */
-diff --git a/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp b/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
-index bd68083..f703e13 100644
---- a/third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
-+++ third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
+--- ./third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
++++ ./third_party/swiftshader/third_party/LLVM/lib/Support/DynamicLibrary.cpp
 @@ -160,7 +160,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
  // On linux we have a weird situation. The stderr/out/in symbols are both
  // macros and global variables because of standards requirements. So, we
@@ -49,10 +43,8 @@ index bd68083..f703e13 100644
    {
      EXPLICIT_SYMBOL(stderr);
      EXPLICIT_SYMBOL(stdout);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index e14edbd..8d7e41e 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+--- ./third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
++++ ./third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
 @@ -14,7 +14,7 @@
  #define ENABLE_CRASH_OVERRIDES 1