diff options
author | Michael Palimaka <kensington@gentoo.org> | 2017-07-23 20:54:33 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2017-07-23 21:35:38 +1000 |
commit | abe534739e1bc506322e31076e7a05ab9efb984d (patch) | |
tree | 266813ef46f3c848ecef73e3ee37f2e901e6bdb9 | |
parent | dev-qt/qtwebkit: fix opengl USE flag for 5.9 (diff) | |
download | qt-abe534739e1bc506322e31076e7a05ab9efb984d.tar.gz qt-abe534739e1bc506322e31076e7a05ab9efb984d.tar.bz2 qt-abe534739e1bc506322e31076e7a05ab9efb984d.zip |
dev-qt/qtwebkit: force using system libpng and libjpeg
Package-Manager: Portage-2.3.6, Repoman-2.3.3
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild | 5 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild | 5 | ||||
-rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 5 |
3 files changed, 15 insertions, 0 deletions
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 \ |