diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-18 14:52:03 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:26 +0000 |
commit | bc02b535edb2125a35230e74ffb4f26d91a766ca (patch) | |
tree | 59c76a5a0a0d7265984ac89c2109d803e741db83 /meta/recipes-devtools/subversion | |
parent | f20cb303aca07d83f510c00c74da3aeb9ef91c85 (diff) | |
download | openembedded-core-contrib-bc02b535edb2125a35230e74ffb4f26d91a766ca.tar.gz |
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')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/disable-revision-install.patch (renamed from meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/libtool2.patch (renamed from meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/neon-detection.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.6.13.bb (renamed from meta/recipes-devtools/subversion/subversion_1.5.5.bb) | 7 |
5 files changed, 18 insertions, 38 deletions
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 b567d5c050c..00000000000 --- 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 diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch index a1c60654cb8..a1c60654cb8 100644 --- a/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch +++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch index 08343b09ec3..08343b09ec3 100644 --- a/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch +++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch new file mode 100644 index 00000000000..eaf6de03753 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/neon-detection.patch @@ -0,0 +1,13 @@ +Index: subversion-1.6.13/build/ac-macros/neon.m4 +=================================================================== +--- subversion-1.6.13.orig/build/ac-macros/neon.m4 ++++ subversion-1.6.13/build/ac-macros/neon.m4 +@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON, + AC_MSG_ERROR([--with-neon requires an argument.]) + fi + 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() diff --git a/meta/recipes-devtools/subversion/subversion_1.5.5.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb index 447727484e7..bcdb6c22ea6 100644 --- a/meta/recipes-devtools/subversion/subversion_1.5.5.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.13.bb @@ -5,14 +5,17 @@ RDEPENDS = "neon" LICENSE = "Apache BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r7" +PR = "r0" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1 \ file://libtool2.patch;patch=1" -LIC_FILES_CHKSUM = "file://COPYING;md5=b592c67ecb801ccc95e236f186ec33fd" +SRC_URI[md5sum] = "7ae1c827689f21cf975804005be30aeb" +SRC_URI[sha256sum] = "3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15" + +LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ |