commit: 38dcb8ee141a67cc6b0f3c05f54df892e16987b3 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Thu Jul 23 19:52:06 2015 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Thu Jul 23 19:52:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=38dcb8ee
[dev-qt/qtwebkit23] Moved to gx86. dev-qt/qtwebkit23/Manifest | 1 - .../qtwebkit23/files/use-correct-icu-typedef.patch | 40 ------- dev-qt/qtwebkit23/metadata.xml | 12 --- dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 120 --------------------- 4 files changed, 173 deletions(-) diff --git a/dev-qt/qtwebkit23/Manifest b/dev-qt/qtwebkit23/Manifest deleted file mode 100644 index ae72ee8..0000000 --- a/dev-qt/qtwebkit23/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtwebkit23-2.3.4.tar.xz 33793176 SHA256 b02e1e7d4e7e00f3d2e27702e7b023c54a64966ea2dc25f3eb5922eacdb9d7e1 SHA512 4fc99301afefaf900d951b4f4e56a5a5a94eaa92376bc0b73c0ced0c9046d8d911ad33c6ebf1e013573568140259ed733ee69bc87d81405f49b2e74e5fe556b5 WHIRLPOOL af7376d2ffdbc6caf824cbc0aad37253ca5ee744cf5849f1378e0a64e25441229b0e95e711bba1e030e08d0b313cdbfb97f2f7b13f96c4a7763cd5e5cf4b0d68 diff --git a/dev-qt/qtwebkit23/files/use-correct-icu-typedef.patch b/dev-qt/qtwebkit23/files/use-correct-icu-typedef.patch deleted file mode 100644 index 3e48162..0000000 --- a/dev-qt/qtwebkit23/files/use-correct-icu-typedef.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> -Date: Tue, 3 Sep 2013 16:59:35 +0200 -Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002 - -This fixes the build failure of qtwebkit23 on my Gentoo machine. ---- - Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +- - Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -index a2d1ad4..392d2db 100644 ---- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -+++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -@@ -69,7 +69,7 @@ typedef uint16_t UChar; - #endif - - #if !USE(ICU_UNICODE) --typedef uint32_t UChar32; -+typedef int32_t UChar32; - #endif - - namespace WTF { -diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -index 10c2026..db8944e 100644 ---- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -+++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -@@ -31,7 +31,7 @@ - #include <wtf/unicode/UnicodeMacrosFromICU.h> - - typedef wchar_t UChar; --typedef uint32_t UChar32; -+typedef int32_t UChar32; - - namespace WTF { - namespace Unicode { --- -1.7.1 - diff --git a/dev-qt/qtwebkit23/metadata.xml b/dev-qt/qtwebkit23/metadata.xml deleted file mode 100644 index 37dc834..0000000 --- a/dev-qt/qtwebkit23/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>qt</herd> - <use> - <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>http://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild deleted file mode 100644 index bd9d57b..0000000 --- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal - -DESCRIPTION="The WebKit module for the Qt toolkit" -HOMEPAGE="https://www.qt.io/"; -SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"; - -LICENSE="|| ( LGPL-2.1 GPL-3 )" -SLOT="4" -KEYWORDS="~amd64" -IUSE="debug +gstreamer" - -RDEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}] - >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/perl - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/perl-Digest-MD5 - virtual/perl-File-Spec - virtual/perl-Getopt-Long -" - -PATCHES=( - "${FILESDIR}/use-correct-icu-typedef.patch" -) - -src_prepare() { - # examples cause a sandbox violation (bug 458222) - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - # respect CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \ - Source/WTF/WTF.pro \ - Source/JavaScriptCore/Target.pri || die - - # apply patches - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - epatch_user -} - -multilib_src_compile() { - local -x \ - QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \ - WEBKITOUTPUTDIR=${BUILD_DIR} - - local myconf=( - "${S}"/Tools/Scripts/build-webkit - --qt - # tell the build system where to find the qmake binary for the current ABI - --qmake="$(qt4_get_bindir)"/qmake - --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" - --makeargs="${MAKEOPTS}" - --$(usex debug debug release) - --$(usex gstreamer video no-video) - # disable WebKit2 since it requires Qt5 - --no-webkit2 - # prevent automagic dependency on qt-mobility (bug 547350) - --no-geolocation - --no-device-orientation - --no-orientation-events - # copied from eqmake4 - QMAKE_AR="'$(tc-getAR) cqs'" - QMAKE_CC="'$(tc-getCC)'" - QMAKE_CXX="'$(tc-getCXX)'" - QMAKE_LINK="'$(tc-getCXX)'" - QMAKE_LINK_C="'$(tc-getCC)'" - QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'" - QMAKE_RANLIB= - QMAKE_STRIP= - QMAKE_CFLAGS="'${CFLAGS}'" - QMAKE_CFLAGS_RELEASE= - QMAKE_CFLAGS_DEBUG= - QMAKE_CXXFLAGS="'${CXXFLAGS}'" - QMAKE_CXXFLAGS_RELEASE= - QMAKE_CXXFLAGS_DEBUG= - QMAKE_LFLAGS="'${LDFLAGS}'" - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG= - ) - echo "${myconf[@]}" - "${myconf[@]}" || die -} - -multilib_src_install() { - emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release) - - # move pkgconfig file to the correct location - mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die -}
