Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/
Date: Sun, 30 Jul 2017 15:30:12
Message-Id: 1501428596.03b08a3ffaca959400650c62f6a9b1801a05ad51.soap@gentoo
1 commit: 03b08a3ffaca959400650c62f6a9b1801a05ad51
2 Author: Niklas Haas <git <AT> haasn <DOT> xyz>
3 AuthorDate: Sat Jun 24 03:13:11 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 15:29:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b08a3f
7
8 app-i18n/fcitx: patch POSIX-incompliant shell usage
9
10 https://github.com/fcitx/fcitx/issues/342
11 Closes: https://github.com/gentoo/gentoo/pull/5065
12
13 app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 5 +++++
14 app-i18n/fcitx/fcitx-9999.ebuild | 5 +++++
15 2 files changed, 10 insertions(+)
16
17 diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
18 index 6aeb244653e..d745e90d79b 100644
19 --- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
20 +++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
21 @@ -87,6 +87,11 @@ src_prepare() {
22 -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
23 -i CMakeLists.txt
24
25 + # https://github.com/fcitx/fcitx/issues/342
26 + while IFS='' read -d $'\0' -r f ; do
27 + sed 's:^#!/bin/sh$:#!/usr/bin/env bash:' -i "${f}" || die
28 + done < <(find "${S}" -name '*.sh' -type f -print0)
29 +
30 cmake-utils_src_prepare
31 xdg_environment_reset
32 }
33
34 diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild
35 index 07841028686..361dba3ca23 100644
36 --- a/app-i18n/fcitx/fcitx-9999.ebuild
37 +++ b/app-i18n/fcitx/fcitx-9999.ebuild
38 @@ -82,6 +82,11 @@ src_prepare() {
39 -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
40 -i CMakeLists.txt
41
42 + # https://github.com/fcitx/fcitx/issues/342
43 + while IFS='' read -d $'\0' -r f ; do
44 + sed 's:^#!/bin/sh$:#!/usr/bin/env bash:' -i "${f}" || die
45 + done < <(find "${S}" -name '*.sh' -type f -print0)
46 +
47 cmake-utils_src_prepare
48 xdg_environment_reset
49 }