* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-06-21 9:16 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-06-21 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 0ded5d274d2424fc1dae4221cf1f843d4c47d7e1
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 21 03:55:08 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 09:11:07 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0ded5d27
dev-qt/qtwebengine: Apply new patches in 5.11.9999 and 5.9999.
Patches included:
- libxml2-disable-catalogs.patch
- ffmpeg4.patch
- nouveau-disable-gpu.patch
Bug: https://bugs.gentoo.org/609752
Bug: https://bugs.gentoo.org/653078
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 6 ++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index b98972ea..acd54530 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -79,6 +79,12 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch"
+ "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index b98972ea..acd54530 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -79,6 +79,12 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch"
+ "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-07-12 15:20 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-07-12 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 5bb4bfb222c72dcecc60b734db952c9870dde84e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 06:11:16 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 15:19:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5bb4bfb2
dev-qt/qtwebengine: Add missing python_check_deps()
Bug: https://bugs.gentoo.org/931970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
index b589d62e..0823ad43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
@@ -101,6 +101,10 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=( "${WORKDIR}/${PATCHSET}" )
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
qtwebengine_check-reqs() {
# bug #307861
eshopts_push -s extglob
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-05-30 12:56 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-05-30 12:56 UTC (permalink / raw
To: gentoo-commits
commit: 69f33d85f987602bbee30b559cfe92ffeb5b7b73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:01:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:55:18 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=69f33d85
dev-qt/qtwebengine: Add python3.12, add missing BDEPEND for catapult
Bug: https://bugs.gentoo.org/925718
Bug: https://bugs.gentoo.org/931970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2aff89a0..1a4170bd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
+DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
index 009eada0..19bc378b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PATCHSET="${PN}-5.15.13_p20240322-patchset"
-PYTHON_COMPAT=( python3_{10..11} )
+PATCHSET="${PN}-5.15.14_p20240510-patchset"
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -91,6 +91,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="${PYTHON_DEPS}
app-alternatives/ninja
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
dev-util/re2c
net-libs/nodejs[ssl]
@@ -152,8 +153,6 @@ src_unpack() {
}
src_prepare() {
- rm "${WORKDIR}/${PATCHSET}"/010-build-without-python-2.patch || die
-
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-05-28 19:34 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-05-28 19:34 UTC (permalink / raw
To: gentoo-commits
commit: e6043ce1ce44375f3e89928218885caffbd36dce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 18:30:55 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 28 18:30:55 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6043ce1
dev-qt/qtwebengine: Use upstreamed mechanism for py3 build
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
index 4c202e58..009eada0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
@@ -152,6 +152,8 @@ src_unpack() {
}
src_prepare() {
+ rm "${WORKDIR}/${PATCHSET}"/010-build-without-python-2.patch || die
+
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
@@ -209,6 +211,7 @@ src_configure() {
--
-no-build-qtpdf
-printing-and-pdf
+ --webengine-python-version=python3
-system-opus
-system-webp
$(qt_use alsa)
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-03-23 13:35 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-03-23 13:35 UTC (permalink / raw
To: gentoo-commits
commit: badb221b04137c576043d6dc58e63e610c2572f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 11:08:30 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 13:34:39 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=badb221b
dev-qt/qtwebengine: Bump patchset to 5.15.13_p20240222
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 901ba754..2aff89a0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
+DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
index 23e3fab7..4c202e58 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PATCHSET="${PN}-5.15.10_p20230815-patchset"
+PATCHSET="${PN}-5.15.13_p20240322-patchset"
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -152,9 +152,6 @@ src_unpack() {
}
src_prepare() {
- # upstreamed, but not spinning new patchset just yet
- rm "${WORKDIR}"/${PATCHSET}/018-gcc13-includes.patch || die
-
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-03-16 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-03-16 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 91d5e15b52a61474873bb517ef0b76c86cea3c90
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 11:36:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 15:40:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=91d5e15b
dev-qt/qtwebengine: dev-util/ninja -> app-alternatives/ninja
All of these will be using app-alternatives/ninja anyway as they're not calling
ninja-reference, so make the dep reflect reality.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
index 3e36c336..489e6121 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
@@ -96,8 +96,8 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
BDEPEND="${PYTHON_DEPS}
+ app-alternatives/ninja
dev-util/gperf
- dev-build/ninja
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-03-16 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2024-03-16 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 157991d0d02010493ccc2f25f86a8e28a31c3d75
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 15:04:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 15:40:29 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=157991d0
Move {dev-util → dev-build}/gn
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
index ba9182c6..3e36c336 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
@@ -102,7 +102,7 @@ BDEPEND="${PYTHON_DEPS}
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
- ppc64? ( >=dev-util/gn-0.1807 )
+ ppc64? ( >=dev-build/gn-0.1807 )
"
PATCHES=( "${WORKDIR}/${PATCHSET}" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2024-01-13 16:45 Sam James
0 siblings, 0 replies; 146+ messages in thread
From: Sam James @ 2024-01-13 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 9c1be49d2b3c91d0dbff6e7f02bace94bfcb7ed3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 16:44:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 16:44:50 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9c1be49d
dev-qt/qtwebengine: dev-util/ninja -> dev-build/ninja
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild
index 3911bd56..ba9182c6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild
@@ -97,7 +97,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="${PYTHON_DEPS}
dev-util/gperf
- dev-util/ninja
+ dev-build/ninja
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-12-30 14:03 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2023-12-30 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 85ceed00eac868f7e858e2eebb3d57a747990094
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 14:02:52 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 14:02:52 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=85ceed00
dev-qt/qtwebengine: Rebased to 5.15.12 branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{qtwebengine-5.15.11.9999.ebuild => qtwebengine-5.15.12.9999.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild
similarity index 100%
rename from dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.12.9999.ebuild
^ permalink raw reply [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-11-11 20:24 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2023-11-11 20:24 UTC (permalink / raw
To: gentoo-commits
commit: d0803c33668dcaa9265b18f62dfc82df86b403e1
Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it>
AuthorDate: Tue Sep 19 09:32:09 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 20:18:14 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0803c33
dev-qt/qtwebengine: fix ppc64 bundled ffmpeg for 5.15
Closes: https://bugs.gentoo.org/904372
Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it>
Closes: https://github.com/gentoo/gentoo/pull/32922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 37419731..88b8c511 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
+DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
index 01bed9ae..8adabbf0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
@@ -28,8 +28,12 @@ else
fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+# ppc64 ffmpeg patchset backported from chromium 98 on https://ppa.quickbuild.io/raptor-engineering-public/chromium/ubuntu/pool/main/c/chromium/
SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz
- ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+ ppc64? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15-ffmpeg-ppc64le.tar.xz
+ )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -212,6 +216,7 @@ src_prepare() {
eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
pushd src/3rdparty/chromium > /dev/null || die
eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+ eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le"
popd > /dev/null || die
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
mkdir -vp source/config/linux/ppc64 || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-11-11 20:24 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2023-11-11 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 6118791cd73fe2d17e693bfddecfde3011c2dcaf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 19:44:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 20:18:46 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6118791c
dev-qt/qtwebengine: Apply ppc64 patches after eapply_user
Thanks-to: Marcus Comstedt <marcus <AT> mc.pp.se>
Closes: https://bugs.gentoo.org/910218
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
index 8adabbf0..3911bd56 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
@@ -208,9 +208,6 @@ src_prepare() {
qt_use_disable_mod widgets widgets src/src.pro
- qt5-build_src_prepare
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
if use ppc64; then
einfo "Patching for ppc64le and generating build files"
eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
@@ -218,6 +215,13 @@ src_prepare() {
eapply -p0 "${WORKDIR}/${PN}-ppc64le"
eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le"
popd > /dev/null || die
+ fi
+
+ qt5-build_src_prepare
+
+ # we need to generate ppc64 stuff because upstream does not ship it yet
+ if use ppc64; then
+ einfo "Generating ppc64le build files"
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-10-08 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2023-10-08 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 2218cdf2d5d6d04ba2a1eac1a004dd13ac4d155b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 00:06:13 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 00:06:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2218cdf2
dev-qt/qtwebengine: update patchset to 5.15.10_p20230815
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 5f21aaa9..37419731 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,2 @@
+DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
index d592d822..01bed9ae 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PATCHSET="${PN}-5.15.10_p20230815-patchset"
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -27,7 +28,7 @@ else
fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-patchset.tar.xz
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz
ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
@@ -100,7 +101,7 @@ BDEPEND="${PYTHON_DEPS}
ppc64? ( >=dev-util/gn-0.1807 )
"
-PATCHES=( "${WORKDIR}/${PN}-5.15.8_p20230313-patchset" )
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
qtwebengine_check-reqs() {
# bug #307861
@@ -154,6 +155,9 @@ src_unpack() {
}
src_prepare() {
+ # upstreamed, but not spinning new patchset just yet
+ rm "${WORKDIR}"/${PATCHSET}/018-gcc13-includes.patch || die
+
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-04-15 17:16 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2023-04-15 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 2eef895accd63b2bddb584239290271779a4d00b
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 17:05:57 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 17:05:57 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2eef895a
dev-qt/qtwebengine: drop system-ffmpeg
Compiling with >=ffmpeg-5 requires a modified upstream ffmpeg.
Bug: https://bugs.gentoo.org/831487
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 5 ++---
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 5 ++---
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 70e89b3f..773b19a7 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -18,7 +18,7 @@ fi
IUSE="
alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
+ +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -77,7 +77,6 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse:= )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -226,7 +225,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_opus=on
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 4671c7bc..ec7a8579 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -18,7 +18,7 @@ fi
IUSE="
alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
+ +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -77,7 +77,6 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse:= )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -226,7 +225,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_opus=on
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 4671c7bc..ec7a8579 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -18,7 +18,7 @@ fi
IUSE="
alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
+ +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -77,7 +77,6 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse:= )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -226,7 +225,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_opus=on
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2023-04-15 17:16 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2023-04-15 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 7792d44b4fc30792722ed7c8d1028f142f11c444
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 17:15:51 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 17:15:51 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7792d44b
dev-qt/qtwebengine: update chromium versions
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 773b19a7..9df94998 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="107.0.5304.110"
+CHROMIUM_PATCHES_VER="110.0.5481.78"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index ec7a8579..2ad4c1c5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="106.0.5249.207"
-CHROMIUM_PATCHES_VER="106.0.5249.207"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="110.0.5481.104"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index ec7a8579..2ad4c1c5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="106.0.5249.207"
-CHROMIUM_PATCHES_VER="106.0.5249.207"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="110.0.5481.104"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-12-16 21:05 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-12-16 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 70833671b5ed814aee3a14e38eadafd6cab55085
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 18:55:27 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 21:05:37 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=70833671
dev-qt/qtwebengine: update 6.* chromium patches and python versions
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 5c16a534..70e89b3f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -3,10 +3,10 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="104.0.5112.102"
+CHROMIUM_PATCHES_VER="107.0.5304.110"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 5c16a534..4671c7bc 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,10 +3,10 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="104.0.5112.102"
+CHROMIUM_VER="106.0.5249.207"
+CHROMIUM_PATCHES_VER="106.0.5249.207"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-11-05 16:39 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-11-05 16:39 UTC (permalink / raw
To: gentoo-commits
commit: d27c7e25c09914c0f1e21f21b4d720038acd183b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 5 09:07:57 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 09:07:57 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d27c7e25
dev-qt/qtwebengine: drop 6.4.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild | 243 ----------------------------
2 files changed, 244 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2f0b383a..d169e66b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
deleted file mode 100644
index 5c16a534..00000000
--- a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="104.0.5112.102"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-10-14 20:24 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-10-14 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 8632c971a3853f5ee27364ac290d23ab9442693e
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 20:22:37 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 20:22:37 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8632c971
dev-qt/qtwebengine: add dependency on 'x11-libs/libxshmfence'
Closes: https://bugs.gentoo.org/862525
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
index 8e78b6ad..5c16a534 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 8e78b6ad..5c16a534 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 8e78b6ad..5c16a534 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-10-06 16:20 Sam James
0 siblings, 0 replies; 146+ messages in thread
From: Sam James @ 2022-10-06 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 4e846acf550c7c510a2ccbd04f546c3baa225789
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 16:14:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 16:20:01 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e846acf
dev-qt/qtwebengine: fix has_version default-libcxx test for Clang
We moved the flag to sys-devel/clang-common to prepare for proper
config file support (which is backported to 15.0.2, although it's
going to be better in 16.x).
Go for the hack for now, but keep the bug open as we want to
switch to the proper link test from the LLVM ebuilds.
Bug: https://bugs.gentoo.org/875641
Bug: https://bugs.gentoo.org/875563
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.6.9999.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.6.9999.ebuild
index d817b83e..6a89caec 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.6.9999.ebuild
@@ -199,8 +199,10 @@ src_prepare() {
fi
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ if tc-is-clang ; then
+ if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
fi
if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-09-24 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 13a7e23110dfe990e0c7b94b1c57f07f072eed3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 20:25:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 20:25:48 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=13a7e231
dev-qt/qtwebengine: drop 6.3.9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 242 -------------------------
1 file changed, 242 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
deleted file mode 100644
index 2ce46d9a..00000000
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="104.0.5112.81"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-09-24 17:03 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 17:03 UTC (permalink / raw
To: gentoo-commits
commit: cdca692129df164b25115ff25218bdaeb7cd8709
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:42:50 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 14:42:50 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cdca6921
dev-qt/qtwebengine: drop 6.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 242 ----------------------------
2 files changed, 243 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8d6b7341..d169e66b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
deleted file mode 100644
index 2ce46d9a..00000000
--- a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="104.0.5112.81"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}" || die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-09-18 11:55 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-09-18 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 87b76a8c153f9bd218ed56a2453db99bbbd0a7e7
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 11:50:05 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 11:54:24 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=87b76a8c
dev-qt/qtwebengine: adjust 6.* Chromium versions/deps/USE
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 2 --
dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 10 +++++-----
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 10 +++++-----
dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild | 12 ++++++------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 12 ++++++------
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 6912e8aa..415d7465 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,8 +14,6 @@
<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="pipewire">Enable PipeWire support for WebRTC.</flag>
- <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
index 22780c57..2ce46d9a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_PATCHES_VER="104.0.5112.81"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
index 22780c57..2ce46d9a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_PATCHES_VER="104.0.5112.81"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
index 22780c57..8e78b6ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="101.0.4951.64"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="104.0.5112.102"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index c508309f..8e78b6ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="99.0.4844.84"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="104.0.5112.102"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
@@ -17,7 +17,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pipewire pulseaudio
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+system-ffmpeg +system-icu widgets
"
REQUIRED_USE="designer? ( widgets )"
@@ -74,8 +74,8 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -234,7 +234,7 @@ src_configure() {
-DQT_FEATURE_webengine_system_zlib=on
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
#-DQT_FEATURE_xcb=off
)
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-07-17 7:13 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-07-17 7:13 UTC (permalink / raw
To: gentoo-commits
commit: c8a1e4810bf75653c3a1239054db60440c47e82d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 07:12:36 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 07:13:28 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c8a1e481
dev-qt/qtwebengine: Switch IUSE pulseaudio to media-libs/libpulse
Drop bogus slot op at the same time.
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
index 3c78403a..d817b83e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
@@ -80,7 +80,7 @@ RDEPEND="
designer? ( =dev-qt/designer-${QT5_PV}* )
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse )
screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-06-20 18:03 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-06-20 18:03 UTC (permalink / raw
To: gentoo-commits
commit: c3c0598c498001333f3cc05106c48dadbf097553
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 18:38:07 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:02:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c3c0598c
dev-qt/qtwebengine: add check-reqs and adjust formatting/dependencies
For qt6, as requested at: https://github.com/gentoo/gentoo/pull/25635
Additionally adjust Chromium patch version, and remove dependency on
'dev-util/gn' since system GN wasn't actually being used even before
the option got renamed [1].
1. https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=6.3&id=9ea295eec31
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild | 96 ++++++++++++++++++-------
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 98 ++++++++++++++++++--------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 96 ++++++++++++++++++-------
3 files changed, 208 insertions(+), 82 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
index 26784071..e858e536 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
CHROMIUM_PATCHES_VER="99.0.4844.84"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
@@ -22,9 +22,8 @@ IUSE="
"
REQUIRED_USE="designer? ( widgets )"
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- >=dev-util/gn-0.1807
dev-util/gperf
dev-util/ninja
dev-util/re2c
@@ -49,7 +48,7 @@ RDEPEND="
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
+ media-libs/libpng:=
>=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/opus
@@ -75,9 +74,9 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire )
+ pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -93,7 +92,51 @@ PATCHES=(
)
python_check_deps() {
- has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ # bug #307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ fi
+ eshopts_pop
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
}
pkg_preinst() {
@@ -127,8 +170,8 @@ src_unpack() {
src_prepare() {
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+ find . -type f -name "*.pr[fio]" -exec \
+ sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
@@ -147,35 +190,35 @@ src_prepare() {
}
src_configure() {
- export NINJA_PATH=/usr/bin/ninja
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local mycmakeargs=(
-# -DQT_FEATURE_accessibility=off
-# -DQT_FEATURE_force_asserts=off
-# -DQT_FEATURE_opengl=off
-# -DQT_FEATURE_printer=off
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
-DQT_FEATURE_qtpdf_build=off
-DQT_FEATURE_qtpdf_quick_build=off
-DQT_FEATURE_qtpdf_widgets_build=off
-DQT_FEATURE_qtwebengine_build=on
-DQT_FEATURE_qtwebengine_quick_build=on
-DQT_FEATURE_qtwebengine_widgets_build=on
-# -DQT_FEATURE_ssl=off
-# -DQT_FEATURE_static=off
-# -DQT_FEATURE_system_zlib=off
-# -DQT_FEATURE_system_png=off
-# -DQT_FEATURE_system_jpeg=off
-# -DQT_FEATURE_system_freetype=off
-# -DQT_FEATURE_system_harfbuzz=off
-# -DQT_FEATURE_use_gold_linker=off
-# -DQT_FEATURE_use_lld_linker=off
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
-DQT_FEATURE_webengine_embedded_build=off
-DQT_FEATURE_webengine_extensions=on
-# -DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
-# -DQT_FEATURE_webengine_jumbo_file_merge_limit
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
-DQT_FEATURE_webengine_native_spellchecker=off
-DQT_FEATURE_webengine_ozone_x11=on
@@ -188,7 +231,6 @@ src_configure() {
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
-DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_gn=on
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
@@ -198,7 +240,7 @@ src_configure() {
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
-DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
-# -DQT_FEATURE_xcb=off
+ #-DQT_FEATURE_xcb=off
)
qt6-build_src_configure
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
index 3642199e..22780c57 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
@@ -6,9 +6,9 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="99.0.4844.84"
+CHROMIUM_PATCHES_VER="101.0.4951.64"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
@@ -22,9 +22,8 @@ IUSE="
"
REQUIRED_USE="designer? ( widgets )"
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- >=dev-util/gn-0.1807
dev-util/gperf
dev-util/ninja
dev-util/re2c
@@ -49,7 +48,7 @@ RDEPEND="
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
+ media-libs/libpng:=
>=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/opus
@@ -75,9 +74,9 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire )
+ pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -88,7 +87,51 @@ DEPEND="${RDEPEND}
"
python_check_deps() {
- has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ # bug #307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ fi
+ eshopts_pop
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
}
pkg_preinst() {
@@ -122,8 +165,8 @@ src_unpack() {
src_prepare() {
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+ find . -type f -name "*.pr[fio]" -exec \
+ sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
@@ -142,35 +185,35 @@ src_prepare() {
}
src_configure() {
- export NINJA_PATH=/usr/bin/ninja
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local mycmakeargs=(
-# -DQT_FEATURE_accessibility=off
-# -DQT_FEATURE_force_asserts=off
-# -DQT_FEATURE_opengl=off
-# -DQT_FEATURE_printer=off
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
-DQT_FEATURE_qtpdf_build=off
-DQT_FEATURE_qtpdf_quick_build=off
-DQT_FEATURE_qtpdf_widgets_build=off
-DQT_FEATURE_qtwebengine_build=on
-DQT_FEATURE_qtwebengine_quick_build=on
-DQT_FEATURE_qtwebengine_widgets_build=on
-# -DQT_FEATURE_ssl=off
-# -DQT_FEATURE_static=off
-# -DQT_FEATURE_system_zlib=off
-# -DQT_FEATURE_system_png=off
-# -DQT_FEATURE_system_jpeg=off
-# -DQT_FEATURE_system_freetype=off
-# -DQT_FEATURE_system_harfbuzz=off
-# -DQT_FEATURE_use_gold_linker=off
-# -DQT_FEATURE_use_lld_linker=off
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
-DQT_FEATURE_webengine_embedded_build=off
-DQT_FEATURE_webengine_extensions=on
-# -DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
-# -DQT_FEATURE_webengine_jumbo_file_merge_limit
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
-DQT_FEATURE_webengine_native_spellchecker=off
-DQT_FEATURE_webengine_ozone_x11=on
@@ -183,7 +226,6 @@ src_configure() {
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
-DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_gn=on
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
@@ -193,7 +235,7 @@ src_configure() {
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
-DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
-# -DQT_FEATURE_xcb=off
+ #-DQT_FEATURE_xcb=off
)
qt6-build_src_configure
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 3642199e..c508309f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
CHROMIUM_PATCHES_VER="99.0.4844.84"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
@@ -22,9 +22,8 @@ IUSE="
"
REQUIRED_USE="designer? ( widgets )"
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- >=dev-util/gn-0.1807
dev-util/gperf
dev-util/ninja
dev-util/re2c
@@ -49,7 +48,7 @@ RDEPEND="
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
+ media-libs/libpng:=
>=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/opus
@@ -75,9 +74,9 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
- pipewire? ( media-video/pipewire )
+ pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-ffmpeg? ( media-video/ffmpeg:= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtbase-${PV}*[widgets]
@@ -88,7 +87,51 @@ DEPEND="${RDEPEND}
"
python_check_deps() {
- has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ # bug #307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ fi
+ eshopts_pop
+
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
}
pkg_preinst() {
@@ -122,8 +165,8 @@ src_unpack() {
src_prepare() {
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+ find . -type f -name "*.pr[fio]" -exec \
+ sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
@@ -142,35 +185,35 @@ src_prepare() {
}
src_configure() {
- export NINJA_PATH=/usr/bin/ninja
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local mycmakeargs=(
-# -DQT_FEATURE_accessibility=off
-# -DQT_FEATURE_force_asserts=off
-# -DQT_FEATURE_opengl=off
-# -DQT_FEATURE_printer=off
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
-DQT_FEATURE_qtpdf_build=off
-DQT_FEATURE_qtpdf_quick_build=off
-DQT_FEATURE_qtpdf_widgets_build=off
-DQT_FEATURE_qtwebengine_build=on
-DQT_FEATURE_qtwebengine_quick_build=on
-DQT_FEATURE_qtwebengine_widgets_build=on
-# -DQT_FEATURE_ssl=off
-# -DQT_FEATURE_static=off
-# -DQT_FEATURE_system_zlib=off
-# -DQT_FEATURE_system_png=off
-# -DQT_FEATURE_system_jpeg=off
-# -DQT_FEATURE_system_freetype=off
-# -DQT_FEATURE_system_harfbuzz=off
-# -DQT_FEATURE_use_gold_linker=off
-# -DQT_FEATURE_use_lld_linker=off
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
-DQT_FEATURE_webengine_embedded_build=off
-DQT_FEATURE_webengine_extensions=on
-# -DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
-# -DQT_FEATURE_webengine_jumbo_file_merge_limit
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
-DQT_FEATURE_webengine_native_spellchecker=off
-DQT_FEATURE_webengine_ozone_x11=on
@@ -183,7 +226,6 @@ src_configure() {
-DQT_FEATURE_webengine_system_libwebp=on
-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
-DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_gn=on
-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
-DQT_FEATURE_webengine_system_libevent=on
-DQT_FEATURE_webengine_system_libpci=on
@@ -193,7 +235,7 @@ src_configure() {
-DQT_FEATURE_webengine_webchannel=on
-DQT_FEATURE_webengine_webrtc=on
-DQT_FEATURE_webengine_webrtc_pipewire=$(usex pipewire on off)
-# -DQT_FEATURE_xcb=off
+ #-DQT_FEATURE_xcb=off
)
qt6-build_src_configure
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-06-18 14:27 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-06-18 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 96c71948182060e92663e39438090821dff84a04
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 07:45:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:22:37 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=96c71948
dev-qt/qtwebengine: don't use clang-format on ppc64
Bug: https://bugs.gentoo.org/849458
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
index c836a98f..438a2c86 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
@@ -226,6 +226,11 @@ src_prepare() {
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
touch source/libvpx/test/test.mk || die
+ # clang-format is used to re-format sources
+ # but we'd rather make it a no-op than introduce a clang dependency
+ # https://bugs.gentoo.org/849458
+ clang-format() { : ; }
+ export -f clang-format || die
./generate_gni.sh || die
popd >/dev/null || die
fi
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-05-14 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-05-14 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 363d3c1f6e75c2e3fe54c666ae388709af3bafa1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 21:08:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 14 21:14:26 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=363d3c1f
dev-qt/qtwebengine: Rebased to 5.15.4 branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{qtwebengine-5.15.3.9999.ebuild => qtwebengine-5.15.4.9999.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4.9999.ebuild
similarity index 100%
rename from dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.4.9999.ebuild
^ permalink raw reply [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-04-12 12:43 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-04-12 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 82424b96e1750a523990c4b10391c7f597927bfe
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 12:31:28 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 12:31:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=82424b96
dev-qt/qtwebengine: update Chromium versions
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
index dd50ac31..3642199e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="98.0.4758.102"
+CHROMIUM_PATCHES_VER="99.0.4844.84"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index dd50ac31..3642199e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="98.0.4758.102"
+CHROMIUM_PATCHES_VER="99.0.4844.84"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-04-09 16:01 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-04-09 16:01 UTC (permalink / raw
To: gentoo-commits
commit: d786db6868603fbc18a538012a787a5887fb0403
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 16:00:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 16:01:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d786db68
dev-qt/qtwebengine: Fix 5.15.3 version downsedding after 5.15.10 bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
index 8d3e80b6..2cc0403e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
@@ -169,10 +169,10 @@ src_prepare() {
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
fi
- # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # We need to make sure this integrates well into Qt 5.15.3 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
+ sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
# QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-03-21 8:14 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2022-03-21 8:14 UTC (permalink / raw
To: gentoo-commits
commit: 2ce6533c5706814fcfa3004ba6108f0e20889cb6
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 08:13:10 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 08:13:34 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2ce6533c
dev-qt/qtwebengine: update Chromium versions
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
index ed81b0d0..dd50ac31 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="94.0.4606.126"
+CHROMIUM_PATCHES_VER="98.0.4758.102"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index ed81b0d0..dd50ac31 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="94.0.4606.126"
+CHROMIUM_PATCHES_VER="98.0.4758.102"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-03-04 9:51 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2022-03-04 9:51 UTC (permalink / raw
To: gentoo-commits
commit: d1f93a5a76cb4ed83052764ab3e892ca2f49a16d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 09:39:42 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 09:39:42 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d1f93a5a
dev-qt/qtwebengine: Rebased to 5.15.3 branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{qtwebengine-5.15.2.9999.ebuild => qtwebengine-5.15.3.9999.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
similarity index 100%
rename from dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
^ permalink raw reply [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-01-06 19:57 Sam James
0 siblings, 0 replies; 146+ messages in thread
From: Sam James @ 2022-01-06 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 61c6b4e97824f4547983dffead5ca392d825cbbc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 19:53:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 19:57:15 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61c6b4e9
dev-qt/qtwebengine: disable CHECKREQS_MEMORY for distcc
It's harder to calculate properly for this case.
Bug: https://bugs.gentoo.org/830661
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 2c200df5..3f5a4cb4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -136,7 +136,11 @@ qtwebengine_check-reqs() {
local CHECKREQS_DISK_BUILD="7G"
local CHECKREQS_DISK_USR="150M"
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ if ! has "distcc" ${FEATURES} ; then
+ # bug #830661
+ # Not super realistic to come up with good estimates for distcc right now
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ fi
check-reqs_${EBUILD_PHASE_FUNC}
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2022-01-06 19:57 Sam James
0 siblings, 0 replies; 146+ messages in thread
From: Sam James @ 2022-01-06 19:57 UTC (permalink / raw
To: gentoo-commits
commit: c2e5a02f2ecd0af162b6598e718058a2420c9a05
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 21:07:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 19:57:14 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2e5a02f
dev-qt/qtwebengine: add check-reqs for disk space and memory usage
For now, assumes:
- RAM/memory: 2GB per job for GCC, 1.5GB per job for Clang
- Disk (build): 7GB
- Disk (installed): 150MB
(Also moves pkg_preinst to the end of the ebuild to reflect
phase execution order, as per devmanual.)
Closes: https://bugs.gentoo.org/570534
Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 61 +++++++++++++++++------
1 file changed, 45 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 381ae491..2c200df5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
HOMEPAGE="https://www.qt.io/"
@@ -110,29 +110,47 @@ PATCHES=(
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "additional security fixes from newer versions. Extensive as it is, the"
- elog "list of backports is impossible to evaluate, but always bound to be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an outdated"
- elog "user agent version (and/or other checks). Google is already known to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
-
-src_unpack() {
- # bug 307861
+qtwebengine_check-reqs() {
+ # bug #307861
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
ewarn "You may experience really long compilation times and/or increased memory usage."
ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn
fi
eshopts_pop
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ # (check-reqs added for bug #570534)
+ #
+ # Estimate the amount of RAM required
+ # Multiplier is *10 because Bash doesn't do floating point maths.
+ # Let's crudely assume ~2GB per compiler job for GCC.
+ local multiplier=20
+
+ # And call it ~1.5GB for Clang.
+ if tc-is-clang ; then
+ multiplier=15
+ fi
+
+ local CHECKREQS_DISK_BUILD="7G"
+ local CHECKREQS_DISK_USR="150M"
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+
+ check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
case ${QT5_BUILD_TYPE} in
live) git-r3_src_unpack ;&
release) default ;;
@@ -231,3 +249,14 @@ src_install() {
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "additional security fixes from newer versions. Extensive as it is, the"
+ elog "list of backports is impossible to evaluate, but always bound to be behind"
+ elog "Chromium's release schedule."
+ elog "In addition, various online services may deny service based on an outdated"
+ elog "user agent version (and/or other checks). Google is already known to do so."
+ elog
+ elog "tldr: Your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-26 22:13 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-12-26 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 36389ef5a5c431d43917cb8e21a6237d880da5be
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 13:26:03 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 19:28:34 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=36389ef5
dev-qt/qtwebengine: adjust 6.9999 dependencies
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index c95c28cb..ed81b0d0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -23,6 +23,7 @@ IUSE="
REQUIRED_USE="designer? ( widgets )"
BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
>=dev-util/gn-0.1807
dev-util/gperf
dev-util/ninja
@@ -86,6 +87,10 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
+python_check_deps() {
+ has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
pkg_preinst() {
elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-25 0:03 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-12-25 0:03 UTC (permalink / raw
To: gentoo-commits
commit: c9c71f30735cb1f4618fb09781e15ee1a4ec6888
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 00:02:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 00:02:50 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c9c71f30
dev-qt/qtwebengine: Add missing space delimiter in SRC_URI
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index d7d70f98..381ae491 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -27,7 +27,7 @@ else
fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-24 23:57 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 5a5e656f6ad20d963eaf5d6f47f4fcc78e220899
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 06:55:18 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:39:15 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a5e656f
dev-qt/qtwebengine: add jumbo-build patch
* asturm 2021-12-25: Fix SRC_URI - always add patch, not just in release
Bug: https://bugs.gentoo.org/813957
Thanks-to: Marco Genasci <fedeliallalinea <AT> gmail.com> (enhancing patch)
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9c826ec1..8405203a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
+DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-everywhere-src-6.2.2.tar.xz 369695600 BLAKE2B 93affc7039e45429060ba35db10131a8873f19fa1188fecf3f28e83afc0e6f25f6ac5b6ad8e3dd6a65216a9e5f7b831ea21b431d652db16d7aff62bb26c365e0 SHA512 7bc7a6ada9125d02995a71a962ae464ae3f452e30b409a004aed245c4636af4b6e6736fbeb9349ecc4ecfeec7328ac96bc9193ed53221de322ebc913ea2a833f
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 61b7a1f3..c8411e17 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -26,8 +26,9 @@ else
inherit git-r3
fi
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -104,6 +105,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-24 23:18 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 5c3649219cf775bf1ecdb909076298a3c8f409e9
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 22:02:06 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:18:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5c364921
dev-qt/qtwebengine: update SRC_URI with new ppc64le patchset
added struct kernel_stat patch for
src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2bee5c71..9c826ec1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,2 @@
-DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
+DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-everywhere-src-6.2.2.tar.xz 369695600 BLAKE2B 93affc7039e45429060ba35db10131a8873f19fa1188fecf3f28e83afc0e6f25f6ac5b6ad8e3dd6a65216a9e5f7b831ea21b431d652db16d7aff62bb26c365e0 SHA512 7bc7a6ada9125d02995a71a962ae464ae3f452e30b409a004aed245c4636af4b6e6736fbeb9349ecc4ecfeec7328ac96bc9193ed53221de322ebc913ea2a833f
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index c8060e90..336099a8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -27,7 +27,7 @@ else
fi
# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-09 13:53 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-12-09 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 4f7ee905498e971b0e80667ace072be5fc4d4883
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 13:48:42 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 13:52:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4f7ee905
dev-qt/qtwebengine: use Python 3 and fix src_unpack()
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 882ad8e8..c95c28cb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="94.0.4606.126"
CHROMIUM_PATCHES_VER="94.0.4606.126"
@@ -109,7 +109,10 @@ src_unpack() {
fi
eshopts_pop
- default
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
}
src_prepare() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-09 13:53 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-12-09 13:53 UTC (permalink / raw
To: gentoo-commits
commit: bf1f2d5b606442ab88b9887cf08ec1a4fc6bba2a
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 13:16:43 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 13:16:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf1f2d5b
dev-qt/qtwebengine: update Chromium/patch versions
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild
index ee95eff6..244db495 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="90.0.4430.228"
-CHROMIUM_PATCHES_VER="94.0.4606.61"
+CHROMIUM_PATCHES_VER="96.0.4664.45"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index ee95eff6..882ad8e8 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -5,8 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="90.0.4430.228"
-CHROMIUM_PATCHES_VER="94.0.4606.61"
+CHROMIUM_VER="94.0.4606.126"
+CHROMIUM_PATCHES_VER="94.0.4606.126"
inherit estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-12-01 19:09 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-12-01 19:09 UTC (permalink / raw
To: gentoo-commits
commit: fb9a816ed89495a1f65439ea286bcc0447d3d69a
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 14:43:12 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 19:06:34 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb9a816e
dev-qt/qtwebengine: use qtpositioning:6 instead of qtlocation:6
0. https://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=974bc6b7d71
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index d6f70346..ee95eff6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtlocation-${PV}* )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
kerberos? ( virtual/krb5 )
pipewire? ( media-video/pipewire )
pulseaudio? ( media-sound/pulseaudio:= )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-10-16 15:36 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-10-16 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 99bc8c2be7464cd9538628b6e640202aa46fe393
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 15:07:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 15:07:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=99bc8c2b
dev-qt/qtwebengine: Add missing PYTHON_REQ_USE="xml(+)"
Reported-by: dE <de.techno <AT> gmail.com>
Bug: https://bugs.gentoo.org/818217
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 21fe9769..fd971278 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -4,6 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 9ed5ef60f95c23ba46ee42cb11adf5bcd354cf59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 10:45:45 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:45:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ed5ef60
dev-qt/qtwebengine: Add upstream link for version downpatch rationale
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index a64f24ef..21fe9769 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -145,6 +145,7 @@ src_prepare() {
fi
# We need to make sure this integrates well into Qt 5.15.2 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ # See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
# QTBUG-88657 - jumbo-build could still make trouble
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-09-23 7:29 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-09-23 7:29 UTC (permalink / raw
To: gentoo-commits
commit: 049be13391d598503402fe8d1f3ab0018993c0dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 18:37:01 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 07:28:00 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=049be133
dev-qt/qtwebengine: Replace media-libs/{mesa -> libglvnd} in DEPEND
Package appears to build without media-libs/mesa, using libglvnd headers only.
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index ccd7ebbc..c81a1a6b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -55,7 +55,6 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
- media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
@@ -86,7 +85,9 @@ RDEPEND="
=dev-qt/qtwidgets-${QT5_PV}*
)
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
BDEPEND="${PYTHON_DEPS}
dev-util/gperf
dev-util/ninja
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-09-15 20:01 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2021-09-15 20:01 UTC (permalink / raw
To: gentoo-commits
commit: fe7c57e795032cfc14d382f556973167f4d89ceb
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 19:58:40 2021 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 19:58:40 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fe7c57e7
dev-qt/qtwebengine: usex -> qt_use
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 3e77c7f4..ccd7ebbc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -198,13 +198,13 @@ src_configure() {
-printing-and-pdf
-system-opus
-system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-webengine-icu')
+ $(qt_use alsa)
+ $(qt_use !bindist proprietary-codecs)
+ $(qt_use geolocation webengine-geolocation)
+ $(qt_use kerberos webengine-kerberos)
+ $(qt_use pulseaudio)
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-09-15 7:39 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-09-15 7:39 UTC (permalink / raw
To: gentoo-commits
commit: d5a402514fa556d9f54626f375d3f44c1b4982a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 07:28:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 07:39:15 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d5a40251
dev-qt/qtwebengine: Fix .qmake.conf
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 73744694..3e77c7f4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -135,11 +135,10 @@ src_prepare() {
if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die
fi
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
# QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-09-08 8:17 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-09-08 8:17 UTC (permalink / raw
To: gentoo-commits
commit: 30c67d760aa0f171ffbbe449bd2af83e9b745616
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 08:16:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 08:16:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=30c67d76
dev-qt/qtwebengine: Switch from ~QTVER to =QT5_PV* version deps
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 27 +++++++++++------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 7e066664..73744694 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -4,7 +4,6 @@
EAPI=8
PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +11,7 @@ HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QTVER}_p* ]]; then
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
QT5_BUILD_DIR="${S}_build"
@@ -42,12 +41,12 @@ RDEPEND="
dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/re2:=
- ~dev-qt/qtcore-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[qml]
+ =dev-qt/qtcore-${QT5_PV}*
+ =dev-qt/qtdeclarative-${QT5_PV}*
+ =dev-qt/qtgui-${QT5_PV}*
+ =dev-qt/qtnetwork-${QT5_PV}*
+ =dev-qt/qtprintsupport-${QT5_PV}*
+ =dev-qt/qtwebchannel-${QT5_PV}*[qml]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -76,15 +75,15 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ designer? ( =dev-qt/designer-${QT5_PV}* )
+ geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
+ =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+ =dev-qt/qtwidgets-${QT5_PV}*
)
"
DEPEND="${RDEPEND}"
@@ -133,13 +132,13 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} == ${QTVER}_p* ]]; then
+ if [[ ${PV} == ${QT5_PV}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die
# We need to make sure this integrates well into Qt 5.15.2 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die
fi
# QTBUG-88657 - jumbo-build could still make trouble
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-08-26 12:10 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-08-26 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 5a89e75017672a18e3ab6fd09ebcec96ad2cc3d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 12:05:05 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 12:10:18 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a89e750
dev-qt/qtwebengine: Add missing sys-devel/flex BDEPEND
Reported-by: Joonas Niilola <juippis <AT> gentoo.org>
Closes: https://bugs.gentoo.org/810463
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index c41269bc..7e066664 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -94,6 +94,7 @@ BDEPEND="${PYTHON_DEPS}
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
+ sys-devel/flex
ppc64? ( >=dev-util/gn-0.1807 )
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-08-20 12:36 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-08-20 12:36 UTC (permalink / raw
To: gentoo-commits
commit: c49f3dbbc56cb332f1ead9ffbacfa9c8ce02ef64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 18:38:04 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 12:34:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c49f3dbb
dev-qt/qtwebengine: EAPI-8 bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 063e73c3..c41269bc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python2_7 )
QTVER=$(ver_cut 1-3)
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-07-03 14:44 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-07-03 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 2c2ffc6b7f5f6117d81a954730f50d67d5c5db1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 14:38:34 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 14:44:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2c2ffc6b
dev-qt/qtwebengine: Sync with Gentoo ebuild repo
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 28 +++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index a4468ac7..063e73c3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -5,9 +5,10 @@ EAPI=7
PYTHON_COMPAT=( python2_7 )
QTVER=$(ver_cut 1-3)
-inherit multiprocessing python-any-r1 qt5-build
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -22,6 +23,7 @@ else
"https://code.qt.io/qt/${QT5_MODULE}.git"
"https://github.com/qt/${QT5_MODULE}.git"
)
+ inherit git-r3
fi
# patchset based on https://github.com/chromium-ppc64le releases
@@ -68,6 +70,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
+ x11-libs/libxkbfile
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
@@ -78,15 +81,14 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-68.2:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
~dev-qt/qtdeclarative-${QTVER}[widgets]
~dev-qt/qtwidgets-${QTVER}
)
"
DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
dev-util/gperf
dev-util/ninja
dev-util/re2c
@@ -111,6 +113,24 @@ pkg_preinst() {
elog "tldr: Your web browsing experience will be compromised."
}
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+ ewarn "You may experience really long compilation times and/or increased memory usage."
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT5_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
src_prepare() {
if [[ ${PV} == ${QTVER}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-07-03 14:44 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-07-03 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 08eba4e86148e6f6211fd16745236d8b7ff023ef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 18:45:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 14:44:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=08eba4e8
dev-qt/qtwebengine: Add pkg_preinst() disclaimer
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 7a2eb367..a4468ac7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -100,6 +100,17 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
)
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "additional security fixes from newer versions. Extensive as it is, the"
+ elog "list of backports is impossible to evaluate, but always bound to be behind"
+ elog "Chromium's release schedule."
+ elog "In addition, various online services may deny service based on an outdated"
+ elog "user agent version (and/or other checks). Google is already known to do so."
+ elog
+ elog "tldr: Your web browsing experience will be compromised."
+}
+
src_prepare() {
if [[ ${PV} == ${QTVER}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-07-03 14:44 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-07-03 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 30df6bc0e1a71ad89970f5e307bfd8fd4de938e5
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 20:54:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 14:44:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=30df6bc0
dev-qt/qtwebengine: dev-util/gn required on ppc64
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index c5be9e25..7a2eb367 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -92,6 +92,7 @@ BDEPEND="
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
+ ppc64? ( >=dev-util/gn-0.1807 )
"
PATCHES=(
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-06-24 11:19 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-06-24 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 45d7908ab622bc74093f309340a1d637b84a0951
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 11:10:34 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 11:11:40 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=45d7908a
dev-qt/qtwebengine: remove "pass appropriate options to ninja"
The file 'bootstrap.py' has changed, and this 'sed' has been doing
nothing since around 83-based. Quick testing suggests that NINJAFLAGS
is being respected as it should be, even without our modifications.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 6b75547b..c5be9e25 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -115,10 +115,6 @@ src_prepare() {
src/buildtools/config/common.pri || die
fi
- # bug 630834 - pass appropriate options to ninja when building GN
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | \
xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-04-19 10:53 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-04-19 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 29de6e406a4ccac4aa2bc44f771c51da1da9e37c
Author: Alec Moskvin <alecm <AT> gmx <DOT> com>
AuthorDate: Sat Mar 20 17:18:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 10:51:18 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=29de6e40
dev-qt/qtwebengine: depend on net-libs/nodejs[ssl]
See also: https://github.com/gentoo/gentoo/pull/20021
Bug: https://bugs.gentoo.org/777405
Signed-off-by: Alec Moskvin <alecm <AT> gmx.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 69eec9bf..74014821 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -90,7 +90,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
dev-util/ninja
dev-util/re2c
- net-libs/nodejs
+ net-libs/nodejs[ssl]
sys-devel/bison
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-04-19 10:53 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-04-19 10:53 UTC (permalink / raw
To: gentoo-commits
commit: cda2b15b96d5b18a9dfa652a33d93c4490de1bb3
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sun Apr 18 20:47:43 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 10:51:31 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cda2b15b
dev-qt/qtwebengine: Move some DEPENDs to BDEPEND
This commit changes two things:
1. Some deps were in DEPEND which are actually CBUILD dependencies, so
they're moved into BDEPEND now.
2. DEPEND contained an old gzip dep to a version which is not in the
tree anymore.
Committer-comment:
Fixed DEPEND/BDEPEND, rebased onto 29de6e40, updated git summary accordingly.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Closes: https://github.com/gentoo/qt/pull/237
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 74014821..6b75547b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -84,9 +84,9 @@ RDEPEND="
~dev-qt/qtwidgets-${QTVER}
)
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
${PYTHON_DEPS}
- >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-04-14 6:54 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-04-14 6:54 UTC (permalink / raw
To: gentoo-commits
commit: a22ac6627d5f3ab9f1e72d57050182749808fa3e
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 16:43:37 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 12 09:07:58 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a22ac662
dev-qt/qtwebengine: add EGIT_REPO_URI in preparation for eclass changes
The eclass will use KDE upstream for all 5.15 modules except for
'qtwebengine'.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index a38e6be2..69eec9bf 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -16,6 +16,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
S="${WORKDIR}/${P}"
QT5_BUILD_DIR="${S}_build"
fi
+else
+ EGIT_BRANCH="5.15"
+ EGIT_REPO_URI=(
+ "https://code.qt.io/qt/${QT5_MODULE}.git"
+ "https://github.com/qt/${QT5_MODULE}.git"
+ )
fi
# patchset based on https://github.com/chromium-ppc64le releases
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-03-14 15:36 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-03-14 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 1d58a144815b1802de2b97a64e5c26761117c57f
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Mar 10 18:00:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 15:23:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1d58a144
dev-qt/qtwebengine: Set correct QT5_BUILD_DIR.
Closes: https://bugs.gentoo.org/775275
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 3a1e6def..98ede450 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -14,6 +14,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
+ QT5_BUILD_DIR="${S}_build"
fi
fi
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-02-12 20:45 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-02-12 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 907a0ff98c5de2f0c717c40f66e2d9d1f1f39b46
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 20:34:42 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 20:35:48 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=907a0ff9
dev-qt/qtwebengine: Fix MODULE_VERSION downpatching sed
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 0f61b7f9..3a1e6def 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -96,9 +96,10 @@ src_prepare() {
# We need to make sure this integrates well into Qt 5.15.2 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTMIN}/" -i .qmake.conf || die
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
fi
+ # QTBUG-88657 - jumbo-build is broken
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-02-05 22:05 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-02-05 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 36f34d8cc9904dd4f1129cb5d0d7d63afce698fa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 5 21:25:59 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 21:58:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=36f34d8c
dev-qt/qtwebengine: Add snapshot switch, go back to ~dev-qt deps
This is going back on c07a5bbe to some extent, as it just does not work to
have these flexible deps completely without issues unless bigger hacks are
applied. Any updates for Qt 5.15.2 will provided as snapshots instead.
Apply hacks for successful snapshot build:
- Add faux .git subdirs to fix build
- sed MODULE_VERSION down to 5.15.2 (from 5.15.3 in git)
- fixes installed header path
- fixes installed cmake config requirements
- consequently, revdeps do not fail to configure
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 41 ++++++++++++++++---------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 01d4c802..0f61b7f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -4,18 +4,22 @@
EAPI=7
PYTHON_COMPAT=( python2_7 )
-QTMIN=5.15.2
+QTVER=$(ver_cut 1-3)
inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
-
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ if [[ ${PV} == ${QTVER}_p* ]]; then
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/${P}"
+ fi
fi
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
+
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -29,12 +33,12 @@ RDEPEND="
dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/re2:=
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwebchannel-${QTMIN}:5[qml]
+ ~dev-qt/qtcore-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[qml]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -62,15 +66,15 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
+ designer? ( ~dev-qt/designer-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
widgets? (
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
)
"
DEPEND="${RDEPEND}
@@ -86,6 +90,15 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
src_prepare() {
+ if [[ ${PV} == ${QTVER}_p* ]]; then
+ # This is made from git, and for some reason will fail w/o .git directories.
+ mkdir -p .git src/3rdparty/chromium/.git || die
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTMIN}/" -i .qmake.conf || die
+ fi
+
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-02-02 0:41 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2021-02-02 0:41 UTC (permalink / raw
To: gentoo-commits
commit: c07a5bbe41a3df3edfe45c161686839c124d10c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 08:41:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 00:40:29 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c07a5bbe
dev-qt/qtwebengine: Relax minimum dev-qt/* version (set to 5.15.2)
Also sync with qtwebengine-5.15.2 ppc64 changes in Gentoo ebuild repo.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 43 ++++++++++++++++---------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 817d5c10..e93d7c47 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
+DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index e50ee0c8..01d4c802 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -4,12 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python2_7 )
+QTMIN=5.15.2
inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -23,17 +24,17 @@ RDEPEND="
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/re2:=
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwebchannel-${QTMIN}:5[qml]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -61,15 +62,15 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${PV} )
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ designer? ( >=dev-qt/designer-${QTMIN}:5 )
+ geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
widgets? (
- ~dev-qt/qtdeclarative-${PV}[widgets]
- ~dev-qt/qtwidgets-${PV}
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
)
"
DEPEND="${RDEPEND}
@@ -85,10 +86,6 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
src_prepare() {
- if use ppc64; then
- eapply "${WORKDIR}/${PN}-ppc64"
- fi
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
@@ -123,6 +120,22 @@ src_prepare() {
qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
+
+ # we need to generate ppc64 stuff because upstream does not ship it yet
+ if use ppc64; then
+ einfo "Patching for ppc64le and generating build files"
+ eapply "${WORKDIR}/${PN}-ppc64"
+ pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
+ mkdir -vp source/config/linux/ppc64 || die
+ mkdir -p source/libvpx/test || die
+ touch source/libvpx/test/test.mk || die
+ # generate_gni.sh runs git at the end of process, prevent it.
+ git() { : ; }
+ export -f git
+ ./generate_gni.sh || die
+ unset git
+ popd >/dev/null || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2021-01-15 15:02 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2021-01-15 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 2d6ef7e74ec98657341817ab7bd2663ad2679b2e
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:26:30 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:26:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d6ef7e7
dev-qt/qtwebengine: add build-time dependency on 'net-libs/nodejs'
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 689f6885..e50ee0c8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -78,6 +78,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
dev-util/ninja
dev-util/re2c
+ net-libs/nodejs
sys-devel/bison
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-11-25 22:22 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-11-25 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 9e68c89d3eafe3d5f08b3e18ef9a89385ff598d9
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 17:35:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 22:22:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9e68c89d
dev-qt/qtwebengine: add use default for libvpx dependency
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17752
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
(cherry picked from commit 0e313cfdb446c76fe4af167c9b03b20ea4fb222f)
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 2fa0f1bc..689f6885 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
+ >=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/mesa[egl,X(+)]
media-libs/opus
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-09-10 17:49 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-09-10 17:49 UTC (permalink / raw
To: gentoo-commits
commit: dad375f474062645d2edb6f6e226771cfd5baa23
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 22:41:47 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 17:48:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dad375f4
dev-qt/qtwebengine: update metadata.xml
Sync metadata with Gentoo ebuild repo.
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Closes: https://github.com/gentoo/gentoo/pull/15982
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 380559ac..ea633503 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -5,9 +5,16 @@
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
+ <maintainer type="person">
+ <description>ppc64 patchset maintainer</description>
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
<use>
<flag name="designer">Install the QWebEngineView plugin used to add widgets in
<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
+ <flag name="geolocation">Enable physical position determination
+ via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
instead of bundled.</flag>
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-09-10 17:49 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-09-10 17:49 UTC (permalink / raw
To: gentoo-commits
commit: e7f2c76dcccc163d7a9d165d19b7dc7f7185f6e5
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 01:46:34 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 17:48:34 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7f2c76d
dev-qt/qtwebengine: add ~ppc64 keyword and patchset
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Acked-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Reviewed-by: Davide Pesavento <pesa <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
new file mode 100644
index 00000000..817d5c10
--- /dev/null
+++ b/dev-qt/qtwebengine/Manifest
@@ -0,0 +1 @@
+DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 84a5805b..2fa0f1bc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -8,8 +8,11 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
+
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
@@ -81,6 +84,10 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
src_prepare() {
+ if use ppc64; then
+ eapply "${WORKDIR}/${PN}-ppc64"
+ fi
+
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-04-29 16:02 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-04-29 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 32db3f7c38a616153d53a1bee35e08af295aa84e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Apr 26 12:57:02 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 21:46:44 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=32db3f7c
dev-qt/qtwebengine: Fix using generated headers
Closes: https://bugs.gentoo.org/717122
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
index 989a394f..84a5805b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
@@ -91,7 +91,8 @@ src_prepare() {
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ find "${S}" -type f -name "*.pr[fio]" | \
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 989a394f..84a5805b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -91,7 +91,8 @@ src_prepare() {
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ find "${S}" -type f -name "*.pr[fio]" | \
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-04-09 20:38 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-04-09 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 7c4e793e33ee97e2a797291245eebb37c56c60ce
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 21:35:50 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 20:33:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7c4e793e
dev-qt/qtwebengine: add USE="kerberos"
Bug: https://bugs.gentoo.org/710866
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 4 +++-
dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild | 4 +++-
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 +++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index ccd095df..029e99a2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -127,6 +128,7 @@ src_configure() {
$(usex alsa '-alsa' '-no-alsa')
$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
$(usex system-icu '-webengine-icu' '-no-webengine-icu')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
index 881123ae..989a394f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -128,6 +129,7 @@ src_configure() {
$(usex alsa '-alsa' '-no-alsa')
$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
$(usex system-icu '-webengine-icu' '-no-webengine-icu')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 881123ae..989a394f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -128,6 +129,7 @@ src_configure() {
$(usex alsa '-alsa' '-no-alsa')
$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
$(usex system-icu '-webengine-icu' '-no-webengine-icu')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 12018a81..c3f4cc37 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
+ kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -124,6 +125,7 @@ src_configure() {
-webp
$(usex alsa '-alsa' '')
$(usex bindist '' '-proprietary-codecs')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-04-09 17:32 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 17:32 UTC (permalink / raw
To: gentoo-commits
commit: ec78602f03852f12ade82e253e60a2853459ecb4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 8 21:55:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 17:31:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ec78602f
dev-qt/qtwebengine: Sanity check against use of bundled ICU
Bug: https://bugs.gentoo.org/630834
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 13 +++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild | 13 +++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 13 +++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 13 +++++++++++++
4 files changed, 52 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 06189a3f..ccd095df 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -92,6 +92,19 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
index c06f87f2..881123ae 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
@@ -92,6 +92,19 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index c06f87f2..881123ae 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -92,6 +92,19 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 1fca3af0..12018a81 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -90,6 +90,19 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ if use system-icu; then
+ # Sanity check to ensure that bundled copy of ICU is not used.
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+ local file
+ while read file; do
+ echo "#error This file should not be used!" > "${file}" || die
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+ fi
+
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-04-09 17:32 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 17:32 UTC (permalink / raw
To: gentoo-commits
commit: faaca2a472833c6acec812a3474d1bf811b3881b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 8 20:53:06 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 17:24:00 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=faaca2a4
dev-qt/qtwebengine: Pass appropriate options to ninja for GN
Bug: https://bugs.gentoo.org/630834
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 4 ++++
dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild | 4 ++++
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index c2229351..06189a3f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -85,6 +85,10 @@ src_prepare() {
src/buildtools/config/common.pri || die
fi
+ # bug 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
index c468cea0..c06f87f2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild
@@ -85,6 +85,10 @@ src_prepare() {
src/buildtools/config/common.pri || die
fi
+ # bug 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index c468cea0..c06f87f2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -85,6 +85,10 @@ src_prepare() {
src/buildtools/config/common.pri || die
fi
+ # bug 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7c6f51fc..1fca3af0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -83,6 +83,10 @@ src_prepare() {
src/core/config/common.pri || die
fi
+ # bug 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-02-11 7:47 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-02-11 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 61cfbf50c5ef8236e5a1802af0ffae9e7d1e4c34
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 07:45:28 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 07:46:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=61cfbf50
dev-qt/qtwebengine: [5.15] apply x86 build patch from 5.14
Tested only on amd64 thus far.
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 0af3da8e..54714f0c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -77,6 +77,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
+PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
+
src_prepare() {
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-01-29 22:48 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-01-29 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 22:47:30 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 22:47:30 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7064af6a
dev-qt/qtwebengine: [5.14] sync with 5.15
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 13940d0b..59cd6171 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,8 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel
+ pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -24,7 +24,6 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtpositioning-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
@@ -60,6 +59,7 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -105,14 +105,15 @@ src_configure() {
local myqmakeargs=(
--
- -opus
-printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-01-29 1:53 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-01-29 1:53 UTC (permalink / raw
To: gentoo-commits
commit: 04c7e03f5e2eabf2a87d3d06b5510dfcb5be2328
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 01:52:38 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 01:52:38 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=04c7e03f
dev-qt/qtwebengine: [5.15] reintroduce USE="geolocation"
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index e6a01a7d..c34e9f79 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -11,8 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel
+ pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -24,7 +24,6 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtpositioning-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
@@ -60,6 +59,7 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -111,6 +111,7 @@ src_configure() {
-system-webp
$(usex alsa '-alsa' '-no-alsa')
$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
$(usex system-icu '-webengine-icu' '-no-webengine-icu')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-01-29 1:53 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-01-29 1:53 UTC (permalink / raw
To: gentoo-commits
commit: a154469e90074c7c027acc6ec75b000d24e6fdf1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 01:47:01 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 01:50:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a154469e
dev-qt/qtwebengine: [5.15] refactor configure options
The options should now be more robust, and depend less on automagic.
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 69228a43..e6a01a7d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -89,10 +89,6 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- # Disable 'qtpdf' for now to fix build.
- sed -i -e 's|qtConfig(build-qtpdf)|false|g' \
- src/src.pro || die
-
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
@@ -109,14 +105,15 @@ src_configure() {
local myqmakeargs=(
--
- -opus
+ -no-build-qtpdf
-printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2020-01-28 2:09 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2020-01-28 2:09 UTC (permalink / raw
To: gentoo-commits
commit: e42d555686bfe2b47a774e9c8a2866573b90402d
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 02:06:09 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 02:06:09 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e42d5556
dev-qt/qtwebengine: [5.15] disable 'qtpdf' for now to fix build
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 13940d0b..69228a43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -89,6 +89,10 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ # Disable 'qtpdf' for now to fix build.
+ sed -i -e 's|qtConfig(build-qtpdf)|false|g' \
+ src/src.pro || die
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-09-24 20:55 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2019-09-24 20:55 UTC (permalink / raw
To: gentoo-commits
commit: dc9767944fa764ada23540868b675d190fae7c85
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 20:44:51 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 20:53:03 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc976794
dev-qt/qtwebengine: update the location of configuration files
Upstream has changed the location of the "gn configs" [1] in the
5.14 and 5.15 branches.
1. https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.14&id=19a73086
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 20cbb0c2..433f331e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -83,17 +83,17 @@ src_prepare() {
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/core/config/common.pri || die
+ src/buildtools/config/common.pri || die
fi
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config geolocation webengine-geolocation \
src/core/core_chromium.pri \
src/core/core_common.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 20cbb0c2..433f331e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -83,17 +83,17 @@ src_prepare() {
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/core/config/common.pri || die
+ src/buildtools/config/common.pri || die
fi
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config geolocation webengine-geolocation \
src/core/core_chromium.pri \
src/core/core_common.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-08-18 11:44 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2019-08-18 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 93a517e2821adab6584b2f2cc521c1121930f037
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 11:43:52 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 11:43:52 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=93a517e2
dev-qt/qtwebengine: DEPEND on media-libs/mesa[X(+)]
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index cc5315ca..f6e918f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa[egl]
+ media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index 9a2e8527..20cbb0c2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa[egl]
+ media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 9a2e8527..20cbb0c2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa[egl]
+ media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-06-20 21:17 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2019-06-20 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 2d478aaca9b1123072eb6773f179d7f3e351dfd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 12:14:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 12:14:45 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2d478aac
dev-qt/qtwebengine: Drop USE geolocation for bug #686670
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
index cc5315ca..ac32ce4b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -24,6 +24,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtpositioning-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
@@ -59,7 +60,6 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -94,9 +94,6 @@ src_prepare() {
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
- qt_use_disable_config geolocation webengine-geolocation \
- src/core/core_chromium.pri \
- src/core/core_common.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-05-14 12:57 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2019-05-14 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 7e7f0cab28475b055e1963f1422e704748d884c6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 12:56:49 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue May 14 12:57:29 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7e7f0cab
dev-qt/qtwebengine: track upstream geolocation/positioning changes
Upstream-Change-Id: I5108456caa024a1ada9bb54750693064a2d36f78
Upstream-Change-Id: If679b5c366074c2f48fad5ba189870571567fe81
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 +++-----
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 8 +++-----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 +++-----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index df474b5d..cf4e9a89 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -94,15 +94,13 @@ src_prepare() {
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config geolocation webengine-geolocation \
+ src/core/core_chromium.pri \
+ src/core/core_common.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
- qt_use_disable_mod geolocation positioning \
- mkspecs/features/configure.prf \
- src/core/core_chromium.pri \
- src/core/core_common.pri
-
qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index 92ce913b..91945c1d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -90,15 +90,13 @@ src_prepare() {
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config geolocation webengine-geolocation \
+ src/core/core_chromium.pri \
+ src/core/core_common.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
- qt_use_disable_mod geolocation positioning \
- mkspecs/features/configure.prf \
- src/core/core_chromium.pri \
- src/core/core_common.pri
-
qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 92ce913b..91945c1d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -90,15 +90,13 @@ src_prepare() {
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config geolocation webengine-geolocation \
+ src/core/core_chromium.pri \
+ src/core/core_common.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
- qt_use_disable_mod geolocation positioning \
- mkspecs/features/configure.prf \
- src/core/core_chromium.pri \
- src/core/core_common.pri
-
qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-04-25 2:30 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2019-04-25 2:30 UTC (permalink / raw
To: gentoo-commits
commit: 08f094ccd202483556ca4038e866b87f3a9f2982
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 02:30:10 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 02:30:18 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=08f094cc
dev-qt/qtwebengine: remove unused dependency
Bug: https://bugs.gentoo.org/610836
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 48fcb535..df474b5d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/libcap
sys-libs/zlib[minizip]
virtual/libudev
x11-libs/libdrm
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index cff56886..92ce913b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/libcap
sys-libs/zlib[minizip]
virtual/libudev
x11-libs/libdrm
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 220936d4..f880cc18 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/libcap
sys-libs/zlib[minizip]
virtual/libudev
x11-libs/libdrm
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-04-20 20:10 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2019-04-20 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 7f9ac40b58c3552941b5ce9860fef70fb3d3a5fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 20:00:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 20:10:17 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f9ac40b
dev-qt/qtwebengine: Block broken sys-devel/binutils-2.32-r0
Bug: https://bugs.gentoo.org/683794
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 48fcb535..0f4f9529 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -15,7 +15,7 @@ IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
-RDEPEND="
+COMMON_DEPEND="
app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
@@ -69,7 +69,7 @@ RDEPEND="
~dev-qt/qtwidgets-${PV}
)
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
>=app-arch/gzip-1.7
dev-util/gperf
@@ -78,6 +78,9 @@ DEPEND="${RDEPEND}
sys-devel/bison
pax_kernel? ( sys-apps/elfix )
"
+RDEPEND="${COMMON_DEPEND}
+ !!=sys-devel/binutils-2.32-r0
+"
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-02-19 16:58 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2019-02-19 16:58 UTC (permalink / raw
To: gentoo-commits
commit: 6a019e522aedc70362b4195592e17271b69d2b76
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 14:36:46 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 14:36:46 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a019e52
dev-qt/qtwebengine: remove 'fixup-system-icu' from 5.13.9999
- https://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.13&id=0e1ef598
Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index ff148cf7..cff56886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2019-02-03 5:15 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2019-02-03 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 2c300eecadc320dcbd907be58f0c442865320065
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 3 05:14:29 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Feb 3 05:14:29 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2c300eec
dev-qt/qtwebengine: remove unneeded GCC patch from 5.{,13.}9999
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 --
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index d3fb8ca6..cff56886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 958712db..cff56886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-12-17 11:49 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-12-17 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 569149da25cfcc5aaa793de44b71d185576cc9ee
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 11:41:21 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 11:48:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=569149da
dev-qt/qtwebengine: switch USE="jumbo-build" default state
Having this enabled by default has lead to at least some surprised
users (in a non-positive way), and as such, it seems like a better
idea to have it disabled until the user enables it.
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
index ea4481da..3210a151 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index ea4481da..3210a151 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index d997418e..958712db 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-12-16 19:01 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 7d1645fc0f771f8031360c6be8bab765fee2ef71
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 10:23:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 10:23:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7d1645fc
dev-qt/qtwebengine: Apply nouveau-disable-gpu patch to 5.12
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild | 5 ++++-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
index d997418e..ea4481da 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+ "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index d997418e..ea4481da 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+ "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+)
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-11-13 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 17:52 UTC (permalink / raw
To: gentoo-commits
commit: e7e2414adb60fad7783974ccfece2412fd27aea4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 17:19:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 17:19:09 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7e2414a
dev-qt/qtwebengine: Add missing media-libs/lcms:2 DEPEND
Bug: https://bugs.gentoo.org/669642
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index e9994435..ea4481da 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index c3767074..d997418e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index c3767074..d997418e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-10-17 16:47 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-10-17 16:47 UTC (permalink / raw
To: gentoo-commits
commit: c2f70462c41a4785715148d1601afbccb81020c6
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 16:47:12 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 16:47:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2f70462
dev-qt/qtwebengine: remove forgotten 'system-libvpx' bits
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 90b09f43..4a62001c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -119,7 +119,6 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
- $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 90b09f43..4a62001c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -119,7 +119,6 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
- $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-09-18 15:02 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-09-18 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 86052e25d83e5df82e7e43f2defa2be3360d3f1c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 15:02:02 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 15:02:02 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=86052e25
dev-qt/qtwebengine: remove upstreamed libxml catalog patch from 5.12
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 63a7df36..4fab7ab9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -79,10 +79,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
-)
+PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-09-09 18:21 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-09-09 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 349be62ac22ce4858f6616483346fab7df9f6b61
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 18:20:40 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 18:20:40 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=349be62a
dev-qt/qtwebengine: drop upstreamed libxml catalogs patch from 5.11
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 61f119f9..c3ed341b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
- "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-08-25 4:04 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-08-25 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 76a2bab7c21e18325253b17ed31ca34cb5f4bf22
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 04:01:57 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 04:02:12 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=76a2bab7
dev-qt/qtwebengine: add USE="jumbo-build"
Allows for disabling 'jumbo-build' completely to reduce memory use.
Bug: https://bugs.gentoo.org/660430
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 8 +++++++-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 +++++++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 +++++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index cd7c273b..acca7340 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -10,6 +10,7 @@
<pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
instead of bundled.</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index c3b6285f..61f119f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -86,6 +87,11 @@ PATCHES+=(
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 7b506cba..3b0d387a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -83,6 +84,11 @@ PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7b506cba..3b0d387a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -83,6 +84,11 @@ PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ if ! use jumbo-build; then
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+ src/core/config/common.pri || die
+ fi
+
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-08-24 23:43 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-08-24 23:43 UTC (permalink / raw
To: gentoo-commits
commit: 1e32d96231537732289db9215ac8ad1208b86d8c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 23:42:58 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 23:42:58 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1e32d962
dev-qt/qtwebengine: enable webrtc again
While this breaks build with system-ffmpeg 3, there are other issues
during run-time (html5 videos and such will not play). The run-time
issues persist even if building with bundled libvpx, so
system-ffmpeg <4 might be a dead end, unless there is something
simple enough to fix.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 7c793ad2..7b506cba 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -110,7 +110,6 @@ src_configure() {
-opus
-printing-and-pdf
-webp
- -no-webengine-webrtc
$(usex alsa '-alsa' '')
$(usex bindist '' '-proprietary-codecs')
$(usex pulseaudio '-pulseaudio' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7c793ad2..7b506cba 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -110,7 +110,6 @@ src_configure() {
-opus
-printing-and-pdf
-webp
- -no-webengine-webrtc
$(usex alsa '-alsa' '')
$(usex bindist '' '-proprietary-codecs')
$(usex pulseaudio '-pulseaudio' '')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-08-16 12:20 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-08-16 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 9e06624678aa8238af9d0fa7d11866eddd1b7798
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 11:29:52 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 11:29:52 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9e066246
dev-qt/qtwebengine: remove nouveau patch from 5.12
The 'qtwebengine-5.11.1-nouveau-disable-gpu.patch' leads to a build
failure, so remove it for now.
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index f1bc40d6..dfd139a4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index f1bc40d6..dfd139a4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-07-25 23:20 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-07-25 23:20 UTC (permalink / raw
To: gentoo-commits
commit: e389555ec66d89f4d0fed7a9d75a3deeada7fce7
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 23:11:33 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 23:15:28 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e389555e
dev-qt/qtwebengine: sync with main Gentoo repo tree
Package-Manager: Portage-2.3.43, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 94340299..32fb11c5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
- dev-libs/protobuf:=
dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
@@ -63,7 +62,7 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
+ system-icu? ( >=dev-libs/icu-60.2:= )
widgets? (
~dev-qt/qtdeclarative-${PV}[widgets]
~dev-qt/qtwidgets-${PV}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index f9aeb7b1..65a2d764 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
- dev-libs/protobuf:=
dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2a7c9515..f1bc40d6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
- dev-libs/protobuf:=
dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
@@ -63,7 +62,7 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
+ system-icu? ( >=dev-libs/icu-60.2:= )
widgets? (
~dev-qt/qtdeclarative-${PV}[widgets]
~dev-qt/qtwidgets-${PV}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-06-21 10:15 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-06-21 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 7f5b354abf4e76b9a0cd7b4f83b333b19c952603
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 10:11:17 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 10:12:53 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f5b354a
dev-qt/qtwebengine: adjust USE="designer" description
This will describe the purpose of the flag more accurately.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/metadata.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d6bd8540..cd7c273b 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,7 +6,8 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="designer">Install QWebEngineView plugin for displaying web pages in <pkg>dev-qt/designer</pkg></flag>
+ <flag name="designer">Install the QWebEngineView plugin used to add widgets in
+ <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-06-18 14:04 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-06-18 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 790d3b518dc792550bbfa4a59c05e3f55d70472a
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jun 15 00:11:55 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 13:36:36 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=790d3b51
dev-qt/qtwebengine: Add "designer" USE flag.
Bug: https://bugs.gentoo.org/652508
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild | 6 +++++-
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 6 +++++-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 6 +++++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +++++-
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d93362dc..d6bd8540 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="designer">Install QWebEngineView plugin for displaying web pages in <pkg>dev-qt/designer</pkg></flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
index 46f6eac4..cae980dd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -91,6 +93,8 @@ src_prepare() {
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 22f8752c..b98972ea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -86,6 +88,8 @@ src_prepare() {
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 1cfd7f69..f9aeb7b1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -91,6 +93,8 @@ src_prepare() {
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 79fbf3c5..39f78647 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -88,6 +90,8 @@ src_prepare() {
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-06-12 22:55 Andreas Sturmlechner
0 siblings, 0 replies; 146+ messages in thread
From: Andreas Sturmlechner @ 2018-06-12 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 94738145c33fac1b4cceda19e0688ef7df11aba6
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 14:33:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 22:39:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=94738145
dev-qt/qtwebengine: depend on 'media-libs/mesa[egl]'
Without USE="egl", the configure phase ends with
"khronos development headers appear to be missing
(mesa/libegl1-mesa-dev) QtWebEngine will not be built.",
and nothing will be compiled.
Thanks-to: kermeat <snowman.sp <AT> gmail.com>
https://github.com/gentoo/gentoo/pull/7683
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
index 82890439..df8f0ed1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-05-27 16:56 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-05-27 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 3b13f0a508e778b5756de7192b83122fd16662fa
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 14:33:16 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:56:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3b13f0a5
dev-qt/qtwebengine: depend on 'media-libs/mesa[egl]'
Without USE="egl", the configure phase ends with
"khronos development headers appear to be missing
(mesa/libegl1-mesa-dev) QtWebEngine will not be built.",
and nothing will be compiled.
Thanks-to: kermeat <snowman.sp <AT> gmail.com>
https://github.com/gentoo/gentoo/pull/7683
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
index 389c4c2e..5887b6d8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 7b17867a..22f8752c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 02106ae4..97480393 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 32064b19..79fbf3c5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-05-16 14:22 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-05-16 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 4faec2a71620422045a5ddf5d566aa606a155da3
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 14:19:42 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed May 16 14:19:42 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4faec2a7
dev-qt/qtwebengine: remove upstreamed ICU patch from 5.11.9999
Package-Manager: Portage-2.3.36, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 32064b19..7b17867a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
- use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-04-17 10:23 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-04-17 10:23 UTC (permalink / raw
To: gentoo-commits
commit: f45f261f4b594a94aa6f1307e13be8eb378bff08
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 10:15:43 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 10:15:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f45f261f
dev-qt/qtwebengine: remove upstreamed ICU patches from 5.9999
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 0fc2f021..32064b19 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,10 +11,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
-)"
-
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
@@ -84,10 +80,7 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=(
- "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch"
- "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch"
- )
+ PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-04-15 7:53 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-04-15 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 2e621cb0cf089ffc1d302487fc63c924e30c072c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 07:50:52 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 07:51:38 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2e621cb0
dev-qt/qtwebengine: update 5.11.0_beta3 system ICU patch
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index aa4fe482..c81eb2f0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,5 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
-DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
+DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 7173 BLAKE2B e67d583eff40b6e4a4c103c5c2cb62b9d96607fde70352baee20e0515428bb0fe13cb20786f348ff1d10caa37685ec249d8d55882b2fbb3377e808d5ec44913a SHA512 a7ee7e73c7a9185b7ae8e62c0fc632269853f32e776dda3e3a0b153fb2eab07b890d45d5b9e60db02be04b7492782ca91978e2e159cf07dd3f206ac152d90e75
DIST qtwebengine-5.11.0_beta2-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-04-11 12:56 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-04-11 12:56 UTC (permalink / raw
To: gentoo-commits
commit: d0793b1af1099f365764b4f1bdf5fb56e943675b
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 12:30:13 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 12:30:13 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d0793b1a
dev-qt/qtwebengine: remove upstreamed ICU patches from 5.11.9999
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 85042ae6..edbb26bd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -84,10 +84,7 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=(
- "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
- "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
- )
+ PATCHES+=( "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch" )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-04-03 3:15 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-04-03 3:15 UTC (permalink / raw
To: gentoo-commits
commit: 7eacbe0e0eacda5f70cda3a6bbcdd5d37b459d56
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 03:07:28 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 03:07:28 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7eacbe0e
dev-qt/qtwebengine: update patches related to system-icu
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/Manifest | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 7 +++++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 7 +++++--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a43f68ad..ff7af173 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,5 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
-DIST qtwebengine-5.11.0-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
-DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
+DIST qtwebengine-5.11.0-icu-patches.tar.bz2 7598 BLAKE2B 4cb72bf71eba67bcbceee5e35b75b19664e0e4027e24e722d159dde1d8741d8621647c5aa7d7298e5e7209800945eadae9f203d59a604481c2c09f99578347ed SHA512 50fa38962ef5203b2fc1f6df0bca8acebc18c26579077cb090dc7f14ad9def39a1325644e66a83dd52cd7943053fc0c6894a00f6939443c34961620ac93c3dd5
+DIST qtwebengine-5.11.0_beta2-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
index 0f479987..5102a5d0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0_beta2-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 4c22a9b0..686d1d20 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -85,7 +85,10 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
+ PATCHES+=(
+ "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
+ "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
+ )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2450a132..85042ae6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -84,7 +84,10 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
+ PATCHES+=(
+ "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
+ "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
+ )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-04-03 3:15 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-04-03 3:15 UTC (permalink / raw
To: gentoo-commits
commit: 4333caddaf05c1fd5dbd8dac64f57c1fbcb550e6
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 03:12:18 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 03:12:18 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4333cadd
dev-qt/qtwebengine: remove 'virtual/jpeg' dependency from 5.11.9999
This was supposed to have been done already in 'b4ff3cdc', but one
version was mysteriously omitted from part of the change.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 686d1d20..85042ae6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
- virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-03-17 2:49 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-03-17 2:49 UTC (permalink / raw
To: gentoo-commits
commit: b4ff3cdc3edb8c2a42bbac54cf0870375253f715
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 02:38:50 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 02:41:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b4ff3cdc
dev-qt/qtwebengine: adjust 'jpeg' dependency on >=5.10
Depend on 'media-libs/libjpeg-turbo' instead of 'virtual/jpeg', since
'media-libs/jpeg' causes issues such as build failures. Also remove
the use of the patch specific to jpeg-9, which is no longer
needed after this change.
Bug: https://bugs.gentoo.org/648200
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild | 4 +---
dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild | 4 +---
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 +---
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
index 7f6d0349..389c4c2e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
@@ -47,7 +48,6 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
- virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
@@ -81,8 +81,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
index 098e4822..0f479987 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
@@ -47,7 +48,6 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
- virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
@@ -81,8 +81,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 05974b1c..4c22a9b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
@@ -81,8 +82,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 05974b1c..2450a132 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
@@ -47,7 +48,6 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
- virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
@@ -81,8 +81,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-03-17 2:49 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-03-17 2:49 UTC (permalink / raw
To: gentoo-commits
commit: f91bb48a1a371a490e26b12b898966ccd9d6b9da
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 02:22:52 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 02:23:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f91bb48a
dev-qt/qtwebengine: switch system ICU patches for 65-based 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 7 ++-----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 7 ++-----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index cbde3844..a43f68ad 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
DIST qtwebengine-5.11.0-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
+DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 098e4822..05974b1c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -86,10 +86,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=(
- "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
- )
+ PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 098e4822..05974b1c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -86,10 +86,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=(
- "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
- )
+ PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-02-10 21:33 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-02-10 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 2a44abc7c9671d6b2bcb0aa1f04498496ee48b56
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 21:32:45 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 21:32:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a44abc7
dev-qt/qtwebengine: fix system-icu for 5.11 and 5.9999
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a99d18a0..fffec4a3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
+DIST qtwebengine-5.11.0-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B 8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa SHA512 7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 7f6d0349..098e4822 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -87,8 +87,8 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
PATCHES+=(
- "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
)
# bug 620444 - ensure local headers are used
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7f6d0349..098e4822 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -87,8 +87,8 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
PATCHES+=(
- "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
)
# bug 620444 - ensure local headers are used
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-01-15 11:06 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2018-01-15 11:06 UTC (permalink / raw
To: gentoo-commits
commit: 45d6e682ced55e694ae731a7277cb4c2a6162847
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 11:05:59 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 11:06:13 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=45d6e682
dev-qt/qtwebengine: dev-libs/libxml2 must be build with USE="icu"
Bug: https://bugs.gentoo.org/644602
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index 90134a2a..e999c623 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
- dev-libs/libxml2
+ dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/protobuf:=
dev-libs/re2:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 90134a2a..e999c623 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
- dev-libs/libxml2
+ dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/protobuf:=
dev-libs/re2:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index b0daf7bf..e36ea1ca 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
- dev-libs/libxml2
+ dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/protobuf:=
dev-libs/re2:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 90134a2a..e999c623 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
- dev-libs/libxml2
+ dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/protobuf:=
dev-libs/re2:=
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-01-04 21:24 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2018-01-04 21:24 UTC (permalink / raw
To: gentoo-commits
commit: cc48c4deae84345f7e0a1201c4f703d41180cf97
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 21:22:56 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 21:22:56 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc48c4de
dev-qt/qtwebengine: swap 'flag' and 'config' passed to 'qt_use_disable_config'
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index f021d435..90134a2a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
- qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index f021d435..90134a2a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
- qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index f021d435..90134a2a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
- qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2018-01-04 13:10 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2018-01-04 13:10 UTC (permalink / raw
To: gentoo-commits
commit: e6b44e3b8c992e995e370c1edbeda5ffc68e50a6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 13:10:18 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 13:10:29 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e6b44e3b
dev-qt/qtwebengine: use new configuration names
Upstream-commit: 2ed1e0ba423a75f68c1547fe0c06e62e773ef64d
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index 291d2ad7..f021d435 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config alsa alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
+ qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 291d2ad7..f021d435 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config alsa alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
+ qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 291d2ad7..f021d435 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -92,8 +92,8 @@ src_prepare() {
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
- qt_use_disable_config alsa alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_config webengine-alsa alsa src/core/config/linux.pri
+ qt_use_disable_config webengine-pulseaudio pulseaudio src/core/config/linux.pri
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-12-23 0:44 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-12-23 0:44 UTC (permalink / raw
To: gentoo-commits
commit: fd3f442fb13ce3af640e229c52152f6cdca8ee8d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 00:44:08 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 00:44:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fd3f442f
dev-qt/qtwebengine: add missing dependency
Bug: https://bugs.gentoo.org/638998
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index 12be341a..291d2ad7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
+ dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 12be341a..291d2ad7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
+ dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 392afb90..b0daf7bf 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
+ dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 12be341a..291d2ad7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
+ dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-12-11 11:37 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2017-12-11 11:37 UTC (permalink / raw
To: gentoo-commits
commit: 009100134be9053761c0f952418b1f17c5d912b3
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 10:53:04 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 10:53:04 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=00910013
dev-qt/qtwebengine: add patches to fix build against system ICU >=59
Package-Manager: Portage-2.3.17, Repoman-2.3.6
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 9 +++++++++
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 9 +++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 9 +++++++++
4 files changed, 28 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 61d0c824..a99d18a0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1,2 @@
+DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B 8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa SHA512 7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index c93317a2..12be341a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
+SRC_URI+=" system-icu? (
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use system-icu && has_version ">=dev-libs/icu-59" && \
+ PATCHES+=(
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index c93317a2..12be341a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
+SRC_URI+=" system-icu? (
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use system-icu && has_version ">=dev-libs/icu-59" && \
+ PATCHES+=(
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index c93317a2..12be341a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,6 +11,10 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
+SRC_URI+=" system-icu? (
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+)"
+
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
@@ -78,6 +82,11 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use system-icu && has_version ">=dev-libs/icu-59" && \
+ PATCHES+=(
+ "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ )
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-12-10 12:03 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-12-10 12:03 UTC (permalink / raw
To: gentoo-commits
commit: c7ad9d645e8b7c2152df893552194e69405ec0dd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 12:03:01 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 12:03:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c7ad9d64
dev-qt/qtwebengine: add missing USE dependency
Bug: https://bugs.gentoo.org/638872
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 5 ++++-
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 5 ++++-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 5 ++++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 ++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index c970853b..c93317a2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index c970853b..c93317a2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 635faf47..392afb90 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index c970853b..c93317a2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-12-09 23:37 Jimi Huotari
0 siblings, 0 replies; 146+ messages in thread
From: Jimi Huotari @ 2017-12-09 23:37 UTC (permalink / raw
To: gentoo-commits
commit: f124252a9473d811a57ca8dd83ea5b6c2c4a69e3
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 23:30:48 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 23:36:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f124252a
dev-qt/qtwebengine: update configure switches
The WEBENGINE_CONFIG has been dropped in favour of 'qtConfig' values,
and while more work is needed to make sure that the USE-flags
actually disable features detected automagically, this commit will
allow for at least some control over them.
http://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=v5.10.0&id=1691d2298a8adf511ed95d5aa5d4410adcbdd1e3
Package-Manager: Portage-2.3.17, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 12 +++++++++---
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 12 +++++++++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 12 +++++++++---
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index 2c0bd638..4191302a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -97,9 +97,15 @@ src_configure() {
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+ --
+ -opus
+ -printing-and-pdf
+ -webp
+ $(usex alsa '-alsa' '')
+ $(usex bindist '' '-proprietary-codecs')
+ $(usex pulseaudio '-pulseaudio' '')
+ $(usex system-ffmpeg '-ffmpeg' '')
+ $(usex system-icu '-webengine-icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 2c0bd638..4191302a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -97,9 +97,15 @@ src_configure() {
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+ --
+ -opus
+ -printing-and-pdf
+ -webp
+ $(usex alsa '-alsa' '')
+ $(usex bindist '' '-proprietary-codecs')
+ $(usex pulseaudio '-pulseaudio' '')
+ $(usex system-ffmpeg '-ffmpeg' '')
+ $(usex system-icu '-webengine-icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2c0bd638..4191302a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -97,9 +97,15 @@ src_configure() {
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
+ --
+ -opus
+ -printing-and-pdf
+ -webp
+ $(usex alsa '-alsa' '')
+ $(usex bindist '' '-proprietary-codecs')
+ $(usex pulseaudio '-pulseaudio' '')
+ $(usex system-ffmpeg '-ffmpeg' '')
+ $(usex system-icu '-webengine-icu' '')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-12-07 9:08 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-12-07 9:08 UTC (permalink / raw
To: gentoo-commits
commit: c701b5a30f12970c1faa3730b6cf5856c111fa42
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 09:08:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 09:08:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c701b5a3
dev-qt/qtwebengine: fix patch name
Bug: https://bugs.gentoo.org/639220
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index afb0d89d..2b51fbf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index afb0d89d..2b51fbf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index afb0d89d..2b51fbf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-11-28 10:48 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-11-28 10:48 UTC (permalink / raw
To: gentoo-commits
commit: d956ea4b5de326d972250aa613c75bb10be07c6f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 10:46:46 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 10:48:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d956ea4b
dev-qt/qtwebengine: add missing dependency
Bug: https://bugs.gentoo.org/639026
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index ba128d2e..2c0bd638 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index ba128d2e..2c0bd638 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index ba128d2e..2c0bd638 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-10-10 12:30 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-10-10 12:30 UTC (permalink / raw
To: gentoo-commits
commit: b77f99ab89efed7eb67d99ee05afb5c412f7da34
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:29:15 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:30:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b77f99ab
dev-qt/qtwebengine: add missing dependency
Bug: https://bugs.gentoo.org/633750
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 7775bf5c..6a174ff2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 52d738f4..ba128d2e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 52d738f4..ba128d2e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-10-10 12:30 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-10-10 12:30 UTC (permalink / raw
To: gentoo-commits
commit: bfc1d52fffb5b9bf0d31936aa5f5d7e01b2662ee
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:29:59 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:30:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bfc1d52f
dev-qt/qtwebengine: sync KEYWORDS
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 6a174ff2..ba128d2e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-09-12 15:27 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-09-12 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 0d9593aa9f95d96324849da854148fd3a75c8337
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 15:26:52 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 15:26:59 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d9593aa
dev-qt/qtwebengine: apply forgotten changes to 5.10.9999
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-09-08 15:52 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-09-08 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 95b94093e5a8aef05a777bbec859af86d91cd194
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 12:18:27 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 8 15:51:58 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=95b94093
dev-qt/qtwebengine: avoid build failure by ensuring system headers are used
Gentoo-bug: 620444
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild | 3 +++
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 +++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 69efb343..7775bf5c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -74,6 +74,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-07-23 12:37 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-07-23 12:37 UTC (permalink / raw
To: gentoo-commits
commit: d18cf12b9e76cef471b246efc8b0debee7b9548b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 12:37:34 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 12:37:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d18cf12b
dev-qt/qtwebengine: add subslot operator for app-arch/snappy
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 95c95a16..a2c25a9b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 89b56544..ed4d9fb4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
index 17e51f3c..69efb343 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.1.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 17e51f3c..69efb343 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 17e51f3c..69efb343 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-27 13:02 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-27 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 6ea6ff40f1d8198b932069fb9b8af8599a246d61
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 13:02:01 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 13:02:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6ea6ff40
dev-qt/qtwebengine: sync ~arm64 keyword
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 743f5327..89b56544 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index d3a20a0c..17e51f3c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index d3a20a0c..17e51f3c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index d3a20a0c..17e51f3c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-18 8:02 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-18 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 8b3bc585d4be74d428d0419dd7b4b55ff2e41e28
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 08:02:41 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 08:02:47 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8b3bc585
dev-qt/qtwebengine: die if nothing is actually built
Gentoo-bug: 601472
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +++++
5 files changed, 25 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 512322d7..df053b08 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -103,5 +103,10 @@ src_configure() {
src_install() {
qt5-build_src_install
+ # bug 601472
+ if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 0542aa91..7f22fd14 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -113,5 +113,10 @@ src_configure() {
src_install() {
qt5-build_src_install
+ # bug 601472
+ if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 9bb4cd34..5be58dd7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -102,5 +102,10 @@ src_configure() {
src_install() {
qt5-build_src_install
+ # bug 601472
+ if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 9bb4cd34..5be58dd7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -102,5 +102,10 @@ src_configure() {
src_install() {
qt5-build_src_install
+ # bug 601472
+ if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 9bb4cd34..5be58dd7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -102,5 +102,10 @@ src_configure() {
src_install() {
qt5-build_src_install
+ # bug 601472
+ if [[ ! -f ${D%/}/${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-05 12:41 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-05 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 65de2d8d8ee98a1dbe2eca72e741f183e342aeaa
Author: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
AuthorDate: Mon Jun 5 12:39:59 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 12:41:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=65de2d8d
dev-qt/qtwebengine: allow NINJAFLAGS to be overridden
Gentoo-bug: 592660
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index d6011214..512322d7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index f8c8f6b4..0542aa91 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -98,7 +98,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 44580c0a..9bb4cd34 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 44580c0a..9bb4cd34 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 44580c0a..9bb4cd34 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-04 13:32 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-04 13:32 UTC (permalink / raw
To: gentoo-commits
commit: a56f46a836220b5880e47845c8a342791aa81e6e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 13:12:24 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 13:32:35 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a56f46a8
dev-qt/qtwebengine: add missing virtual/jpeg dependency
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 672249ed..f8c8f6b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index a6dcdd81..44580c0a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index a6dcdd81..44580c0a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index a6dcdd81..44580c0a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/jpeg:0
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-04 12:59 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-04 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 777f184deafdb957df9718140574f451d6961a28
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 12:59:20 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 12:59:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=777f184d
dev-qt/qtwebengine: remove unused dependencies
Gentoo-bug: 610848
Gentoo-bug: 610834
Gentoo-bug: 610830
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 3 ---
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 3 ---
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 ---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ---
4 files changed, 12 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index aa280e91..672249ed 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -24,12 +24,10 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp:=
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/flac
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -38,7 +36,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
- media-libs/speex
net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index d5a2d8b6..a6dcdd81 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -24,12 +24,10 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp:=
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/flac
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -38,7 +36,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
- media-libs/speex
net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index d5a2d8b6..a6dcdd81 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -24,12 +24,10 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp:=
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/flac
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -38,7 +36,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
- media-libs/speex
net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index d5a2d8b6..a6dcdd81 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -24,12 +24,10 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp:=
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/flac
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
@@ -38,7 +36,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
- media-libs/speex
net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-04 12:13 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-04 12:13 UTC (permalink / raw
To: gentoo-commits
commit: ba51bab012d9fb357f3e78204a197656cd1c6485
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 12:13:06 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 12:13:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ba51bab0
dev-qt/qtwebengine: add missing virtual/libudev dependency
Build system generates loader for it, which uses dlopen and dlsym for accessing
udev functionality.
Gentoo-bug: 610860
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
5 files changed, 5 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index a2eacb72..d6011214 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 1499b058..aa280e91 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 08947104..d5a2d8b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 08947104..d5a2d8b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 08947104..d5a2d8b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
sys-apps/pciutils
sys-libs/libcap
sys-libs/zlib[minizip]
+ virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-04 11:40 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-04 11:40 UTC (permalink / raw
To: gentoo-commits
commit: cfbb33fabae2dd1ced8dbf4d83dfad1068571272
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 11:39:53 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 11:40:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cfbb33fa
dev-qt/qtwebengine: make build log verbose
Gentoo-bug: 590920
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 980222ab..a2eacb72 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index cea59ebe..6662a5a0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -98,7 +98,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
local myqmakeargs=(
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 7ba36758..08947104 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 7ba36758..08947104 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7ba36758..08947104 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-04 11:40 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-04 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 522bef331aed4670a4c97d635d6d9fe8df0bb31e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 11:39:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 11:40:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=522bef33
dev-qt/qtwebengine: use correct variable name
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 75bfee80..980222ab 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 487e68d8..cea59ebe 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -98,7 +98,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index f4fb9799..7ba36758 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index f4fb9799..7ba36758 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index f4fb9799..7ba36758 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+ export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-06-03 16:01 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2017-06-03 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 3210bde4818f62d3acef982a1311f1ba2be8a020
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 3 16:01:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 16:01:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3210bde4
dev-qt/qtwebengine: convert MAKEOPTS to NINJAFLAGS
Gentoo-bug: 592660
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 73431476..75bfee80 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -89,6 +89,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
+ export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 837bdb33..601e8685 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -96,6 +96,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
+ export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 68e4702b..473bf57a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -86,6 +86,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
+ export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 68e4702b..473bf57a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -86,6 +86,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
+ export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 68e4702b..473bf57a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
+inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -86,6 +86,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
+ export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-05-14 2:15 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2017-05-14 2:15 UTC (permalink / raw
To: gentoo-commits
commit: d73da08732b764d5067cda4154c9a6735feab44c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 00:41:17 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 14 00:56:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d73da087
dev-qt/qtwebengine: Remove the removal of bundled ICU sources.
Compilation fails without the bundled ICU sources, because according
to upstream, they also have the build scripts for using system ICU,
and it does a weird thing of shadowing the system headers over the
bundled ones, so they have to be there.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild | 5 -----
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 5 -----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 -----
3 files changed, 15 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild
index 38c2fcf0..72750bde 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0_beta3.ebuild
@@ -74,11 +74,6 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
- if use system-icu; then
- # ensure build against system headers - bug #601264
- rm -r src/3rdparty/chromium/third_party/icu/source || die
- fi
-
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 38c2fcf0..72750bde 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -74,11 +74,6 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
- if use system-icu; then
- # ensure build against system headers - bug #601264
- rm -r src/3rdparty/chromium/third_party/icu/source || die
- fi
-
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 38c2fcf0..72750bde 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -74,11 +74,6 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
- if use system-icu; then
- # ensure build against system headers - bug #601264
- rm -r src/3rdparty/chromium/third_party/icu/source || die
- fi
-
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_chromium.pri \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-05-14 2:15 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2017-05-14 2:15 UTC (permalink / raw
To: gentoo-commits
commit: 3e7fc43e10fc19fb1e52d781d0ea14b1dc154656
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 00:47:21 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 14 02:12:04 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e7fc43e
dev-qt/qtwebengine: Fix the location of 'configure.prf'.
The qmake files have been moved around, and the 'tools/qmake'
directory doesn't exist any longer.
Upstream change:
http://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.9&id=8fb1dbef9c6606b49371f4c7baa8a21419146990
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 72750bde..bebfc788 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -75,9 +75,9 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
qt_use_disable_mod geolocation positioning \
- src/core/core_common.pri \
+ mkspecs/features/configure.prf \
src/core/core_chromium.pri \
- tools/qmake/mkspecs/features/configure.prf
+ src/core/core_common.pri
qt_use_disable_mod widgets widgets src/src.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 72750bde..bebfc788 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -75,9 +75,9 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
qt_use_disable_mod geolocation positioning \
- src/core/core_common.pri \
+ mkspecs/features/configure.prf \
src/core/core_chromium.pri \
- tools/qmake/mkspecs/features/configure.prf
+ src/core/core_common.pri
qt_use_disable_mod widgets widgets src/src.pro
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-04-25 20:15 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2017-04-25 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 83fa4bc92c11a1d12dad4cd4c0c53d3210c83592
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 16:05:07 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 20:13:49 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=83fa4bc9
dev-qt/qtwebengine: Remove unneeded patches.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 5 -----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 -----
2 files changed, 10 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 7e15ff03..38c2fcf0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -71,11 +71,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
- "${FILESDIR}/${PN}-5.7.0-icu58.patch"
-)
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7e15ff03..38c2fcf0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -71,11 +71,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
- "${FILESDIR}/${PN}-5.7.0-icu58.patch"
-)
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2017-04-25 20:15 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2017-04-25 20:15 UTC (permalink / raw
To: gentoo-commits
commit: bdce15ceafa411a7d8c6507976a956ca8f85848e
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 15:59:52 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 20:12:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bdce15ce
dev-qt/qtwebengine: Update disabling 'positioning' in 5.9 ebuilds.
Upstream changes:
- http://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.9&id=e00ac03b406f7588a41b83f6d33a8306c3dd92b8
- http://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=5.9&id=ff15dec87970a6ed9fdb1f41c344ec9513853ae8
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 62e3d38d..7e15ff03 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -86,7 +86,8 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
- src/core/core_gyp_generator.pro
+ src/core/core_chromium.pri \
+ tools/qmake/mkspecs/features/configure.prf
qt_use_disable_mod widgets widgets src/src.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 62e3d38d..7e15ff03 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -86,7 +86,8 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
- src/core/core_gyp_generator.pro
+ src/core/core_chromium.pri \
+ tools/qmake/mkspecs/features/configure.prf
qt_use_disable_mod widgets widgets src/src.pro
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-12-09 14:16 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-12-09 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 290dcd58e5bfa047d238cf08f4a3e22f797f3d20
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 14:16:15 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 9 14:16:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=290dcd58
dev-qt/qtwebengine: add missing dependency
Package-Manager: portage-2.3.3
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 62b4112..1a54966 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
+ dev-libs/protobuf:=
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index bcc8e36..b12b10f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
+ dev-libs/protobuf:=
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index bcc8e36..b12b10f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
+ dev-libs/protobuf:=
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-12-06 6:57 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-12-06 6:57 UTC (permalink / raw
To: gentoo-commits
commit: d90768cda39a85bd3d88639dd570d751272baee1
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec 6 06:56:55 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 06:57:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d90768cd
dev-qt/qtwebengine: Use correct libsrtp slot.
Package-Manager: portage-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 0edef41..dbd3eea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 0edef41..dbd3eea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index 0edef41..dbd3eea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 0edef41..dbd3eea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-12-03 1:16 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2016-12-03 1:16 UTC (permalink / raw
To: gentoo-commits
commit: 4706deb666abe324d9995acca1e381875fadd1b1
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 01:15:42 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 01:15:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4706deb6
dev-qt/qtwebengine: fix typo in comment
Package-Manager: portage-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 38e8525..0edef41 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 38e8525..0edef41 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index 38e8525..0edef41 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 38e8525..0edef41 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
src_prepare() {
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-12-01 14:03 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-12-01 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 0d0d887849cecce39c488f5e055d8b3f56cf4e5c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 14:02:48 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 14:02:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d0d8878
dev-qt/qtwebengine: ensure build against system icu headers
Gentoo-bug: 601264
Package-Manager: portage-2.3.2
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 4d718ad..38e8525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 4d718ad..38e8525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index 4d718ad..38e8525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 4d718ad..38e8525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ if use system-icu; then
+ # ensuire build against system headers - bug #601264
+ rm -r src/3rdparty/chromium/third_party/icu/source || die
+ fi
+
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-09-06 18:12 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2016-09-06 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 5a2a8ef7808603949491d9160fa061af49e1092e
Author: Pablo Cholaky <waltercool <AT> slash <DOT> cl>
AuthorDate: Sun Sep 4 17:22:49 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 18:10:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a2a8ef7
dev-qt/qtwebengine: add svc requirement for libvpx
See http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=3d698f5de377bde2293e222536bc50171cfdf1b8
for some background.
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index cdebff6..4d718ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
+ >=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index cdebff6..4d718ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
+ >=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index cdebff6..4d718ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
+ >=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index cdebff6..4d718ad 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4:=
+ >=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa
media-libs/opus
^ permalink raw reply related [flat|nested] 146+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-09-01 12:38 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-09-01 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 432f312ad6af179e1f6dc63faabb53623968b01f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 1 12:38:14 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 12:38:43 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=432f312a
dev-qt/qtwebengine: relax media-video/ffmpeg for 5.6 branch too
Tested by Chiitoo.
Package-Manager: portage-2.3.0
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index e94423e..cdebff6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-08-31 18:23 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-08-31 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 4942382e75a61cbcf531f560907902f0e79c5cd7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 18:22:47 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 18:22:56 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4942382e
dev-qt/qtwebengine: relax media-video/ffmpeg for 5.7 branch
Tested against media-video/ffmpeg-3.1.3 by josef64.
Package-Manager: portage-2.3.0
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index e94423e..cdebff6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-05-12 13:52 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-05-12 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 9f317845a8d2746c082a5f20dba8dfee11ee5d55
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 13:52:06 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 12 13:52:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f317845
dev-qt/qtwebengine: ping media-video/ffmpeg to SLOT 0
As per media-video/ffmpeg's metadata, binary compatibility slots may come and go.
Package-Manager: portage-2.2.28
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 1e51797..e94423e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
index 1e51797..e94423e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 1e51797..e94423e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 78ea518..cdebff6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-04-19 19:54 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2016-04-19 19:54 UTC (permalink / raw
To: gentoo-commits
commit: 0e4fb2888ef5040c2df29b765215d3affd1bbdd2
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 19:54:27 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 19:54:27 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0e4fb288
dev-qt/qtwebengine: restrict system ffmpeg to 2.x only
Gentoo-Bug: 575982
Package-Manager: portage-2.2.28
dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
index 9e55525..b08dbf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index d1fa59f..3d54717 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-04-19 19:54 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2016-04-19 19:54 UTC (permalink / raw
To: gentoo-commits
commit: e12b40b783901c7db3888abb350e655ff70b243d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 19:49:31 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 19:49:31 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e12b40b7
dev-qt/qtwebengine: remove redundant quoting
Package-Manager: portage-2.2.28
dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.7.0_alpha.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
index 0edd6dd..9e55525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
@@ -88,9 +88,9 @@ src_prepare() {
src_configure() {
export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
- $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 5293465..d1fa59f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -82,9 +82,9 @@ src_prepare() {
src_configure() {
export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
- $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0_alpha.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0_alpha.ebuild
index 34ca7d3..344dc64 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0_alpha.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0_alpha.ebuild
@@ -84,9 +84,9 @@ src_prepare() {
src_configure() {
export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
- $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 34ca7d3..344dc64 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -84,9 +84,9 @@ src_prepare() {
src_configure() {
export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
- $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 34ca7d3..344dc64 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -84,9 +84,9 @@ src_prepare() {
src_configure() {
export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
- $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-04-19 19:54 Davide Pesavento
0 siblings, 0 replies; 146+ messages in thread
From: Davide Pesavento @ 2016-04-19 19:54 UTC (permalink / raw
To: gentoo-commits
commit: 07b8bef923921c457ef1357c6b5096235b92fa00
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 19:51:34 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 19:51:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=07b8bef9
dev-qt/qtwebengine: icu patch is now in the 5.7 branch too
Package-Manager: portage-2.2.28
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 344dc64..d1fa59f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -68,8 +68,6 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
-
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-03-09 11:58 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-03-09 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 05eeed53556569fe2eb880bfab0884f5c5dfc03a
Author: Jan Kundrát <jkt <AT> kde <DOT> org>
AuthorDate: Wed Mar 9 11:34:25 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 11:57:29 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=05eeed53
dev-qt/qtwebengine: Do not apply a patch which is already in the 5.6 branch
This got merged on March 1st, see [1]. As far as I can see, it hasn't
been merged into 5.7 yet.
[1] https://codereview.qt-project.org/149873/
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 34ca7d3..5293465 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -68,8 +68,6 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
-
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-17 19:16 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-17 19:16 UTC (permalink / raw
To: gentoo-commits
commit: aec7c2235b24448d499299088dead334b59b892e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 19:15:39 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 19:15:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aec7c223
dev-qt/qtwebengine: add patch to live ebuilds too
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 5293465..34ca7d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -68,6 +68,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
+
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 5293465..34ca7d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -68,6 +68,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
+
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-13 18:56 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-13 18:56 UTC (permalink / raw
To: gentoo-commits
commit: ae1e71f2b540ff8a5d5d2ce98190561b53aaa3c0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 18:55:57 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 18:55:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ae1e71f2
dev-qt/qtwebengine: add some build deps
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index 2d3f3ce..5293465 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -62,8 +62,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/gperf
dev-util/ninja
dev-util/re2c
+ sys-devel/bison
"
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 2d3f3ce..5293465 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -62,8 +62,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/gperf
dev-util/ninja
dev-util/re2c
+ sys-devel/bison
"
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2d3f3ce..5293465 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -62,8 +62,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/gperf
dev-util/ninja
dev-util/re2c
+ sys-devel/bison
"
src_prepare() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-13 16:04 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-13 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 3c46b340a78378b09c6e54c3026ee99d391680d6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 16:03:09 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 16:03:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c46b340
dev-qt/qtwebengine: unbundle ninja
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index e273580..2d3f3ce 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/ninja
dev-util/re2c
"
@@ -77,6 +78,7 @@ src_prepare() {
}
src_configure() {
+ export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index e273580..2d3f3ce 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/ninja
dev-util/re2c
"
@@ -77,6 +78,7 @@ src_prepare() {
}
src_configure() {
+ export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index e273580..2d3f3ce 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -62,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/ninja
dev-util/re2c
"
@@ -77,6 +78,7 @@ src_prepare() {
}
src_configure() {
+ export NINJA_PATH="/usr/bin/ninja"
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-13 15:59 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-13 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 2fc03f6fe59a3dcd194b5c4c0aa5cd16f859f336
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 15:58:54 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 15:58:54 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2fc03f6f
dev-qt/qtwebengine: fix positioning USE flag
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index 7c0353f..e273580 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- qt_use_disable_mod geolocation positionint \
+ qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
qt_use_disable_mod widgets widgets \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 7c0353f..e273580 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- qt_use_disable_mod geolocation positionint \
+ qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
qt_use_disable_mod widgets widgets \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7c0353f..e273580 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- qt_use_disable_mod geolocation positionint \
+ qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
qt_use_disable_mod widgets widgets \
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-13 15:54 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-13 15:54 UTC (permalink / raw
To: gentoo-commits
commit: 065057cb658279f9ebc954ab0c92f42ce4f6bde4
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 15:53:11 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 15:53:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=065057cb
dev-qt/qtwebengine: add missing dependencies
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 27 +++++++++++++++++++++---
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 27 +++++++++++++++++++++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 27 +++++++++++++++++++++---
3 files changed, 72 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index 33e45ed..7c0353f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -16,24 +16,44 @@ IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
+ dev-libs/glib:2
+ dev-libs/nspr
dev-libs/nss
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtwebchannel-${PV}
- ~dev-qt/qtxmlpatterns-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
dev-libs/jsoncpp
dev-libs/libevent
dev-libs/libxml2
dev-libs/libxslt
+ media-libs/alsa-lib
media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.4
media-libs/libwebp
media-libs/opus
media-libs/speex
net-libs/libsrtp
- >=media-libs/libvpx-1.4
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
sys-libs/zlib
+ x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
system-ffmpeg? ( media-video/ffmpeg:= )
@@ -42,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/re2c
"
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 33e45ed..7c0353f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -16,24 +16,44 @@ IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
+ dev-libs/glib:2
+ dev-libs/nspr
dev-libs/nss
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtwebchannel-${PV}
- ~dev-qt/qtxmlpatterns-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
dev-libs/jsoncpp
dev-libs/libevent
dev-libs/libxml2
dev-libs/libxslt
+ media-libs/alsa-lib
media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.4
media-libs/libwebp
media-libs/opus
media-libs/speex
net-libs/libsrtp
- >=media-libs/libvpx-1.4
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
sys-libs/zlib
+ x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
system-ffmpeg? ( media-video/ffmpeg:= )
@@ -42,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/re2c
"
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 33e45ed..7c0353f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -16,24 +16,44 @@ IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
+ dev-libs/glib:2
+ dev-libs/nspr
dev-libs/nss
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtwebchannel-${PV}
- ~dev-qt/qtxmlpatterns-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
dev-libs/jsoncpp
dev-libs/libevent
dev-libs/libxml2
dev-libs/libxslt
+ media-libs/alsa-lib
media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.4
media-libs/libwebp
media-libs/opus
media-libs/speex
net-libs/libsrtp
- >=media-libs/libvpx-1.4
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
sys-libs/zlib
+ x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
system-ffmpeg? ( media-video/ffmpeg:= )
@@ -42,6 +62,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-util/re2c
"
src_prepare() {
^ permalink raw reply related [flat|nested] 146+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
@ 2016-01-13 8:07 Michael Palimaka
0 siblings, 0 replies; 146+ messages in thread
From: Michael Palimaka @ 2016-01-13 8:07 UTC (permalink / raw
To: gentoo-commits
commit: a307fdda816fef1b4992f9c0ef7ef1cf4443a205
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 08:06:06 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 08:07:25 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a307fdda
dev-qt/qtwebengine: new package
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/metadata.xml | 18 +++++++
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 65 ++++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 65 ++++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 65 ++++++++++++++++++++++++
5 files changed, 214 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
new file mode 100644
index 0000000..ce11a4b
--- /dev/null
+++ b/dev-qt/qtwebengine/Manifest
@@ -0,0 +1 @@
+DIST qtwebengine-opensource-src-5.6.0-beta.tar.gz 211518072 SHA256 486d749e7afbceee6715debb93d1f11b7b45a8f6719e5a31d4d0036e701ef14e SHA512 86996f4a6dff525a904c01bd50047251cce218815828d1a692875f86fce4c115e056802d467dd596cdd5cda9cdb4f761fcdc2def5c7ddb8e52643e907ecae3b9 WHIRLPOOL f7cb43249fd044140be8e16af426cc7610af22fe4a279c6a5cfc96ebc68b0360e28f58e26cc20ed1cfa3196c6f623a7fc88330d22e46182f7304a85916d639e4
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
new file mode 100644
index 0000000..6f49a4c
--- /dev/null
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <use>
+ <flag name="geolocation">Enable physical position determination
+ via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
+ instead of bundled.</flag>
+ <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+ instead of bundled.</flag>
+ <flag name="widgets">Enable QtWidgets support</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://doc.qt.io/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
new file mode 100644
index 0000000..33e45ed
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+ app-arch/snappy
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtwebchannel-${PV}
+ ~dev-qt/qtxmlpatterns-${PV}
+ dev-libs/jsoncpp
+ dev-libs/libevent
+ dev-libs/libxml2
+ dev-libs/libxslt
+ media-libs/flac
+ media-libs/libwebp
+ media-libs/opus
+ media-libs/speex
+ net-libs/libsrtp
+ >=media-libs/libvpx-1.4
+ sys-libs/zlib
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXtst
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ system-ffmpeg? ( media-video/ffmpeg:= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+"
+
+src_prepare() {
+ qt_use_disable_mod geolocation positionint \
+ src/core/core_common.pri \
+ src/core/core_gyp_generator.pro
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
new file mode 100644
index 0000000..33e45ed
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+ app-arch/snappy
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtwebchannel-${PV}
+ ~dev-qt/qtxmlpatterns-${PV}
+ dev-libs/jsoncpp
+ dev-libs/libevent
+ dev-libs/libxml2
+ dev-libs/libxslt
+ media-libs/flac
+ media-libs/libwebp
+ media-libs/opus
+ media-libs/speex
+ net-libs/libsrtp
+ >=media-libs/libvpx-1.4
+ sys-libs/zlib
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXtst
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ system-ffmpeg? ( media-video/ffmpeg:= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+"
+
+src_prepare() {
+ qt_use_disable_mod geolocation positionint \
+ src/core/core_common.pri \
+ src/core/core_gyp_generator.pro
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
new file mode 100644
index 0000000..33e45ed
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+
+RDEPEND="
+ app-arch/snappy
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtwebchannel-${PV}
+ ~dev-qt/qtxmlpatterns-${PV}
+ dev-libs/jsoncpp
+ dev-libs/libevent
+ dev-libs/libxml2
+ dev-libs/libxslt
+ media-libs/flac
+ media-libs/libwebp
+ media-libs/opus
+ media-libs/speex
+ net-libs/libsrtp
+ >=media-libs/libvpx-1.4
+ sys-libs/zlib
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXtst
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ system-ffmpeg? ( media-video/ffmpeg:= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+"
+
+src_prepare() {
+ qt_use_disable_mod geolocation positionint \
+ src/core/core_common.pri \
+ src/core/core_gyp_generator.pro
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+="use_proprietary_codecs"')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+="use_system_ffmpeg"' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+="use_system_icu"' '')
+ )
+ qt5-build_src_configure
+}
^ permalink raw reply related [flat|nested] 146+ messages in thread
end of thread, other threads:[~2024-07-12 15:20 UTC | newest]
Thread overview: 146+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-21 9:16 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ Jimi Huotari
-- strict thread matches above, loose matches on Subject: below --
2024-07-12 15:20 Andreas Sturmlechner
2024-05-30 12:56 Andreas Sturmlechner
2024-05-28 19:34 Andreas Sturmlechner
2024-03-23 13:35 Andreas Sturmlechner
2024-03-16 15:40 Andreas Sturmlechner
2024-03-16 15:40 Andreas Sturmlechner
2024-01-13 16:45 Sam James
2023-12-30 14:03 Andreas Sturmlechner
2023-11-11 20:24 Andreas Sturmlechner
2023-11-11 20:24 Andreas Sturmlechner
2023-10-08 11:58 Andreas Sturmlechner
2023-04-15 17:16 Jimi Huotari
2023-04-15 17:16 Jimi Huotari
2022-12-16 21:05 Jimi Huotari
2022-11-05 16:39 Andreas Sturmlechner
2022-10-14 20:24 Jimi Huotari
2022-10-06 16:20 Sam James
2022-09-24 21:24 Andreas Sturmlechner
2022-09-24 17:03 Andreas Sturmlechner
2022-09-18 11:55 Jimi Huotari
2022-07-17 7:13 Andreas Sturmlechner
2022-06-20 18:03 Jimi Huotari
2022-06-18 14:27 Andreas Sturmlechner
2022-05-14 21:15 Andreas Sturmlechner
2022-04-12 12:43 Jimi Huotari
2022-04-09 16:01 Andreas Sturmlechner
2022-03-21 8:14 Jimi Huotari
2022-03-04 9:51 Andreas Sturmlechner
2022-01-06 19:57 Sam James
2022-01-06 19:57 Sam James
2021-12-26 22:13 Jimi Huotari
2021-12-25 0:03 Andreas Sturmlechner
2021-12-24 23:57 Andreas Sturmlechner
2021-12-24 23:18 Andreas Sturmlechner
2021-12-09 13:53 Jimi Huotari
2021-12-09 13:53 Jimi Huotari
2021-12-01 19:09 Jimi Huotari
2021-10-16 15:36 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-23 7:29 Andreas Sturmlechner
2021-09-15 20:01 Davide Pesavento
2021-09-15 7:39 Andreas Sturmlechner
2021-09-08 8:17 Andreas Sturmlechner
2021-08-26 12:10 Andreas Sturmlechner
2021-08-20 12:36 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-07-03 14:44 Andreas Sturmlechner
2021-06-24 11:19 Jimi Huotari
2021-04-19 10:53 Andreas Sturmlechner
2021-04-19 10:53 Andreas Sturmlechner
2021-04-14 6:54 Jimi Huotari
2021-03-14 15:36 Andreas Sturmlechner
2021-02-12 20:45 Andreas Sturmlechner
2021-02-05 22:05 Andreas Sturmlechner
2021-02-02 0:41 Andreas Sturmlechner
2021-01-15 15:02 Jimi Huotari
2020-11-25 22:22 Andreas Sturmlechner
2020-09-10 17:49 Andreas Sturmlechner
2020-09-10 17:49 Andreas Sturmlechner
2020-04-29 16:02 Andreas Sturmlechner
2020-04-09 20:38 Jimi Huotari
2020-04-09 17:32 Andreas Sturmlechner
2020-04-09 17:32 Andreas Sturmlechner
2020-02-11 7:47 Jimi Huotari
2020-01-29 22:48 Jimi Huotari
2020-01-29 1:53 Jimi Huotari
2020-01-29 1:53 Jimi Huotari
2020-01-28 2:09 Jimi Huotari
2019-09-24 20:55 Jimi Huotari
2019-08-18 11:44 Andreas Sturmlechner
2019-06-20 21:17 Andreas Sturmlechner
2019-05-14 12:57 Michael Palimaka
2019-04-25 2:30 Michael Palimaka
2019-04-20 20:10 Andreas Sturmlechner
2019-02-19 16:58 Jimi Huotari
2019-02-03 5:15 Jimi Huotari
2018-12-17 11:49 Jimi Huotari
2018-12-16 19:01 Andreas Sturmlechner
2018-11-13 17:52 Andreas Sturmlechner
2018-10-17 16:47 Jimi Huotari
2018-09-18 15:02 Jimi Huotari
2018-09-09 18:21 Jimi Huotari
2018-08-25 4:04 Jimi Huotari
2018-08-24 23:43 Jimi Huotari
2018-08-16 12:20 Jimi Huotari
2018-07-25 23:20 Jimi Huotari
2018-06-21 10:15 Jimi Huotari
2018-06-18 14:04 Jimi Huotari
2018-06-12 22:55 Andreas Sturmlechner
2018-05-27 16:56 Jimi Huotari
2018-05-16 14:22 Jimi Huotari
2018-04-17 10:23 Jimi Huotari
2018-04-15 7:53 Jimi Huotari
2018-04-11 12:56 Jimi Huotari
2018-04-03 3:15 Jimi Huotari
2018-04-03 3:15 Jimi Huotari
2018-03-17 2:49 Jimi Huotari
2018-03-17 2:49 Jimi Huotari
2018-02-10 21:33 Jimi Huotari
2018-01-15 11:06 Michael Palimaka
2018-01-04 21:24 Jimi Huotari
2018-01-04 13:10 Michael Palimaka
2017-12-23 0:44 Michael Palimaka
2017-12-11 11:37 Jimi Huotari
2017-12-10 12:03 Michael Palimaka
2017-12-09 23:37 Jimi Huotari
2017-12-07 9:08 Michael Palimaka
2017-11-28 10:48 Michael Palimaka
2017-10-10 12:30 Michael Palimaka
2017-10-10 12:30 Michael Palimaka
2017-09-12 15:27 Michael Palimaka
2017-09-08 15:52 Michael Palimaka
2017-07-23 12:37 Michael Palimaka
2017-06-27 13:02 Michael Palimaka
2017-06-18 8:02 Michael Palimaka
2017-06-05 12:41 Michael Palimaka
2017-06-04 13:32 Michael Palimaka
2017-06-04 12:59 Michael Palimaka
2017-06-04 12:13 Michael Palimaka
2017-06-04 11:40 Michael Palimaka
2017-06-04 11:40 Michael Palimaka
2017-06-03 16:01 Michael Palimaka
2017-05-14 2:15 Davide Pesavento
2017-05-14 2:15 Davide Pesavento
2017-04-25 20:15 Davide Pesavento
2017-04-25 20:15 Davide Pesavento
2016-12-09 14:16 Michael Palimaka
2016-12-06 6:57 Michael Palimaka
2016-12-03 1:16 Davide Pesavento
2016-12-01 14:03 Michael Palimaka
2016-09-06 18:12 Davide Pesavento
2016-09-01 12:38 Michael Palimaka
2016-08-31 18:23 Michael Palimaka
2016-05-12 13:52 Michael Palimaka
2016-04-19 19:54 Davide Pesavento
2016-04-19 19:54 Davide Pesavento
2016-04-19 19:54 Davide Pesavento
2016-03-09 11:58 Michael Palimaka
2016-01-17 19:16 Michael Palimaka
2016-01-13 18:56 Michael Palimaka
2016-01-13 16:04 Michael Palimaka
2016-01-13 15:59 Michael Palimaka
2016-01-13 15:54 Michael Palimaka
2016-01-13 8:07 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox