[flintqs] 01/01: Applied patches
Dominique Ingoglia
godel108-guest at alioth.debian.org
Sat Sep 14 05:47:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
godel108-guest pushed a commit to branch master
in repository flintqs.
commit 98c28c559f7d82cf947cc8e0d37812e6d9e867cd
Author: Dominique Ingoglia <Dominique.Ingoglia at gmail.com>
Date: Fri Sep 13 23:52:12 2013 -0600
Applied patches
---
.QS.cpp.swp | Bin 4096 -> 0 bytes
.pc/.quilt_patches | 1 +
.pc/.quilt_series | 1 +
.pc/.version | 1 +
.pc/applied-patches | 4 ++++
QS.cpp => .pc/flintqs-gcc-4.3-fix.patch/QS.cpp | 2 +-
lanczos.h => .pc/lanczos.h.patch/lanczos.h | 0
QS.cpp => .pc/log.patch/QS.cpp | 0
TonelliShanks.h => .pc/stdint.patch/TonelliShanks.h | 0
QS.cpp | 4 ++--
TonelliShanks.h | 1 +
debian/.pc/.quilt_patches | 1 +
debian/.pc/.quilt_series | 1 +
debian/.pc/.version | 1 +
debian/patches/flintqs-gcc-4.3-fix.patch | 11 +++++++++++
debian/patches/lanczos.h.patch | 17 +++++++++++++++++
debian/patches/log.patch | 12 ++++++++++++
debian/patches/series | 4 ++++
debian/patches/stdint.patch | 11 +++++++++++
lanczos.h | 7 +++++++
20 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/.QS.cpp.swp b/.QS.cpp.swp
deleted file mode 100644
index 3bab53f..0000000
Binary files a/.QS.cpp.swp and /dev/null differ
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..0f0b7b0
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,4 @@
+stdint.patch
+log.patch
+lanczos.h.patch
+flintqs-gcc-4.3-fix.patch
diff --git a/.pc/flintqs-gcc-4.3-fix.patch/.timestamp b/.pc/flintqs-gcc-4.3-fix.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/QS.cpp b/.pc/flintqs-gcc-4.3-fix.patch/QS.cpp
similarity index 99%
copy from QS.cpp
copy to .pc/flintqs-gcc-4.3-fix.patch/QS.cpp
index 4e02b8d..61cd376 100644
--- a/QS.cpp
+++ b/.pc/flintqs-gcc-4.3-fix.patch/QS.cpp
@@ -467,7 +467,7 @@ void computeSizes(unsigned long numPrimes)
primeSizes = (unsigned char *) calloc(sizeof(unsigned char),numPrimes);
for (unsigned long i = 0; i<numPrimes; i++)
{
- primeSizes[i]=(unsigned char)floor(log(factorBase[i])/log(2.0)-FUDGE+0.5);
+ primeSizes[i]=(unsigned char)floor(log((double)factorBase[i])/log(2.0)-FUDGE+0.5);
}
return;
diff --git a/.pc/lanczos.h.patch/.timestamp b/.pc/lanczos.h.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/lanczos.h b/.pc/lanczos.h.patch/lanczos.h
similarity index 100%
copy from lanczos.h
copy to .pc/lanczos.h.patch/lanczos.h
diff --git a/.pc/log.patch/.timestamp b/.pc/log.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/QS.cpp b/.pc/log.patch/QS.cpp
similarity index 100%
copy from QS.cpp
copy to .pc/log.patch/QS.cpp
diff --git a/.pc/stdint.patch/.timestamp b/.pc/stdint.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/TonelliShanks.h b/.pc/stdint.patch/TonelliShanks.h
similarity index 100%
copy from TonelliShanks.h
copy to .pc/stdint.patch/TonelliShanks.h
diff --git a/QS.cpp b/QS.cpp
index 4e02b8d..3fbe8bf 100644
--- a/QS.cpp
+++ b/QS.cpp
@@ -467,7 +467,7 @@ void computeSizes(unsigned long numPrimes)
primeSizes = (unsigned char *) calloc(sizeof(unsigned char),numPrimes);
for (unsigned long i = 0; i<numPrimes; i++)
{
- primeSizes[i]=(unsigned char)floor(log(factorBase[i])/log(2.0)-FUDGE+0.5);
+ primeSizes[i]=(unsigned char)floor(log((double)factorBase[i])/log(2.0)-FUDGE+0.5);
}
return;
@@ -1563,7 +1563,7 @@ void mainRoutine(unsigned long Mdiv2, mpz_t n, unsigned long multiplier)
Function: Factors a user specified number using a quadratic sieve
===========================================================================*/
-int main(int argc, unsigned char *argv[])
+int main(int argc, char *argv[])
{
unsigned long multiplier;
diff --git a/TonelliShanks.h b/TonelliShanks.h
index 92048e2..79a970e 100644
--- a/TonelliShanks.h
+++ b/TonelliShanks.h
@@ -20,6 +20,7 @@
============================================================================*/
#include <stdlib.h>
+#include <stdint.h>
// =====================================================================
// INTERFACE:
diff --git a/debian/.pc/.quilt_patches b/debian/.pc/.quilt_patches
new file mode 100644
index 0000000..4baccb8
--- /dev/null
+++ b/debian/.pc/.quilt_patches
@@ -0,0 +1 @@
+patches
diff --git a/debian/.pc/.quilt_series b/debian/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/debian/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/debian/.pc/.version b/debian/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/patches/flintqs-gcc-4.3-fix.patch b/debian/patches/flintqs-gcc-4.3-fix.patch
new file mode 100644
index 0000000..0a28fd1
--- /dev/null
+++ b/debian/patches/flintqs-gcc-4.3-fix.patch
@@ -0,0 +1,11 @@
+--- src/QS.cpp.orig 2008-04-14 14:16:38.000000000 -0700
++++ src/QS.cpp 2008-04-14 14:16:54.000000000 -0700
+@@ -1563,7 +1563,7 @@
+ Function: Factors a user specified number using a quadratic sieve
+
+ ===========================================================================*/
+-int main(int argc, unsigned char *argv[])
++int main(int argc, char *argv[])
+ {
+ unsigned long multiplier;
+
diff --git a/debian/patches/lanczos.h.patch b/debian/patches/lanczos.h.patch
new file mode 100644
index 0000000..1e40fec
--- /dev/null
+++ b/debian/patches/lanczos.h.patch
@@ -0,0 +1,17 @@
+diff -ur src/lanczos.h b/lanczos.h
+--- src/lanczos.h 2007-05-06 00:52:39.000000000 +0200
++++ b/lanczos.h 2012-05-26 06:17:05.784874818 +0200
+@@ -21,6 +21,13 @@
+ #ifndef LANCZOS_H
+ #define LANCZOS_H
+
++#ifdef __sun
++#define u_int32_t unsigned int
++#define u_int64_t unsigned long long
++#endif
++
++#include <sys/types.h> // needed on MacOS X 10.5 for uint type
++
+ #include <stdlib.h>
+
+ typedef struct {
diff --git a/debian/patches/log.patch b/debian/patches/log.patch
new file mode 100644
index 0000000..0dcf4c4
--- /dev/null
+++ b/debian/patches/log.patch
@@ -0,0 +1,12 @@
+diff -ru src/QS.cpp b/QS.cpp
+--- src/QS.cpp 2008-04-14 23:16:38.000000000 +0200
++++ b/QS.cpp 2012-05-26 06:30:15.823360044 +0200
+@@ -467,7 +467,7 @@
+ primeSizes = (unsigned char *) calloc(sizeof(unsigned char),numPrimes);
+ for (unsigned long i = 0; i<numPrimes; i++)
+ {
+- primeSizes[i]=(unsigned char)floor(log(factorBase[i])/log(2.0)-FUDGE+0.5);
++ primeSizes[i]=(unsigned char)floor(log((double)factorBase[i])/log(2.0)-FUDGE+0.5);
+ }
+
+ return;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6ae30ba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+stdint.patch -p1
+log.patch
+lanczos.h.patch
+flintqs-gcc-4.3-fix.patch
diff --git a/debian/patches/stdint.patch b/debian/patches/stdint.patch
new file mode 100644
index 0000000..ec0ac0a
--- /dev/null
+++ b/debian/patches/stdint.patch
@@ -0,0 +1,11 @@
+diff -ru src/TonelliShanks.h b/TonelliShanks.h
+--- src/TonelliShanks.h 2007-05-06 00:52:39.000000000 +0200
++++ b/TonelliShanks.h 2012-06-21 12:18:28.353358700 +0200
+@@ -20,6 +20,7 @@
+ ============================================================================*/
+
+ #include <stdlib.h>
++#include <stdint.h>
+
+ // =====================================================================
+ // INTERFACE:
diff --git a/lanczos.h b/lanczos.h
index c07e6d1..2951e76 100644
--- a/lanczos.h
+++ b/lanczos.h
@@ -21,6 +21,13 @@
#ifndef LANCZOS_H
#define LANCZOS_H
+#ifdef __sun
+#define u_int32_t unsigned int
+#define u_int64_t unsigned long long
+#endif
+
+#include <sys/types.h> // needed on MacOS X 10.5 for uint type
+
#include <stdlib.h>
typedef struct {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flintqs.git
More information about the debian-science-commits
mailing list