[singular] 01/01: Slightly less hacky fixes, and refresh patches

Ximin Luo infinity0 at debian.org
Mon Jul 11 06:51:28 UTC 2016 

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master3-sage
in repository singular.

commit a3da1c1fa38b3b1fc5e73b5ec59369c21cd381fe
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Jul 11 08:47:25 2016 +0200

    Slightly less hacky fixes, and refresh patches
    
    - use soft relative link as standard for Debian shared libraries
    - patch upstream Makefile.in not to incorrectly patch si_gmp.h
---
 debian/patches/Minor.h.patch                       |  4 ++--
 debian/patches/assert.patch                        |  5 ++---
 debian/patches/currring.patch                      |  5 ++---
 debian/patches/cygwin64.patch                      | 20 ++++++++------------
 debian/patches/exeext.patch                        |  5 ++---
 debian/patches/fix-headers.patch                   | 11 +++++++++++
 debian/patches/flint.patch                         | 10 ++++------
 debian/patches/remove_warning.patch                |  5 ++---
 debian/patches/sanitize_gmp_header_hack.patch      | 21 +++++++++------------
 debian/patches/series                              |  1 +
 debian/patches/sing_win.patch                      |  5 ++---
 .../singular-3.1.7-use_cxx_for_linking.patch       | 22 +++++++++-------------
 debian/patches/singular_ntl.patch                  |  6 ++----
 debian/patches/slibdir.patch                       | 10 ++++------
 debian/patches/stricmp.patch                       |  5 ++---
 debian/patches/templates.patch                     | 12 +++++-------
 debian/rules                                       |  4 +---
 17 files changed, 68 insertions(+), 83 deletions(-)

diff --git a/debian/patches/Minor.h.patch b/debian/patches/Minor.h.patch
index 1d03e61..4def1b0 100644
--- a/debian/patches/Minor.h.patch
+++ b/debian/patches/Minor.h.patch
@@ -1,5 +1,5 @@
---- src/Singular/Minor.h	2010-02-02 08:22:24.000000000 -0500
-+++ patches/Minor.h	2011-06-28 13:26:01.000000000 -0400
+--- a/Singular/Minor.h
++++ b/Singular/Minor.h
 @@ -2,6 +2,7 @@
  #define MINOR_H
  
diff --git a/debian/patches/assert.patch b/debian/patches/assert.patch
index 3290a94..ff21493 100644
--- a/debian/patches/assert.patch
+++ b/debian/patches/assert.patch
@@ -1,6 +1,5 @@
-diff -ru src/factory/assert.h b/factory/assert.h
---- src/factory/assert.h	2012-02-21 20:00:09.000000000 +0100
-+++ b/factory/assert.h	2012-08-01 12:31:09.343379875 +0200
+--- a/factory/assert.h
++++ b/factory/assert.h
 @@ -128,3 +128,13 @@
  #define PVIRT_CHARCC(msg) = 0
  #endif /* NOASSERT */
diff --git a/debian/patches/currring.patch b/debian/patches/currring.patch
index 9ae716f..1a571a7 100644
--- a/debian/patches/currring.patch
+++ b/debian/patches/currring.patch
@@ -1,9 +1,8 @@
 Revert part of commit a53ae5000c439608b9dcf884b63d62b219e8fcc0.
 
 It makes Singular segfault at least when calling pOne() and currRing is NULL.
-diff -druN latest.orig/Singular/iparith.cc latest.new/Singular/iparith.cc
---- latest.orig/Singular/iparith.cc	2014-11-19 05:06:05.000000000 -0800
-+++ latest.new/Singular/iparith.cc	2014-11-20 08:30:25.068389635 -0800
+--- a/Singular/iparith.cc
++++ b/Singular/iparith.cc
 @@ -8477,7 +8477,6 @@
      sArithBase.sCmds[i].name);
      sArithBase.sCmds[i].alias=1;
