The big webkitgtk bump
cover The big webkitgtk bump
This is the first vesion of the bump.
There's support for libgtk2 & libgtk3, though libgtk2 is always needed for the plugin system.
GL* support was only tested via mesa software renderer.
Wayland support wasn't enabled because it still needs gtk2 (plugins) - this could possibly be patched away.
Multimedia support is automatic via detection of gst1-plugins-good, ideally this should be an option but right now opencv+gst generate a dependency loop if gstreamer1 is selected. Also codecs will need to be catered by the user via the appropiate gst selects.
MIPS support was disabled pending libatomic support for __sync_fetch_and_add_8 which is handled there for some 32-bit architectures.
Possible TODOs:
Wayland in a proper way, granite support, gcr support, more arch testing/support.
v1:
* Bump webkitgtk to version 2.4.x in a versioned package. This is because midori can't use 2.6.x or 2.8.x and this way we can have another webkitgtk package in parallel for other uses. The series is still security-supported upstream.
* Bump midori to version 0.5.9.
No effort was made to enable support for the old webkit 1.x. series, it may be possible to do so but it makes no sense.
* Deprecate old webkit package.
Security bugs, build issues, general instability.
Gustavo Zacarias (3):
webkitgtk24: new package
midori: bump to version 0.5.9
webkit: mark as deprecated
package/Config.in | 1 + package/midori/0001-disable-libnotify.patch | 43 ++++++++++++ package/midori/Config.in | 39 +++++++---- package/midori/midori.hash | 2 + package/midori/midori.mk | 57 ++++++++-------- package/webkit/Config.in | 3 + package/webkitgtk24/0001-fix-bug-137640.patch | 17 +++++ package/webkitgtk24/Config.in | 56 ++++++++++++++++ package/webkitgtk24/webkitgtk24.hash | 2 + package/webkitgtk24/webkitgtk24.mk | 97 +++++++++++++++++++++++++++ 10 files changed, 278 insertions(+), 39 deletions(-) create mode 100644 package/midori/0001-disable-libnotify.patch create mode 100644 package/midori/midori.hash create mode 100644 package/webkitgtk24/0001-fix-bug-137640.patch create mode 100644 package/webkitgtk24/Config.in create mode 100644 package/webkitgtk24/webkitgtk24.hash create mode 100644 package/webkitgtk24/webkitgtk24.mk
Signature · 1 line
2.0.5
PATCH 1/3 webkitgtk24: new package
Add new webkitgtk24 package.
The difference with the legacy webkit package is that this one uses the new webkit2 API, and optionally the webkit1 API.
It's versioned because the latest release of midori can't use the newer 2.6.x or 2.8.x webkitgtk versions yet.
This paves the way for a newer webkit26 or webkit28 package that can live side-by-side with this one for other uses.
Some loose checks (like !xorg7) are in place for possible/future wayland support.
Right now wayland requires gtk2, hence xorg, but it might be possible to patch that out with some work (it seems to be done for version 2.6.x, though the build system changed to cmake so it might not be a straighfoward patch).
Choices had to be made in the GL-area, right now the preference order is libGL (full OpenGL), then GLES, then nothing (obviously). And when gtk3 is around it's also preferred as well.
--- package/Config.in | 1 + package/webkitgtk24/0001-fix-bug-137640.patch | 17 +++++ package/webkitgtk24/Config.in | 56 ++++++++++++++++ package/webkitgtk24/webkitgtk24.hash | 2 + package/webkitgtk24/webkitgtk24.mk | 97 +++++++++++++++++++++++++++ 5 files changed, 173 insertions(+) create mode 100644 package/webkitgtk24/0001-fix-bug-137640.patch create mode 100644 package/webkitgtk24/Config.in create mode 100644 package/webkitgtk24/webkitgtk24.hash create mode 100644 package/webkitgtk24/webkitgtk24.mk
package/Config.in +1 -0
@@ -766,6 +766,7 @@ menu "Graphics" source "package/tiff/Config.in" source "package/wayland/Config.in" source "package/webkit/Config.in" + source "package/webkitgtk24/Config.in" source "package/webp/Config.in" source "package/zxing/Config.in" endmenu
package/webkitgtk24/0001-fix-bug-137640.patch new file +17 -0
@@ -0,0 +1,17 @@ +Fix for bug #137640 - build breaks without accelerated compositing. +See: https://bugs.webkit.org/show_bug.cgi?id=137640 + +Singed-off-by: Gustavo Zacarias <[email protected]> + +diff -urN webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp webkitgtk-2.4.6/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp +--- webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-09-26 11:40:45.000000000 +0400 ++++ webkitgtk-2.4.6/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-10-11 20:43:16.687116807 +0400 +@@ -110,7 +110,7 @@ + WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval); + WebCore::pageCache()->setCapacity(pageCacheCapacity); + +-#if PLATFORM(GTK) ++#if PLATFORM(GTK) && USE(ACCELERATED_COMPOSITING) + WebCore::pageCache()->setShouldClearBackingStores(true); + #endif +
package/webkitgtk24/Config.in new file +56 -0
56 lines not on this page · raw message
package/webkitgtk24/webkitgtk24.hash new file +2 -0
@@ -0,0 +1,2 @@ +# From http://www.webkitgtk.org/releases/webkitgtk-2.4.8.tar.xz.sha1 +sha1 44c6bbe52108297126830525619c1df047886a6f webkitgtk-2.4.8.tar.xz
package/webkitgtk24/webkitgtk24.mk new file +97 -0
97 lines not on this page · raw message
Signature · 1 line
2.0.5
PATCH 2/3 midori: bump to version 0.5.9
In reply to Gustavo ZacariasBump to version 0.5.9 which uses the new webkit2 API (gtk3) or alternatively fallback to webkit1 compatibility API (gtk2). The old webkit is completely unsupported now, it makes no sense because of instability and security issues.
--- package/midori/0001-disable-libnotify.patch | 43 ++++++++++++++++++++++ package/midori/Config.in | 39 ++++++++++++++------ package/midori/midori.hash | 2 + package/midori/midori.mk | 57 +++++++++++++++-------------- 4 files changed, 102 insertions(+), 39 deletions(-) create mode 100644 package/midori/0001-disable-libnotify.patch create mode 100644 package/midori/midori.hash
package/midori/0001-disable-libnotify.patch new file +43 -0
@@ -0,0 +1,43 @@ +Disable libnotify support, we've got no package and it's not very useful +in embedded targets anyway. +The webmedia extension requires libnotify as well. + +Signed-off-by: Gustavo Zacarias <[email protected]> + +diff -Nura midori-0.5.9.orig/CMakeLists.txt midori-0.5.9/CMakeLists.txt +--- midori-0.5.9.orig/CMakeLists.txt 2015-03-30 15:57:29.554632932 -0300 ++++ midori-0.5.9/CMakeLists.txt 2015-03-30 15:57:35.299830192 -0300 +@@ -143,16 +143,7 @@ + endif () + endif () + +-if (WIN32) +- add_definitions("-DLIBNOTIFY_VERSION=\"No\"") +-else () +- pkg_check_modules(NOTIFY REQUIRED libnotify) +- add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"") +- add_definitions("-DHAVE_LIBNOTIFY") +- set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}") +- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}") +- set(PKGS ${PKGS} libnotify) +-endif () ++add_definitions("-DLIBNOTIFY_VERSION=\"No\"") + + option(USE_GTK3 "Use GTK+3" OFF) + option(HALF_BRO_INCOM_WEBKIT2 "Serve as a guniea pig" OFF) +diff -Nura midori-0.5.9.orig/extensions/CMakeLists.txt midori-0.5.9/extensions/CMakeLists.txt +--- midori-0.5.9.orig/extensions/CMakeLists.txt 2015-03-30 15:57:29.544632589 -0300 ++++ midori-0.5.9/extensions/CMakeLists.txt 2015-03-30 15:57:51.777395949 -0300 +@@ -24,11 +24,7 @@ + ) + endif () + +-# FIXME: re-enable webmedia extension +-# once we have working notifications on win +-if (WIN32) +- list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala") +-endif() ++list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala") + + foreach(UNIT_SRC ${EXTENSIONS}) + string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)
package/midori/Config.in +27 -12
@@ -1,20 +1,35 @@ +comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads" + depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2 + config BR2_PACKAGE_MIDORI bool "midori" - select BR2_PACKAGE_WEBKIT - select BR2_PACKAGE_LIBSEXY + select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP_GNOME + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_WEBKITGTK24 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_INSTALL_LIBSTDCPP # webkit - depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2 - depends on BR2_USE_WCHAR # webkit - depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS + depends on (BR2_PACKAGE_LIBGTK2 && BR2_PACKAGE_XORG7) + depends on BR2_INSTALL_LIBSTDCPP # webkitgtk24 + depends on BR2_TOOLCHAIN_HAS_THREADS # webkitgtk24 + depends on BR2_USE_WCHAR # webkitgtk24 + depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS help Midori is a lightweight web browser based on WebKit - http://software.twotoasts.de/?page=midori + http://www.midori-browser.org/ -comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads" - depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2 +if BR2_PACKAGE_MIDORI + +config BR2_PACKAGE_MIDORI_HTTPS + bool "HTTPS support" + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_GLIB_NETWORKING + select BR2_PACKAGE_GNUTLS # for glib-networking + help + Enable HTTPS protocol support + +endif
package/midori/midori.hash new file +2 -0
@@ -0,0 +1,2 @@ +# From download link @ http://midori-browser.org/download/source/ +sha1 475614dcc89a214a3c2fdc2aaefc817a5fa0ca03 midori_0.5.9_all_.tar.bz2
package/midori/midori.mk +30 -27
74 lines not on this page · raw message
Signature · 1 line
2.0.5
PATCH 3/3 webkit: mark as deprecated
In reply to Gustavo ZacariasMark webkit as deprecated now that midori has been updated to use webkitgtk24.
It has multiple CVEs under it's belt and is no longer maintained upstream.
--- package/webkit/Config.in | 3 +++ 1 file changed, 3 insertions(+)
package/webkit/Config.in +3 -0
@@ -5,11 +5,13 @@ config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS default y if BR2_i386 || BR2_mips || BR2_mipsel || \ BR2_sparc || BR2_x86_64 depends on BR2_USE_MMU # libgail -> pango -> libglib2 + depends on BR2_DEPRECATED_SINCE_2015_05 # disabled on powerpc due to bug https://bugs.webkit.org/show_bug.cgi?id=113638 config BR2_PACKAGE_WEBKIT bool "webkit" + depends on BR2_DEPRECATED_SINCE_2015_05 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # enchant -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2; icu
@@ -43,6 +45,7 @@ config BR2_PACKAGE_WEBKIT http://webkit.org/ comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads" + depends on BR2_DEPRECATED_SINCE_2015_05 depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS depends on BR2_ARCH_HAS_ATOMICS # cairo depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \
Signature · 1 line
2.0.5
cover The big webkitgtk bump
In reply to Gustavo ZacariasOn 04/04/2015 10:25 AM, Gustavo Zacarias wrote:
Well, some typos and omissions... ;)
Quoted 2 lines
Wayland support wasn't enabled because it still needs gtk2 (plugins) - this could possibly be patched away.
...which would pull in xorg7 and negate any size savings wayland gives.
Quoted 4 lines
Multimedia support is automatic via detection of gst1-plugins-good, ideally this should be an option but right now opencv+gst generate a dependency loop if gstreamer1 is selected. Also codecs will need to be catered by the user via the appropiate gst selects.
s/gst1-plugins-good/gst1-plugins-base/
Quoted 3 lines
Possible TODOs:
Wayland in a proper way, granite support, gcr support, more arch testing/support.
Most of the tests were for the ARM vexpress target, to excercise the JIT a bit, though v5 behaved as well (in qemu it doesn't make much difference between JIT vs. non-JIT, they're both turtle slow). Also most of the tests i went for the gtk3 GUI, for it to look good just add some basic font (liberation) and icons (adwaita) otherwise things will look somewhat broken/bad.
Regards.