@@ -1,4 +1,4 @@
-From 54b2cf44445820ea7c3250a25ed957a389aafbd6 Mon Sep 17 00:00:00 2001
+From d8f18b85e017f7fcfffaeb46cfbf6cc07ce1376c Mon Sep 17 00:00:00 2001
From: Haixiao Yan <haixiao.yan.cn@windriver.com>
Date: Thu, 28 May 2026 09:20:59 +0800
Subject: [PATCH] build: do not run svnversion during install
@@ -23,10 +23,10 @@ Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 7f0a37dd9a9b..914c1c37790c 100644
+index bea3a35..92ca3a0 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -499,10 +499,7 @@ local-install: @INSTALL_RULES@
+@@ -500,10 +500,7 @@ local-install: @INSTALL_RULES@
revision-install:
test -d $(DESTDIR)$(includedir)/subversion-1 || \
$(MKDIR) $(DESTDIR)$(includedir)/subversion-1
@@ -38,6 +38,3 @@ index 7f0a37dd9a9b..914c1c37790c 100644
install-static: @INSTALL_STATIC_RULES@
-2.53.0
-
@@ -1,4 +1,8 @@
-Ensure that directories are created before files are compiled into them.
+From a0aad59e068b6ed852db38cf26c5d862ce0ec2ab Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Thu, 5 Mar 2026 11:51:30 +0000
+Subject: [PATCH] Ensure that directories are created before files are compiled
+ into them.
This is a hacky workaround, upstream have been informed and a better
solution proposed:
@@ -7,12 +11,15 @@ https://lists.apache.org/thread/nr0w8hcpr9my2gkys09kj89rlxgd84of
Upstream-Status: Inappropriate [discussion upstream]
Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ Makefile.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git i/Makefile.in w/Makefile.in
-index 0fb9e39602..8bae2cc3d2 100644
---- i/Makefile.in
-+++ w/Makefile.in
-@@ -424,7 +424,9 @@ ECHO_N = @ECHO_N@
+diff --git a/Makefile.in b/Makefile.in
+index 983f3d1..bea3a35 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -419,7 +419,9 @@ ECHO_N = @ECHO_N@
TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
@@ -1,3 +1,8 @@
+From d8f21366d2b9bd72faf078099d4ba8146396ac59 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 7 Dec 2016 13:54:18 +0000
+Subject: [PATCH] subversion: Fix issues in LDFLAGS sed manipulation
+
The existing sed expression can match expressions like
--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
incorrect paths into LDFLAGS.
@@ -14,10 +19,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
-index 0a549b3..3a069ac 100644
+index 4637430..126eb74 100644
--- a/build/ac-macros/serf.m4
+++ b/build/ac-macros/serf.m4
-@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
+@@ -185,7 +185,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
dnl don't use --libs-only-L because then we might miss some options
@@ -26,6 +31,3 @@ index 0a549b3..3a069ac 100644
break
else
AC_MSG_RESULT([no])
-2.7.4
-
similarity index 95%
rename from meta/recipes-devtools/subversion/subversion_1.14.5.bb
rename to meta/recipes-devtools/subversion/subversion_1.15.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://subversion.apache.org"
DESCRIPTION = "Subversion is an open source version control system."
SECTION = "console/network"
LICENSE = "Apache-2.0 AND MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d9c5b0e279cdb238d735af75554a3902"
DEPENDS = "apr-util serf sqlite3 file lz4 expat"
DEPENDS:append:class-native = " file-replacement-native"
@@ -14,7 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-fix-svn-revision-host-contamination.patch \
"
-SRC_URI[sha256sum] = "e78a29e7766b8b7b354497d08f71a55641abc53675ce1875584781aae35644a1"
+SRC_URI[sha256sum] = "dfb7b1e5270c7def971ccbd5938b0c03b1b5bd60b6674a2d8a74a9560839fb8c"
inherit autotools pkgconfig gettext python3native
Version 1.15.0 (21 Sep 2026, from /branches/1.15.x) https://svn.apache.org/repos/asf/subversion/tags/1.15.0 See the 1.15 release notes for a more verbose overview of the changes since the 1.14 release: https://subversion.apache.org/docs/release-notes/1.15.html License-Update: Update content due to Remove experimental move-tracking development. [1] [1] https://github.com/apache/subversion/commit/d3c038eb5da2c56040193df8de128bb896d7b642 Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- Changes since v1: - Remove License FIXME text from AUH ...-fix-svn-revision-host-contamination.patch | 9 +++------ .../subversion/subversion/parallel.patch | 19 +++++++++++++------ .../subversion/subversion/serfmacro.patch | 12 +++++++----- ...version_1.14.5.bb => subversion_1.15.0.bb} | 4 ++-- 4 files changed, 25 insertions(+), 19 deletions(-) rename meta/recipes-devtools/subversion/{subversion_1.14.5.bb => subversion_1.15.0.bb} (95%)