From bc02b535edb2125a35230e74ffb4f26d91a766ca Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 18 Nov 2010 14:52:03 -0800 Subject: 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 --- .../disable-revision-install.patch | 22 ------------- .../subversion/subversion-1.5.5/libtool2.patch | 15 --------- .../subversion-1.5.5/neon-detection.patch | 36 ---------------------- .../subversion/disable-revision-install.patch | 22 +++++++++++++ .../subversion/subversion/libtool2.patch | 15 +++++++++ .../subversion/subversion/neon-detection.patch | 13 ++++++++ .../subversion/subversion_1.5.5.bb | 32 ------------------- .../subversion/subversion_1.6.13.bb | 35 +++++++++++++++++++++ 8 files changed, 85 insertions(+), 105 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch create mode 100644 meta/recipes-devtools/subversion/subversion/disable-revision-install.patch create mode 100644 meta/recipes-devtools/subversion/subversion/libtool2.patch create mode 100644 meta/recipes-devtools/subversion/subversion/neon-detection.patch delete mode 100644 meta/recipes-devtools/subversion/subversion_1.5.5.bb create mode 100644 meta/recipes-devtools/subversion/subversion_1.6.13.bb (limited to 'meta/recipes-devtools') 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 a1c60654cb..0000000000 --- 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 08343b09ec..0000000000 --- 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 b567d5c050..0000000000 --- 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/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch new file mode 100644 index 0000000000..a1c60654cb --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch @@ -0,0 +1,22 @@ +--- 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/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch new file mode 100644 index 0000000000..08343b09ec --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch @@ -0,0 +1,15 @@ +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/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch new file mode 100644 index 0000000000..eaf6de0375 --- /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.5.5.bb deleted file mode 100644 index 447727484e..0000000000 --- a/meta/recipes-devtools/subversion/subversion_1.5.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r7" - -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" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -acpaths = "-I build/ -I build/ac-macros/" - -do_configure_prepend () { - rm -f ${S}/libtool - rm -f ${S}/build/libtool.m4 - sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 -} diff --git a/meta/recipes-devtools/subversion/subversion_1.6.13.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb new file mode 100644 index 0000000000..bcdb6c22ea --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion_1.6.13.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS = "neon" +LICENSE = "Apache BSD" +HOMEPAGE = "http://subversion.tigris.org" + +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" + +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 \ + --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS}" + +inherit autotools + +export LDFLAGS += " -L${STAGING_LIBDIR} " + +acpaths = "-I build/ -I build/ac-macros/" + +do_configure_prepend () { + rm -f ${S}/libtool + rm -f ${S}/build/libtool.m4 + sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 +} -- cgit v1.2.3