| 1 |
commit: 3171e9dadc5ff17ca8568f525eb6fe1581787b68 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 13 12:09:34 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 13 12:11:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3171e9da |
| 7 |
|
| 8 |
dev-qt/qtdeclarative: revert workaround |
| 9 |
|
| 10 |
The workaround is actually not required beginning with 5.8. |
| 11 |
|
| 12 |
This reverts commit 4512a456df71b4e9efb59b9952cc74ea565d9a03. |
| 13 |
This reverts commit f743270fbbe4e084be0f1496cbbcc6cb2fcaed85. |
| 14 |
|
| 15 |
dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild | 8 +------- |
| 16 |
dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild | 8 +------- |
| 17 |
dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild | 8 +------- |
| 18 |
dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 8 +------- |
| 19 |
4 files changed, 4 insertions(+), 28 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild |
| 22 |
index c6957999..23c47148 100644 |
| 23 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild |
| 24 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild |
| 25 |
@@ -3,7 +3,7 @@ |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 29 |
-inherit flag-o-matic python-any-r1 qt5-build |
| 30 |
+inherit python-any-r1 qt5-build |
| 31 |
|
| 32 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 33 |
|
| 34 |
@@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} |
| 35 |
" |
| 36 |
|
| 37 |
src_prepare() { |
| 38 |
- # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 39 |
- # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 40 |
- if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 41 |
- append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 42 |
- fi |
| 43 |
- |
| 44 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 45 |
|
| 46 |
qt_use_disable_mod localstorage sql \ |
| 47 |
|
| 48 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 49 |
index c6957999..23c47148 100644 |
| 50 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 51 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild |
| 52 |
@@ -3,7 +3,7 @@ |
| 53 |
|
| 54 |
EAPI=6 |
| 55 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 56 |
-inherit flag-o-matic python-any-r1 qt5-build |
| 57 |
+inherit python-any-r1 qt5-build |
| 58 |
|
| 59 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 60 |
|
| 61 |
@@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} |
| 62 |
" |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 66 |
- # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 67 |
- if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 68 |
- append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 69 |
- fi |
| 70 |
- |
| 71 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 72 |
|
| 73 |
qt_use_disable_mod localstorage sql \ |
| 74 |
|
| 75 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 76 |
index c6957999..23c47148 100644 |
| 77 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 78 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild |
| 79 |
@@ -3,7 +3,7 @@ |
| 80 |
|
| 81 |
EAPI=6 |
| 82 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 83 |
-inherit flag-o-matic python-any-r1 qt5-build |
| 84 |
+inherit python-any-r1 qt5-build |
| 85 |
|
| 86 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 87 |
|
| 88 |
@@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} |
| 89 |
" |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
- # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 93 |
- # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 94 |
- if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 95 |
- append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 96 |
- fi |
| 97 |
- |
| 98 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 99 |
|
| 100 |
qt_use_disable_mod localstorage sql \ |
| 101 |
|
| 102 |
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 103 |
index c6957999..23c47148 100644 |
| 104 |
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 105 |
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild |
| 106 |
@@ -3,7 +3,7 @@ |
| 107 |
|
| 108 |
EAPI=6 |
| 109 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
| 110 |
-inherit flag-o-matic python-any-r1 qt5-build |
| 111 |
+inherit python-any-r1 qt5-build |
| 112 |
|
| 113 |
DESCRIPTION="The QML and Quick modules for the Qt5 framework" |
| 114 |
|
| 115 |
@@ -34,12 +34,6 @@ RDEPEND="${COMMON_DEPEND} |
| 116 |
" |
| 117 |
|
| 118 |
src_prepare() { |
| 119 |
- # this is supposed to be handled by the build system (src/qml/qml.pro), |
| 120 |
- # fails because we override QMAKE_CXXFLAGS. bug 626070 |
| 121 |
- if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then |
| 122 |
- append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse |
| 123 |
- fi |
| 124 |
- |
| 125 |
use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") |
| 126 |
|
| 127 |
qt_use_disable_mod localstorage sql \ |
Archives