[libgap-sage] 06/12: Refresh patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Oct 11 23:15:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch debian-4.8.4
in repository libgap-sage.
commit d1897eaf266c4f85aa2afd9da01bbae87c6c4504
Author: Tobias Hansen <thansen at debian.org>
Date: Tue Oct 11 18:20:26 2016 +0000
Refresh patches.
---
debian/patches/series | 3 -
.../upstream-autotoolization-header_folder.patch | 6 +-
...am-autotoolization-libtool-version_script.patch | 40 +-------
...m-autotoolization-libtool-version_triplet.patch | 50 ----------
...eam-source-lintian-spelling-error-silence.patch | 106 ---------------------
.../upstream-source-test-disable_autoloading.patch | 82 ----------------
6 files changed, 8 insertions(+), 279 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index b75ffc3..9240e6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-upstream-source-lintian-spelling-error-silence.patch
-upstream-source-test-disable_autoloading.patch
-upstream-autotoolization-libtool-version_triplet.patch
upstream-autotoolization-libtool-version_script.patch
upstream-autotoolization-header_folder.patch
upstream-autotoolization-test-systemwide.patch
diff --git a/debian/patches/upstream-autotoolization-header_folder.patch b/debian/patches/upstream-autotoolization-header_folder.patch
index 62266cd..e5655aa 100644
--- a/debian/patches/upstream-autotoolization-header_folder.patch
+++ b/debian/patches/upstream-autotoolization-header_folder.patch
@@ -49,7 +49,7 @@ Last-Update: 2016-08-06
--- a/src/integer.h
+++ b/src/integer.h
@@ -16,7 +16,7 @@
- #define GAP_INTEGER_H
+ #define libGAP_GAP_INTEGER_H
#ifdef USE_GMP /* then use the gmp version of the header file */
- #include "gmpints.h"
@@ -60,8 +60,8 @@ Last-Update: 2016-08-06
--- a/src/profile.h
+++ b/src/profile.h
@@ -12,7 +12,7 @@
- #ifndef GAP_PROFILE_H
- #define GAP_PROFILE_H
+ #ifndef libGAP_GAP_PROFILE_H
+ #define libGAP_GAP_PROFILE_H
-#include "exprs.h"
+#include <gap/exprs.h>
diff --git a/debian/patches/upstream-autotoolization-libtool-version_script.patch b/debian/patches/upstream-autotoolization-libtool-version_script.patch
index 133d9ee..4f3678d 100644
--- a/debian/patches/upstream-autotoolization-libtool-version_script.patch
+++ b/debian/patches/upstream-autotoolization-libtool-version_script.patch
@@ -1,7 +1,11 @@
-Description: autotoolization: libtoolization: version triplet
+Description: autotoolization: libtoolization: version script
Add version script support for the shared library: only the functions with
the prefixes libGAP_ and libgap_ are visible. Meant to be submitted to the
upstream maintainer.
+ .
+ This patch in its original form was applied upstream,
+ but the map file is missing from the dist tarball.
+ It should be added to src/Makefile.am.
Origin: debian
Forwarded: https://bitbucket.org/vbraun/libgap/pull-requests/7
Author: Jerome Benoit <calculus at rezozer.net>
@@ -17,37 +21,3 @@ Last-Update: 2016-08-06
+local:
+*;
+};
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,5 +193,8 @@
- dnl AC_SUBST(LIBGAP_VERSION_MICRO)
- AC_SUBST(LIBGAP_LT_VERSION)
-
-+# Checks for linker script support:
-+gl_LD_VERSION_SCRIPT
-+
- #OUTPUT
- AC_OUTPUT
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -4,6 +4,11 @@
-
- libgap_la_LT_INFO = -version-info @LIBGAP_LT_VERSION@
-
-+libgap_la_LD_VERSION_SCRIPT =
-+if HAVE_LD_VERSION_SCRIPT
-+ libgap_la_LD_VERSION_SCRIPT += -Wl,--version-script=$(top_srcdir)/src/libgap.map
-+endif
-+
-
- libgap_la_SOURCES = \
- ariths.c c_random.c gmpints.c objccoll.c rational.c system.c \
-@@ -47,7 +52,7 @@
- -DCONFIG_H @GMP_CFLAGS@ @SAGE_CFLAGS@
-
- # the no-undefined is necessary for Cygwin
--libgap_la_LDFLAGS = $(libgap_la_LT_INFO) -lm @GMP_LIBS@ -no-undefined
-+libgap_la_LDFLAGS = $(libgap_la_LT_INFO) $(libgap_la_LD_VERSION_SCRIPT) @GMP_LIBS@ -lm -no-undefined
-
-
- dist-hook:
diff --git a/debian/patches/upstream-autotoolization-libtool-version_triplet.patch b/debian/patches/upstream-autotoolization-libtool-version_triplet.patch
deleted file mode 100644
index 9af34d8..0000000
--- a/debian/patches/upstream-autotoolization-libtool-version_triplet.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: autotoolization: libtoolization: version triplet
- Add version triplet support for the shared library: the version of the library
- is the version of the upstream package itself. Meant to be submitted to the
- upstream maintainer.
-Origin: debian
-Forwarded: https://bitbucket.org/vbraun/libgap/pull-requests/7
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-08-06
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -181,6 +181,17 @@
- AC_DEFINE([SYS_IS_CYGWIN32], [0], [whether we are running on Windows])
- fi
-
-+LIBGAP_RELEASE_MAJOR=${PACKAGE_VERSION%.*}
-+LIBGAP_VERSION_MAJOR=${PACKAGE_VERSION%%.*}
-+LIBGAP_VERSION_MINOR=${LIBGAP_RELEASE_MAJOR#*.}
-+LIBGAP_VERSION_MICRO=${PACKAGE_VERSION##*.}
-+LIBGAP_VERSION_MICRO=${LIBGAP_VERSION_MICRO%-*}
-+LIBGAP_LT_VERSION="$(expr ${LIBGAP_VERSION_MAJOR} + ${LIBGAP_VERSION_MINOR}):${LIBGAP_VERSION_MICRO}:${LIBGAP_VERSION_MINOR}"
-+
-+dnl AC_SUBST(LIBGAP_VERSION_MAJOR)
-+dnl AC_SUBST(LIBGAP_VERSION_MINOR)
-+dnl AC_SUBST(LIBGAP_VERSION_MICRO)
-+AC_SUBST(LIBGAP_LT_VERSION)
-
- #OUTPUT
- AC_OUTPUT
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,6 +2,9 @@
-
- lib_LTLIBRARIES = libgap.la
-
-+libgap_la_LT_INFO = -version-info @LIBGAP_LT_VERSION@
-+
-+
- libgap_la_SOURCES = \
- ariths.c c_random.c gmpints.c objccoll.c rational.c system.c \
- blister.c c_type1.c gvars.c objcftl.c read.c tietze.c \
-@@ -44,7 +47,7 @@
- -DCONFIG_H @GMP_CFLAGS@ @SAGE_CFLAGS@
-
- # the no-undefined is necessary for Cygwin
--libgap_la_LDFLAGS = -lm @GMP_LIBS@ -no-undefined
-+libgap_la_LDFLAGS = $(libgap_la_LT_INFO) -lm @GMP_LIBS@ -no-undefined
-
-
- dist-hook:
diff --git a/debian/patches/upstream-source-lintian-spelling-error-silence.patch b/debian/patches/upstream-source-lintian-spelling-error-silence.patch
deleted file mode 100644
index 85d541a..0000000
--- a/debian/patches/upstream-source-lintian-spelling-error-silence.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: source typo
- Correct spelling errors as reported by lintian in the binary library; meant
- to silence lintian and eventually to be submitted to the upstream maintainer.
-Origin: debian
-Forwarded: https://bitbucket.org/vbraun/libgap/pull-requests/5
-Comment: spelling-error-in-binary
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-08-16
-
---- a/src/lists.c
-+++ b/src/lists.c
-@@ -1976,7 +1976,7 @@
- }
- if ( LEN_LIST( poss ) != LEN_LIST( obj ) ) {
- obj = ErrorReturnObj(
-- "List Assigments: <objs> must have the same length as <positions> (%d)",
-+ "List Assignments: <objs> must have the same length as <positions> (%d)",
- LEN_LIST( poss ), 0L,
- "you can replace <objs> via 'return <objs>;'" );
- }
---- a/README
-+++ b/README
-@@ -1,9 +1,9 @@
--LibGAP
-+LibGAP
- ======
-
- A C library version of the GAP kernel.
-
--GAP (http://www.gap-system.org) is a system fo computational group
-+GAP (http://www.gap-system.org) is a system for computational group
- theory. This repo contains a shared library version of the GAP kernel,
- allowing you to directly talk to GAP from your own C/C++ code.
-
-@@ -14,7 +14,7 @@
- Requirements
- ============
-
--Runtime:
-+Runtime:
- * the GAP library (scripts in the GAP language)
- * GMP/MPIR shared library
-
-@@ -22,7 +22,7 @@
- * GMP/MPIR headers
-
- Packaging (to run "make dist"):
-- * Python
-+ * Python
- * The Python PLY module (http://www.dabeaz.com/ply)
-
-
-@@ -43,13 +43,13 @@
- quoted such that it ends up with quotation marks in C sources:
-
- $ ./configure CFLAGS='-DSYS_DEFAULT_PATHS=\"/path/to/gap\"'
--
-- or
-+
-+ or
-
- $ export CFLAGS='-DSYS_DEFAULT_PATHS=\"/home/vbraun/Sage/git/local/gap/latest\"'
- $ ./configure
- $ make check
--
-+
- For example, using the GAP installation in SageMath:
-
- $ ./configure CFLAGS='-DSYS_DEFAULT_PATHS=\"$SAGE_ROOT/local/gap/latest\"'
-@@ -68,7 +68,7 @@
- patches/gap-x.y.z.patch
-
- 3. Replace the C sources in LibGAP's src with the new
-- upstream-gap-x.y.(z+1):
-+ upstream-gap-x.y.(z+1):
-
- cp upstream/src/*.[c,h] src/
-
-@@ -79,7 +79,7 @@
-
- 5. Update src/Makefile.am if C sources have been added/removed.
-
-- 6. Update the version in configure.ac and run
-+ 6. Update the version in configure.ac and run
-
- $ autoreconf -fiv
-
-@@ -99,7 +99,6 @@
- LibGAP with debug symbols:
-
- $ ./configure CFLAGS='-DSYS_DEFAULT_PATHS=\"/path/to/gap\" -O0 -g3 -DDEBUG_MASTERPOINTERS -DDEBUG_GLOBAL_BAGS -DDEBUG_FUNCTIONS_BAGS'
--
-
-
- Usage
---- a/src/saveload.c
-+++ b/src/saveload.c
-@@ -924,7 +924,7 @@
- if ((x & 3) == 1)
- Pr("Immediate integer %d\n", INT_INTOBJ((Obj)x),0L);
- else if ((x & 3) == 2)
-- Pr("Immedate FFE %d %d\n", VAL_FFE(x), SIZE_FF(FLD_FFE(x)));
-+ Pr("Immediate FFE %d %d\n", VAL_FFE(x), SIZE_FF(FLD_FFE(x)));
- else
- Pr("Reference to bag number %d\n",x>>2,0L);
- }
diff --git a/debian/patches/upstream-source-test-disable_autoloading.patch b/debian/patches/upstream-source-test-disable_autoloading.patch
deleted file mode 100644
index 7dacdd3..0000000
--- a/debian/patches/upstream-source-test-disable_autoloading.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: source test: disable autoloading
- Add the swith option `-A' to disable the autoloading of the suggested
- GAP packages as there is `no support for dynamic loading'; see gap(1)
- and `src/gap.c'. Meant to be submitted to the upstream maintainer.
-Origin: debian
-Forwarded: https://bitbucket.org/vbraun/libgap/pull-requests/6
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-08-06
-
---- a/test/shell.c
-+++ b/test/shell.c
-@@ -54,16 +54,17 @@
- {
- print_stack_start();
- stacker();
-- char* argv[8];
-+ char* argv[9];
- argv[0] = "gap";
- argv[1] = "-l";
- argv[2] = SYS_DEFAULT_PATHS;
- argv[3] = "-m";
- argv[4] = "32M";
- argv[5] = "-q";
-- argv[6] = "-T";
-- argv[7] = NULL;
-- int argc=7;
-+ argv[6] = "-A";
-+ argv[7] = "-T";
-+ argv[8] = NULL;
-+ int argc=8;
- // gap_main_loop(argc, argv, environ);
- libgap_set_error_handler(&error_handler);
- libgap_initialize(argc, argv);
---- a/test/test.c
-+++ b/test/test.c
-@@ -42,8 +42,8 @@
- void init()
- {
- printf("Using gap library at %s\n", SYS_DEFAULT_PATHS);
-- char* argv[12];
-- argv[0] = "sage";
-+ char* argv[13];
-+ argv[0] = "gap";
- argv[1] = "-l";
- argv[2] = SYS_DEFAULT_PATHS;
- char* memory_pool = "1000M";
-@@ -54,9 +54,10 @@
- argv[7] = "-m";
- argv[8] = "64M";
- argv[9] = "-q";
-- argv[10] = "-T";
-- argv[11] = NULL;
-- int argc=11;
-+ argv[10] = "-A";
-+ argv[11] = "-T";
-+ argv[12] = NULL;
-+ int argc=12;
- // libgap_set_error_handler(&error_handler);
- // libgap_initialize(argc, argv);
-
---- a/test/error_handler.c
-+++ b/test/error_handler.c
-@@ -28,15 +28,16 @@
-
- int main()
- {
-- char* argv[7];
-+ char* argv[8];
- argv[0] = "gap";
- argv[1] = "-l";
- argv[2] = SYS_DEFAULT_PATHS;
- argv[3] = "-m";
- argv[4] = "24M";
- argv[5] = "-T";
-- argv[6] = NULL;
-- int argc=6;
-+ argv[6] = "-A";
-+ argv[7] = NULL;
-+ int argc=7;
- libgap_set_error_handler(handler);
- libgap_initialize(argc, argv);
- libgap_mark_stack_bottom();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libgap-sage.git
More information about the debian-science-commits
mailing list