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 52F51139083 for ; Mon, 18 Dec 2017 09:19:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9B4BE0F67; Mon, 18 Dec 2017 09:19:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A89DAE0F67 for ; Mon, 18 Dec 2017 09:19:48 +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 DF8B533BEE5 for ; Mon, 18 Dec 2017 09:19:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E2B3AE74 for ; Mon, 18 Dec 2017 09:19:46 +0000 (UTC) From: "Michael Weber" 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 Weber" Message-ID: <1513588768.1c15f97c3cfb23fccd1f63ddd8016ae95d9f4193.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 1c15f97c3cfb23fccd1f63ddd8016ae95d9f4193 X-VCS-Branch: master Date: Mon, 18 Dec 2017 09:19:46 +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: 411c0ff0-93f9-4bc7-acb9-16a70e00bfea X-Archives-Hash: b8361491ef8622cee5b981ec7562d57e commit: 1c15f97c3cfb23fccd1f63ddd8016ae95d9f4193 Author: Michael Weber gentoo org> AuthorDate: Mon Dec 18 09:19:28 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Mon Dec 18 09:19:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c15f97c media-gfx/zbar: Switch deprecated qt4 function (thanks Sam Jorna). Closes: https://bugs.gentoo.org/572488 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild index 3a552305df6..6aa664bfb14 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild @@ -60,6 +60,10 @@ src_prepare() { "${FILESDIR}"/${PN}-0.10-python-crash.patch \ "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch + # fix use of deprecated qt4 function, bug 572488 + sed -e 's:numBytes:byteCount:g' \ + -i "${S}"/include/zbar/QZBarImage.h || die + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then eapply "${FILESDIR}/${P}-ImageMagick-7.diff" fi