From b8726b131e3986a45c5f80288dbdde644a4dfd90 Mon Sep 17 00:00:00 2001 From: laokz Date: Wed, 5 Nov 2025 07:19:41 +0800 Subject: [PATCH] Drop clang-specific patches Build will succeed without these patches when building with clang-built toolchains, such as perl, ruby, python. --- subversion-1.14.3-fix-build-errors.patch | 34 ------------------------ subversion.spec | 9 +++---- support-clang-build.patch | 25 ----------------- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 subversion-1.14.3-fix-build-errors.patch delete mode 100644 support-clang-build.patch diff --git a/subversion-1.14.3-fix-build-errors.patch b/subversion-1.14.3-fix-build-errors.patch deleted file mode 100644 index 76d1468..0000000 --- a/subversion-1.14.3-fix-build-errors.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 628738a55d5ce1d585011d919ab0b5f5ea25d095 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 16 Nov 2023 19:35:54 +0800 -Subject: [PATCH] support clang build - ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7d65f01..e94472d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -156,7 +156,7 @@ SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@ - SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ - SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@ - SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby --SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -+SWIG_RB_COMPILE = @CC@ - SWIG_RB_LINK = @SWIG_RB_LINK@ - SWIG_RB_LIBS = @SWIG_RB_LIBS@ - SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@ -@@ -306,7 +306,7 @@ LINK_SHARED_ONLY_CXX_LIB = $(LINK_CXX_LIB) $(shared_only_LDFLAGS) -shared - - # Compilation of SWIG-generated C source code - COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ --COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ -+COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@ - - # these commands link the wrapper objects into an extension library/module - LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module --- -2.19.1 - diff --git a/subversion.spec b/subversion.spec index f49a256..bd19e0b 100644 --- a/subversion.spec +++ b/subversion.spec @@ -10,7 +10,7 @@ Summary: Subversion, a version control system. Name: subversion Version: 1.14.3 -Release: 7 +Release: 8 License: ASL 2.0 URL: https://subversion.apache.org/ @@ -21,10 +21,6 @@ Patch1: subversion-1.14.0-testwarn.patch Patch2: subversion-1.14.0-soversion.patch Patch3: subversion-1.8.0-rubybind.patch Patch4: subversion-1.8.5-swigplWall.patch -Patch5: subversion-1.14.3-fix-build-errors.patch -%if "%{?toolchain}" == "clang" -Patch6: support-clang-build.patch -%endif Patch7: backport-CVE-2024-45720.patch Patch8: backport-CVE-2024-46901.patch @@ -320,6 +316,9 @@ make check-javahl %endif %changelog +* Mon Nov 3 2025 laokz - 1.14.3-8 +- drop useless clang patches + * Mon Sep 8 2025 fuanan - 1.14.3-7 - fix changelog display exception diff --git a/support-clang-build.patch b/support-clang-build.patch deleted file mode 100644 index 9107008..0000000 --- a/support-clang-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3ccb72b8139788450e779576ad19741180adda39 Mon Sep 17 00:00:00 2001 -From: luofeng -Date: Wed, 3 Apr 2024 10:20:33 +0800 -Subject: [PATCH] support clang build - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index e6996a6..56c2361 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -223,7 +223,7 @@ COMPILE_SHARED_ONLY_CXX_LIB = $(LT_COMPILE_CXX) -o $@ -c -shared - # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c) - COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) -DSWIGPYTHON $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c - COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c --COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c -+COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(LT_CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c - - # special compilation for files destined for javahl (i.e. C++) - COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c --- -2.19.1 - -- Gitee