From abe534739e1bc506322e31076e7a05ab9efb984d Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sun, 23 Jul 2017 20:54:33 +1000 Subject: dev-qt/qtwebkit: force using system libpng and libjpeg Package-Manager: Portage-2.3.6, Repoman-2.3.3 --- dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 5 +++++ dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 5 +++++ dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild index 6fb0b38b..9eb9645f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild @@ -66,6 +66,11 @@ src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # force using system library + sed -i -e 's/qtConfig(system-jpeg)/true/' \ + -e 's/qtConfig(system-png)/true/' \ + Tools/qmake/mkspecs/features/features.prf || die + # bug 466216 sed -i -e '/CONFIG +=/s/rpath//' \ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild index 6fb0b38b..9eb9645f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild @@ -66,6 +66,11 @@ src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # force using system library + sed -i -e 's/qtConfig(system-jpeg)/true/' \ + -e 's/qtConfig(system-png)/true/' \ + Tools/qmake/mkspecs/features/features.prf || die + # bug 466216 sed -i -e '/CONFIG +=/s/rpath//' \ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 6fb0b38b..9eb9645f 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -66,6 +66,11 @@ src_prepare() { # ensure bundled library cannot be used rm -r Source/ThirdParty/leveldb || die + # force using system library + sed -i -e 's/qtConfig(system-jpeg)/true/' \ + -e 's/qtConfig(system-png)/true/' \ + Tools/qmake/mkspecs/features/features.prf || die + # bug 466216 sed -i -e '/CONFIG +=/s/rpath//' \ Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ -- cgit v1.2.3-18-g5258