Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 19 years ago
parent
commit
70e5c345b9
3 changed files with 2 additions and 87 deletions
  1. +0
    -55
      package/base/subversion/APR_PATH_MAX.patch
  2. +0
    -30
      package/base/subversion/pthread-link.patch
  3. +2
    -2
      package/base/subversion/subversion.desc

+ 0
- 55
package/base/subversion/APR_PATH_MAX.patch

@ -1,55 +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/base/subversion/APR_PATH_MAX.patch
# ROCK Linux is Copyright (C) 1998 - 2006 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 ---
diff -dur subversion-1.2.3/Makefile.in src.subversion.1129998287.20026.922330946/subversion-1.2.3/Makefile.in
--- subversion-1.2.3/Makefile.in 2005-05-09 07:56:09.000000000 +0200
+++ src.subversion.1129998287.20026.922330946/subversion-1.2.3/Makefile.in 2005-10-25 14:09:02.000000000 +0200
@@ -110,7 +110,8 @@
SWIG = @SWIG@
SWIG_VERSION = @SWIG_VERSION@
SWIG_LIBSWIG_DIR = @SWIG_LIBSWIG_DIR@
-SWIG_INCLUDES = -I$(SWIG_SRC_DIR) \
+SWIG_INCLUDES = -I/usr/include \
+ -I$(SWIG_SRC_DIR) \
-I$(abs_srcdir)/subversion/include \
-I$(SWIG_LIBSWIG_DIR) \
-DSVN_SWIG_VERSION=$(SWIG_VERSION) \
diff -dur subversion-1.2.3/subversion/bindings/swig/apr.i src.subversion.1129998287.20026.922330946/subversion-1.2.3/subversion/bindings/swig/apr.i
--- subversion-1.2.3/subversion/bindings/swig/apr.i 2005-03-29 20:21:35.000000000 +0200
+++ src.subversion.1129998287.20026.922330946/subversion-1.2.3/subversion/bindings/swig/apr.i 2005-10-25 13:43:37.000000000 +0200
@@ -44,6 +44,7 @@
/* ----------------------------------------------------------------------- */
+%include linux/limits.h
%include apr.h
/* ### be nice to have all the error values and macros. there are some
diff -dur subversion-1.2.3/subversion/bindings/swig/perl/native/Makefile.PL.in src.subversion.1129998287.20026.922330946/subversion-1.2.3/subversion/bindings/swig/perl/native/Makefile.PL.in
--- subversion-1.2.3/subversion/bindings/swig/perl/native/Makefile.PL.in 2005-03-22 10:31:58.000000000 +0100
+++ src.subversion.1129998287.20026.922330946/subversion-1.2.3/subversion/bindings/swig/perl/native/Makefile.PL.in 2005-10-25 14:15:24.000000000 +0200
@@ -29,7 +29,7 @@
my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
-my $apr_cflags = '@SVN_APR_INCLUDES@';
+my $apr_cflags = '@SVN_APR_INCLUDES@ -I/usr/include';
my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
# According to the log of r7937, the flags guarded by the conditional break

+ 0
- 30
package/base/subversion/pthread-link.patch

@ -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/base/subversion/pthread-link.patch
# ROCK Linux is Copyright (C) 1998 - 2006 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.26.0/Makefile.in.orig 2003-08-14 16:38:38.000000000 +0200
+++ subversion-0.26.0/Makefile.in 2003-08-14 16:39:15.000000000 +0200
@@ -46,7 +46,7 @@
EXTERNAL_PROJECT_DIRS = @SVN_SUBDIRS@
NEON_LIBS = @NEON_LIBS@
-SVN_APR_LIBS = @SVN_APR_LIBS@
+SVN_APR_LIBS = @SVN_APR_LIBS@ -lpthread
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_DB_LIBS = @SVN_DB_LIBS@

+ 2
- 2
package/base/subversion/subversion.desc

@ -42,10 +42,10 @@
[L] OpenSource
[S] Stable
[V] 1.2.3
[V] 1.3.0
[P] X -?---5---9 193.400
[D] 1932165774 subversion-1.2.3.tar.bz2 http://subversion.tigris.org/tarballs/
[D] 3009228507 subversion-1.3.0.tar.bz2 http://subversion.tigris.org/tarballs/
[CV-URL] http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260

Loading…
Cancel
Save