[gimp] build: enable WebKit dependency and get a full-feature Flatpak build!
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build: enable WebKit dependency and get a full-feature Flatpak build!
- Date: Tue, 31 Jan 2017 18:50:59 +0000 (UTC)
commit c09b54d3168a58ab9c3b2ec703ed21d50a7bdee5
Author: Jehan <jehan girinstud io>
Date: Tue Jan 31 19:35:01 2017 +0100
build: enable WebKit dependency and get a full-feature Flatpak build!
The build has been fixed by a patch from Upstream:
https://bugs.webkit.org/show_bug.cgi?id=156510
Note that WebKit takes hours to build, so if you just want to test
Flatpak, you may prefer disable this module again.
We now have a full-feature Flatpak build, except for libgudev, which
means that special input devices probably won't work in the GIMP
Flatpak. It is to be noted that Flatpak developers told me that
libudev won't work inside the sandbox anyway. A portal will have
to be implemented. See:
https://github.com/flatpak/flatpak/issues/12#issuecomment-276016074
build/flatpak/org.gimp.GIMP.json | 5 ++++-
build/flatpak/patches/webkitgtk-2.4.11.patch | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/build/flatpak/org.gimp.GIMP.json b/build/flatpak/org.gimp.GIMP.json
index 816dd70..8a82967 100644
--- a/build/flatpak/org.gimp.GIMP.json
+++ b/build/flatpak/org.gimp.GIMP.json
@@ -247,7 +247,6 @@
},
{
"name": "webkitgtk",
- "disabled": true,
"config-opts": [ "--with-gtk=2.0", "--disable-webkit2", "--disable-geolocation",
"--disable-video",
"--disable-spellcheck", "--disable-credential-storage", "--disable-web-audio" ],
"cleanup": [ "/share/doc", "/bin" ],
@@ -256,6 +255,10 @@
"type": "archive",
"url": "https://www.webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz",
"sha256": "588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"
+ },
+ {
+ "type": "patch",
+ "path": "patches/webkitgtk-2.4.11.patch"
}
]
},
diff --git a/build/flatpak/patches/webkitgtk-2.4.11.patch b/build/flatpak/patches/webkitgtk-2.4.11.patch
new file mode 100644
index 0000000..85e9ad5
--- /dev/null
+++ b/build/flatpak/patches/webkitgtk-2.4.11.patch
@@ -0,0 +1,11 @@
+diff -ru webkitgtk-2.4.11/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
webkitgtk-2.4.11.raw.patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
+--- webkitgtk-2.4.11/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11.raw.patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2017-01-30
23:43:13.427189343 +0100
+@@ -40,6 +40,7 @@
+ #include "PaintInfo.h"
+ #include "PlatformContextCairo.h"
+ #include "RenderElement.h"
++#include "RenderBox.h"
+ #include "TextDirection.h"
+ #include "UserAgentStyleSheets.h"
+ #include "WidgetRenderingContext.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]