From 67bb098696b2cc4c0c4b826cebc53aca9ae624df Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 1 Jul 2018 19:14:40 +0200 Subject: dev-qt: Remove last-rited Qt4 Closes: https://bugs.gentoo.org/631788 --- dev-qt/qtscript/Manifest | 1 - .../qtscript/files/4.8.6-javascriptcore-x32.patch | 53 ---------------------- dev-qt/qtscript/metadata.xml | 2 - dev-qt/qtscript/qtscript-4.8.7.ebuild | 38 ---------------- 4 files changed, 94 deletions(-) delete mode 100644 dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch delete mode 100644 dev-qt/qtscript/qtscript-4.8.7.ebuild (limited to 'dev-qt/qtscript') diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index 9c4aab9224bd..2131e7a731e6 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46 diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch deleted file mode 100644 index cde4cfb93f51..000000000000 --- a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 4 Mar 2014 10:46:18 +0100 -Subject: Fix build on x32 - -Recognize x32 and disable JIT in this configuration. - -Task-number: QTBUG-35463 -Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 0b95639..85ed8a7 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -202,6 +202,11 @@ - #if defined(__x86_64__) \ - || defined(_M_X64) - #define WTF_CPU_X86_64 1 -+ -+#if defined(__ILP32__) -+#define WTF_CPU_X32 1 -+#endif -+ - #endif - - /* 64-bit mode on AIX */ -@@ -906,7 +911,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) -+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 -@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ - #define ENABLE_REPAINT_THROTTLING 0 - #endif - -+/* Disable JIT on x32 */ -+#if CPU(X32) -+#define ENABLE_JIT 0 -+#endif -+ - #if !defined(ENABLE_JIT) - - /* The JIT is tested & working on x86_64 Mac */ --- -cgit v0.11.0 - diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml index a559e6341854..da283d207fe3 100644 --- a/dev-qt/qtscript/metadata.xml +++ b/dev-qt/qtscript/metadata.xml @@ -6,8 +6,6 @@ Gentoo Qt Project - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) Build the QtScriptTools module (requires QtWidgets) diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild deleted file mode 100644 index ce3c8d0893c2..000000000000 --- a/dev-qt/qtscript/qtscript-4.8.7.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The QtScript module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+jit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/script" - -QCONFIG_ADD="script" -QCONFIG_DEFINE="QT_SCRIPT" - -PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) - -multilib_src_configure() { - local myconf=( - $(qt_use jit javascript-jit) - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama - -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif - -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg - -no-gtkstyle - ) - qt4_multilib_src_configure -} -- cgit v1.2.3-65-gdbad