external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 | 25
++++++++++
external/cppunit/UnpackedTarball_cppunit.mk | 3 +
2 files changed, 28 insertions(+)
New commits:
commit 819630ee52ae9e9249bb8e25ca8d97e9b3ce90de
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 30 20:11:43 2023 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 30 22:12:33 2023 +0100
cid#1546460 COPY_INSTEAD_OF_MOVE
Change-Id: I562eea9548929f11de2a2b68bba09ae3a777ffe3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
new file mode 100644
index 000000000000..3f587e16b0a9
--- /dev/null
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -0,0 +1,25 @@
+From ae5acc79d5f6e9b6f64cc550d858f41884362025 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sat, 30 Dec 2023 20:08:01 +0000
+Subject: [PATCH] cid#1546460 COPY_INSTEAD_OF_MOVE
+
+---
+ src/cppunit/TestFactoryRegistry.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cppunit/TestFactoryRegistry.cpp
b/src/cppunit/TestFactoryRegistry.cpp
+index 3b68d58..7b38a34 100644
+--- a/src/cppunit/TestFactoryRegistry.cpp
++++ b/src/cppunit/TestFactoryRegistry.cpp
+@@ -85,7 +85,7 @@ public:
+
+ TestFactoryRegistry::TestFactoryRegistry( std::string name ) :
+ m_factories(),
+- m_name( name )
++ m_name(std::move(name))
+ {
+ }
+
+--
+2.43.0
+
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk
b/external/cppunit/UnpackedTarball_cppunit.mk
index 99bbea6971d0..7efe5c4f92bf 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -23,6 +23,8 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,cppunit))
# * external/cppunit/clang.patch.0 upstreamed at
# <https://gerrit.libreoffice.org/c/cppunit/+/147384> "Don't mis-apply GCC <
4.6 workaround for
# Clang":
+# * external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 upstreamed
at
+# <https://gerrit.libreoffice.org/c/cppunit/+/161455> "cid#1546460
COPY_INSTEAD_OF_MOVE";
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows.patch \
external/cppunit/unix.patch \
@@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/propagate-exceptions.patch.0 \
external/cppunit/sprintf.patch.0 \
external/cppunit/clang.patch.0 \
+ external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 \
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
