Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmudmount/, x11-plugins/wmudmount/files/
Date: Sun, 22 Oct 2017 19:25:08
Message-Id: 1508700297.a05a155d3294d453d27d777c4e134ecfbb36dcfd.voyageur@gentoo
1 commit: a05a155d3294d453d27d777c4e134ecfbb36dcfd
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 22 19:24:27 2017 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 22 19:24:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05a155d
7
8 x11-plugins/wmudmount: fix build with newer perl
9
10 "Unescaped left brace in regex is illegal here in regex", deprecated
11 for some time and now a fatal error
12
13 Closes: https://bugs.gentoo.org/634948
14 Package-Manager: Portage-2.3.12, Repoman-2.3.3
15
16 .../wmudmount/files/wmudmount-2.2-perl_brace_regex.patch | 12 ++++++++++++
17 x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild | 2 ++
18 2 files changed, 14 insertions(+)
19
20 diff --git a/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
21 new file mode 100644
22 index 00000000000..4730b2d64b9
23 --- /dev/null
24 +++ b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
25 @@ -0,0 +1,12 @@
26 +diff -Naur wmudmount-2.2.orig/make-chars.pl wmudmount-2.2/make-chars.pl
27 +--- wmudmount-2.2.orig/make-chars.pl 2014-02-03 06:41:59.000000000 +0100
28 ++++ wmudmount-2.2/make-chars.pl 2017-10-22 21:13:22.555748713 +0200
29 +@@ -52,7 +52,7 @@
30 +
31 + while(<IN>){
32 + $head.=$_;
33 +- if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = {/){
34 ++ if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = \{/){
35 + $name=$1;
36 + last;
37 + }
38
39 diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
40 index 58882b144a2..c919f691e41 100644
41 --- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
42 +++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
43 @@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
44
45 DOCS="ChangeLog"
46
47 +PATCHES=( "${FILESDIR}"/${P}-perl_brace_regex.patch )
48 +
49 src_configure() {
50 econf \
51 $(use_with libnotify) \