From a920e966d80f767eae06052029f9b1111eed265d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Fri, 14 Aug 2009 00:11:02 +0300 Subject: [PATCH] librep: Updated (0.17 -> 0.17.4) --- develop/librep/fix_gmp_test.patch | 34 ----------------------- develop/librep/librep.conf | 5 ++++ develop/librep/librep.desc | 8 ++---- develop/librep/readline-path-needed.patch | 27 ------------------ 4 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 develop/librep/fix_gmp_test.patch delete mode 100644 develop/librep/readline-path-needed.patch diff --git a/develop/librep/fix_gmp_test.patch b/develop/librep/fix_gmp_test.patch deleted file mode 100644 index 056266708..000000000 --- a/develop/librep/fix_gmp_test.patch +++ /dev/null @@ -1,34 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../librep/fix_gmp_test.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./configure.orig 2003-11-25 00:46:51.000000000 -0300 -+++ ./configure 2005-02-09 11:15:20.871677738 -0300 -@@ -19377,11 +19377,12 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char mpz_init (); -+#include - int - main () - { --mpz_init (); -+mpz_t integ; -+mpz_init(integ) - ; - return 0; - } diff --git a/develop/librep/librep.conf b/develop/librep/librep.conf index 2fdba7c55..6e2861be3 100644 --- a/develop/librep/librep.conf +++ b/develop/librep/librep.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../librep/librep.conf +# Copyright (C) 2009 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -20,3 +21,7 @@ esac # FIXME temporarily necessary for configure: export libsuff=${libdir##*/lib} + +if ! pkginstalled gmp; then + var_append extraconfopt ' ' '--without-gmp' +fi diff --git a/develop/librep/librep.desc b/develop/librep/librep.desc index 064a72591..179686855 100644 --- a/develop/librep/librep.desc +++ b/develop/librep/librep.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../librep/librep.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -32,8 +31,7 @@ [L] GPL [S] Stable -[V] 0.17 +[V] 0.17.4 [P] X -----5---9 139.400 -[D] 2168326936 librep-0.17.tar.gz http://dl.sourceforge.net/sourceforge/librep/ - +[D] 2074958039 librep-0.17.4.tar.bz2 http://dl.sourceforge.net/sourceforge/librep/ diff --git a/develop/librep/readline-path-needed.patch b/develop/librep/readline-path-needed.patch deleted file mode 100644 index 7729459be..000000000 --- a/develop/librep/readline-path-needed.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../librep/readline-path-needed.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- librep-0.17/configure.orig 2006-02-05 21:50:21.000000000 +0100 -+++ librep-0.17/configure 2006-02-05 21:50:39.000000000 +0100 -@@ -20235,7 +20235,7 @@ - echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 - if test $ac_cv_lib_readline_readline = yes; then - -- READLINE_LIBS="-lreadline $tcap" -+ READLINE_LIBS="-L/lib${libsuff} -lreadline $tcap" - cat >>confdefs.h <<\_ACEOF - #define HAVE_LIBREADLINE 1 - _ACEOF