| 1 |
commit: 17df09aa6b27fc8df525472ce8d227ae7f4834f1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 21:03:50 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 21:03:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=17df09aa |
| 7 |
|
| 8 |
kde-apps/cantor: Fix bashism |
| 9 |
|
| 10 |
Gentoo-bug: 596940 |
| 11 |
Thanks-to: Michael Palimaka (kensington) |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.3 |
| 14 |
|
| 15 |
kde-apps/cantor/cantor-16.12.49.9999.ebuild | 2 ++ |
| 16 |
kde-apps/cantor/cantor-9999.ebuild | 2 ++ |
| 17 |
kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +++++++++++++ |
| 18 |
3 files changed, 17 insertions(+) |
| 19 |
|
| 20 |
diff --git a/kde-apps/cantor/cantor-16.12.49.9999.ebuild b/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
| 21 |
index 8952906c50..0db7d4c646 100644 |
| 22 |
--- a/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
| 23 |
+++ b/kde-apps/cantor/cantor-16.12.49.9999.ebuild |
| 24 |
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" |
| 25 |
|
| 26 |
RESTRICT+=" test" |
| 27 |
|
| 28 |
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) |
| 29 |
+ |
| 30 |
pkg_pretend() { |
| 31 |
kde5_pkg_pretend |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild |
| 35 |
index 8952906c50..0db7d4c646 100644 |
| 36 |
--- a/kde-apps/cantor/cantor-9999.ebuild |
| 37 |
+++ b/kde-apps/cantor/cantor-9999.ebuild |
| 38 |
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}" |
| 39 |
|
| 40 |
RESTRICT+=" test" |
| 41 |
|
| 42 |
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch ) |
| 43 |
+ |
| 44 |
pkg_pretend() { |
| 45 |
kde5_pkg_pretend |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch |
| 49 |
new file mode 100644 |
| 50 |
index 0000000000..424ca4d15a |
| 51 |
--- /dev/null |
| 52 |
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch |
| 53 |
@@ -0,0 +1,13 @@ |
| 54 |
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake |
| 55 |
+index 6303417..6494884 100644 |
| 56 |
+--- a/cmake/FindR.cmake |
| 57 |
++++ b/cmake/FindR.cmake |
| 58 |
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE) |
| 59 |
+ OUTPUT_VARIABLE R_INCLUDE_DIR) |
| 60 |
+ ELSE(WIN32) |
| 61 |
+ EXECUTE_PROCESS( |
| 62 |
+- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR" |
| 63 |
++ COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR" |
| 64 |
+ OUTPUT_VARIABLE R_INCLUDE_DIR) |
| 65 |
+ ENDIF(WIN32) |
| 66 |
+ ENDIF(NOT R_INCLUDE_DIR) |
Archives