From 8e5fe71bce51e511c578677cf26d2d8cfef40f7d Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Fri, 2 Jun 2017 15:27:15 -0700 Subject: dev-qt/qt*: clean up older/crufty versions of qt5 Signed-off-by: Steve Arnold --- dev-qt/qtgui/Manifest | 1 - dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 ---- .../files/qtgui-5.4.1-CVE-2015-1858-1859.patch | 62 ------ dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch | 30 --- dev-qt/qtgui/qtgui-5.4.1-r2.ebuild | 168 --------------- dev-qt/qtwebkit/Manifest | 1 - .../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 -- .../files/qtwebkit-5.3.2-use-gstreamer010.patch | 18 -- ...twebkit-5.4.1-Fix-building-with-glib-2.43.patch | 238 --------------------- .../files/qtwebkit-5.4.2-system-leveldb.patch | 25 --- dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild | 111 ---------- 11 files changed, 712 deletions(-) delete mode 100644 dev-qt/qtgui/Manifest delete mode 100644 dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch delete mode 100644 dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch delete mode 100644 dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch delete mode 100644 dev-qt/qtgui/qtgui-5.4.1-r2.ebuild delete mode 100644 dev-qt/qtwebkit/Manifest delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.4.1-Fix-building-with-glib-2.43.patch delete mode 100644 dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch delete mode 100644 dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest deleted file mode 100644 index 49268c4..0000000 --- a/dev-qt/qtgui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340 diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch deleted file mode 100644 index 35c4538..0000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001 -From: "Richard J. Moore" -Date: Sat, 21 Feb 2015 17:43:21 +0000 -Subject: [PATCH] Fix a division by zero when processing malformed BMP files. - -This fixes a division by 0 when processing a maliciously crafted BMP -file. No impact beyond DoS. - -Task-number: QTBUG-44547 -Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 -Reviewed-by: Thiago Macieira -Reviewed-by: Oswald Buddenhagen ---- - src/gui/image/qbmphandler.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp -index 21c1a2f..df66499 100644 ---- a/src/gui/image/qbmphandler.cpp -+++ b/src/gui/image/qbmphandler.cpp -@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - alpha_shift = calc_shift(alpha_mask); -+ if (((alpha_mask >> alpha_shift) + 1) == 0) -+ return false; - alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; --- -2.0.5 \ No newline at end of file diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch deleted file mode 100644 index c0ea6c2..0000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Wed, 11 Mar 2015 13:34:01 +0100 -Subject: Fixes crash in bmp and ico image decoding - -Fuzzing test revealed that for certain malformed bmp and ico files, -the handler would segfault. - -Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe -Reviewed-by: Lars Knoll ---- - src/gui/image/qbmphandler.cpp | 13 +++++++------ - src/plugins/imageformats/ico/qicohandler.cpp | 2 +- - 2 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp -index df66499..8acc593 100644 ---- a/src/gui/image/qbmphandler.cpp -+++ b/src/gui/image/qbmphandler.cpp -@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - p = data + (h-y-1)*bpl; - break; - case 2: // delta (jump) -- // Protection -- if ((uint)x >= (uint)w) -- x = w-1; -- if ((uint)y >= (uint)h) -- y = h-1; -- - { - quint8 tmp; - d->getChar((char *)&tmp); -@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - d->getChar((char *)&tmp); - y += tmp; - } -+ -+ // Protection -+ if ((uint)x >= (uint)w) -+ x = w-1; -+ if ((uint)y >= (uint)h) -+ y = h-1; -+ - p = data + (h-y-1)*bpl + x; - break; - default: // absolute mode -diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp -index 00de0c8..ec1654e 100644 ---- a/src/plugins/imageformats/ico/qicohandler.cpp -+++ b/src/plugins/imageformats/ico/qicohandler.cpp -@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index) - QImage::Format format = QImage::Format_ARGB32; - if (icoAttrib.nbits == 24) - format = QImage::Format_RGB32; -- else if (icoAttrib.ncolors == 2) -+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) - format = QImage::Format_Mono; - else if (icoAttrib.ncolors > 0) - format = QImage::Format_Indexed8; --- -cgit v0.11.0 - diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch deleted file mode 100644 index 3b9daa5..0000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d3048a29797ee2d80d84bbda26bb3c954584f332 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Wed, 11 Mar 2015 09:00:41 +0100 -Subject: Fixes crash in gif image decoder - -Fuzzing test revealed that for certain malformed gif files, -qgifhandler would segfault. - -Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 -Reviewed-by: Richard J. Moore ---- - src/gui/image/qgifhandler.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp -index 03e46ab..8d8c4ae 100644 ---- a/src/gui/image/qgifhandler.cpp -+++ b/src/gui/image/qgifhandler.cpp -@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co - - void QGIFFormat::nextY(unsigned char *bits, int bpl) - { -+ if (out_of_bounds) -+ return; - int my; - switch (interlace) { - case 0: // Non-interlaced --- -cgit v0.11.0 - diff --git a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild deleted file mode 100644 index ce17ce9..0000000 --- a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -QT5_MODULE="qtbase" - -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == live ]]; then - KEYWORDS="~ppc64" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" -fi - -# TODO: directfb, linuxfb, offscreen (auto-depends on X11) - -IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" -REQUIRED_USE=" - egl? ( evdev opengl ) - eglfs? ( egl ) - gles2? ( opengl ) - kms? ( egl gles2 ) -" - -RDEPEND=" - dev-libs/glib:2 - ~dev-qt/qtcore-${PV}[debug=] - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib - egl? ( media-libs/mesa[egl] ) - evdev? ( sys-libs/mtdev ) - gtkstyle? ( - x11-libs/gtk+:2 - x11-libs/pango - !!x11-libs/cairo[qt4] - ) - gles2? ( media-libs/mesa[gles2] ) - harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) - ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) - jpeg? ( virtual/jpeg:0 ) - kms? ( - media-libs/mesa[gbm] - virtual/libudev:= - x11-libs/libdrm - ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - udev? ( virtual/libudev:= ) - xcb? ( - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libX11-1.5 - >=x11-libs/libXi-1.6 - x11-libs/libXrender - >=x11-libs/libxcb-1.10:=[xkb] - >=x11-libs/libxkbcommon-0.4.1[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - accessibility? ( ~dev-qt/qtdbus-${PV}[debug=] ) - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch" - "${FILESDIR}/${PN}-5.4.1-CVE-2015-1858-1859.patch" - "${FILESDIR}/${PN}-5.4.1-CVE-2015-1860.patch" -) - -QT5_TARGET_SUBDIRS=( - src/gui - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl - eglfs - evdev - evdev:mtdev: - :fontconfig - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2::OPENGL_ES - gles2:opengles2:OPENGL_ES_2 - gtkstyle:gtkstyle: - gtkstyle:gtk2:STYLE_GTK - !:no-gui: - harfbuzz:system-harfbuzz:HARFBUZZ - !harfbuzz:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - kms:kms: - opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - udev:libudev: - xcb:xcb: - xcb:xcb-glx: - xcb:xcb-plugin: - xcb:xcb-render: - xcb:xcb-sm: - xcb:xcb-xlib: - xcb:xinput2: - xcb::XKB -) - -pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) - use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) - use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) - use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) - - # egl_x11 is activated when both egl and xcb are enabled - use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) -} - -src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif [ use opengl && ! use gles2 ]; then - gl="-opengl desktop" - fi - - local myconf=( - $(use accessibility && use xcb && echo -dbus-linked) - $(use ibus && echo -dbus-linked) - $(qt_use egl) - $(qt_use eglfs) - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(use gif || echo -no-gif) - ${gl} - $(qt_use gtkstyle) - $(qt_use harfbuzz harfbuzz system) - $(qt_use jpeg libjpeg system) - $(qt_use kms) - $(qt_use png libpng system) - $(qt_use udev libudev) - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon system) - $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) - -v - ) - qt5-build_src_configure -} diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index d2fdd9b..0000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea 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 deleted file mode 100644 index 05e41a1..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 deleted file mode 100644 index 1c02e45..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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.1-Fix-building-with-glib-2.43.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-Fix-building-with-glib-2.43.patch deleted file mode 100644 index 1203470..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-Fix-building-with-glib-2.43.patch +++ /dev/null @@ -1,238 +0,0 @@ -From ef94c178a7ba0bd43a677ec90fde334ce2c90810 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Fri, 27 Feb 2015 14:14:44 +0100 -Subject: [PATCH 3/3] Fix building with glib 2.43+ - -The newest version of glib have introduced their own GMutexLocker -conflicting with the one defined in WebCore. - -Task-number: QTBUG-44714 -Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b -Reviewed-by: Andras Becsi ---- - .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++++++++++----------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -index 5625873..a6d961f 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler) - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler) - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri) - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData) - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData) - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response) - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length) - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished() - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*) - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*) - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - --- -2.3.5 - 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 deleted file mode 100644 index 0a476c6..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - #include --#include -+#include - - int main(int, char**) - { - ---- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild deleted file mode 100644 index 4acd339..0000000 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -# TODO: qttestlib, geolocation, orientation/sensors - -IUSE="gles2 gstreamer gstreamer010 gtkstyle 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" -) - -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 -} - -src_configure() { - local myconf=( - $(qt_use gtkstyle) - $(qt_use gles2 opengles2) - ) - - qt5-build_src_configure -} -- cgit v1.2.3-65-gdbad