Diff
Modified: trunk/Tools/ChangeLog (235113 => 235114)
--- trunk/Tools/ChangeLog 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/ChangeLog 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1,3 +1,23 @@
+2018-08-21 Michael Catanzaro <[email protected]>
+
+ [Flatpak] Update to GNOME master runtime
+ https://bugs.webkit.org/show_bug.cgi?id=188731
+
+ Reviewed by Philippe Normand.
+
+ The 3.28 runtime is pretty stale at this point. We could wait a couple weeks for the 3.30
+ runtime, but I don't think there's any need to stick with the stable runtime when we have
+ the ability to pin to a particular version of the master runtime. There are also several
+ advantages to switching to the master runtime.
+
+ * flatpak/files/httpd-autogen.sh: Removed.
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.clean_args):
+ * flatpak/org.webkit.GTK.yaml:
+ * flatpak/org.webkit.WebKit.yaml:
+ * flatpak/patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch: Removed.
+ * flatpak/patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch: Removed.
+
2018-08-20 Jonathan Bedard <[email protected]>
WebKitTestRunner: Add watchOS entitlements
Deleted: trunk/Tools/flatpak/files/httpd-autogen.sh (235113 => 235114)
--- trunk/Tools/flatpak/files/httpd-autogen.sh 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/files/httpd-autogen.sh 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1 +0,0 @@
-autoreconf
\ No newline at end of file
Modified: trunk/Tools/flatpak/flatpakutils.py (235113 => 235114)
--- trunk/Tools/flatpak/flatpakutils.py 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-08-21 13:53:31 UTC (rev 235114)
@@ -612,9 +612,9 @@
repos = FlatpakRepos()
self.sdk_repo = repos.add(
- FlatpakRepo("flathub",
- url=""
- repo_file="https://dl.flathub.org/repo/flathub.flatpakrepo"))
+ FlatpakRepo("gnome-nightly",
+ url=""
+ repo_file="https://sdk.gnome.org/gnome-nightly.flatpakrepo"))
manifest = load_manifest(self.manifest_path)
if not manifest:
Modified: trunk/Tools/flatpak/org.webkit.GTK.yaml (235113 => 235114)
--- trunk/Tools/flatpak/org.webkit.GTK.yaml 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/org.webkit.GTK.yaml 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1,8 +1,8 @@
- name: mesa
sources:
- type: archive
- url: https://mesa.freedesktop.org/archive/mesa-18.0.3.tar.xz
- sha256: 099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30
+ url: https://mesa.freedesktop.org/archive/mesa-18.0.5.tar.xz
+ sha256: 5187bba8d72aea78f2062d134ec6079a508e8216062dce9ec9048b5eb2c4fc6b
config-opts:
- --prefix=/app/softGL
- --disable-dri3
Modified: trunk/Tools/flatpak/org.webkit.WebKit.yaml (235113 => 235114)
--- trunk/Tools/flatpak/org.webkit.WebKit.yaml 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/org.webkit.WebKit.yaml 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1,14 +1,14 @@
app-id: %(PORTNAME)s
runtime: org.gnome.Platform
-runtime-version: "3.28"
+runtime-version: "master"
# Control the exact version of the Sdk/Runtime that is being used.
-sdk-hash: cea71fe86d6961b4fe58046170f8dc8f8d4d04141ddf211e7cc6db44a18a0c49
-runtime-hash: 9785cf7dc62290d76eef4bf0f5d25240fc5bb3d73128c25e95c4e4cb90bb3560
+sdk-hash: 381c97c2d71033d9b09b15da363af75a49500b691245396adbc85ddca548410c
+runtime-hash: 235289b568ff0fe78771eeae45562c1415104821abbffe6559380aae58f06c58
sdk: org.gnome.Sdk
command: %(COMMAND)s
finish-args:
# Basically no sandboxing, the goal here is to make it flexible
- # for developers, not really to isolate (openning all devices
+ # for developers, not really to isolate (opening all devices
# to allow acces video cameras until we have a portal at least).
- --share=ipc
- --socket=x11
@@ -42,21 +42,14 @@
- --with-apr=/app/bin/apr-1-config
- name: httpd
sources:
- - type: git
- url: https://github.com/apache/httpd.git
- branch: 2.4.33
- - type : file
- path : files/httpd-autogen.sh
- dest-filename : autogen.sh
- # The version embedded in the sandbox doesn't have a working pcre-config
- - type: patch
- path: patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch
+ - type: archive
+ url: http://mirror.metrocast.net/apache//httpd/httpd-2.4.34.tar.gz
+ sha256: 6eaef0313b071d105eb3ca49289fc0f1431392e1061e1df420ca5775caed2211
config-opts:
- --enable-mpms-shared=all
- --enable-modules=all
- --with-apr=/app/bin/apr-1-config
- --with-apr-util=/app/bin/apu-1-config
- - --with-pcre=/app
- --enable-authnz-fcgi
- --enable-cgi
- --enable-cgid
@@ -110,97 +103,14 @@
url: https://files.pythonhosted.org/packages/9e/17/1d4ed6e1a4c0918a0357dfa2fdbe26bf63f6e616013c04a14bce9fd33e40/pyaml-17.12.1.tar.gz
sha256: 66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3
- # GStreamer modules
- - name: libvpx
- no-autogen: true
+ # Speed up libgcrypt for testing.
+ # (You'd better not be using this flatpak environment for real use!)
+ - name: libgcrypt
sources:
- type: git
- url: https://chromium.googlesource.com/webm/libvpx
- branch: v1.7.0
- config-opts:
- - --enable-pic
- - --as=yasm
- - --disable-unit-tests
- - --size-limit=16384x16384
- - --enable-postproc
- - --enable-multi-res-encoding
- - --enable-temporal-denoising
- - --enable-vp9-temporal-denoising
- - --enable-vp9-postproc
- - --enable-shared
- - name: libopenh264
- buildsystem: meson
- sources:
- - type: git
- url: https://github.com/cisco/openh264.git
- branch: a1b3f07c5271f312997fcc3451237031444c4475 # 1.8.0 + fix for gcc 8
- - name: gstreamer
- buildsystem: meson
- sources:
- - type: git
- url: https://anongit.freedesktop.org/git/gstreamer/gstreamer
- branch: 1.14.1
- config-opts:
- - -Ddisable_gtkdoc=true
- - name: gst-plugins-base
- buildsystem: meson
- sources:
- - type: git
- url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-base
- branch: 1.14.1
- config-opts:
- - -Ddisable_gtkdoc=true
- - name: gst-plugins-good
- buildsystem: meson
- sources:
- - type: git
- url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good
- branch: 1.14.1
- - type: patch
- path: ../gstreamer/patches/gst-plugins-good-0002-qtdemux-add-context-for-a-preferred-protection.patch
- - type: patch
- path: ../gstreamer/patches/gst-plugins-good-0003-qtdemux-also-push-buffers-without-encryption-info-in.patch
- - type: patch
- path: ../gstreamer/patches/gst-plugins-good-0001-qtdemux-Do-not-run-the-preferred-decryptor-context-q.patch
- - type: patch
- path: ../gstreamer/patches/gst-plugins-good-0002-qtdemux-Do-not-unref-a-NULL-stream_tags.patch
- - type: patch
- path: ../gstreamer/patches/gst-plugins-good-0003-qtdemux-Clarify-field-name-about-stream-encryption-s.patch
- config-opts:
- - -Ddisable_gtkdoc=true
- - name: gst-plugins-ugly
- buildsystem: meson
- sources:
- - type: git
- url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-ugly
- branch: 1.14.1
- config-opts:
- - -Ddisable_gtkdoc=true
- - name: gst-plugins-bad
- buildsystem: meson
- sources:
- - type: git
- url: https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad
- branch: 1.14.1
- config-opts:
- - -Ddisable_gtkdoc=true
- - name: gst-libav
- buildsystem: meson
- sources:
- - type: archive
- url: https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.1.tar.xz
- sha256: eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d
- config-opts:
- - -Ddisable_gtkdoc=true
-
- - name: libgcrypt # Speedup libgrcypt
- sources:
- - type: git
url: https://dev.gnupg.org/source/libgcrypt.git
- branch: libgcrypt-1.7.6
+ branch: libgcrypt-1.8.3
- type: patch
- path: patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch
- - type: patch
path: ../gtk/patches/libgcrypt-use-only-dev-urandom-for-testing.patch
config-opts:
- --disable-doc
Deleted: trunk/Tools/flatpak/patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch (235113 => 235114)
--- trunk/Tools/flatpak/patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/patches/httpd-0001-configure-use-pkg-config-for-PCRE-detection.patch 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1,50 +0,0 @@
-From b5ebe404f1388ddda3603e53277f87e0b96ba695 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <[email protected]>
-Date: Mon, 11 Jun 2018 16:14:38 -0400
-Subject: [PATCH] configure: use pkg-config for PCRE detection
-
----
- configure.in | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 761e836..b155d4b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -215,28 +215,11 @@ fi
- AC_ARG_WITH(pcre,
- APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
-
--AC_PATH_PROG(PCRE_CONFIG, pcre-config, false)
--if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
-- PCRE_CONFIG=$with_pcre/bin/pcre-config
--elif test -x "$with_pcre"; then
-- PCRE_CONFIG=$with_pcre
--fi
--
--if test "$PCRE_CONFIG" != "false"; then
-- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
-- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
-- fi
-- case `$PCRE_CONFIG --version` in
-- [[1-5].*])
-- AC_MSG_ERROR([Need at least pcre version 6.0])
-- ;;
-- esac
-- AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
-- APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
-- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`])
--else
-- AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
--fi
-+PKG_CHECK_MODULES([PCRE], [libpcre], [
-+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
-+], [
-+ AC_MSG_ERROR([$PCRE_PKG_ERRORS])
-+])
- APACHE_SUBST(PCRE_LIBS)
-
- AC_MSG_NOTICE([])
---
-2.17.1
-
Deleted: trunk/Tools/flatpak/patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch (235113 => 235114)
--- trunk/Tools/flatpak/patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch 2018-08-21 13:27:42 UTC (rev 235113)
+++ trunk/Tools/flatpak/patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch 2018-08-21 13:53:31 UTC (rev 235114)
@@ -1,110 +0,0 @@
-From 9aff3f1b344fc8666b14c57629162c2b9007cad8 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <[email protected]>
-Date: Fri, 29 Jun 2018 09:05:52 -0400
-Subject: [PATCH] Use pkg-config to detect gpg-error
-
----
- m4/gpg-error.m4 | 88 +++++++------------------------------------------
- 1 file changed, 12 insertions(+), 76 deletions(-)
-
-diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
-index 1661204c..5f9f33c2 100644
---- a/m4/gpg-error.m4
-+++ b/m4/gpg-error.m4
-@@ -41,81 +41,17 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
- AC_ARG_WITH(gpg-error-prefix,,
- [gpg_error_config_prefix="$withval"])
-
-- if test x"${GPG_ERROR_CONFIG}" = x ; then
-- if test x"${gpg_error_config_prefix}" != x ; then
-- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
-- else
-- case "${SYSROOT}" in
-- /*)
-- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
-- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
-- fi
-- ;;
-- '')
-- ;;
-- *)
-- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-- ;;
-- esac
-- fi
-- fi
-+ PKG_CHECK_MODULES([GPG_ERROR], [gpg-error], [
-+ AC_DEFINE([HAVE_GPG_ERROR], [1], [Define if you have gpg-error library])
-
-- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
-- min_gpg_error_version=ifelse([$1], ,0.0,$1)
-- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
-- ok=no
-- if test "$GPG_ERROR_CONFIG" != "no" \
-- && test -f "$GPG_ERROR_CONFIG" ; then
-- req_major=`echo $min_gpg_error_version | \
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-- req_minor=`echo $min_gpg_error_version | \
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
-- major=`echo $gpg_error_config_version | \
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-- minor=`echo $gpg_error_config_version | \
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-- if test "$major" -gt "$req_major"; then
-- ok=yes
-- else
-- if test "$major" -eq "$req_major"; then
-- if test "$minor" -ge "$req_minor"; then
-- ok=yes
-- fi
-- fi
-- fi
-- fi
-- if test $ok = yes; then
-- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
-- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
-- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
-- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
-- AC_MSG_RESULT([yes ($gpg_error_config_version)])
-- ifelse([$2], , :, [$2])
-- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
-- if test x"$gpg_error_config_host" != xnone ; then
-- if test x"$gpg_error_config_host" != x"$host" ; then
-- AC_MSG_WARN([[
--***
--*** The config script $GPG_ERROR_CONFIG was
--*** built for $gpg_error_config_host and thus may not match the
--*** used host $host.
--*** You may want to use the configure option --with-gpg-error-prefix
--*** to specify a matching config script or use \$SYSROOT.
--***]])
-- gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
-- fi
-- fi
-- else
-- GPG_ERROR_CFLAGS=""
-- GPG_ERROR_LIBS=""
-- GPG_ERROR_MT_CFLAGS=""
-- GPG_ERROR_MT_LIBS=""
-- AC_MSG_RESULT(no)
-- ifelse([$3], , :, [$3])
-- fi
-- AC_SUBST(GPG_ERROR_CFLAGS)
-- AC_SUBST(GPG_ERROR_LIBS)
-- AC_SUBST(GPG_ERROR_MT_CFLAGS)
-- AC_SUBST(GPG_ERROR_MT_LIBS)
-+ GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS"
-+ GPG_ERROR_MT_LIBS="-lpthread $GPG_ERROR_LIBS"
-+
-+ AC_SUBST(GPG_ERROR_CFLAGS)
-+ AC_SUBST(GPG_ERROR_LIBS)
-+ AC_SUBST(GPG_ERROR_MT_CFLAGS)
-+ AC_SUBST(GPG_ERROR_MT_LIBS)
-+ ], [
-+ AC_MSG_ERROR([$GPG_ERROR_ERRORS])
-+ ])
- ])
---
-2.18.0
-