diff --git a/debian/patches/cygwin64.patch b/debian/patches/cygwin64.patch
index 9fe1135..5c98f2c 100644
--- a/debian/patches/cygwin64.patch
+++ b/debian/patches/cygwin64.patch
@@ -1,6 +1,5 @@
-diff -druN latest.new/omalloc/configure latest/omalloc/configure
---- latest.new/omalloc/configure	2014-08-06 08:59:15.000000000 -0700
-+++ latest/omalloc/configure	2014-10-21 05:56:10.267081469 -0700
+--- a/omalloc/configure
++++ b/omalloc/configure
 @@ -2330,8 +2330,12 @@
  int main()
  {
@@ -14,9 +13,8 @@ diff -druN latest.new/omalloc/configure latest/omalloc/configure
     if (i == 1) exit(0);
     else exit(i+1);
  }
-diff -druN latest.new/omalloc/configure.in latest/omalloc/configure.in
---- latest.new/omalloc/configure.in	2014-08-06 08:59:15.000000000 -0700
-+++ latest/omalloc/configure.in	2014-10-21 05:56:10.267081469 -0700
+--- a/omalloc/configure.in
++++ b/omalloc/configure.in
 @@ -487,8 +487,12 @@
  int main()
  {
@@ -30,9 +28,8 @@ diff -druN latest.new/omalloc/configure.in latest/omalloc/configure.in
     if (i == 1) exit(0);
     else exit(i+1);
  }
-diff -druN latest.new/Singular/Makefile.in latest/Singular/Makefile.in
---- latest.new/Singular/Makefile.in	2014-08-06 08:59:15.000000000 -0700
-+++ latest/Singular/Makefile.in	2014-10-21 05:56:10.277081490 -0700
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
 @@ -176,6 +176,13 @@
  LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline @FLINT_LIBS@ -lgmp -lomalloc  -lhtmlhelp
  endif
@@ -47,9 +44,8 @@ diff -druN latest.new/Singular/Makefile.in latest/Singular/Makefile.in
  ifeq ($(SINGUNAME),ix86-SunOS)
  SO_SUFFIX  = so
  MODULE_SUFFIX    = so
-diff -druN latest.new/singuname.sh latest/singuname.sh
---- latest.new/singuname.sh	2014-08-06 08:59:15.000000000 -0700
-+++ latest/singuname.sh	2014-10-21 05:56:10.277081490 -0700
+--- a/singuname.sh
++++ b/singuname.sh
 @@ -96,7 +96,12 @@
  elif (echo $uname_m | $egrep "x86_64" > $devnull)
  then
diff --git a/debian/patches/exeext.patch b/debian/patches/exeext.patch
index cae6e81..8a72244 100644
--- a/debian/patches/exeext.patch
+++ b/debian/patches/exeext.patch
@@ -1,6 +1,5 @@
-diff -ru src/IntegerProgramming/Makefile.in b/IntegerProgramming/Makefile.in
---- src/IntegerProgramming/Makefile.in	2012-06-19 11:00:05.000000000 +0200
-+++ b/IntegerProgramming/Makefile.in	2012-07-12 17:00:42.253780191 +0200
+--- a/IntegerProgramming/Makefile.in
++++ b/IntegerProgramming/Makefile.in
 @@ -64,11 +64,11 @@
  
  install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
new file mode 100644
index 0000000..2f1eb6f
--- /dev/null
+++ b/debian/patches/fix-headers.patch
@@ -0,0 +1,11 @@
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -274,7 +274,7 @@
+ install-libsingular: install
+ 	-${MKINSTALLDIRS} ${includedir}
+ 	-${MKINSTALLDIRS} ${includedir}/singular
+-	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
++	-for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:" > ${includedir}/singular/$$file; done
+ 
+ install: all installbin
+ 
diff --git a/debian/patches/flint.patch b/debian/patches/flint.patch
index 911e2c8..cd37f25 100644
--- a/debian/patches/flint.patch
+++ b/debian/patches/flint.patch
@@ -1,6 +1,5 @@
-diff -druN latest.tmp/Singular/configure latest/Singular/configure
---- latest.tmp/Singular/configure	2014-08-06 08:59:15.000000000 -0700
-+++ latest/Singular/configure	2014-10-21 02:26:41.030021194 -0700
+--- a/Singular/configure
++++ b/Singular/configure
 @@ -9939,6 +9939,7 @@
  
  if test "x$flint_found" = "xyes"; then
@@ -9,9 +8,8 @@ diff -druN latest.tmp/Singular/configure latest/Singular/configure
    NEED_LIBS="-lflint -lmpfr ${NEED_LIBS}"
  fi
  
-diff -druN latest.tmp/Singular/configure.in latest/Singular/configure.in
---- latest.tmp/Singular/configure.in	2014-08-06 08:59:15.000000000 -0700
-+++ latest/Singular/configure.in	2014-10-21 02:26:41.030021194 -0700
+--- a/Singular/configure.in
++++ b/Singular/configure.in
 @@ -1431,6 +1431,7 @@
  
  if test "x$flint_found" = "xyes"; then
diff --git a/debian/patches/remove_warning.patch b/debian/patches/remove_warning.patch
index 23053e4..37f5792 100644
--- a/debian/patches/remove_warning.patch
+++ b/debian/patches/remove_warning.patch
@@ -1,6 +1,5 @@
-diff -uri latest/kernel/mod_raw.cc latest.tmp/kernel/mod_raw.cc
---- latest/kernel/mod_raw.cc	2014-11-19 14:06:05.000000000 +0100
-+++ latest.tmp/kernel/mod_raw.cc	2015-03-08 00:32:55.489679509 +0100
+--- a/kernel/mod_raw.cc
++++ b/kernel/mod_raw.cc
 @@ -150,10 +150,10 @@
      handle = dynl_open(path_name);
      if (handle == NULL && ! warn_handle)
diff --git a/debian/patches/sanitize_gmp_header_hack.patch b/debian/patches/sanitize_gmp_header_hack.patch
index 46e5de2..4bfce3a 100644
--- a/debian/patches/sanitize_gmp_header_hack.patch
+++ b/debian/patches/sanitize_gmp_header_hack.patch
@@ -1,19 +1,16 @@
-diff -Naur Singular-3-1-5.orig/factory/gen_cf_gmp.cc Singular-3-1-5/factory/gen_cf_gmp.cc
---- Singular-3-1-5.orig/factory/gen_cf_gmp.cc	2009-11-02 11:12:22.000000000 +0100
-+++ Singular-3-1-5/factory/gen_cf_gmp.cc	1970-01-01 01:00:00.000000000 +0100
+--- a/factory/gen_cf_gmp.cc
++++ /dev/null
 @@ -1 +0,0 @@
 -#include <gmp.h>
-diff -Naur Singular-3-1-5.orig/factory/gen_cf_gmp.template Singular-3-1-5/factory/gen_cf_gmp.template
---- Singular-3-1-5.orig/factory/gen_cf_gmp.template	2009-11-02 11:12:22.000000000 +0100
-+++ Singular-3-1-5/factory/gen_cf_gmp.template	1970-01-01 01:00:00.000000000 +0100
+--- a/factory/gen_cf_gmp.template
++++ /dev/null
 @@ -1,3 +0,0 @@
 -GMP_H=`echo $GMP_H_T| sed -e 's/^.*gmp.cc//' -e 's/ .$//'`
 -echo generating cf_gmp.h from $GMP_H
 -cat $GMP_H | grep -v __GMP_DECLSPEC_XX |grep -v std::FILE > cf_gmp.h
-diff -Naur Singular-3-1-5.orig/factory/GNUmakefile.in Singular-3-1-5/factory/GNUmakefile.in
---- Singular-3-1-5.orig/factory/GNUmakefile.in	2012-05-11 16:00:15.000000000 +0200
-+++ Singular-3-1-5/factory/GNUmakefile.in	2013-06-24 23:08:48.317324421 +0200
-@@ -61,6 +61,9 @@
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -60,6 +60,9 @@
  MKINSTALLDIRS =	@FACTORY_MKINSTALLDIRS@
  MAKEHEADER =	@FACTORY_MAKEHEADER@
  
@@ -23,7 +20,7 @@ diff -Naur Singular-3-1-5.orig/factory/GNUmakefile.in Singular-3-1-5/factory/GNU
  #
  # - flags.
  #
-@@ -363,7 +366,7 @@
+@@ -370,7 +373,7 @@
  		$(distsrc) $(distincl) $(hdrtemplsrc) \
  		GNUmakefile.in configure.in config.h.in configure \
  		ChangeLog README NEWS INSTALL \
@@ -32,7 +29,7 @@ diff -Naur Singular-3-1-5.orig/factory/GNUmakefile.in Singular-3-1-5/factory/GNU
  		examples/GNUmakefile examples/application.cc \
  		examples/factorize.cc examples/gcd.cc \
  		bin/folding.el bin/fold-docu.el \
-@@ -693,9 +696,18 @@
+@@ -687,9 +690,18 @@
  config.status:	configure
  		./config.status --recheck
  
diff --git a/debian/patches/series b/debian/patches/series
index 5161be1..505682e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ sing_win.patch
 slibdir.patch
 stricmp.patch
 templates.patch
+fix-headers.patch
diff --git a/debian/patches/sing_win.patch b/debian/patches/sing_win.patch
index 82aecc8..84c4821 100644
--- a/debian/patches/sing_win.patch
+++ b/debian/patches/sing_win.patch
@@ -1,6 +1,5 @@
-diff -ru src/Singular/sing_win.cc c/Singular/sing_win.cc
---- src/Singular/sing_win.cc	2012-07-10 12:00:15.000000000 +0200
-+++ c/Singular/sing_win.cc	2012-08-01 12:31:32.753384989 +0200
+--- a/Singular/sing_win.cc
++++ b/Singular/sing_win.cc
 @@ -37,7 +37,12 @@
     link.pszMsgTitle =  NULL ;
     link.pszWindow =    NULL ;
diff --git a/debian/patches/singular-3.1.7-use_cxx_for_linking.patch b/debian/patches/singular-3.1.7-use_cxx_for_linking.patch
index ec1591d..93c84b2 100644
--- a/debian/patches/singular-3.1.7-use_cxx_for_linking.patch
+++ b/debian/patches/singular-3.1.7-use_cxx_for_linking.patch
@@ -7,9 +7,8 @@ Patch taken from https://raw.githubusercontent.com/cschwan/sage-on-gentoo/master
 Added LIBSINGULAR_LDFLAGS in Trac #19698
 
 
-diff -Naur Singular-3-1-7.orig/Singular/Makefile.in Singular-3-1-7/Singular/Makefile.in
---- Singular-3-1-7.orig/Singular/Makefile.in	2014-11-20 02:06:05.000000000 +1300
-+++ Singular-3-1-7/Singular/Makefile.in	2015-04-30 11:55:25.285611669 +1200
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
 @@ -67,7 +67,7 @@
  ##
  @SET_MAKE@
@@ -18,10 +17,9 @@ diff -Naur Singular-3-1-7.orig/Singular/Makefile.in Singular-3-1-7/Singular/Make
 +LD              = @CXX@
  CXX		= @CXX@
  LEX		= sh flexer.sh
-
-diff -Naur Singular-3-1-7.orig/dyn_modules/modgen/Makefile.in Singular-3-1-7/dyn_modules/modgen/Makefile.in
---- Singular-3-1-7.orig/dyn_modules/modgen/Makefile.in	2014-11-20 02:06:05.000000000 +1300
-+++ Singular-3-1-7/dyn_modules/modgen/Makefile.in	2015-04-30 11:55:25.285611669 +1200
+ 
+--- a/dyn_modules/modgen/Makefile.in
++++ b/dyn_modules/modgen/Makefile.in
 @@ -20,7 +20,7 @@
  ##
  @SET_MAKE@
@@ -31,9 +29,8 @@ diff -Naur Singular-3-1-7.orig/dyn_modules/modgen/Makefile.in Singular-3-1-7/dyn
  CXX		= @CXX@
  LEX		= sh ../../Singular/flexer.sh
  PERL		= @PERL@
-diff -Naur Singular-3-1-7.orig/kernel/Makefile.in Singular-3-1-7/kernel/Makefile.in
---- Singular-3-1-7.orig/kernel/Makefile.in	2014-11-20 02:06:05.000000000 +1300
-+++ Singular-3-1-7/kernel/Makefile.in	2015-04-30 11:55:25.285611669 +1200
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
 @@ -30,7 +30,7 @@
  ##
  @SET_MAKE@
@@ -43,9 +40,8 @@ diff -Naur Singular-3-1-7.orig/kernel/Makefile.in Singular-3-1-7/kernel/Makefile
  CXX		= @CXX@
  LEX		= @LEX@
  PERL		= @PERL@
-diff -Naur Singular-3-1-7.orig/Singular/configure Singular-3-1-7/Singular/configure
---- Singular-3-1-7.orig/Singular/configure	2015-07-15 10:18:31.000000000 +1200
-+++ Singular-3-1-7/Singular/configure	2015-07-15 10:41:16.000000000 +1200
+--- a/Singular/configure
++++ b/Singular/configure
 @@ -6876,7 +6876,7 @@
  	  	LD_DYN_FLAGS1="-dynamic"
  	  	LD_DYN_FLAGS2="-ldl"
diff --git a/debian/patches/singular_ntl.patch b/debian/patches/singular_ntl.patch
index d4305c1..0fdf87b 100644
--- a/debian/patches/singular_ntl.patch
+++ b/debian/patches/singular_ntl.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] Fixing incompatibility with NTL8
  factory/NTLconvert.cc | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
 
-diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc
-index 41ce9b2..e32093d 100644
 --- a/factory/NTLconvert.cc
 +++ b/factory/NTLconvert.cc
 @@ -30,6 +30,7 @@
@@ -19,7 +17,7 @@ index 41ce9b2..e32093d 100644
  #include "int_int.h"
  #include <limits.h>
  #include "NTLconvert.h"
-@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a)
+@@ -510,8 +511,14 @@
      return CanonicalForm(coeff_long);
    }
    else
@@ -36,7 +34,7 @@ index 41ce9b2..e32093d 100644
      bool lessZero= false;
      if (sizeofrep < 0)
      {
-@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a)
+@@ -529,7 +536,7 @@
        cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
        cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
      }
diff --git a/debian/patches/slibdir.patch b/debian/patches/slibdir.patch
index 9009c5f..8d89c70 100644
--- a/debian/patches/slibdir.patch
+++ b/debian/patches/slibdir.patch
@@ -1,6 +1,5 @@
-diff -druN latest.new/IntegerProgramming/Makefile.in latest/IntegerProgramming/Makefile.in
---- latest.new/IntegerProgramming/Makefile.in	2014-10-21 05:59:54.327560770 -0700
-+++ latest/IntegerProgramming/Makefile.in	2014-10-21 05:59:36.327521758 -0700
+--- a/IntegerProgramming/Makefile.in
++++ b/IntegerProgramming/Makefile.in
 @@ -5,7 +5,7 @@
  ##
  bindir          = @bindir@
