changeset 4916:8b862c9f48ba

of-windows: add dev 6.0 patch * src/of-windows-1-fixes.patch: new file * dist-files.mk: add ref to of-windows-1-fixes.patch
author John Donoghue
date Thu, 03 Jan 2019 09:00:59 -0500
parents aa8e596703c2
children 4f39dbdea431
files dist-files.mk src/of-windows-1-fixes.patch
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Jan 03 08:41:41 2019 -0500
+++ b/dist-files.mk	Thu Jan 03 09:00:59 2019 -0500
@@ -538,6 +538,7 @@
   of-tsa.mk \
   of-video-1-fixes.patch \
   of-video.mk \
+  of-windows-1-fixes.patch \
   of-windows.mk \
   of-zenity.mk \
   of-zeromq.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-windows-1-fixes.patch	Thu Jan 03 09:00:59 2019 -0500
@@ -0,0 +1,12 @@
+diff -ur windows-1.3.0.orig/src/__COM__.cc windows-1.3.0/src/__COM__.cc
+--- windows-1.3.0.orig/src/__COM__.cc	2019-01-02 10:47:50.386998529 -0500
++++ windows-1.3.0/src/__COM__.cc	2019-01-02 10:48:25.859871218 -0500
+@@ -69,7 +69,7 @@
+   return std::string (&tmp[0], len);
+ }
+ 
+-class octave_com_object : public octave_base_value, public octave_auto_shlib
++class octave_com_object : public octave_base_value
+ {
+ public:
+   // Constructors