* [gentoo-commits] proj/qt:master commit in: eclass/, x11-libs/qt-webkit/files/, x11-libs/qt-webkit/
@ 2012-06-17 21:23 Davide Pesavento
0 siblings, 0 replies; only message in thread
From: Davide Pesavento @ 2012-06-17 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 30f8dd8575fa42cca650a1195883313a0cd722e8
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 20:31:44 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 20:31:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=30f8dd85
[x11-libs/qt-webkit] Drop USE=c++0x, unsupported upstream (bug 410289).
---
eclass/qt4-build.eclass | 9 +-
.../files/qt-webkit-4.8.0-c++0x-fix.patch | 101 --------------------
x11-libs/qt-webkit/metadata.xml | 1 -
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 3 -
4 files changed, 4 insertions(+), 110 deletions(-)
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 5ad78c7..b68f9b6 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -33,7 +33,7 @@ case ${QT4_BUILD_TYPE} in
live)
EGIT_REPO_URI="git://gitorious.org/qt/qt.git
https://git.gitorious.org/qt/qt.git"
- EGIT_BRANCH="${PV%.9999}"
+ EGIT_BRANCH=${PV%.9999}
;;
release)
if version_is_at_least 4.8.1; then
@@ -45,11 +45,10 @@ case ${QT4_BUILD_TYPE} in
esac
IUSE="aqua debug pch"
-if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then
- IUSE+=" +exceptions"
-fi
+[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
if version_is_at_least 4.8; then
- IUSE+=" c++0x qpa"
+ [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
+ IUSE+=" qpa"
fi
DEPEND="virtual/pkgconfig"
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
deleted file mode 100644
index 8213da4..0000000
--- a/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-All this is needed for qt-webkit to build if c++0x use is enabled
-while using gcc-4.6 ...
-
-you also need to append -fpermissive to the compiler flags
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
-@@ -23,6 +23,7 @@
- #define TypeTraits_h
-
- #include "Platform.h"
-+#include <tr1/memory>
-
- #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
- #include <type_traits>
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
-@@ -23,6 +23,7 @@
- #define TypeTraits_h
-
- #include "Platform.h"
-+#include <tr1/memory>
-
- #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
- #include <type_traits>
---- src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
-+++ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
-@@ -1106,7 +1106,7 @@ RegisterID* BytecodeGenerator::emitLoad(RegisterID* dst, double number)
- // FIXME: Our hash tables won't hold infinity, so we make a new JSValue each time.
- // Later we can do the extra work to handle that like the other cases. They also don't
- // work correctly with NaN as a key.
-- if (isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
-+ if (std::isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
- return emitLoad(dst, jsNumber(number));
- JSValue& valueInMap = m_numberMap.add(number, JSValue()).first->second;
- if (!valueInMap)
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
-@@ -137,8 +137,10 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
- inline long long abs(long long num) { return _abs64(num); }
- #endif
-
-+#ifndef __GXX_EXPERIMENTAL_CXX0X__
- inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }
- inline bool isnan(double num) { return !!_isnan(num); }
-+#endif
- inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
-
- inline double nextafter(double x, double y) { return _nextafter(x, y); }
-@@ -240,8 +242,10 @@ inline int clampToInteger(unsigned value)
-
- #if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
- using std::isfinite;
-+#ifndef __GXX_EXPERIMENTAL_CXX0X__
- using std::isinf;
- using std::isnan;
-+#endif
- using std::signbit;
- #endif
-
---- src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
-+++ src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
-@@ -80,7 +80,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
- if (exec->hadException())
- return 0;
- // If the value is positive infinity, there's nothing to do.
-- if (!(isinf(timeoutNumber) && (timeoutNumber > 0))) {
-+ if (!(std::isinf(timeoutNumber) && (timeoutNumber > 0))) {
- // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
- options->setTimeout(max(0, timeoutValue.toInt32(exec)));
- if (exec->hadException())
-@@ -95,7 +95,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
- double maximumAgeNumber = maximumAgeValue.toNumber(exec);
- if (exec->hadException())
- return 0;
-- if (isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
-+ if (std::isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
- // If the value is positive infinity, clear maximumAge.
- options->clearMaximumAge();
- } else {
---- src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
-+++ src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
-@@ -332,7 +332,7 @@ void HTMLInputElement::applyStep(double count, ExceptionCode& ec)
- return;
- }
- double newValue = current + step * count;
-- if (isinf(newValue)) {
-+ if (std::isinf(newValue)) {
- ec = INVALID_STATE_ERR;
- return;
- }
---- src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
-+++ src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
-@@ -132,7 +132,7 @@ bool NumberInputType::stepMismatch(const String& value, double step) const
- if (!parseToDoubleForNumberType(value, &doubleValue))
- return false;
- doubleValue = fabs(doubleValue - stepBase());
-- if (isinf(doubleValue))
-+ if (std::isinf(doubleValue))
- return false;
- // double's fractional part size is DBL_MAN_DIG-bit. If the current value
- // is greater than step*2^DBL_MANT_DIG, the following computation for
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 96d2378..c5b19ab 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index 12ba243..15cbde2 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -34,7 +34,6 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
"${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
)
@@ -58,8 +57,6 @@ pkg_setup() {
}
src_prepare() {
- use c++0x && append-cxxflags -fpermissive
-
# 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-17 21:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-17 21:23 [gentoo-commits] proj/qt:master commit in: eclass/, x11-libs/qt-webkit/files/, x11-libs/qt-webkit/ Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox