From 5bb47984af79fe2e8c3ba5bc6895741131f03bcd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Jun 2018 12:00:37 +0000 Subject: [PATCH] subversion: 1.9.7 -> 1.10.0 License changed since licenses for the bundled linenoise and lz4 codebases were added. We don't build either of them. Add MIT since utf8proc is MIT licensed. Configure to use the internal utf8proc codebase since we have no copy of that in OE-Core, nor any need to add one. Add a dependency on lz4 which is now required rather than using the internal codebase within subversion. Drop a patch merged upstream. Signed-off-by: Richard Purdie --- .../{subversion_1.9.7.bb => subversion_1.10.0.bb} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-devtools/subversion/{subversion_1.9.7.bb => subversion_1.10.0.bb} (91%) diff --git a/meta/recipes-devtools/subversion/subversion_1.9.7.bb b/meta/recipes-devtools/subversion/subversion_1.10.0.bb similarity index 91% rename from meta/recipes-devtools/subversion/subversion_1.9.7.bb rename to meta/recipes-devtools/subversion/subversion_1.10.0.bb index da9de9d5b9..82454ae63c 100644 --- a/meta/recipes-devtools/subversion/subversion_1.9.7.bb +++ b/meta/recipes-devtools/subversion/subversion_1.10.0.bb @@ -1,21 +1,20 @@ SUMMARY = "Subversion (svn) version control system client" HOMEPAGE = "http://subversion.tigris.org" SECTION = "console/network" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709" +LICENSE = "Apache-2 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83206f39819e7a4dfca2ff7c190f6ce0" -DEPENDS = "apr-util serf sqlite3 file" +DEPENDS = "apr-util serf sqlite3 file lz4" DEPENDS_append_class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ - file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \ file://0001-Fix-libtool-name-in-configure.ac.patch \ file://serfmacro.patch \ " -SRC_URI[md5sum] = "05b0c677681073920f938c1f322e0be2" -SRC_URI[sha256sum] = "c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623" +SRC_URI[md5sum] = "0126847f9e8cb8ed0b90a6a18b203309" +SRC_URI[sha256sum] = "2cf23f3abb837dea0585a6b0ebd70e80e01f95bddef7c1aa097c18e3eaa6b584" inherit autotools pkgconfig gettext @@ -31,6 +30,7 @@ EXTRA_OECONF = " \ --without-berkeley-db \ --without-swig \ --disable-keychain \ + --with-utf8proc=internal \ ac_cv_path_RUBY=none \ " -- 2.40.1