@@ -10,9 +9,8 @@ diff -druN latest.new/IntegerProgramming/Makefile.in latest/IntegerProgramming/M
  install_bindir  = ${install_prefix}/${SINGUNAME}
  libdir          = @libdir@
  
-diff -druN latest.new/Singular/Makefile.in latest/Singular/Makefile.in
---- latest.new/Singular/Makefile.in	2014-10-21 05:58:50.087421525 -0700
-+++ latest/Singular/Makefile.in	2014-10-21 05:59:36.327521758 -0700
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
 @@ -48,7 +48,7 @@
  bindir		= @bindir@
  # includes are taken from here
diff --git a/debian/patches/stricmp.patch b/debian/patches/stricmp.patch
index f6d1354..7b628fa 100644
--- a/debian/patches/stricmp.patch
+++ b/debian/patches/stricmp.patch
@@ -1,9 +1,8 @@
 stricmp is being deprecated in Cygwin.
 One should use strcasecmp.
 See https://cygwin.com/ml/cygwin/2014-10/msg00359.html
-diff -druN src/latest/Singular/run.c src/latest/Singular/run.c
---- latest/Singular/run.c	2014-11-19 14:06:05.000000000 +0100
-+++ latest/Singular/run.c	2015-01-16 09:32:45.771298300 +0100
+--- a/Singular/run.c
++++ b/Singular/run.c
 @@ -45,6 +45,7 @@
   #include <sys/stat.h>
   #include <sys/cygwin.h>
diff --git a/debian/patches/templates.patch b/debian/patches/templates.patch
index e8702ef..c75af3c 100644
--- a/debian/patches/templates.patch
+++ b/debian/patches/templates.patch
@@ -1,7 +1,6 @@
-diff -druN latest.orig/factory/GNUmakefile.in latest/factory/GNUmakefile.in
---- latest.orig/factory/GNUmakefile.in	2014-08-06 08:59:15.000000000 -0700
-+++ latest/factory/GNUmakefile.in	2014-10-20 04:21:24.914606325 -0700
-@@ -98,11 +98,13 @@
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -101,11 +101,13 @@
  		 @FLINT_CFLAGS@ $(DEFS) $(CPPFLAGS) $(CFLAGS)
  
  # flags to translate library c++ files
@@ -17,9 +16,8 @@ diff -druN latest.orig/factory/GNUmakefile.in latest/factory/GNUmakefile.in
  		-I. -I.. -I$(srcdir) -I${prefix} -I$(includedir) \
  		 @FLINT_CFLAGS@ $(DEFS) $(CPPFLAGS)
  
-diff -druN latest.orig/Singular/claptmpl.cc latest.new/Singular/claptmpl.cc
---- latest.orig/Singular/claptmpl.cc	2014-11-19 05:06:05.000000000 -0800
-+++ latest.new/Singular/claptmpl.cc	2014-11-21 08:58:02.514808678 -0800
+--- a/Singular/claptmpl.cc
++++ b/Singular/claptmpl.cc
 @@ -122,37 +122,3 @@
  template class std::list<PolyMinorValue>;
  template class Cache<MinorKey, IntMinorValue>;
diff --git a/debian/rules b/debian/rules
index 23a875c..771927d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,4 @@ override_dh_prep:
 override_dh_auto_build:
 	debian/spkg-install
 	mv $(SAGE_LOCAL)/lib/libsingular.so $(SAGE_LOCAL)/lib/libsingular-$(VERSION).so
-	ln $(SAGE_LOCAL)/lib/libsingular-$(VERSION).so $(SAGE_LOCAL)/lib/libsingular.so
-# Somehow the build changes "#include <factory/cf_gmp.h>" to "#include <cf_gmp.h>"
-	cp kernel/si_gmp.h $(SAGE_LOCAL)/include/singular/si_gmp.h
+	ln -s libsingular-$(VERSION).so $(SAGE_LOCAL)/lib/libsingular.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git

More information about the debian-science-commits mailing list