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 EEDB4138350 for ; Sun, 26 Apr 2020 13:37:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 281AAE0A92; Sun, 26 Apr 2020 13:37:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 1397BE0A92 for ; Sun, 26 Apr 2020 13:37:32 +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 BD88734F66C for ; Sun, 26 Apr 2020 13:37:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBAA4219 for ; Sun, 26 Apr 2020 13:37:24 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1587908211.c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch X-VCS-Directories: media-gfx/zbar/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f X-VCS-Branch: master Date: Sun, 26 Apr 2020 13:37:24 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8ebc837-8ef3-40af-88f0-9679e0720124 X-Archives-Hash: 9966d88d744453d16b3a2b679e15620e commit: c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Apr 26 10:28:55 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Apr 26 13:36:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b3f3e8 media-gfx/zbar: remove unused patch Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15525 Signed-off-by: Joonas Niilola gentoo.org> .../files/zbar-0.10_p20121015-ImageMagick-7.patch | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch deleted file mode 100644 index f58c3e4d9c4..00000000000 --- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fixed build with imagemagick-7 (bug #592324). -Thanks-to: Jürgen Rose - -diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac ---- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200 -+++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200 -@@ -324,7 +324,7 @@ - dnl double check ImageMagick install (bug #2582232) - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" -- AC_CHECK_HEADER([wand/MagickWand.h], -+ AC_CHECK_HEADER([MagickWand/MagickWand.h], - [have_IM="yes"], - [have_IM="broken"]) - CPPFLAGS="$CPPFLAGS_save"])]) -diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c ---- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200 -+++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200 -@@ -44,7 +44,7 @@ - #endif - - #ifdef HAVE_IMAGEMAGICK --# include -+# include - - /* ImageMagick frequently changes API names - just use the original - * (more stable?) names to match GraphicsMagick