summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/subversion/subversion-1.5.5
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-11-18 14:52:03 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 22:02:26 +0000
commitbc02b535edb2125a35230e74ffb4f26d91a766ca (patch)
tree59c76a5a0a0d7265984ac89c2109d803e741db83 /meta/recipes-devtools/subversion/subversion-1.5.5
parentf20cb303aca07d83f510c00c74da3aeb9ef91c85 (diff)
downloadopenembedded-core-bc02b535edb2125a35230e74ffb4f26d91a766ca.tar.gz
openembedded-core-bc02b535edb2125a35230e74ffb4f26d91a766ca.tar.bz2
openembedded-core-bc02b535edb2125a35230e74ffb4f26d91a766ca.tar.xz
openembedded-core-bc02b535edb2125a35230e74ffb4f26d91a766ca.zip
subversion: upgrade from 1.5.5 to 1.6.13
And update recipe checksums rebased neon-detection.patch: upstream code has some of the changes similar to the changes in the patch. Removing the duplicate changes from the patch file. subversion: update LIC_CHKSUM_FILES field Noticed this change in the COPYING file: $ diff -u COPYING /tmp/COPYING --- COPYING 2006-05-28 07:41:18.000000000 -0700 +++ /tmp/COPYING 2010-12-03 11:16:15.000000000 -0800 @@ -10,7 +10,7 @@ on), you may use a newer version instead, at your option. ================================================================ -Copyright (c) 2000-2006 CollabNet. All rights reserved. +Copyright (c) 2000-2009 CollabNet. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.5.5')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch22
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch15
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch36
3 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch
deleted file mode 100644
index a1c60654c..000000000
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/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/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch
deleted file mode 100644
index 08343b09e..000000000
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: subversion-1.5.5/configure.ac
-===================================================================
---- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
-+++ subversion-1.5.5/configure.ac 2009-01-07 18:00:47.000000000 +0000
-@@ -153,8 +153,8 @@
- 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="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
- dnl libtoolize requires that the following line not be indented
- ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
- fi
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
deleted file mode 100644
index b567d5c05..000000000
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/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