From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA0CE139694 for ; Sun, 23 Jul 2017 11:35:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E47DCE0E33; Sun, 23 Jul 2017 11:35:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCE24E0E33 for ; Sun, 23 Jul 2017 11:35:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 902A9341816 for ; Sun, 23 Jul 2017 11:35:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7191074B5 for ; Sun, 23 Jul 2017 11:35:50 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1500809738.abe534739e1bc506322e31076e7a05ab9efb984d.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: abe534739e1bc506322e31076e7a05ab9efb984d X-VCS-Branch: master Date: Sun, 23 Jul 2017 11:35:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bf81854d-1feb-480f-a0d8-313db9bb5745 X-Archives-Hash: aceed8e32f6090c0428c7b48736ba3d4 commit: abe534739e1bc506322e31076e7a05ab9efb984d Author: Michael Palimaka gentoo org> AuthorDate: Sun Jul 23 10:54:33 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jul 23 11:35:38 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=abe53473 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 \