summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2018-04-01 16:17:30 -0700
committerMatt Turner <mattst88@gentoo.org>2018-04-01 16:24:31 -0700
commit152407387340dd08c853e9a0ca97a1d36e2b889f (patch)
tree7913e15a68781b920b536ac23dedbb6e5e3f4026
parentwww-apps/nikola: Drop Python 2 support (diff)
downloadgentoo-15240738.tar.gz
gentoo-15240738.tar.bz2
gentoo-15240738.zip
sci-visualization/opendx: Add patch to fix invalid conversion
Closes: https://bugs.gentoo.org/638610
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch13
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r6.ebuild1
2 files changed, 14 insertions, 0 deletions
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
new file mode 100644
index 000000000000..579cceb96842
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C
+index c406cc1..d6c0765 100644
+--- a/src/uipp/dxuilib/EditorWindow.C
++++ b/src/uipp/dxuilib/EditorWindow.C
+@@ -5997,7 +5997,7 @@ char msg[128];
+ //
+ const char *tmpdir = theDXApplication->getTmpDirectory();
+ int tmpdirlen = STRLEN(tmpdir);
+- if (!tmpdirlen) return FALSE;
++ if (!tmpdirlen) return (char*)FALSE;
+ if (tmpdir[tmpdirlen-1] == '/') {
+ sprintf(netfilename, "%sdx%d.net", tmpdir, getpid());
+ sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid());
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
index 2aae53cbc9d5..4f7453fdd627 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}/${P}-open.patch"
"${FILESDIR}/${P}-szip.patch"
"${FILESDIR}/${P}-null.patch"
+ "${FILESDIR}/${P}-invalid-conversion.patch"
"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
)