gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-gfx/gmic: strip stray backslashes from grep calls

Browse Source 
Since grep-3.8 the string '\ ' no longer matches a space.

Closes: https://bugs.gentoo.org/880339
Signed-off-by: Marek Szuba <marecki@gentoo.org>
This commit is contained in:
Marek Szuba
2022-11-10 23:25:14 +00:00
parent d5b4e4f0ea
commit a16ca95eda
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
media-gfx/gmic/files/gmic-3.1.6-grep38.patch Normal file
View File

@@ -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

1
media-gfx/gmic/gmic-3.1.6.ebuild
View File

@@ -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
)