diff options
author | Michael Palimaka <kensington@gentoo.org> | 2015-10-30 04:05:51 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2015-11-01 01:29:09 +1100 |
commit | 2f38ee0ac7e073edbf0018b93b78e035081ff595 (patch) | |
tree | be0dec6066b33a2d21f925858d4ec8626c9f7d0d /dev-qt/qtwebkit | |
parent | dev-python/autopep8: Add python3.5 support (diff) | |
download | gentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.tar.gz gentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.tar.bz2 gentoo-2f38ee0ac7e073edbf0018b93b78e035081ff595.zip |
dev-qt: remove 4.8.5
Diffstat (limited to 'dev-qt/qtwebkit')
-rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch | 17 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild | 83 |
2 files changed, 0 insertions, 100 deletions
diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch deleted file mode 100644 index d29d5da7f04c..000000000000 --- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri ---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 -@@ -3,13 +3,6 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -- - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 - CONFIG += production diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild deleted file mode 100644 index d7de5b417345..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build flag-o-matic - -DESCRIPTION="The WebKit module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - dev-db/sqlite:3 - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - x11-libs/libX11 - x11-libs/libXrender - gstreamer? ( - dev-libs/glib:2 - dev-libs/libxml2:2[!icu?] - >=media-libs/gstreamer-0.10.36:0.10 - >=media-libs/gst-plugins-base-0.10.36:0.10 - ) - icu? ( dev-libs/icu:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - - QT4_EXTRACT_DIRECTORIES=" - include - src" - - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - # Fix version number in generated pkgconfig file, bug 406443 - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build_src_prepare -} - -src_configure() { - myconf+=" - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0)" - - qt4-build_src_configure -} |