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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE666158020 for ; Thu, 10 Nov 2022 23:26:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D5CBE0A7D; Thu, 10 Nov 2022 23:26:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9138E0A7D for ; Thu, 10 Nov 2022 23:26:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2C7D33BE4D for ; Thu, 10 Nov 2022 23:26:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F3CA6E9 for ; Thu, 10 Nov 2022 23:26:49 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1668122802.a16ca95eda19f52557b440b134dbc50e9fc7fcfd.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/, media-gfx/gmic/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gmic/files/gmic-3.1.6-grep38.patch media-gfx/gmic/gmic-3.1.6.ebuild X-VCS-Directories: media-gfx/gmic/ media-gfx/gmic/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: a16ca95eda19f52557b440b134dbc50e9fc7fcfd X-VCS-Branch: master Date: Thu, 10 Nov 2022 23:26:49 +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: 2d5ee364-9d92-43c3-9f89-4b6d2ae0f65f X-Archives-Hash: 53894c8e170b3312c10fbdaa41e0db3b commit: a16ca95eda19f52557b440b134dbc50e9fc7fcfd Author: Marek Szuba gentoo org> AuthorDate: Thu Nov 10 23:25:14 2022 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu Nov 10 23:26:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16ca95e media-gfx/gmic: strip stray backslashes from grep calls Since grep-3.8 the string '\ ' no longer matches a space. Closes: https://bugs.gentoo.org/880339 Signed-off-by: Marek Szuba gentoo.org> media-gfx/gmic/files/gmic-3.1.6-grep38.patch | 27 +++++++++++++++++++++++++++ media-gfx/gmic/gmic-3.1.6.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/media-gfx/gmic/files/gmic-3.1.6-grep38.patch b/media-gfx/gmic/files/gmic-3.1.6-grep38.patch new file mode 100644 index 000000000000..ec1df70002c3 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.1.6-grep38.patch @@ -0,0 +1,27 @@ +Starting with version 3.8, grep no longer quietly ignores backslashes +preceding a white-space character. + +--- a/src/Makefile ++++ b/src/Makefile +@@ -88,16 +88,16 @@ + EXE = + WGET = wget --no-check-certificate --quiet -O + PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins +-VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3) +-VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1) +-VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1) +-VERSION3 = $(shell grep 'gmic_version\ ' gmic.h | tail -c2 | head -c1) ++VERSION = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c3) ++VERSION1 = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c1) ++VERSION2 = $(shell grep 'gmic_version ' gmic.h | tail -c3 | head -c1) ++VERSION3 = $(shell grep 'gmic_version ' gmic.h | tail -c2 | head -c1) + SVERSION=$(VERSION1).$(VERSION2).$(VERSION3) + SRC_PATH=$(shell pwd) + + # Check that versions of files 'CImg.h' and 'gmic.h' match. + ifneq (,$(wildcard CImg.h)) +-CIMG_VERSION = $(shell grep 'cimg_version\ ' CImg.h | tail -c4 | head -c3) ++CIMG_VERSION = $(shell grep 'cimg_version ' CImg.h | tail -c4 | head -c3) + else + CIMG_VERSION = $(VERSION) + endif diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild index da836f3b546c..85bb406d8cc0 100644 --- a/media-gfx/gmic/gmic-3.1.6.ebuild +++ b/media-gfx/gmic/gmic-3.1.6.ebuild @@ -67,6 +67,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.1.6-ar_so.patch + "${FILESDIR}"/${PN}-3.1.6-grep38.patch "${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch "${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch )