1 |
commit: 152407387340dd08c853e9a0ca97a1d36e2b889f |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 1 23:17:30 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 1 23:24:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15240738 |
7 |
|
8 |
sci-visualization/opendx: Add patch to fix invalid conversion |
9 |
|
10 |
Closes: https://bugs.gentoo.org/638610 |
11 |
|
12 |
.../opendx/files/opendx-4.4.4-invalid-conversion.patch | 13 +++++++++++++ |
13 |
sci-visualization/opendx/opendx-4.4.4-r6.ebuild | 1 + |
14 |
2 files changed, 14 insertions(+) |
15 |
|
16 |
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..579cceb9684 |
19 |
--- /dev/null |
20 |
+++ b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch |
21 |
@@ -0,0 +1,13 @@ |
22 |
+diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C |
23 |
+index c406cc1..d6c0765 100644 |
24 |
+--- a/src/uipp/dxuilib/EditorWindow.C |
25 |
++++ b/src/uipp/dxuilib/EditorWindow.C |
26 |
+@@ -5997,7 +5997,7 @@ char msg[128]; |
27 |
+ // |
28 |
+ const char *tmpdir = theDXApplication->getTmpDirectory(); |
29 |
+ int tmpdirlen = STRLEN(tmpdir); |
30 |
+- if (!tmpdirlen) return FALSE; |
31 |
++ if (!tmpdirlen) return (char*)FALSE; |
32 |
+ if (tmpdir[tmpdirlen-1] == '/') { |
33 |
+ sprintf(netfilename, "%sdx%d.net", tmpdir, getpid()); |
34 |
+ sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid()); |
35 |
|
36 |
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
37 |
index 2aae53cbc9d..4f7453fdd62 100644 |
38 |
--- a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
39 |
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
40 |
@@ -46,6 +46,7 @@ PATCHES=( |
41 |
"${FILESDIR}/${P}-open.patch" |
42 |
"${FILESDIR}/${P}-szip.patch" |
43 |
"${FILESDIR}/${P}-null.patch" |
44 |
+ "${FILESDIR}/${P}-invalid-conversion.patch" |
45 |
"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch" |
46 |
) |