GNOME.org
 

[gtk-osx] Remove the webkit-1.6 module and update WebKit to 2.4.11.

commit 20abfffd2eee44a093d8d5920d4b80f182a4a6d3
Author: John Ralls <jralls ceridwen us>
Date:   Sat Apr 8 17:43:30 2017 -0700

    Remove the webkit-1.6 module and update WebKit to 2.4.11.
    
    2.4.11 is the last webkit version to support the WebKit1 API.

 jhbuildrc-gtk-osx                                  |    4 +-
 modulesets-stable/gtk-osx-network.modules          |   48 +--
 modulesets-unstable/gtk-osx-network.modules        |   47 +-
 modulesets/gtk-osx-network.modules                 |   49 +--
 patches/webkit-1.10-no-x11.patch                   |   39 --
 patches/webkit-1.10-pango-includes.patch           |   12 -
 patches/webkit-1.10-platform-fixes.patch           |   31 --
 .../webkit-1.10-remove-pangoft2-dependency.patch   |   16 -
 patches/webkit-1.6-clang-fixup.patch               |   35 --
 patches/webkit-1.6-enable-blob.patch               |   19 -
 patches/webkit-1.6-gnome-3.6-fixup.patch           |  523 --------------------
 patches/webkit-1.6-missing-utf8-include.patch      |   10 -
 patches/webkit-1.6-no-x11.patch                    |  146 ------
 patches/webkit-1.6-out-of-source-fixup.patch       |   18 -
 patches/webkit-1.6-pango-includes.patch            |   24 -
 .../webkit-1.6-remove-pangoft2-dependency.patch    |   14 -
 patches/webkit-88407-portable-echo-n.patch         |   13 -
 17 files changed, 59 insertions(+), 989 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index f9c9760..4a8f4e3 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -308,13 +308,11 @@ def setup_sdk(target=_osx_version, sdk_version=None, architectures=[_default_arc
     module_extra_env["pkg-config"] = {'CFLAGS': os.environ['CFLAGS'] + ' -std=gnu89'}
     append_autogenargs('libgcrypt', 'CFLAGS="$CFLAGS -fheinous-gnu-extensions"')
     module_makeargs['liboil'] = 'CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE -fheinous-gnu-extensions"'
-    module_extra_env["WebKit"] = {'CXXFLAGS':os.environ['CXXFLAGS'] +
-                                  ' -stdlib=libstdc++'}
     module_extra_env["expat"] = {'CFLAGS':os.environ['CFLAGS'] + ' -arch i386 -arch x86_64'}
     append_autogenargs('babl', '--disable-sse')
 
     # openssl doesn't understand DESTDIR, but luckily it has its own mechanism.
-#    module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
+    module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
 
     # Finally when building normally we need to force CFLAGS_FOR_BUILD
     # to our current CFLAGS so that everything will link with other
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 87b9b1c..dd34cdc 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -113,50 +113,40 @@
     <branch repo="webm" module="webp/libwebp-0.4.3.tar.gz" version="0.4.3"/>
   </autotools>
 
-  <!-- This is WebKitGTK 1.x, for GTK 2.x.
-    disable-geolocation: Requires geoclue. No module for this yet.
-    disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
+  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
+    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
+    disable-credential-storage: Requires libsecret. No module for this yet.
+    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
+    disable-video, disable-web-audio: Requires gstreamer. If you want video and
+      audio, add this to your .jhbuildrc:
       append_autogenargs('WebKit', '&#45;-enable-video')
-    Wno-c++11-extensions: Suppresses clang warning that makes output
-      inconvenient to read.
-    std=c99: Required for inline keyword in C.
+      append_autogenargs('WebKit', '&#45;-enable-web-audio')
+    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
   -->
-  <autotools id="WebKit" autogen-sh="autoreconf"
-             autogenargs='--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0 
--disable-geolocation --disable-webkit2 CXXFLAGS="$CXXFLAGS -Wno-c++11-extensions" CFLAGS="$CFLAGS -std=c99"'>
-    <branch repo="webkit.org" module="webkitgtk-1.10.2.tar.xz" version="1.10.2">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+  <autotools id="webkit" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
+    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11">
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
     </branch>
     <dependencies>
+      <dep package="libwebp"/>
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk"/>
       <dep package="meta-gstreamer-1.0"/>
-      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
-  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
-    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
-    disable-credential-storage: Requires libsecret. No module for this yet.
-    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
-    disable-video, disable-web-audio: Requires gstreamer. If you want video and
-      audio, add this to your .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-      append_autogenargs('WebKit', '&#45;-enable-web-audio')
-    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
-  -->
+  <!-- This is WebKitGTK 2.4.x as above, but for gtk3.  -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
     <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 17f340c..1c38358 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -107,49 +107,40 @@
     <branch repo="chromium" module="webm/libwebp"/>
   </autotools>
 
-  <!-- This is WebKitGTK 1.x, for GTK 2.x.
-    disable-geolocation: Requires geoclue. No module for this yet.
-    disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
+  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
+    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
+    disable-credential-storage: Requires libsecret. No module for this yet.
+    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
+    disable-video, disable-web-audio: Requires gstreamer. If you want video and
+      audio, add this to your .jhbuildrc:
       append_autogenargs('WebKit', '&#45;-enable-video')
-    Wno-c++11-extensions: Suppresses clang warning that makes output
-      inconvenient to read.
-    std=c99: Required for inline keyword in C.
+      append_autogenargs('WebKit', '&#45;-enable-web-audio')
+    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
   -->
-  <autotools id="WebKit" autogen-sh="autoreconf"
-             autogenargs='--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0 
--disable-geolocation --disable-webkit2 CXXFLAGS="$CXXFLAGS -Wno-c++11-extensions" CFLAGS="$CFLAGS -std=c99"'>
-    <branch repo="webkit.org" module="webkitgtk-1.10.2.tar.xz" version="1.10.2">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+  <autotools id="webkit" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
+    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
     </branch>
     <dependencies>
+      <dep package="libwebp"/>
       <dep package="enchant"/>
       <dep package="icu"/>
       <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk"/>
       <dep package="meta-gstreamer-1.0"/>
     </after>
   </autotools>
 
-  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
-    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
-    disable-credential-storage: Requires libsecret. No module for this yet.
-    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
-    disable-video, disable-web-audio: Requires gstreamer. If you want video and
-      audio, add this to your .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-      append_autogenargs('WebKit', '&#45;-enable-web-audio')
-    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
-  -->
+  <!-- This is WebKitGTK 2.4.x as above, but for gtk3. -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
     <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 8e64d7e..a5e99ed 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -107,49 +107,40 @@
     <branch repo="chromium" module="webm/libwebp" revision="0.4.3"/>
   </autotools>
 
-  <!-- This is WebKitGTK 1.x, for GTK 2.x.
-    disable-geolocation: Requires geoclue. No module for this yet.
-    disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
+  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
+    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
+    disable-credential-storage: Requires libsecret. No module for this yet.
+    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
+    disable-video, disable-web-audio: Requires gstreamer. If you want video and
+      audio, add this to your .jhbuildrc:
       append_autogenargs('WebKit', '&#45;-enable-video')
-    Wno-c++11-extensions: Suppresses clang warning that makes output
-      inconvenient to read.
-    std=c99: Required for inline keyword in C.
+      append_autogenargs('WebKit', '&#45;-enable-web-audio')
+    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
   -->
-  <autotools id="WebKit" autogen-sh="autoreconf"
-             autogenargs='--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0 
--disable-geolocation --disable-webkit2 CXXFLAGS="$CXXFLAGS -Wno-c++11-extensions" CFLAGS="$CFLAGS -std=c99"'>
-    <branch repo="webkit.org" module="webkitgtk-1.10.2.tar.xz" version="1.10.2">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+  <autotools id="webkit" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
+    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
              strip="1"/>
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
              strip="1"/>
     </branch>
     <dependencies>
-      <dep package="libsoup"/>
+      <dep package="libwebp"/>
       <dep package="enchant"/>
       <dep package="icu"/>
+      <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk"/>
       <dep package="meta-gstreamer-1.0"/>
     </after>
   </autotools>
 
-  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
-    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
-    disable-credential-storage: Requires libsecret. No module for this yet.
-    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
-    disable-video, disable-web-audio: Requires gstreamer. If you want video and
-      audio, add this to your .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-      append_autogenargs('WebKit', '&#45;-enable-web-audio')
-    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
-  -->
+  <!-- This is WebKitGTK 2.4.x as above, but for gtk3.  -->
   <autotools id="webkit1gtk3" autogen-sh="autoreconf"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
     <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]