commit: 17df09aa6b27fc8df525472ce8d227ae7f4834f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:03:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 21:03:50 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=17df09aa
kde-apps/cantor: Fix bashism
Gentoo-bug: 596940
Thanks-to: Michael Palimaka (kensington)
Package-Manager: portage-2.3.3
kde-apps/cantor/cantor-16.12.49.9999.ebuild | 2 ++
kde-apps/cantor/cantor-9999.ebuild | 2 ++
kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +++++++++++++
3 files changed, 17 insertions(+)
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
index 8952906c50..0db7d4c646 100644
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild
+++ b/kde-apps/cantor/cantor-16.12.49.9999.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+
pkg_pretend() {
kde5_pkg_pretend
diff --git a/kde-apps/cantor/cantor-9999.ebuild
b/kde-apps/cantor/cantor-9999.ebuild
index 8952906c50..0db7d4c646 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+
pkg_pretend() {
kde5_pkg_pretend
diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
new file mode 100644
index 0000000000..424ca4d15a
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
+index 6303417..6494884 100644
+--- a/cmake/FindR.cmake
++++ b/cmake/FindR.cmake
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ELSE(WIN32)
+ EXECUTE_PROCESS(
+- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
++ COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ENDIF(WIN32)
+ ENDIF(NOT R_INCLUDE_DIR)
