webkitgtk: mark as broken on darwin

2 files changed, 1 insertions, 107 deletions

diff --git a/pkgs/development/libraries/webkitgtk/428774.patch b/pkgs/development/libraries/webkitgtk/428774.patch
deleted file mode 100644
index 85da185dc4e42..0000000000000
--- a/pkgs/development/libraries/webkitgtk/428774.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
---- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp	2021-02-26 04:57:15.000000000 -0500
-+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp	2021-05-16 14:45:32.000000000 -0400
-@@ -87,7 +87,7 @@
-     if (!m_store.createSharedMemoryHandle(handle))
-         return;
- 
--#if OS(DARWIN) || OS(WINDOWS)
-+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
-     uint64_t dataSize = handle.size();
- #else
-     uint64_t dataSize = 0;
-diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
---- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp	2021-02-26 04:57:15.000000000 -0500
-+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp	2021-05-16 15:54:53.000000000 -0400
-@@ -26,8 +26,6 @@
- #include "config.h"
- #include "IPCSemaphore.h"
- 
--#if !OS(DARWIN)
--
- namespace IPC {
- 
- Semaphore::Semaphore() = default;
-@@ -46,5 +44,3 @@
- }
- 
- }
--
--#endif
-diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
---- a/Source/WebKit/Platform/IPC/IPCSemaphore.h	2021-02-26 04:57:15.000000000 -0500
-+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h	2021-05-16 14:46:13.000000000 -0400
-@@ -29,7 +29,7 @@
- #include <wtf/Optional.h>
- #include <wtf/Seconds.h>
- 
--#if OS(DARWIN)
-+#if PLATFORM(COCOA)
- #include <mach/semaphore.h>
- #include <wtf/MachSendRight.h>
- #endif
-@@ -51,7 +51,7 @@
-     void encode(Encoder&) const;
-     static Optional<Semaphore> decode(Decoder&);
- 
--#if OS(DARWIN)
-+#if PLATFORM(COCOA)
-     explicit Semaphore(MachSendRight&&);
- 
-     void signal();
-@@ -64,7 +64,7 @@
- #endif
- 
- private:
--#if OS(DARWIN)
-+#if PLATFORM(COCOA)
-     void destroy();
-     MachSendRight m_sendRight;
-     semaphore_t m_semaphore { SEMAPHORE_NULL };
-Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
-diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
---- a/Source/WebKit/Platform/SharedMemory.h	2021-02-26 04:57:15.000000000 -0500
-+++ b/Source/WebKit/Platform/SharedMemory.h	2021-05-16 14:45:32.000000000 -0400
-@@ -75,7 +75,7 @@
- 
-         bool isNull() const;
- 
--#if OS(DARWIN) || OS(WINDOWS)
-+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
-         size_t size() const { return m_size; }
- #endif
- 
-diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
---- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp	2021-02-26 04:57:16.000000000 -0500
-+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp	2021-05-16 14:45:32.000000000 -0400
-@@ -119,7 +119,7 @@
-         return;
- 
-     // FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
--#if OS(DARWIN) || OS(WINDOWS)
-+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
-     uint64_t dataSize = handle.size();
- #else
-     uint64_t dataSize = 0;
-Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 761c97510b767..304dfbc2e7849 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv
 , runCommand
 , fetchurl
-, fetchpatch
 , perl
 , python3
 , ruby
@@ -83,26 +82,6 @@ stdenv.mkDerivation rec {
       inherit (addOpenGLRunpath) driverLink;
     })
     ./libglvnd-headers.patch
-  ] ++ lib.optionals stdenv.isDarwin [
-    # https://bugs.webkit.org/show_bug.cgi?id=225856
-    (fetchpatch {
-      url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
-      sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU=";
-      excludes = [ "Source/WebCore/ChangeLog" ];
-    })
-
-    # https://bugs.webkit.org/show_bug.cgi?id=225850
-    ./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774
-    (fetchpatch {
-      url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776";
-      sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ=";
-      excludes = [ "Source/WTF/ChangeLog" ];
-    })
-    (fetchpatch {
-      url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778";
-      sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo=";
-      excludes = [ "Source/WebKit/ChangeLog" ];
-    })
   ];
 
   preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@@ -231,5 +210,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = teams.gnome.members;
+    broken = stdenv.isDarwin;
   };
 }