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" && \
