From 2e699d738036aa27cfb183c1581229044744af99 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 18 Aug 2005 15:13:06 +0000 Subject: [PATCH] Clifford Wolf: Updated subversion-1.2.1 [2005081614130824917] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6326 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/subversion/db40.patch.disabled | 30 --------------------- package/base/subversion/subversion.desc | 4 +-- package/base/subversion/swig_hotfix.patch | 18 +++++++++++++ 3 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 package/base/subversion/db40.patch.disabled create mode 100644 package/base/subversion/swig_hotfix.patch diff --git a/package/base/subversion/db40.patch.disabled b/package/base/subversion/db40.patch.disabled deleted file mode 100644 index 57705d2d4..000000000 --- a/package/base/subversion/db40.patch.disabled +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/subversion/db40.patch.disabled -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- subversion-0.21.0/configure 2003-04-16 03:16:06.000000000 +0200 -+++ subversion-0.21.0-new/configure 2003-05-04 11:31:27.000000000 +0200 -@@ -8844,7 +8844,7 @@ - ;; - esac - -- for db_libname in db4 db; do -+ for db_libname in db40 db4 db; do - # We generate a separate cache variable for each prefix and libname - # we search under. That way, we avoid caching information that - # changes if the user runs `configure' with a different set of diff --git a/package/base/subversion/subversion.desc b/package/base/subversion/subversion.desc index b922d3a27..ad1045a35 100644 --- a/package/base/subversion/subversion.desc +++ b/package/base/subversion/subversion.desc @@ -42,8 +42,8 @@ [L] OpenSource [S] Stable -[V] 1.2.0 +[V] 1.2.1 [P] X -?---5---9 194.100 -[D] 3287144704 subversion-1.2.0.tar.bz2 http://subversion.tigris.org/tarballs/ +[D] 339598553 subversion-1.2.1.tar.bz2 http://subversion.tigris.org/tarballs/ diff --git a/package/base/subversion/swig_hotfix.patch b/package/base/subversion/swig_hotfix.patch new file mode 100644 index 000000000..867572733 --- /dev/null +++ b/package/base/subversion/swig_hotfix.patch @@ -0,0 +1,18 @@ +--- ./subversion/bindings/swig/core.i.orig 2005-08-16 13:40:09.000000000 +0200 ++++ ./subversion/bindings/swig/core.i 2005-08-16 13:40:33.000000000 +0200 +@@ -425,13 +425,13 @@ + + static apr_pool_t *current_pool = 0; + +-SWIGEXPORT(apr_pool_t *) ++SWIGEXPORT apr_pool_t * + svn_swig_pl_get_current_pool (void) + { + return current_pool; + } + +-SWIGEXPORT(void) ++SWIGEXPORT void + svn_swig_pl_set_current_pool (apr_pool_t *pool) + { + current_pool = pool;