Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 412292 Details for
Bug 560860
dev-qt/qtwebkit-5.5.0 fails to build with musl
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch for ::musl
0001-dev-qt-qtwebkit-Disable-backtrace-bug-560860.patch (text/plain), 12.83 KB, created by
Vic Kerr (wikky)
on 2015-09-19 19:32:33 UTC
(
hide
)
Description:
Proposed patch for ::musl
Filename:
MIME Type:
Creator:
Vic Kerr (wikky)
Created:
2015-09-19 19:32:33 UTC
Size:
12.83 KB
patch
obsolete
>From 14f65188d8125def93cd6a07c349cd44f778b104 Mon Sep 17 00:00:00 2001 >From: Wiktor W Brodlo <wiktor@brodlo.net> >Date: Sat, 19 Sep 2015 19:30:29 +0000 >Subject: [PATCH] dev-qt/qtwebkit: Disable backtrace, bug #560860 > >--- > dev-qt/qtwebkit/Manifest | 7 ++ > .../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 +++ > .../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 ++++ > .../files/qtwebkit-5.4.2-system-leveldb.patch | 25 +++++ > ...webkit-5.5.0-fix-backtrace-detection-musl.patch | 22 +++++ > dev-qt/qtwebkit/metadata.xml | 19 ++++ > dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild | 102 +++++++++++++++++++++ > 7 files changed, 208 insertions(+) > create mode 100644 dev-qt/qtwebkit/Manifest > create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch > create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch > create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch > create mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch > create mode 100644 dev-qt/qtwebkit/metadata.xml > create mode 100644 dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild > >diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest >new file mode 100644 >index 0000000..fd74f5a >--- /dev/null >+++ b/dev-qt/qtwebkit/Manifest >@@ -0,0 +1,7 @@ >+AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71 >+AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274 >+AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7 >+AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 832 SHA256 2f626061cadac70a881b91f03e9b5671ecf848d6c619c38b75f0fe3fdf380463 SHA512 39ea30ae653b39b4e933f26acaa0d75e9ea4fbd3cd4843a404c887e7525183a722870e561512e7829f1d60e6f63628c2e79a19d03b47935cad6cc7f46e515e22 WHIRLPOOL ca0bf716dbc81d233af66a6aa0fb4ae96e28dffb493d5d6cf2af799fb5a7b3ee16f13e8fefc0d3fb28839cc7aaf3d696533cb76d4b8d4ef96b964757d1654039 >+DIST qtwebkit-opensource-src-5.5.0.tar.xz 33483864 SHA256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec SHA512 6255ec8d3a6fc067b25bf4f19ecbf256be339969a973768337d5452457d77030c229634d6be944d96ffbbdc3603ca00497ff8fac8bcf1b7051dad31612742d3e WHIRLPOOL 5866fa4d6cf002f083a88af19db1b2d517e6bf54e942c0d7c708bc4ef808071b1ab62d0ff85fe8baa0ac9bcc9b451e52a9911bc25d16d8d70e9a0825252293e2 >+EBUILD qtwebkit-5.5.0-r99.ebuild 2989 SHA256 4911597479777dcafe6bc3230977a1949014149af0438d6ea3049297a66923f9 SHA512 6a3046b679451df67077b5ad20a259e13874a92e110ef1d780670a442bb69fd569dd808008c0ed7ba5ff6159046d1787a97478bda721a8b15a6dd98e956b55c6 WHIRLPOOL 2b59df14ef64b306a03e21eb6a5795cb2ab368f137edb5198a146147536a32d34db3b6d45f71c06035b9ee0011fc55b56585355effbb5428d68054eaa60365b0 >+MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9 >diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch >new file mode 100644 >index 0000000..05e41a1 >--- /dev/null >+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch >@@ -0,0 +1,15 @@ >+--- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000 >++++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000 >+@@ -99,12 +99,6 @@ >+ >+ # HTML5 Media Support for builds with GStreamer >+ unix:!mac:!contains(QT_CONFIG, no-pkg-config) { >+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { >+- WEBKIT_CONFIG += video use_gstreamer >+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { >+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 >+- } >+- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video >+ } >+ >+ !enable?(video):qtHaveModule(multimediawidgets) { >diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch >new file mode 100644 >index 0000000..1c02e45 >--- /dev/null >+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch >@@ -0,0 +1,18 @@ >+--- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 >++++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 >+@@ -96,14 +96,8 @@ >+ use?(3d_graphics): WEBKIT_CONFIG += webgl >+ >+ # HTML5 Media Support for builds with GStreamer >+- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { >+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { >+- WEBKIT_CONFIG += video use_gstreamer >+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { >+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 >+- } >++ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 >+ use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video >+- } >+ >+ !enable?(video):qtHaveModule(multimediawidgets) { >+ WEBKIT_CONFIG += video use_qt_multimedia >diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch >new file mode 100644 >index 0000000..0a476c6 >--- /dev/null >+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch >@@ -0,0 +1,25 @@ >+Correct header location so system dev-libs/leveldb can be detected. >+ >+--- Tools/qmake/config.tests/leveldb/leveldb.cpp >++++ Tools/qmake/config.tests/leveldb/leveldb.cpp >+@@ -19,7 +19,7 @@ >+ >+ #include <leveldb/db.h> >+ #include <leveldb/env.h> >+-#include <helpers/memenv/memenv.h> >++#include <leveldb/helpers/memenv.h> >+ >+ int main(int, char**) >+ { >+ >+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp >++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp >+@@ -38,7 +38,7 @@ >+ #include <leveldb/comparator.h> >+ #include <leveldb/db.h> >+ #include <leveldb/env.h> >+-#include <helpers/memenv/memenv.h> >++#include <leveldb/helpers/memenv.h> >+ #include <leveldb/slice.h> >+ #include <string> >+ #include <wtf/PassOwnPtr.h> >diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch >new file mode 100644 >index 0000000..73e085f >--- /dev/null >+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-fix-backtrace-detection-musl.patch >@@ -0,0 +1,22 @@ >+https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch >+ >+--- a/Source/WTF/wtf/Assertions.cpp >++++ b/Source/WTF/wtf/Assertions.cpp >+@@ -61,7 +61,7 @@ >+ #include <windows.h> >+ #endif >+ >+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) >++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) >+ #include <cxxabi.h> >+ #include <dlfcn.h> >+ #include <execinfo.h> >+@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f >+ >+ void WTFGetBacktrace(void** stack, int* size) >+ { >+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) >++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) >+ *size = backtrace(stack, *size); >+ #elif OS(WINDOWS) && !OS(WINCE) >+ // The CaptureStackBackTrace function is available in XP, but it is not defined >diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml >new file mode 100644 >index 0000000..0ca02a9 >--- /dev/null >+++ b/dev-qt/qtwebkit/metadata.xml >@@ -0,0 +1,19 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> >+<pkgmetadata> >+ <herd>qt</herd> >+ <use> >+ <flag name="exceptions">Add support for exceptions - like catching them >+ inside the event loop (recommended by upstream)</flag> >+ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag> >+ <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag> >+ <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> >+ <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> >+ <flag name="qml">Build QML/QtQuick bindings</flag> >+ <flag name="webp">Add support for WebP image format</flag> >+ </use> >+ <upstream> >+ <bugs-to>https://bugreports.qt.io/</bugs-to> >+ <doc>http://doc.qt.io/</doc> >+ </upstream> >+</pkgmetadata> >diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild >new file mode 100644 >index 0000000..e63a930 >--- /dev/null >+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild >@@ -0,0 +1,102 @@ >+# Copyright 1999-2015 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Id$ >+ >+EAPI=5 >+PYTHON_COMPAT=( python2_7 ) >+inherit python-any-r1 qt5-build >+ >+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" >+ >+if [[ ${QT5_BUILD_TYPE} == release ]]; then >+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" >+fi >+ >+# TODO: qttestlib, geolocation, orientation/sensors >+ >+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp" >+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" >+ >+RDEPEND=" >+ dev-db/sqlite:3 >+ dev-libs/icu:= >+ >=dev-libs/leveldb-1.18-r1 >+ dev-libs/libxml2:2 >+ dev-libs/libxslt >+ >=dev-qt/qtcore-${PV}:5[icu] >+ >=dev-qt/qtgui-${PV}:5 >+ >=dev-qt/qtnetwork-${PV}:5 >+ >=dev-qt/qtsql-${PV}:5 >+ >=dev-qt/qtwidgets-${PV}:5 >+ media-libs/fontconfig:1.0 >+ media-libs/libpng:0= >+ >=sys-libs/zlib-1.2.5 >+ virtual/jpeg:0 >+ virtual/opengl >+ x11-libs/libX11 >+ x11-libs/libXcomposite >+ x11-libs/libXrender >+ gstreamer? ( >+ dev-libs/glib:2 >+ media-libs/gstreamer:1.0 >+ media-libs/gst-plugins-base:1.0 >+ ) >+ gstreamer010? ( >+ dev-libs/glib:2 >+ media-libs/gstreamer:0.10 >+ media-libs/gst-plugins-base:0.10 >+ ) >+ multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] ) >+ opengl? ( >=dev-qt/qtopengl-${PV}:5 ) >+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 ) >+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 ) >+ udev? ( virtual/udev ) >+ webp? ( media-libs/libwebp:0= ) >+" >+DEPEND="${RDEPEND} >+ ${PYTHON_DEPS} >+ dev-lang/ruby >+ dev-util/gperf >+ sys-devel/bison >+ sys-devel/flex >+ virtual/rubygems >+" >+ >+PATCHES=( >+ "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" >+ "${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch" >+) >+ >+src_prepare() { >+ # ensure bundled library cannot be used >+ rm -r Source/ThirdParty/leveldb || die >+ >+ # bug 466216 >+ sed -i -e '/CONFIG +=/s/rpath//' \ >+ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ >+ Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ >+ || die >+ >+ if use gstreamer010; then >+ epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" >+ elif ! use gstreamer; then >+ epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" >+ fi >+ use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ >+ Tools/qmake/mkspecs/features/features.prf || die >+ use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ >+ Tools/qmake/mkspecs/features/features.prf || die >+ use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ >+ Tools/qmake/mkspecs/features/features.prf || die >+ use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ >+ Source/QtWebKit.pro || die >+ use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ >+ Tools/qmake/mkspecs/features/features.prf || die >+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ >+ Tools/qmake/mkspecs/features/features.prf || die >+ >+ # bug 458222 >+ sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die >+ >+ qt5-build_src_prepare >+} >-- >2.4.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 560860
:
412290
| 412292