[gtk-osx: 12/17] WebKit and dependencies in new modules file
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx: 12/17] WebKit and dependencies in new modules file
- Date: Tue, 10 Nov 2015 23:49:40 +0000 (UTC)
commit b24a67e482d8faeee4dfbae5e8eedef612cc30ed
Author: Philip Chimento <philip chimento gmail com>
Date: Mon Oct 12 20:01:14 2015 -0700
WebKit and dependencies in new modules file
Having WebKit in "unsupported" is kind of misleading now that it's
getting easier to build WebKit. WebKit, as well as the networking and
crypto stack that it depends on, are also required for a lot of modern
Gnome applications.
Let's move WebKit and the network stack dependencies into a new
gtk-osx-network.modules file. It's technically still "unsupported"
according to the comment in gtk-osx.modules, just a little... less so.
We also move enchant into gtk-osx-random.modules, since it's required by
gtkspell there as well as webkit.
modulesets-stable/gtk-osx-network.modules | 258 ++++++++++++++++++++++
modulesets-stable/gtk-osx-random.modules | 16 ++
modulesets-stable/gtk-osx-unsupported.modules | 259 -----------------------
modulesets-stable/gtk-osx.modules | 5 +
modulesets-unstable/gtk-osx-network.modules | 205 ++++++++++++++++++
modulesets-unstable/gtk-osx-random.modules | 10 +
modulesets-unstable/gtk-osx-unsupported.modules | 215 -------------------
modulesets-unstable/gtk-osx.modules | 5 +
modulesets/gtk-osx-network.modules | 205 ++++++++++++++++++
modulesets/gtk-osx-random.modules | 9 +
modulesets/gtk-osx-unsupported.modules | 211 ------------------
modulesets/gtk-osx.modules | 5 +
12 files changed, 718 insertions(+), 685 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
new file mode 100644
index 0000000..caec3cc
--- /dev/null
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -0,0 +1,258 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository name="ftp.gnome.org" type="tarball" default="yes"
+ href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+ <repository name="openssl" type="tarball"
+ href="https://www.openssl.org/source/"/>
+ <repository name="ftp.gnu.org" type="tarball" href="ftp://ftp.gnu.org/gnu/"/>
+ <repository name="sourceforge" type="tarball"
+ href="http://downloads.sourceforge.net/sourceforge/"/>
+ <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
+ <repository name="webm" type="tarball"
+ href="http://downloads.webmproject.org/releases/"/>
+ <repository name="webkit.org" type="tarball"
+ href="http://www.webkitgtk.org/releases/"/>
+
+ <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
+ <metamodule id="meta-gtk-osx-webkit">
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="WebKit"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Same as meta-gtk-osx-webkit above, but builds the last version that
+ worked on SDK <= 10.5 -->
+ <metamodule id="meta-gtk-osx-webkit1.6">
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="WebKit1.6"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
+ <metamodule id="meta-gtk-osx-webkit-gtk3">
+ <dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
+ <dep package="webkit2gtk3"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- of the many arguments such as prefix and libdir that jhbuild might pass
+ to configure, openssl only understands prefix, and only with =. -->
+ <autotools id="openssl" autogen-sh="config" autogenargs="shared"
+ autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl
%(autogenargs)s"
+ makeinstallargs="install_sw" supports-non-srcdir-builds="no">
+ <branch module="openssl-0.9.8zg.tar.gz" version="0.9.8zg" repo="openssl"/>
+ </autotools>
+
+ <!-- Rudely demands TeX to build documentation -->
+ <!-- Assembler files are missing md5-compress.asm for x86_64 -->
+ <autotools id="libnettle" autogen-sh="configure"
+ autogenargs="--disable-documentation --disable-assembler">
+ <!-- gnutls 3.3.x does not support nettle 3.0 -->
+ <branch repo="ftp.gnu.org" version="2.7.1"
+ module="nettle/nettle-2.7.1.tar.gz">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch"; strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="gmp"/>
+ <dep package="openssl"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libtasn1" supports-non-srcdir-builds="no"
+ autogen-sh="configure">
+ <branch repo="ftp.gnu.org" version="4.4"
+ module="libtasn1/libtasn1-4.4.tar.gz"/>
+ </autotools>
+
+ <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+ supports-non-srcdir-builds="no">
+ <branch repo="sourceforge" version="1.2.8"
+ module="libpng/zlib-1.2.8.tar.xz"/>
+ </autotools>
+
+ <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+ <autotools id="gnutls" autogen-sh="configure"
+ autogenargs="--disable-gtk-doc-html --without-p11-kit">
+ <branch repo="gnutls" version="3.3.12"
+ module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
+ <dependencies>
+ <dep package="libnettle"/>
+ <dep package="libtasn1"/>
+ <dep package="zlib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="glib-networking" autogen-sh="configure"
+ autogenargs="--without-ca-certificates set_more_warnings=no">
+ <branch module="glib-networking/2.44/glib-networking-2.44.0.tar.xz"
+ hash="sha256:8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
+ version="2.44.0"/>
+ <dependencies>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libsoup" autogen-sh="configure"
+ autogenargs="set_more_warnings=no">
+ <branch module="libsoup/2.48/libsoup-2.48.1.tar.xz" version="2.48.1"
+ hash="sha256:9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="glib-networking"/>
+ <dep package="sqlite"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libwebp" autogen-sh="configure">
+ <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:
+ append_autogenargs('WebKit', '--enable-video')
+ Wno-c++11-extensions: Suppresses clang warning that makes output
+ inconvenient to read.
+ std=c99: Required for inline keyword in C.
+ -->
+ <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+ strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="enchant"/>
+ <dep package="icu"/>
+ <dep package="libsoup"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="meta-gstreamer-1.0"/>
+ <dep package="meta-gtk-osx-gtk3"/>
+ </after>
+ </autotools>
+
+ <!--WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for
+ old builds.-->
+ <autotools id="WebKit1.6" autogen-sh="configure"
+ autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
+ <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-remove-pangoft2-dependency.patch";
+ strip="1"/>
+ </branch>
+ <dependencies>
+ <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-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', '--enable-video')
+ append_autogenargs('WebKit', '--enable-web-audio')
+ -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
+ -->
+ <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
+ 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">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
+ strip="1"/>
+ <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+ it's left in -->
+ <patch file="http://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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </autotools>
+
+ <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
+ the WebKit2 API (most applications do.)
+ ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
+ library is working correctly: run "jhbuild run MiniBrowser".
+ ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
+ supported.
+ ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
+ audio, fix this in your .jhbuildrc-custom. You may need some extra
+ patches, this is untested.
+ ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
+ ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
+ ENABLE_OPENGL: Untested.
+ USE_LIBNOTIFY: Requires libnotify. No module for this yet.
+ USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
+ -->
+ <cmake id="webkit2gtk3"
+ cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
+ <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </cmake>
+</moduleset>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index ba38fb5..6aacbd1 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -28,6 +28,8 @@
href="git://git.gnome.org/"/>
<repository type="tarball" name="itstool"
href="http://files.itstool.org/"/>
+ <repository type="tarball" name="abisource/enchant"
+ href="http://www.abisource.com/downloads/enchant/"/>
<metamodule id="meta-gtk-osx-random">
<dependencies>
@@ -379,6 +381,20 @@ Libglade itself is deprecated. This is the last release. -->
repo="sourceforge"/>
</autotools>
+ <autotools id="enchant" autogen-sh="configure"
+ autogenargs="--with-myspell-dir=/Library/Dictionaries">
+ <branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0"
+ repo="abisource/enchant">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-env.patch";
+ strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gtkspell" autogen-sh="configure">
<branch module="gtkspell/gtkspell-2.0.16.tar.gz" repo="sourceforge"
version="2.0.16"/>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 76257f5..712473b 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -4,30 +4,15 @@
<moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
- <repository type='tarball' name='michael.68k.org'
- href="http://www.68k.org/~michael/"/>
- <repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
<repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
- <repository type="tarball" name="sourceforge"
- href="http://downloads.sourceforge.net/sourceforge/"/>
- <repository type="svn" name="svn.debian.org" href="svn://svn.debian.org/"/>
- <repository type="tarball" name="abisource/enchant"
- href="http://www.abisource.com/downloads/enchant/"; />
<repository type="tarball" name="iso-codes"
href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
<repository type='tarball' name='libproxy.google.com'
href='http://libproxy.googlecode.com/files/'/>
<repository type="tarball" name="curl.haxx.se"
href="http://curl.haxx.se/download/"/>
- <repository type="tarball" name="webkit.org"
- href="http://www.webkitgtk.org/releases/"/>
<repository type="tarball" name="p11-glue"
href="http://p11-glue.freedesktop.org/releases/"/>
- <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
- <repository type="tarball" name="webm"
- href="http://downloads.webmproject.org/releases/"/>
- <repository type="tarball" name="openssl"
- href="https://www.openssl.org/source/"/>
<metamodule id="meta-gtk-osx-unsupported">
<dependencies>
@@ -36,30 +21,6 @@
</dependencies>
</metamodule>
- <metamodule id="meta-gtk-osx-webkit">
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libsoup"/>
- <dep package="WebKit"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gtk-osx-webkit1.6">
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libsoup"/>
- <dep package="WebKit1.6"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gtk-osx-webkit-gtk3">
- <dependencies>
- <dep package="meta-gtk-osx-gtk3"/>
- <dep package="libsoup"/>
- <dep package="webkit2gtk3"/>
- </dependencies>
- </metamodule>
-
<autotools id="gnome-mime-data" autogen-sh="configure">
<branch module="gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"
version="2.18.0" md5sum="541858188f80090d12a33b5a7c34d42c"/>
@@ -73,12 +34,6 @@
repo="iso-codes"/>
</autotools>
- <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
- supports-non-srcdir-builds="no">
- <branch repo="sourceforge" version="1.2.8"
- module="libpng/zlib-1.2.8.tar.xz"/>
- </autotools>
-
<autotools id="p11-kit" autogen-sh="configure"
autogenargs="--without-trust-paths">
<branch repo="p11-glue" version="0.22.1"
@@ -91,42 +46,6 @@
</dependencies>
</autotools>
- <!-- of the many arguments such as prefix and libdir that jhbuild might pass
- to configure, openssl only understands prefix, and only with =. -->
- <autotools id="openssl" autogen-sh="config" autogenargs="shared"
- autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl
%(autogenargs)s" makeinstallargs="install_sw"
- supports-non-srcdir-builds="no">
- <branch module="openssl-0.9.8zg.tar.gz" version="0.9.8zg" repo="openssl"/>
- </autotools>
-
-
- <!-- Rudely demands TeX to build documentation -->
- <!-- Assembler files are missing md5-compress.asm for x86_64 -->
- <autotools id="libnettle" autogen-sh="configure"
- autogenargs="--disable-documentation --disable-assembler">
- <!-- gnutls 3.3.x does not support nettle 3.0 -->
- <branch repo="ftp.gnu.org" version="2.7.1"
- module="nettle/nettle-2.7.1.tar.gz">
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch"; strip="1"/>
- </branch>
- <dependencies>
- <dep package="gmp"/>
- <dep package="openssl"/>
- </dependencies>
- </autotools>
-
- <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
- <autotools id="gnutls" autogen-sh="configure"
- autogenargs="--disable-gtk-doc-html --without-p11-kit">
- <branch repo="gnutls" version="3.3.12"
- module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
- <dependencies>
- <dep package="libnettle"/>
- <dep package="libtasn1" />
- <dep package="zlib"/>
- </dependencies>
- </autotools>
-
<cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
<branch version='0.4.10' module='libproxy-0.4.10.tar.gz'
repo='libproxy.google.com'>
@@ -148,38 +67,6 @@
</dependencies>
</autotools>
- <autotools id="glib-networking" autogen-sh="configure"
- autogenargs="--without-ca-certificates set_more_warnings=no">
- <branch module="glib-networking/2.44/glib-networking-2.44.0.tar.xz"
- hash="sha256:8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
- version="2.44.0"/>
- <dependencies>
- <dep package="gnutls"/>
- </dependencies>
- </autotools>
-
- <autotools id="libsoup" autogen-sh="configure" autogenargs="set_more_warnings=no">
- <branch module="libsoup/2.48/libsoup-2.48.1.tar.xz" version="2.48.1"
- hash="sha256:9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a"/>
- <dependencies>
- <dep package="glib"/>
- <dep package="glib-networking"/>
- <dep package='sqlite'/>
- </dependencies>
- </autotools>
-
- <autotools id="enchant" autogen-sh="configure"
- autogenargs="--with-myspell-dir=/Library/Dictionaries">
- <branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0"
- repo="abisource/enchant">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-env.patch"; strip="1"/>
- </branch>
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<autotools id="libgpg-error" autogen-sh="configure"
supports-non-srdir-builds="no">
<branch repo="ftp.gnupg.org" version="1.17"
@@ -194,154 +81,8 @@
</dependencies>
</autotools>
- <autotools id="libtasn1" supports-non-srcdir-builds="no"
- autogen-sh="configure">
- <branch repo="ftp.gnu.org" version="4.4"
- module="libtasn1/libtasn1-4.4.tar.gz"/>
- </autotools>
-
<!-- 10.5 has 7.16.3, which is too old for some things. Otherwise can be skipped. -->
<autotools id="libcurl" autogen-sh="configure">
<branch repo="curl.haxx.se" module="curl-7.28.0.tar.bz2" version="7.28.0" />
</autotools>
-
- <autotools id="libwebp" autogen-sh="configure">
- <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:
- append_autogenargs('WebKit', '--enable-video')
- Wno-c++11-extensions: Suppresses clang warning that makes output
- inconvenient to read.
- std=c99: Required for inline keyword in C.
- -->
- <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
- strip="1"/>
- </branch>
- <dependencies>
- <dep package="enchant"/>
- <dep package="icu"/>
- <dep package="libsoup"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-core"/>
- <dep package="meta-gstreamer-1.0"/>
- <dep package="meta-gtk-osx-gtk3"/>
- </after>
- </autotools>
-
- /* WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for old builds. */
- <autotools id="WebKit1.6" autogen-sh="configure"
- autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
- <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch"; strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch";
strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch";
strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch";
strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch";
strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch";
strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch";
strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-remove-pangoft2-dependency.patch";
- strip="1"/>
- </branch>
- <dependencies>
- <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-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', '--enable-video')
- append_autogenargs('WebKit', '--enable-web-audio')
- -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
- -->
- <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
- 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">
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
- strip="1"/>
- <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
- it's left in -->
- <patch file="http://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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </autotools>
-
- <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
- the WebKit2 API (most applications do.)
- ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
- library is working correctly: run "jhbuild run MiniBrowser".
- ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
- supported.
- ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
- audio, fix this in your .jhbuildrc-custom. You may need some extra
- patches, this is untested.
- ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
- ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
- ENABLE_OPENGL: Untested.
- USE_LIBNOTIFY: Requires libnotify. No module for this yet.
- USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
- -->
- <cmake id="webkit2gtk3"
- cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
- <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </cmake>
</moduleset>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 3e197e8..d0c1207 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -32,8 +32,12 @@
- gtk-osx-python.modules: self explaining.
- gtk-osx-gtkmm.modules: self explaining.
+ - gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
+ library it depends on.
- gtk-osx-gstreamer.modules: self explaining.
- gtk-osx-themes.modules: self explaining.
+ - gtk-osx-network.modules: The network/crypto stack and various
+ configurations of WebKit.
- gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
- gtk-osx-unsupported.modules: more testing stuff, competely unsupported.
@@ -43,6 +47,7 @@
<include href="gtk-osx-gstreamer.modules"/>
<include href="gtk-osx-gtkmm.modules"/>
<include href="gtk-osx-javascript.modules"/>
+ <include href="gtk-osx-network.modules"/>
<include href="gtk-osx-python.modules"/>
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-themes.modules"/>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
new file mode 100644
index 0000000..1a04868
--- /dev/null
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository name="git.gnome.org" type="git" default="yes"
+ href="git://git.gnome.org/"/>
+ <repository name="lysator" type="git"
+ href="https://git.lysator.liu.se/"/>
+ <!--repository name="git.gnu.org" type="git" href="git://git.savannah.gnu.org/"/-->
+ <repository name="ftp.gnu.org" type="tarball" href="ftp://ftp.gnu.org/gnu/"/>
+ <repository name="sourceforge" type="tarball"
+ href="http://downloads.sourceforge.net/sourceforge/"/>
+ <!--repository name="gitlab" type="git" href="https://gitlab.com/"/-->
+ <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
+ <repository name="chromium" type="git"
+ href="https://chromium.googlesource.com/"/>
+ <repository name="webkit.org" type="tarball"
+ href="http://www.webkitgtk.org/releases/"/>
+
+ <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
+ <metamodule id="meta-gtk-osx-webkit">
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="WebKit"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
+ <metamodule id="meta-gtk-osx-webkit-gtk3">
+ <dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
+ <dep package="webkit2gtk3"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Rudely demands TeX to build documentation -->
+ <!-- Assembler files are missing md5-compress.asm for x86_64 -->
+ <autotools id="libnettle"
+ autogenargs="--disable-documentation --disable-assembler"
+ autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
+ <!-- gnutls 3.3.x does not support nettle 3.0 -->
+ <branch repo="lysator" module="nettle/nettle.git"
+ tag="nettle_2.7_release_20130424"/>
+ <dependencies>
+ <dep package="gmp"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libtasn1" supports-non-srcdir-builds="no">
+ <!-- Git repository is missing files required to build libtasn1
+ <branch repo="git.gnu.org" /> -->
+ <branch repo="ftp.gnu.org" version="4.4"
+ module="libtasn1/libtasn1-4.4.tar.gz"/>
+ </autotools>
+
+ <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+ supports-non-srcdir-builds="no">
+ <branch repo="sourceforge" version="1.2.8"
+ module="libpng/zlib-1.2.8.tar.xz"/>
+ </autotools>
+
+ <!-- Building from git does not work because they have checked in a bunch of
+ files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
+ <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+ <autotools id="gnutls" autogen-sh="configure"
+ autogenargs="--disable-gtk-doc-html --without-p11-kit">
+ <!--branch repo="gitlab" module="gnutls/gnutls"/-->
+ <branch repo="gnutls" version="3.3.12"
+ module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
+ <dependencies>
+ <dep package="libnettle"/>
+ <dep package="libtasn1"/>
+ <dep package="zlib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="glib-networking"
+ autogenargs="--without-ca-certificates set_more_warnings=no">
+ <branch/>
+ <dependencies>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libsoup" autogenargs="set_more_warnings=no">
+ <branch/>
+ <dependencies>
+ <dep package="sqlite"/>
+ <dep package="glib"/>
+ <dep package="glib-networking"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libwebp" autogen-sh="autoreconf">
+ <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:
+ append_autogenargs('WebKit', '--enable-video')
+ Wno-c++11-extensions: Suppresses clang warning that makes output
+ inconvenient to read.
+ std=c99: Required for inline keyword in C.
+ -->
+ <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+ strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="enchant"/>
+ <dep package="icu"/>
+ <dep package="libsoup"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ <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', '--enable-video')
+ append_autogenargs('WebKit', '--enable-web-audio')
+ -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
+ -->
+ <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
+ 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">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
+ strip="1"/>
+ <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+ it's left in -->
+ <patch file="http://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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </autotools>
+
+ <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
+ the WebKit2 API (most applications do.)
+ ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
+ library is working correctly: run "jhbuild run MiniBrowser".
+ ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
+ supported.
+ ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
+ audio, fix this in your .jhbuildrc-custom. You may need some extra
+ patches, this is untested.
+ ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
+ ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
+ ENABLE_OPENGL: Untested.
+ USE_LIBNOTIFY: Requires libnotify. No module for this yet.
+ USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
+ -->
+ <cmake id="webkit2gtk3"
+ cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
+ <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </cmake>
+</moduleset>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index a99ee4d..2613573 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -30,6 +30,8 @@
href="http://www.hboem.info/"/>
<repository type="svn" name="exiv2.org"
href="svn://dev.exiv2.org/"/>
+ <repository type="svn" name="abisource/enchant"
+ href="http://svn.abisource.com/"/>
<metamodule id="meta-gtk-osx-random">
<dependencies>
@@ -282,6 +284,14 @@
</dependencies>
</autotools>
+ <autotools id="enchant" >
+ <!-- No version. Doesn't seem to have been touched in a while. -->
+ <branch repo="abisource/enchant" module="enchant"/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gtkspell">
<branch module="gtkspell2" repo="gtkspell"/>
<dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 0c96bcd..00e760a 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -4,35 +4,13 @@
<moduleset>
<repository type="git" name="git.gnome.org" default="yes"
href="git://git.gnome.org/"/>
- <repository type='git' name='git.gnu.org'
- href="git://git.savannah.gnu.org/"/>
<repository type='git' name='git.gnupg.org' href="git://git.gnupg.org/" />
- <repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="sourceforge"
- href="http://downloads.sourceforge.net/sourceforge/"/>
- <repository type="cvs" name="gnutls.gnupg.org"
- cvsroot=":pserver:anoncvs cvs gnupg org:/cvs/gnutls"
- password="anoncvs"/>
- <repository type="svn" name="abisource/enchant"
- href="http://svn.abisource.com/"; />
<repository type='svn' name='libproxy.google.com'
href='http://libproxy.googlecode.com/svn/'
tags-template="tags/%(tag)s"/>
- <repository type="tarball" name="webkit.org"
- href="http://www.webkitgtk.org/releases/"/>
- <repository type="svn" name="svn.webkit.org"
- href="http://svn.webkit.org/repository/"/>
- <repository type="git" name="git.webkit.org"
- href="git://git.webkit.org/"/>
<repository type="git" name="git.debian.org" href="git://git.debian.org/"/>
<repository type="git" name="freedesktop"
href="git://anongit.freedesktop.org"/>
- <repository type="git" name="lysator"
- href="https://git.lysator.liu.se/"/>
- <repository name="gitlab" type="git" href="https://gitlab.com/"/>
- <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
- <repository type="git" name="chromium"
- href="https://chromium.googlesource.com/"/>
<metamodule id="meta-gtk-osx-unsupported">
<dependencies>
@@ -41,22 +19,6 @@
</dependencies>
</metamodule>
- <metamodule id="meta-gtk-osx-webkit">
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libsoup"/>
- <dep package="WebKit"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gtk-osx-webkit-gtk3">
- <dependencies>
- <dep package="meta-gtk-osx-gtk3"/>
- <dep package="libsoup-gtk3"/>
- <dep package="webkit2gtk3"/>
- </dependencies>
- </metamodule>
-
<autotools id="gnome-mime-data">
<branch />
<dependencies>
@@ -70,12 +32,6 @@
</autotools>
- <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
- supports-non-srcdir-builds="no">
- <branch repo="sourceforge" version="1.2.8"
- module="libpng/zlib-1.2.8.tar.xz"/>
- </autotools>
-
<autotools id="p11-kit" autogenargs="--without-trust-paths">
<branch repo="freedesktop" module="p11-glue/p11-kit"/>
<dependencies>
@@ -83,34 +39,6 @@
</dependencies>
</autotools>
-<!-- Rudely demands TeX to build documentation -->
- <!-- Assembler files are missing md5-compress.asm for x86_64 -->
- <autotools id="libnettle"
- autogenargs="--disable-documentation --disable-assembler"
- autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
- <!-- gnutls 3.3.x does not support nettle 3.0 -->
- <branch repo="lysator" module="nettle/nettle.git"
- tag="nettle_2.7_release_20130424"/>
- <dependencies>
- <dep package="gmp"/>
- </dependencies>
- </autotools>
-
- <!-- Building from git does not work because they have checked in a bunch of
- files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
- <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
- <autotools id="gnutls" autogen-sh="configure"
- autogenargs="--disable-gtk-doc-html --without-p11-kit">
- <!--branch repo="gitlab" module="gnutls/gnutls"/-->
- <branch repo="gnutls" version="3.3.12"
- module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
- <dependencies>
- <dep package="libnettle"/>
- <dep package="libtasn1" />
- <dep package="zlib"/>
- </dependencies>
- </autotools>
-
<autotools id="libgpg-error" autogen-sh="autogen.sh"
autogenargs="--disable-doc"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
@@ -125,13 +53,6 @@
</dependencies>
</autotools>
- <autotools id="libtasn1" supports-non-srcdir-builds="no" >
- <!-- Git repository is missing files required to build libtasn1
- <branch repo="git.gnu.org" /> -->
- <branch repo="ftp.gnu.org" version="4.4"
- module="libtasn1/libtasn1-4.4.tar.gz"/>
- </autotools>
-
<autotools id="libgnome-keyring" autogenargs="--disable-pam --without-root-certs">
<branch/>
<dependencies>
@@ -142,13 +63,6 @@
</dependencies>
</autotools>
- <autotools id="glib-networking" autogenargs="--without-ca-certificates set_more_warnings=no">
- <branch/>
- <dependencies>
- <dep package="gnutls"/>
- </dependencies>
- </autotools>
-
<autotools id="gnome-keyring"
autogenargs="--disable-pam --without-root-certs">
<branch/>
@@ -159,138 +73,9 @@
</dependencies>
</autotools>
- <autotools id="libsoup" autogenargs="set_more_warnings=no">
- <branch />
- <dependencies>
- <dep package='sqlite'/>
- <dep package="glib"/>
- <dep package="glib-networking"/>
- </dependencies>
- </autotools>
-
- <autotools id="enchant" >
- <!-- No version. Doesn't seem to have been touched in a while. -->
- <branch repo="abisource/enchant" module="enchant"/>
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF -DWITH_PERL=OFF -DWITH_NM=OF">
<branch repo='libproxy.google.com' module="trunk" />
<dependencies>
</dependencies>
</cmake>
-
- <autotools id="libwebp" autogen-sh="autoreconf">
- <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:
- append_autogenargs('WebKit', '--enable-video')
- Wno-c++11-extensions: Suppresses clang warning that makes output
- inconvenient to read.
- std=c99: Required for inline keyword in C.
- -->
- <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
- strip="1"/>
- </branch>
- <dependencies>
- <dep package="enchant"/>
- <dep package="icu"/>
- <dep package="libsoup"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-core"/>
- <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', '--enable-video')
- append_autogenargs('WebKit', '--enable-web-audio')
- -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
- -->
- <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
- 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">
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
- strip="1"/>
- <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
- it's left in -->
- <patch file="http://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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </autotools>
-
- <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
- the WebKit2 API (most applications do.)
- ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
- library is working correctly: run "jhbuild run MiniBrowser".
- ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
- supported.
- ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
- audio, fix this in your .jhbuildrc-custom. You may need some extra
- patches, this is untested.
- ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
- ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
- ENABLE_OPENGL: Untested.
- USE_LIBNOTIFY: Requires libnotify. No module for this yet.
- USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
- -->
- <cmake id="webkit2gtk3"
- cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
- <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </cmake>
</moduleset>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index a13c8aa..92c96ed 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -26,8 +26,12 @@
- gtk-osx-python.modules: self explaining.
- gtk-osx-gtkmm.modules: self explaining.
+ - gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
+ library it depends on.
- gtk-osx-gstreamer.modules: self explaining.
- gtk-osx-themes.modules: self explaining.
+ - gtk-osx-network.modules: The network/crypto stack and various
+ configurations of WebKit.
- gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
- gtk-osx-unsupported.modules: more testing stuff, competely unsupported.
@@ -38,6 +42,7 @@
<include href="gtk-osx-python.modules"/>
<include href="gtk-osx-gstreamer.modules"/>
<include href="gtk-osx-gtkmm.modules"/>
+ <include href="gtk-osx-network.modules"/>
<include href="gtk-osx-themes.modules"/>
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-unsupported.modules"/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
new file mode 100644
index 0000000..b89bacd
--- /dev/null
+++ b/modulesets/gtk-osx-network.modules
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+ <repository name="git.gnome.org" type="git" default="yes"
+ href="git://git.gnome.org/"/>
+ <repository name="lysator" type="git" href="https://git.lysator.liu.se/"/>
+ <!--repository name="git.gnu.org" type="git"
+ href="git://git.savannah.gnu.org/"/-->
+ <repository name="ftp.gnu.org" type="tarball" href="ftp://ftp.gnu.org/gnu/"/>
+ <repository name="sourceforge" type="tarball"
+ href="http://downloads.sourceforge.net/sourceforge/"/>
+ <!--repository name="gitlab" type="git" href="https://gitlab.com/"/-->
+ <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
+ <repository name="chromium" type="git"
+ href="https://chromium.googlesource.com/"/>
+ <repository name="webkit.org" type="tarball"
+ href="http://www.webkitgtk.org/releases/"/>
+
+ <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
+ <metamodule id="meta-gtk-osx-webkit">
+ <dependencies>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="WebKit"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
+ <metamodule id="meta-gtk-osx-webkit-gtk3">
+ <dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
+ <dep package="webkit2gtk3"/>
+ </dependencies>
+ </metamodule>
+
+ <!-- Rudely demands TeX to build documentation -->
+ <!-- Assembler files are missing md5-compress.asm for x86_64 -->
+ <autotools id="libnettle"
+ autogenargs="--disable-documentation --disable-assembler"
+ autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
+ <!-- gnutls 3.3.x does not support nettle 3.0 -->
+ <branch repo="lysator" module="nettle/nettle.git"
+ tag="nettle_2.7_release_20130424"/>
+ <dependencies>
+ <dep package="gmp"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libtasn1" supports-non-srcdir-builds="no">
+ <!-- Git repository is missing files required to build libtasn1
+ <branch repo="git.gnu.org" tag="libtasn1_4_4" module="libtasn1"/> -->
+ <branch repo="ftp.gnu.org" version="4.4"
+ module="libtasn1/libtasn1-4.4.tar.gz"/>
+ </autotools>
+
+ <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+ supports-non-srcdir-builds="no">
+ <branch repo="sourceforge" version="1.2.8"
+ module="libpng/zlib-1.2.8.tar.gz"/>
+ </autotools>
+
+ <!-- Building from git does not work because they have checked in a bunch of
+ files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
+ <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+ <autotools id="gnutls" autogen-sh="configure"
+ autogenargs="--disable-gtk-doc-html --without-p11-kit">
+ <!--branch repo="gitlab" module="gnutls/gnutls"/-->
+ <branch repo="gnutls" version="3.3.12"
+ module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
+ <dependencies>
+ <dep package="libnettle"/>
+ <dep package="libtasn1" />
+ <dep package="zlib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="glib-networking"
+ autogenargs="--without-ca-certificates set_more_warnings=no">
+ <branch revision="glib-2-44"/>
+ <dependencies>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libsoup" autogenargs="set_more_warnings=no">
+ <branch revision="gnome-3-14"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="glib-networking"/>
+ <dep package="sqlite"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libwebp" autogen-sh="autoreconf">
+ <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:
+ append_autogenargs('WebKit', '--enable-video')
+ Wno-c++11-extensions: Suppresses clang warning that makes output
+ inconvenient to read.
+ std=c99: Required for inline keyword in C.
+ -->
+ <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
+ strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="libsoup"/>
+ <dep package="enchant"/>
+ <dep package="icu"/>
+ </dependencies>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ <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', '--enable-video')
+ append_autogenargs('WebKit', '--enable-web-audio')
+ -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
+ -->
+ <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
+ 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">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
+ strip="1"/>
+ <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+ it's left in -->
+ <patch file="http://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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </autotools>
+
+ <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
+ the WebKit2 API (most applications do.)
+ ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
+ library is working correctly: run "jhbuild run MiniBrowser".
+ ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
+ supported.
+ ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
+ audio, fix this in your .jhbuildrc-custom. You may need some extra
+ patches, this is untested.
+ ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
+ ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
+ ENABLE_OPENGL: Untested.
+ USE_LIBNOTIFY: Requires libnotify. No module for this yet.
+ USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
+ -->
+ <cmake id="webkit2gtk3"
+ cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
+ <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
+ strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
+ strip="1"/>
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
+ <dep package="meta-gstreamer-1.0"/>
+ </after>
+ </cmake>
+</moduleset>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 69c26b4..4c06526 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -26,6 +26,8 @@
<repository type="git" name="github" href="https://github.com"/>
<repository type="tarball" name="boehm"
href="http://www.hboem.info/"/>
+ <repository type="svn" name="abisource/enchant"
+ href="http://svn.abisource.com/"/>
<metamodule id="meta-gtk-osx-random">
<dependencies>
@@ -311,6 +313,13 @@
repo="hunspell-cvs"/>
</autotools>
+ <autotools id="enchant">
+ <branch repo="abisource/enchant" module="enchant" tag="enchant-1-6-0"/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gtkspell">
<branch module="gtkspell" repo="gtkspell-cvs"
version="2.0.16"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 40c7cdb..fa59b2e 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -4,32 +4,15 @@
<moduleset>
<repository type="git" name="git.gnome.org" default="yes"
href="git://git.gnome.org/"/>
- <repository type='git' name='git.gnu.org'
- href="git://git.savannah.gnu.org/"/>
<repository type='git' name='git.debian.org'
href="git://git.debian.org/git/"/>
<repository type='git' name='git.gnupg.org' href="git://git.gnupg.org/" />
<repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
- <repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="sourceforge"
- href="http://downloads.sourceforge.net/sourceforge/"/>
- <repository type="svn" name="abisource/enchant"
- href="http://svn.abisource.com/"; />
<repository type='svn' name='libproxy.google.com'
href='http://libproxy.googlecode.com/svn/'
tags-template="tags/%(tag)s"/>
- <repository type="git" name="chromium"
- href="https://chromium.googlesource.com/"/>
- <repository type="tarball" name="webkit.org"
- href="http://www.webkitgtk.org/releases/"/>
<repository type="git" name="freedesktop"
href="git://anongit.freedesktop.org"/>
- <repository type="git" name="lysator"
- href="https://git.lysator.liu.se/"/>
- <repository name="gitlab" type="git" href="https://gitlab.com/"/>
- <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
- <repository type='tarball' name='icu'
- href='http://download.icu-project.org/files/'/>
<metamodule id="meta-gtk-osx-unsupported">
<dependencies>
@@ -38,22 +21,6 @@
</dependencies>
</metamodule>
- <metamodule id="meta-gtk-osx-webkit">
- <dependencies>
- <dep package="meta-gtk-osx-core"/>
- <dep package="libsoup"/>
- <dep package="WebKit"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gtk-osx-webkit-gtk3">
- <dependencies>
- <dep package="meta-gtk-osx-gtk3"/>
- <dep package="libsoup-gtk3"/>
- <dep package="webkit2gtk3"/>
- </dependencies>
- </metamodule>
-
<autotools id="gnome-mime-data">
<branch tag="GNOME_MIME_DATA_2_18_0"/>
<dependencies>
@@ -67,12 +34,6 @@
</autotools>
- <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
- supports-non-srcdir-builds="no">
- <branch repo="sourceforge" version="1.2.8"
- module="libpng/zlib-1.2.8.tar.gz"/>
- </autotools>
-
<autotools id="p11-kit" autogenargs="--without-trust-paths">
<branch repo="freedesktop" module="p11-glue/p11-kit" revision="stable"/>
<dependencies>
@@ -80,34 +41,6 @@
</dependencies>
</autotools>
- <!-- Rudely demands TeX to build documentation -->
- <!-- Assembler files are missing md5-compress.asm for x86_64 -->
- <autotools id="libnettle"
- autogenargs="--disable-documentation --disable-assembler"
- autogen-template="autoreconf -fis && %(srcdir)s/configure --prefix %(prefix)s
%(autogenargs)s">
- <!-- gnutls 3.3.x does not support nettle 3.0 -->
- <branch repo="lysator" module="nettle/nettle.git"
- tag="nettle_2.7_release_20130424"/>
- <dependencies>
- <dep package="gmp"/>
- </dependencies>
- </autotools>
-
- <!-- Building from git does not work because they have checked in a bunch of
- files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
- <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
- <autotools id="gnutls" autogen-sh="configure"
- autogenargs="--disable-gtk-doc-html --without-p11-kit">
- <!--branch repo="gitlab" module="gnutls/gnutls"/-->
- <branch repo="gnutls" version="3.3.12"
- module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
- <dependencies>
- <dep package="libnettle"/>
- <dep package="libtasn1" />
- <dep package="zlib"/>
- </dependencies>
- </autotools>
-
<cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
<branch tag="libproxy-0.4.10"
repo='libproxy.google.com'/>
@@ -125,31 +58,6 @@
</dependencies>
</autotools>
- <autotools id="glib-networking"
- autogenargs="--without-ca-certificates set_more_warnings=no">
- <branch revision="glib-2-44"/>
- <dependencies>
- <dep package="gnutls"/>
- </dependencies>
- </autotools>
-
- <autotools id="libsoup" autogenargs="set_more_warnings=no">
- <branch revision="gnome-3-14"/>
- <dependencies>
- <dep package="glib"/>
- <dep package="glib-networking"/>
- <dep package='sqlite'/>
- </dependencies>
- </autotools>
-
- <autotools id="enchant" >
- <branch repo="abisource/enchant" module="enchant"
- tag="enchant-1-6-0"/>
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- </autotools>
-
<!-- libgpg-error releases from master -->
<autotools id="libgpg-error" autogenargs="--disable-doc"
autogen-template="%(srcdir)s/%(autogen-sh)s && autoreconf -if &&
%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
@@ -167,123 +75,4 @@
<dep package="libgpg-error" />
</dependencies>
</autotools>
-
- <autotools id="libtasn1" supports-non-srcdir-builds="no" >
- <!-- Git repository is missing files required to build libtasn1
- <branch repo="git.gnu.org" tag="libtasn1_4_4" module="libtasn1"/> -->
- <branch repo="ftp.gnu.org" version="4.4"
- module="libtasn1/libtasn1-4.4.tar.gz"/>
- </autotools>
-
- <autotools id="libwebp" autogen-sh="autoreconf">
- <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:
- append_autogenargs('WebKit', '--enable-video')
- Wno-c++11-extensions: Suppresses clang warning that makes output
- inconvenient to read.
- std=c99: Required for inline keyword in C.
- -->
- <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="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch";
- strip="1"/>
- </branch>
- <dependencies>
- <dep package="libsoup"/>
- <dep package="enchant"/>
- <dep package="icu"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-core"/>
- <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', '--enable-video')
- append_autogenargs('WebKit', '--enable-web-audio')
- -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
- -->
- <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
- 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">
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
- strip="1"/>
- <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
- it's left in -->
- <patch file="http://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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </autotools>
-
- <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
- the WebKit2 API (most applications do.)
- ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
- library is working correctly: run "jhbuild run MiniBrowser".
- ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
- supported.
- ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
- audio, fix this in your .jhbuildrc-custom. You may need some extra
- patches, this is untested.
- ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
- ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
- ENABLE_OPENGL: Untested.
- USE_LIBNOTIFY: Requires libnotify. No module for this yet.
- USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
- -->
- <cmake id="webkit2gtk3"
- cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
- <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
- strip="1"/>
- <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch";
- strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.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-gtk3"/>
- <dep package="meta-gstreamer-1.0"/>
- </after>
- </cmake>
</moduleset>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 6b7958e..ddc6728 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -26,8 +26,12 @@
- gtk-osx-python.modules: self explaining.
- gtk-osx-gtkmm.modules: self explaining.
+ - gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
+ library it depends on.
- gtk-osx-gstreamer.modules: self explaining.
- gtk-osx-themes.modules: self explaining.
+ - gtk-osx-network.modules: The network/crypto stack and various
+ configurations of WebKit.
- gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
- gtk-osx-unsupported.modules: more testing stuff, competely unsupported.
@@ -38,6 +42,7 @@
<include href="gtk-osx-gstreamer.modules"/>
<include href="gtk-osx-gtkmm.modules"/>
<include href="gtk-osx-javascript.modules"/>
+ <include href="gtk-osx-network.modules"/>
<include href="gtk-osx-themes.modules"/>
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-unsupported.modules"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
