Mercurial > mxe-octave

changeset 5579:2734b3818171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid double-free with librsb (bug #58957). * src/librsb.mk: Add work-around to avoid double-free (provided by Michele Martone). * src/mingw-of-sparsersb-1-no-render.patch: Remove patch. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 02 Nov 2020 08:55:18 +0100
parents deca3045c118
children 398a70d29c6e
files dist-files.mk src/librsb.mk src/mingw-of-sparsersb-1-no-render.patch
diffstat 3 files changed, 4 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Oct 31 19:13:51 2020 +0100
+++ b/dist-files.mk	Mon Nov 02 08:55:18 2020 +0100
@@ -520,7 +520,6 @@
   of-sockets-1-cross-fixes.patch \
   of-sockets-2-deprecated.patch \
   of-sockets.mk \
-  mingw-of-sparsersb-1-no-render.patch \
   of-sparsersb.mk \
   of-specfun-1-deprecated.patch \
   of-specfun.mk \
--- a/src/librsb.mk	Sat Oct 31 19:13:51 2020 +0100
+++ b/src/librsb.mk	Mon Nov 02 08:55:18 2020 +0100
@@ -20,6 +20,10 @@
 endef
 
 define $(PKG)_BUILD
+    # This is a work-around for a bug in version 1.2.0.9.
+    # Remove the following command once this is fixed upstream.
+    $(SED) -i 's/.A.=.rsb__real.*\([,;]\)/1\1/g' $(1)/rsb_eps.c
+
     cd '$(1)' && autoreconf -fi && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
--- a/src/mingw-of-sparsersb-1-no-render.patch	Sat Oct 31 19:13:51 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1604060822 -3600
-#      Fri Oct 30 13:27:02 2020 +0100
-# Node ID 2465e05138acf1e722d770a543438dbdb7448a7e
-# Parent  467a580199cabb5a3c2256119f57ead777dc583b
-Temporarily de-activate option "render" for Windows (bug #58957).
-
-diff -r 467a580199ca -r 2465e05138ac src/sparsersb.cc
---- a/src/sparsersb.cc	Tue Aug 11 16:54:28 2020 +0200
-+++ b/src/sparsersb.cc	Fri Oct 30 13:27:02 2020 +0100
-@@ -2906,6 +2906,7 @@
-  		&& args(1).is_string() && args(1).string_value().substr(0,6)=="render"
- 		&& args(2).is_string())
- 	{
-+		error("sparsersb: option \"render\" is temporarily de-activated for this build.");
- 		// sparsersb (S,"render", FILENAME[, RWIDTH, RHEIGHT])
- 		rsb_err_t errval = RSB_ERR_NO_ERROR;
- 		std::string rmf = args(2).string_value();