# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1665838011 -7200
# Node ID 86edd6018826b451f13483ef5cb88acfa86f5346
# Parent  eaf43454b1fa82a51885e9dc309fee7d2730faf0
librsb: Update to version 1.3.0.1 (bug #61393).

* src/librsb.mk: Update version and checksum. (Temporarily) build without
librsbpp.
* src/librsb-1-setenv.patch, src/librsb-2-config.patch: Add patches for MinGW
(no setenv function) and for dependency on zlib.
* dist-files.mk: Add new files to dist.

diff -r eaf43454b1fa -r 86edd6018826 dist-files.mk
--- a/dist-files.mk	Sat Oct 01 08:57:05 2022 -0400
+++ b/dist-files.mk	Sat Oct 15 14:46:51 2022 +0200
@@ -299,6 +299,8 @@
   libpng-test.c \
   libpng.mk \
   libproxy.mk \
+  librsb-1-setenv.patch \
+  librsb-2-config.patch \
   librsb.mk \
   librsvg-1-fixes.patch \
   librsvg-test.c \
diff -r eaf43454b1fa -r 86edd6018826 src/librsb-1-setenv.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/librsb-1-setenv.patch	Sat Oct 15 14:46:51 2022 +0200
@@ -0,0 +1,49 @@
+--- librsb-1.3.0.1/rsb_test_matops.c.orig	2022-02-24 11:11:02.000000000 +0100
++++ librsb-1.3.0.1/rsb_test_matops.c	2022-10-15 13:44:55.920772450 +0200
+@@ -1979,7 +1979,7 @@
+ 			RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt);
+ 	}
+ 
+-#ifdef RSB_HAVE_UNISTD_H
++#ifdef RSB_HAVE_SETENV
+ {
+ 	/* special environmental variables set just for the sake of being saved in .rpr files */
+ #ifdef RSB_CC
+@@ -6536,7 +6536,7 @@
+ 			RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt);
+ 	}
+ 
+-#ifdef RSB_HAVE_UNISTD_H
++#ifdef RSB_HAVE_SETENV
+ {
+ 	/* special environmental variables set just for the sake of being saved in .rpr files */
+ #ifdef RSB_CC
+@@ -10962,7 +10962,7 @@
+ 			RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt);
+ 	}
+ 
+-#ifdef RSB_HAVE_UNISTD_H
++#ifdef RSB_HAVE_SETENV
+ {
+ 	/* special environmental variables set just for the sake of being saved in .rpr files */
+ #ifdef RSB_CC
+ 
+ --- librsb-1.3.0.1/rsbench.c.orig	2022-10-15 13:54:32.053382000 +0200
++++ librsb-1.3.0.1/rsbench.c	2022-10-15 13:54:58.038005553 +0200
+@@ -479,7 +479,15 @@
+ 	{
+ 		const rsb_char_t *name=ava, *value=esp+1;
+ 		*esp=RSB_NUL;
++		#ifdef RSB_HAVE_SETENV
+ 		setenv(name, value, /*overwrite*/1);
++		#else
++		rsb_char_t buf[1000];
++		strcpy(buf, name);
++		strcat(buf, "=");
++		strcat(buf, value);
++		putenv(buf);
++		#endif
+ 		RSBENCH_STDOUT("# Calling setenv() with arguments %s and %s\n",name,value);
+ 	}
+ 	if( ava )
+ 	
diff -r eaf43454b1fa -r 86edd6018826 src/librsb-2-config.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/librsb-2-config.patch	Sat Oct 15 14:46:51 2022 +0200
@@ -0,0 +1,11 @@
+--- librsb-1.3.0.1/librsb-config.in.orig	2022-04-28 19:17:05.000000000 +0200
++++ librsb-1.3.0.1/librsb-config.in	2022-10-15 14:10:34.827545946 +0200
+@@ -16,7 +16,7 @@
+ includedir="@includedir@/"
+ ldflags="@LDFLAGS@"
+ # Note: if using -lrsbpp explicitly and -stdc++ is there, optional -lasan needs to precede -stdc++ (in RSB_RSBPP_LIBS)
+-libs="-lrsb"
++libs="-lrsb -lz"
+ extra_libs="@LIBS@ @OPENMP_CFLAGS@ @LIBRSB_MKL_LIBS@ @RSB_RSBPP_LIBS@"
+ all_libs="-lrsb"
+ fclibs="@FCLIBS@"
diff -r eaf43454b1fa -r 86edd6018826 src/librsb.mk
--- a/src/librsb.mk	Sat Oct 01 08:57:05 2022 -0400
+++ b/src/librsb.mk	Sat Oct 15 14:46:51 2022 +0200
@@ -3,8 +3,8 @@
 
 PKG             := librsb
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.0.11
-$(PKG)_CHECKSUM := 5c4e31e3e61f5b6b21a777b2e5093861e52da852
+$(PKG)_VERSION  := 1.3.0.1
+$(PKG)_CHECKSUM := c5781cfdd137a6d442318f9f5e7b9fd18c46d8c2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_FILE)
@@ -25,9 +25,11 @@
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        --disable-c-examples --disable-fortran-examples \
+        --disable-c-examples \
+        --disable-fortran-examples \
         --disable-sparse-blas-interface \
-        --disable-octave-testing
+        --disable-octave-testing \
+        --without-librsbpp
     $(MAKE) -C '$(1)' -j '$(JOBS)' 
     $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'