[ecl] New upstream release. Drop upstreamed patches.
Jerry James
jjames at fedoraproject.org
Fri Dec 7 23:39:04 UTC 2012
commit c18999bd8187671f4a97fc0dcf9500839c19cb6d
Author: Jerry James <jamesjer at betterlinux.com>
Date: Fri Dec 7 16:38:48 2012 -0700
New upstream release.
Drop upstreamed patches.
.gitignore | 2 +-
...tch => ecl-12.12.1-signal_handling_thread.patch | 6 +-
ecl-12.12.1-warnings.patch | 215 +++++++++++++++
ecl-12.7.1-atomic_ops.patch | 52 ----
ecl-12.7.1-sighandler.patch | 63 -----
ecl-12.7.1-warnings.patch | 277 --------------------
ecl.spec | 24 +-
sources | 4 +-
8 files changed, 231 insertions(+), 412 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8454d2..4a4fe94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/ecl-doc.tar.xz
-/ecl-12.7.1.tar.gz
+/ecl-12.12.1.tgz
diff --git a/ecl-12.7.1-signal_handling_thread.patch b/ecl-12.12.1-signal_handling_thread.patch
similarity index 79%
rename from ecl-12.7.1-signal_handling_thread.patch
rename to ecl-12.12.1-signal_handling_thread.patch
index 8c51786..14693a6 100644
--- a/ecl-12.7.1-signal_handling_thread.patch
+++ b/ecl-12.12.1-signal_handling_thread.patch
@@ -1,5 +1,5 @@
---- ./src/c/main.d.orig 2012-07-24 10:51:53.000000000 -0600
-+++ ./src/c/main.d 2012-07-27 15:43:14.666816529 -0600
+--- ./src/c/main.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/main.d 2012-12-07 15:35:06.105922908 -0700
@@ -76,7 +76,11 @@ cl_fixnum ecl_option_values[ECL_OPT_LIMI
1, /* ECL_OPT_TRAP_SIGPIPE */
1, /* ECL_OPT_TRAP_SIGCHLD */
@@ -12,7 +12,7 @@
16, /* ECL_OPT_SIGNAL_QUEUE_SIZE */
0, /* ECL_OPT_BOOTED */
8192, /* ECL_OPT_BIND_STACK_SIZE */
-@@ -504,11 +508,11 @@ cl_boot(int argc, char **argv)
+@@ -506,11 +510,11 @@ cl_boot(int argc, char **argv)
return 1;
}
diff --git a/ecl-12.12.1-warnings.patch b/ecl-12.12.1-warnings.patch
new file mode 100644
index 0000000..60dc704
--- /dev/null
+++ b/ecl-12.12.1-warnings.patch
@@ -0,0 +1,215 @@
+--- ./src/c/ffi.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/ffi.d 2012-12-07 15:20:00.520398501 -0700
+@@ -701,7 +701,7 @@ si_load_foreign_module(cl_object filenam
+ #if !defined(ENABLE_DLOPEN)
+ FEerror("SI:LOAD-FOREIGN-MODULE does not work when ECL is statically linked", 0);
+ #else
+- cl_object output;
++ cl_object output = ECL_NIL;
+
+ # ifdef ECL_THREADS
+ mp_get_lock(1, ecl_symbol_value(@'mp::+load-compile-lock+'));
+--- ./src/c/cinit.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/cinit.d 2012-12-07 15:20:27.867319897 -0700
+@@ -149,6 +149,7 @@ static cl_object si_simple_toplevel ()
+ ecl_prin1(sentence, output);
+ }
+ } ECL_CATCH_ALL_END;
++ return ECL_NIL;
+ }
+
+ int
+--- ./src/c/read.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/read.d 2012-12-07 15:20:48.636254848 -0700
+@@ -2269,7 +2269,7 @@ ecl_init_module(cl_object block, void (*
+ volatile cl_object x;
+ cl_index i, len, perm_len, temp_len;
+ cl_object in;
+- cl_object *VV, *VVtemp = 0;
++ cl_object *VV = 0, *VVtemp = 0;
+
+ if (block == NULL)
+ block = ecl_make_codeblock();
+--- ./src/c/compiler.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/compiler.d 2012-12-07 15:21:45.907071363 -0700
+@@ -3073,7 +3073,7 @@ si_valid_function_name_p(cl_object name)
+ cl_object
+ si_make_lambda(cl_object name, cl_object rest)
+ {
+- cl_object lambda;
++ cl_object lambda = ECL_NIL;
+ const cl_env_ptr the_env = ecl_process_env();
+ volatile cl_compiler_env_ptr old_c_env = the_env->c_env;
+ struct cl_compiler_env new_c_env;
+--- ./src/c/unixfsys.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/unixfsys.d 2012-12-07 15:23:40.586702719 -0700
+@@ -460,7 +460,6 @@ ecl_file_len(int f)
+
+ @(defun rename-file (oldn newn &key (if_exists @':error'))
+ cl_object old_filename, new_filename, old_truename, new_truename;
+- int error;
+ @
+
+ /* 1) Get the old filename, and complain if it has wild components,
+@@ -504,6 +503,9 @@ ecl_file_len(int f)
+ 1, if_exists);
+ }
+ {
++#if defined(ECL_MS_WINDOWS_HOST)
++ int error;
++#endif
+ ecl_disable_interrupts();
+ #if defined(ECL_MS_WINDOWS_HOST)
+ error = SetErrorMode(0);
+@@ -664,7 +666,10 @@ ecl_homedir_pathname(cl_object user)
+ {
+ cl_index i;
+ cl_object namestring;
+- const char *h, *d;
++ const char *h;
++#if defined(ECL_MS_WINDOWS_HOST)
++ const char *d;
++#endif
+ if (!Null(user)) {
+ #ifdef HAVE_PWD_H
+ struct passwd *pwent = NULL;
+--- ./src/c/printer/float_to_digits.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/printer/float_to_digits.d 2012-12-07 15:24:47.690499242 -0700
+@@ -177,7 +177,6 @@ change_precision(float_approx *approx, c
+ {
+ cl_object e1 = cl_expt(PRINT_BASE, position);
+ cl_object e2 = ecl_divide(e1, ecl_make_fixnum(2));
+- cl_object e3 = cl_expt(PRINT_BASE, k);
+ if (ecl_greatereq(ecl_plus(approx->r, ecl_times(approx->s, e1)),
+ ecl_times(approx->s, e2)))
+ position = ecl_one_minus(position);
+--- ./src/c/num_co.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/num_co.d 2012-12-07 15:25:29.618382962 -0700
+@@ -453,7 +453,7 @@ ecl_ceiling2(cl_object x, cl_object y)
+ }
+ #endif
+ default:
+- (void)0; /*Never reached */
++ __builtin_unreachable(); /*Never reached */
+ }
+ break;
+ case t_bignum:
+@@ -499,7 +499,7 @@ ecl_ceiling2(cl_object x, cl_object y)
+ }
+ #endif
+ default:
+- (void)0; /*Never reached */
++ __builtin_unreachable(); /*Never reached */
+ }
+ break;
+ case t_ratio:
+--- ./src/c/ffi/libraries.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/ffi/libraries.d 2012-12-07 15:26:00.442290888 -0700
+@@ -286,7 +286,6 @@ cl_object
+ ecl_library_open(cl_object filename, bool force_reload) {
+ cl_object block;
+ bool self_destruct = 0;
+- char *filename_string;
+
+ /* Coerces to a file name but does not merge with cwd */
+ filename = coerce_to_physical_pathname(filename);
+--- ./src/c/num_log.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/num_log.d 2012-12-07 15:28:35.705820639 -0700
+@@ -476,7 +476,7 @@ cl_object
+ si_bit_array_op(cl_object o, cl_object x, cl_object y, cl_object r)
+ {
+ cl_fixnum i, j, n, d;
+- cl_object r0;
++ cl_object r0 = ECL_NIL;
+ bit_operator op;
+ bool replace = FALSE;
+ int xi, yi, ri;
+--- ./src/c/numbers/expt.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/numbers/expt.d 2012-12-07 15:28:59.089752925 -0700
+@@ -81,7 +81,7 @@ expt_zero(cl_object x, cl_object y)
+ return ecl_make_complex(z, ecl_make_fixnum(0));
+ default:
+ /* We will never reach this */
+- (void)0;
++ __builtin_unreachable();
+ }
+ }
+
+--- ./src/c/alloc_2.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/alloc_2.d 2012-12-07 15:29:51.633592866 -0700
+@@ -767,8 +767,6 @@ to_bitmap(void *x, void *y)
+ void
+ init_alloc(void)
+ {
+- union cl_lispunion o;
+- struct ecl_cons c;
+ int i;
+ if (alloc_initialized) return;
+ alloc_initialized = TRUE;
+--- ./src/c/interpreter.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/interpreter.d 2012-12-07 15:30:31.985843385 -0700
+@@ -273,7 +273,7 @@ ecl_interpret(cl_object frame, cl_object
+ volatile cl_index frame_index = 0;
+ cl_opcode *vector = (cl_opcode*)bytecodes->bytecodes.code;
+ cl_object *data = bytecodes->bytecodes.data->vector.self.t;
+- cl_object reg0, reg1, lex_env = env;
++ cl_object reg0 = ECL_NIL, reg1 = ECL_NIL, lex_env = env;
+ cl_index narg;
+ struct ecl_stack_frame frame_aux;
+ volatile struct ecl_ihs_frame ihs;
+--- ./src/c/file.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/file.d 2012-12-07 15:32:16.257565630 -0700
+@@ -1101,7 +1101,7 @@ static int
+ utf_8_encoder(cl_object stream, unsigned char *buffer, ecl_character c)
+ {
+ int nbytes;
+- if (c < 0) {
++ if (c < 0 || c > 0x1FFFFFL) {
+ nbytes = 0;
+ } else if (c <= 0x7F) {
+ buffer[0] = c;
+@@ -1116,7 +1116,7 @@ utf_8_encoder(cl_object stream, unsigned
+ buffer[1] = (c & 0x3f) | 0x80; c >>= 6;
+ buffer[0] = c | 0xE0;
+ nbytes = 3;
+- } else if (c <= 0x1FFFFFL) {
++ } else {
+ buffer[3] = (c & 0x3f) | 0x80; c >>= 6;
+ buffer[2] = (c & 0x3f) | 0x80; c >>= 6;
+ buffer[1] = (c & 0x3f) | 0x80; c >>= 6;
+@@ -5110,7 +5110,7 @@ ecl_open_stream(cl_object fn, enum ecl_s
+ FEerror("Illegal stream mode ~S", 1, ecl_make_fixnum(smm));
+ }
+ if (flags & ECL_STREAM_C_STREAM) {
+- FILE *fp;
++ FILE *fp = NULL;
+ safe_close(f);
+ /* We do not use fdopen() because Windows seems to
+ * have problems with the resulting streams. Furthermore, even for
+--- ./src/c/serialize.d.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/c/serialize.d 2012-12-07 15:32:31.937850413 -0700
+@@ -120,7 +120,7 @@ fix_to_ptr(cl_object ptr)
+ static cl_object
+ enqueue(pool_t pool, cl_object what)
+ {
+- cl_object record, index;
++ cl_object index;
+ if (ECL_FIXNUMP(what) || ECL_CHARACTERP(what) || what == OBJNULL) {
+ return what;
+ }
+--- ./src/h/ecl-inl.h.orig 2012-12-07 14:01:02.000000000 -0700
++++ ./src/h/ecl-inl.h 2012-12-07 15:34:05.409879595 -0700
+@@ -73,11 +73,11 @@
+ cl_fixnum padding[(sizeof(struct ecl_base_string)+3)/4*4]; \
+ } name[]
+
+-#define ecl_def_string_array_elt(chars) { \
++#define ecl_def_string_array_elt(chars) { { \
+ (int8_t)t_base_string, 0, ecl_aet_bc, 0, \
+ ECL_NIL, (cl_index)(sizeof(chars))-1, \
+ (cl_index)(sizeof(chars))-1, \
+- (ecl_base_char*)(chars) }
++ (ecl_base_char*)(chars) } }
+
+ #define ecl_def_ct_base_string(name,chars,len,static,const) \
+ static const struct ecl_base_string name ## _data = { \
diff --git a/ecl.spec b/ecl.spec
index 7cbb50f..980bcee 100644
--- a/ecl.spec
+++ b/ecl.spec
@@ -1,17 +1,17 @@
Name: ecl
-Version: 12.7.1
+Version: 12.12.1
Release: 1%{?dist}
Summary: Embeddable Common-Lisp
Group: Development/Languages
License: LGPLv2+ and BSD and MIT and Public Domain
URL: http://ecls.sourceforge.net/
-Source0: http://downloads.sourceforge.net/ecls/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/ecls/%{name}-%{version}.tgz
# The manual has not yet been released. Use the following commands to generate
# the manual tarball:
# git clone git://ecls.git.sourceforge.net/gitroot/ecls/ecl-doc
# cd ecl-doc
-# git checkout 5d2657b5b32a2b5df701ba1ffa768e3e05816b70
+# git checkout 3af1c1eaec1a3cb590c0ce140f881f48be19995e
# rm -fr .git
# cd ..
# tar cJf ecl-doc.tar.xz ecl-doc
@@ -20,23 +20,17 @@ Source2: %{name}.desktop
# A modified version of src/util/ecl.svg with extra whitespace removed. The
# extra whitespace made the icon appear very small and shoved into a corner.
Source3: %{name}.svg
-# This patch is Fedora-specific; it will not be sent upstream. It avoids
-# building libatomic_ops from source.
-Patch0: %{name}-12.7.1-atomic_ops.patch
# This patch was sent upstream on 4 Feb 2012. It fixes a few warnings
# from the C compiler that indicate situations that might be dangerous at
# runtime.
-Patch1: %{name}-12.7.1-warnings.patch
+Patch0: %{name}-12.12.1-warnings.patch
# Do not use a separate thread to handle signals by default if built with
-# bohem-gc support.
+# boehm-gc support.
# This prevents a deadlock when building maxima with ecl support in
# fedora, and should handle by default these problems:
# http://trac.sagemath.org/sage_trac/ticket/11752
# http://www.mail-archive.com/ecls-list@lists.sourceforge.net/msg00644.html
-Patch2: %{name}-12.7.1-signal_handling_thread.patch
-# Sent upstream 8 Aug 2012. Fix a signal handler interface that does not
-# conform to the required interface.
-Patch3: %{name}-12.7.1-sighandler.patch
+Patch1: %{name}-12.12.1-signal_handling_thread.patch
BuildRequires: libX11-devel
BuildRequires: pkgconfig
@@ -74,8 +68,6 @@ Gray streams.
%setup -q -T -D -a 1
%patch0
%patch1
-%patch2
-%patch3
# Remove spurious executable bits
chmod a-x src/CHANGELOG
@@ -155,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null ||:
%changelog
+* Fri Dec 7 2012 Jerry James <loganjerry at gmail.com> - 12.12.1-1
+- New upstream release
+- Drop upstreamed patches
+
* Wed Aug 8 2012 Jerry James <loganjerry at gmail.com> - 12.7.1-1
- New upstream release
- Add sighandler patch to fix thread-enabled build
diff --git a/sources b/sources
index b2caef8..716a84c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ce8dd2136fbbc74e44a1c41b32db1f3c ecl-12.7.1.tar.gz
-1eb2e041f59852dc3adb4db457564e6c ecl-doc.tar.xz
+014856bdfe265672f9d4b86a060a7aba ecl-12.12.1.tgz
+f8215ff3dbf7a9896c0e703fda26cb3b ecl-doc.tar.xz
More information about the scm-commits
mailing list