From 1daca591dd32df7e810fe279c75296cac437dfa8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 8 Jan 2009 11:29:31 +0000 Subject: subversion 1.4.5 -> 1.5.5 --- .../files/disable-revision-install.patch | 22 ------------- meta/packages/subversion/files/libtool2.patch | 17 ---------- .../packages/subversion/files/neon-detection.patch | 36 ---------------------- 3 files changed, 75 deletions(-) delete mode 100644 meta/packages/subversion/files/disable-revision-install.patch delete mode 100644 meta/packages/subversion/files/libtool2.patch delete mode 100644 meta/packages/subversion/files/neon-detection.patch (limited to 'meta/packages/subversion/files') diff --git a/meta/packages/subversion/files/disable-revision-install.patch b/meta/packages/subversion/files/disable-revision-install.patch deleted file mode 100644 index a1c60654c..000000000 --- a/meta/packages/subversion/files/disable-revision-install.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 -+++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 -@@ -260,7 +260,7 @@ - clean: external-clean local-clean - distclean: external-distclean local-distclean - extraclean: external-extraclean local-extraclean --install: external-install local-install revision-install -+install: external-install local-install #revision-install - - @INCLUDE_OUTPUTS@ - -@@ -320,8 +320,8 @@ - local-install: @INSTALL_RULES@ - - ### HACK!! Find a better way to do this --revision-install: -- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt -+#revision-install: -+# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt - - install-static: @INSTALL_STATIC_RULES@ - diff --git a/meta/packages/subversion/files/libtool2.patch b/meta/packages/subversion/files/libtool2.patch deleted file mode 100644 index a0163fd7f..000000000 --- a/meta/packages/subversion/files/libtool2.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: subversion-1.4.5/configure.in -=================================================================== ---- subversion-1.4.5.orig/configure.in 2009-01-07 17:10:41.000000000 +0000 -+++ subversion-1.4.5/configure.in 2009-01-07 17:13:32.000000000 +0000 -@@ -138,10 +138,10 @@ - echo "using APR's libtool" - sh_libtool="`$apr_config --apr-libtool`" - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(abs_builddir)/$host_alias-libtool" - dnl libtoolize requires that the following line not be indented - AC_PROG_LIBTOOL - fi diff --git a/meta/packages/subversion/files/neon-detection.patch b/meta/packages/subversion/files/neon-detection.patch deleted file mode 100644 index b567d5c05..000000000 --- a/meta/packages/subversion/files/neon-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 -index 9fcf859..8d964f3 100644 ---- a/build/ac-macros/neon.m4 -+++ b/build/ac-macros/neon.m4 -@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, - if test "$withval" = "yes" ; then - AC_MSG_ERROR([--with-neon requires an argument.]) - else -- neon_config="$withval/bin/neon-config" -+ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" - fi - - SVN_NEON_CONFIG() -@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() - dnl neon-config found, gather relevant information from it - AC_DEFUN(SVN_NEON_CONFIG, - [ -- if test -f "$neon_config"; then -- if test "$neon_config" != ""; then -+ if true; then -+ if true; then - AC_MSG_CHECKING([neon library version]) -- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` -+ NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` - AC_MSG_RESULT([$NEON_VERSION]) - - if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then -@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, - test "$svn_allowed_neon" = "any"; then - svn_allowed_neon_on_system="yes" - SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] -- NEON_LIBS=`$neon_config --la-file` -+ NEON_LIBS=`$neon_config --libs` - CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] - svn_lib_neon="yes" - break -- cgit v1.2.3