- Revision
- 227900
- Author
- [email protected]
- Date
- 2018-01-31 07:55:37 -0800 (Wed, 31 Jan 2018)
Log Message
[WPE] Update jhbuild dependencies
https://bugs.webkit.org/show_bug.cgi?id=182286
This upgrades the following packages,
glib 2.44.1 -> 2.54.3
glib-networking 2.42.0 -> 2.54.1
libsoup 2.48.0 -> 2.60.3
The initial reason for performing these upgrades was that when
visiting https://youtube.com, WPE was getting TLS certificate
errors. After upgrading glib-networking, these were fixed, but the
upgrade introduced dependencies on newer versions of the other
packages upgraded in this commit.
The upgrade to glib caused a linking error in gstreamer, the
following errors were being logged during linking,
//usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_from_script'
//usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_get_unicode_funcs'
//usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_to_script'
This was fixed by adding the glib package built in the jhbuild to
harfbuzz.
Finally, the upgrade of glib caused the glib-warning-fix.patch to
no longer apply, so this patch was removed.
Reviewed by Michael Catanzaro.
* wpe/jhbuild.modules: Added dependecies.
* wpe/patches/glib-warning-fix.patch: Removed.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (227899 => 227900)
--- trunk/Tools/ChangeLog 2018-01-31 13:47:44 UTC (rev 227899)
+++ trunk/Tools/ChangeLog 2018-01-31 15:55:37 UTC (rev 227900)
@@ -1,3 +1,37 @@
+2018-01-31 Charlie Turner <[email protected]>
+
+ [WPE] Update jhbuild dependencies
+ https://bugs.webkit.org/show_bug.cgi?id=182286
+
+ This upgrades the following packages,
+ glib 2.44.1 -> 2.54.3
+ glib-networking 2.42.0 -> 2.54.1
+ libsoup 2.48.0 -> 2.60.3
+
+ The initial reason for performing these upgrades was that when
+ visiting https://youtube.com, WPE was getting TLS certificate
+ errors. After upgrading glib-networking, these were fixed, but the
+ upgrade introduced dependencies on newer versions of the other
+ packages upgraded in this commit.
+
+ The upgrade to glib caused a linking error in gstreamer, the
+ following errors were being logged during linking,
+
+ //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_from_script'
+ //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_get_unicode_funcs'
+ //usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0: undefined reference to `hb_glib_script_to_script'
+
+ This was fixed by adding the glib package built in the jhbuild to
+ harfbuzz.
+
+ Finally, the upgrade of glib caused the glib-warning-fix.patch to
+ no longer apply, so this patch was removed.
+
+ Reviewed by Michael Catanzaro.
+
+ * wpe/jhbuild.modules: Added dependecies.
+ * wpe/patches/glib-warning-fix.patch: Removed.
+
2018-01-31 Carlos Garcia Campos <[email protected]>
Unreviewed, rolling out r227782.
Modified: trunk/Tools/wpe/jhbuild.modules (227899 => 227900)
--- trunk/Tools/wpe/jhbuild.modules 2018-01-31 13:47:44 UTC (rev 227899)
+++ trunk/Tools/wpe/jhbuild.modules 2018-01-31 15:55:37 UTC (rev 227900)
@@ -58,11 +58,11 @@
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
+ <branch module="/pub/GNOME/sources/glib/2.54/glib-2.54.3.tar.xz" version="2.54.3"
repo="ftp.gnome.org"
- hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
- <patch file="glib-warning-fix.patch" strip="1"/>
+ hash="sha256:963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8">
<patch file="gdate-suppress-string-format-literal-warning.patch" strip="1"/>
+ <patch file="glib-revert-wakeup-changes.patch" strip="1"/>
</branch>
</autotools>
@@ -71,9 +71,9 @@
<dependencies>
<dep package="glib"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib-networking/2.42/glib-networking-2.42.0.tar.xz" version="2.42.0"
+ <branch module="/pub/GNOME/sources/glib-networking/2.54/glib-networking-2.54.1.tar.xz" version="2.54.1"
repo="ftp.gnome.org"
- hash="sha256:304dd9e4c0ced69094300e0b9e66cd2eaae7161b9fc3186536d11458677d820d"/>
+ hash="sha256:eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"/>
</autotools>
<autotools id="libsoup"
@@ -82,9 +82,9 @@
<dependencies>
<dep package="glib-networking"/>
</dependencies>
- <branch module="/pub/GNOME/sources/libsoup/2.48/libsoup-2.48.0.tar.xz" version="2.48.0"
+ <branch module="/pub/GNOME/sources/libsoup/2.60/libsoup-2.60.3.tar.xz" version="2.60.3"
repo="ftp.gnome.org"
- hash="sha256:ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784"/>
+ hash="sha256:1b0dc762f23abe4e0d29b77370e539fd35f31d8e8e0318d6ddccff395be68a22"/>
</autotools>
<autotools id="fonts" supports-non-srcdir-builds="no"
@@ -116,8 +116,9 @@
</autotools>
<autotools id="harfbuzz" autogen-sh="configure"
- autogenargs="--with-cairo=no --with-glib=no --with-freetype=yes --with-fontconfig=yes">
+ autogenargs="--with-cairo=no --with-glib=yes --with-freetype=yes --with-fontconfig=yes">
<dependencies>
+ <dep package="glib"/>
<dep package="freetype6"/>
<dep package="fontconfig"/>
</dependencies>
Added: trunk/Tools/wpe/patches/glib-revert-wakeup-changes.patch (0 => 227900)
--- trunk/Tools/wpe/patches/glib-revert-wakeup-changes.patch (rev 0)
+++ trunk/Tools/wpe/patches/glib-revert-wakeup-changes.patch 2018-01-31 15:55:37 UTC (rev 227900)
@@ -0,0 +1,106 @@
+From 94b38beff1347ec4a733199f7a7abdacaa958678 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <[email protected]>
+Date: Wed, 17 Jan 2018 11:38:50 +0000
+Subject: gmain: Partial revert of recent wakeup changes to gmain.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts the following commits (but keeps the other recent changes
+to gmain.c):
+ • e4ee3079c Do not wake up main loop if change is from same thread
+ • 208702404 main: Create a helper function for "owner wakeup" optimization
+ • 0c0469b56 gmain: Signal wakeups if context has never been acquired as well
+ • 9ba95e25b gmain: only signal GWakeup right before or during a blocking poll
+
+Some combination of them is causing problems with LibreOffice and/or
+WebKit, and the safest thing to do at the moment is revert them all
+until we work out what’s going on. The previous revert (4976e8109) was
+not sufficient (it fixed WebKit, but re-broken LibreOffice).
+
+By reverting, we gain some spurious wakeups, but avoid dropping
+necessary wakeups, which is presumably what’s causing problems in the
+other modules.
+
+Signed-off-by: Philip Withnall <[email protected]>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761102
+---
+ glib/gmain.c | 33 +++++----------------------------
+ 1 file changed, 5 insertions(+), 28 deletions(-)
+
+diff --git a/glib/gmain.c b/glib/gmain.c
+index 8ca54de..67102cd 100644
+--- a/glib/gmain.c
++++ b/glib/gmain.c
+@@ -1118,29 +1118,6 @@ source_remove_from_context (GSource *source,
+ }
+ }
+
+-/* See https://bugzilla.gnome.org/show_bug.cgi?id=761102 for
+- * the introduction of this.
+- *
+- * The main optimization is to avoid waking up the main
+- * context if a change is made by the current owner.
+- */
+-static void
+-conditional_wakeup (GMainContext *context)
+-{
+- /* We want to signal wakeups in two cases:
+- * 1 When the context is owned by another thread
+- * 2 When the context owner is NULL (two subcases)
+- * 2a Possible if the context has never been acquired
+- * 2b Or if the context has no current owner
+- *
+- * At least case 2a) is necessary to ensure backwards compatibility with
+- * qemu's use of GMainContext.
+- * https://bugzilla.gnome.org/show_bug.cgi?id=761102#c14
+- */
+- if (context->owner != G_THREAD_SELF)
+- g_wakeup_signal (context->wakeup);
+-}
+-
+ static guint
+ g_source_attach_unlocked (GSource *source,
+ GMainContext *context,
+@@ -1187,8 +1164,8 @@ g_source_attach_unlocked (GSource *source,
+ /* If another thread has acquired the context, wake it up since it
+ * might be in poll() right now.
+ */
+- if (do_wakeup)
+- conditional_wakeup (context);
++ if (do_wakeup && context->owner && context->owner != G_THREAD_SELF)
++ g_wakeup_signal (context->wakeup);
+
+ return source->source_id;
+ }
+@@ -1878,7 +1855,7 @@ g_source_set_ready_time (GSource *source,
+ {
+ /* Quite likely that we need to change the timeout on the poll */
+ if (!SOURCE_BLOCKED (source))
+- conditional_wakeup (context);
++ g_wakeup_signal (context->wakeup);
+ UNLOCK_CONTEXT (context);
+ }
+ }
+@@ -4318,7 +4295,7 @@ g_main_context_add_poll_unlocked (GMainContext *context,
+ context->poll_changed = TRUE;
+
+ /* Now wake up the main loop if it is waiting in the poll() */
+- conditional_wakeup (context);
++ g_wakeup_signal (context->wakeup);
+ }
+
+ /**
+@@ -4378,7 +4355,7 @@ g_main_context_remove_poll_unlocked (GMainContext *context,
+ context->poll_changed = TRUE;
+
+ /* Now wake up the main loop if it is waiting in the poll() */
+- conditional_wakeup (context);
++ g_wakeup_signal (context->wakeup);
+ }
+
+ /**
+--
+cgit v0.12
+
Deleted: trunk/Tools/wpe/patches/glib-warning-fix.patch (227899 => 227900)
--- trunk/Tools/wpe/patches/glib-warning-fix.patch 2018-01-31 13:47:44 UTC (rev 227899)
+++ trunk/Tools/wpe/patches/glib-warning-fix.patch 2018-01-31 15:55:37 UTC (rev 227900)
@@ -1,34 +0,0 @@
-From 9f90ee5eeccd47f39c7a03dcd786b125a19c195d Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <[email protected]>
-Date: Sat, 13 Jun 2015 22:52:33 -0500
-Subject: [PATCH] genmarshal: silence register storage class warnings
-
-Using the register keyword triggers warnings on noteworthy compilers
-(clang), since it's deprecated in C++ and at danger of being removed
-from the language. There is no reason to use it since it isn't 1980
-anymore.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=750918
----
- gobject/glib-genmarshal.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
-index be4151a..ca78a6f 100644
---- a/gobject/glib-genmarshal.c
-+++ b/gobject/glib-genmarshal.c
-@@ -412,9 +412,9 @@ generate_marshal (const gchar *signame,
- g_fprintf (fout, "%s%s data2);\n", indent (ind), pad ("gpointer"));
-
- /* cfile marshal variables */
-- g_fprintf (fout, " register GMarshalFunc_%s callback;\n", signame);
-- g_fprintf (fout, " register GCClosure *cc = (GCClosure*) closure;\n");
-- g_fprintf (fout, " register gpointer data1, data2;\n");
-+ g_fprintf (fout, " GMarshalFunc_%s callback;\n", signame);
-+ g_fprintf (fout, " GCClosure *cc = (GCClosure*) closure;\n");
-+ g_fprintf (fout, " gpointer data1, data2;\n");
- if (sig->rarg->setter)
- g_fprintf (fout, " %s v_return;\n", sig->rarg->ctype);
-
---
-2.4.2
\ No newline at end of file
