configure.ac | 2
download.lst | 4
external/nss/UnpackedTarball_nss.mk | 1
external/nss/Wincompatible-function-pointer-types.patch.0 | 234 ++++++++++++++
external/openldap/ExternalProject_openldap.mk | 13
external/openldap/UnpackedTarball_openldap.mk | 2
external/openldap/Wint-conversion.patch | 11
external/openldap/configure-c99.patch | 11
external/openldap/openldap-2.4.44.patch.1 | 12
external/redland/UnpackedTarball_raptor.mk | 1
external/redland/raptor/Wint-conversion.patch | 22 +
include/vbahelper/vbahelperinterface.hxx | 2
include/vcl/vclstatuslistener.hxx | 2
sal/osl/unx/thread.cxx | 2
sal/rtl/hash.cxx | 2
sc/source/filter/xml/sheetdata.cxx | 2
store/source/storbase.hxx | 1
17 files changed, 315 insertions(+), 9 deletions(-)
New commits:
commit 84b2b1cc51aa2d5d8188a4b0a7abf64cffe91d3b
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Aug 6 22:59:52 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:50:14 2024 +0200
Missing include
with --disable-pch
Change-Id: I017a15cb58e8e4b5dcf4dab60d13ae1f79e7c3f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100222
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit e66279af801057bee783a465c153d7c11ce04d8e)
diff --git a/sc/source/filter/xml/sheetdata.cxx
b/sc/source/filter/xml/sheetdata.cxx
index c8796d9f691a..d7992d8870ab 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -22,6 +22,8 @@
#include <xmloff/families.hxx>
#include <xmloff/nmspmap.hxx>
+#include <algorithm>
+
#include <sheetdata.hxx>
ScSheetSaveData::ScSheetSaveData() :
commit 11f556a65fcff1442209e049f6b9380dd1ed9b10
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Apr 22 07:42:14 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:39:34 2024 +0200
external/openldap: Don't use pthread_get/setconcurrency without declarations
At least with glibc on Linux, those two functions are only declared in
<pthread.h> when _XOPEN_SOURCE is defined. And with
<https://github.com/llvm/llvm-project/commit/7d644e1215b376ec5e915df9ea2eeb56e2d94626>
"[C11/C2x] Change the behavior of the implicit function declaration
warning" in
Clang 15 trunk that now causes hard errors
> thr_posix.c:93:9: error: call to undeclared function
'pthread_setconcurrency'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
> return pthread_setconcurrency( n );
> ^
> thr_posix.c:107:9: error: call to undeclared function
'pthread_getconcurrency'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
> return pthread_getconcurrency();
> ^
(vs. just silently ignored warnings) when building ExternalProject_openldap.
(And the way the corresponding AC_CHECK_FUNCS in
workdir/UnpackedTarball/openldap/configure.in works, it always set
HAVE_PTHREAD_GET/SETCONCURRENCY because it effectively checks for
availability
of the symbols in a library, not for declarations of the C functions in an
include file.)
But if we explicitly define _XOPEN_SOURCE, we now also need to explicitly
define
_DEFAULT_SOURCE or _BSD_SOURCE (which is otherwise implicitly defined by
default
in glibc's features.h if no other such macros are defined).
Change-Id: I148d50c82ee2efc2a54f2cf4f84dead3941a3568
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133312
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 02311766135700f8dd8528cc7cacda636c8f304d)
diff --git a/external/openldap/ExternalProject_openldap.mk
b/external/openldap/ExternalProject_openldap.mk
index 0c7aaa6ae17d..ed6fc7807a40 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -15,6 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,openldap,\
build \
))
+openldap_CFLAGS =
+ifeq ($(OS),LINUX) # i.e., assuming glibc
+# glibc needs at least _XOPEN_SOURCE=500 to declare pthread_getconcurrency and
+# pthread_setconcurrency in <pthread.h> (and once that is defined, it also
needs either
+# _DEFUALT_SOURCE (glibc >= 2.19) or the deprecated _BSD_SOURCE (glibc <=
2.18) to be defined
+# explicitly, so that e.g. u_char is declared in <sys/types.h>):
+openldap_CFLAGS = -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE
+endif
+
openldap_LDFLAGS =
ifeq ($(SYSTEM_NSS),)
openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
@@ -41,10 +50,10 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
ac_cv_func_memcmp_working=yes \
) \
$(if $(SYSTEM_NSS), \
- CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)"
CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))"
LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \
+ CPPFLAGS="$(CPPFLAGS) $(openldap_CFLAGS)
$(NSS_CFLAGS)" CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))"
LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \
, \
CPPFLAGS="$(CPPFLAGS) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
- CFLAGS="$(CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+ CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call
gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
) \
$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS)
$(openldap_LDFLAGS)") \
&& MAKEFLAGS= && $(MAKE) \
commit 504526dbee35760858723759facd3d649352c696
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Nov 10 13:36:43 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:25:25 2024 +0200
Add forward declaration to openldap to fix compilation with current Xcode
For some reason the warning about this undeclared function is treated
as an error by the Clang version in current Xcode, at least for me,
even if openldap isn't compiled with -Werror.
Change-Id: Ic8479ca63031319ce55c6fb9d95132019ae82cae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124959
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 34b586dc84b810eece7ae08b4028caba78db319f)
diff --git a/external/openldap/openldap-2.4.44.patch.1
b/external/openldap/openldap-2.4.44.patch.1
index 0d3cf5b70c3f..317ef9a62e56 100644
--- a/external/openldap/openldap-2.4.44.patch.1
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -1,3 +1,4 @@
+-*- Mode: diff -*-
--- openldap.org/configure
+++ openldap/configure
@@ -15735,7 +15735,7 @@
@@ -52,6 +53,17 @@
#undef NSS_VERSION_INT
#define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
+--- openldap.org/libraries/libldap/tls2.c
++++ openldap.org/libraries/libldap/tls2.c
+@@ -80,6 +80,8 @@
+ { BER_BVNULL, BER_BVNULL }
+ };
+
++int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
++
+ #ifdef HAVE_TLS
+
+ void
--- openldap.org/Makefile.in
+++ openldap/Makefile.in
@@ -13,7 +13,7 @@
commit fd8a8beb3327a8b37116635005fcee9aff782f01
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jun 17 17:29:09 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:19:05 2024 +0200
Adapt to C++20 CWG2237
...<http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2237> "Can
a
template-id name a constructor?", as implemented by GCC 11 trunk since
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;
h=4b38d56dbac6742b038551a36ec80200313123a1> "c++: C++20 DR 2237, disallow
simple-template-id in cdtor."
Change-Id: I2113a3968549103e1b35fb17d7f12770ba0086d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96547
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 1dbb338842a9725cfbad73007f69244a13a0bea7)
diff --git a/include/vbahelper/vbahelperinterface.hxx
b/include/vbahelper/vbahelperinterface.hxx
index 20f3d7ab77ce..dc8ca5238db8 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -111,7 +111,7 @@ class SAL_DLLPUBLIC_TEMPLATE
InheritedHelperInterfaceWeakImpl : public Inherited
{
typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > >
Base;
public:
- InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+ InheritedHelperInterfaceWeakImpl( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
};
diff --git a/include/vcl/vclstatuslistener.hxx
b/include/vcl/vclstatuslistener.hxx
index 2652befcd4cc..fb6d876ef6a2 100644
--- a/include/vcl/vclstatuslistener.hxx
+++ b/include/vcl/vclstatuslistener.hxx
@@ -24,7 +24,7 @@
template <class T> class VclStatusListener final : public cppu::WeakImplHelper
< css::frame::XStatusListener>
{
public:
- VclStatusListener<T>(T* widget, const OUString& aCommand);
+ VclStatusListener(T* widget, const OUString& aCommand);
private:
VclPtr<T> mWidget; /** The widget on which actions are performed */
commit 554d1067b207adcd4eba899889590c6f32b96d9e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 3 17:18:38 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:13:48 2024 +0200
external/openldap: Fix -Wint-conversion
...with recent Clang 16 trunk since
<https://github.com/llvm/llvm-project/commit/7068aa98412ade19a34b7ed126f4669f581b2311>
"Strengthen -Wint-conversion to default to an error", causing
> checking for pthread_detach with <pthread.h>... no
> configure: error: could not locate pthread_detach()
because of
> configure:19227: checking for pthread_detach with <pthread.h>
> configure:19249: ~/llvm/inst/bin/clang -o conftest -D_XOPEN_SOURCE=500
-D_DEFAULT_SOURCE -D_BSD_SOURCE -O0 -fstrict-aliasing -fstrict-overflow -ggdb2
-gsplit-dwarf -Xclang -debug-info-kind=constructor -ggnu-pubnames
-Iworkdir/UnpackedTarball/nss/dist/public/nss
-Iworkdir/UnpackedTarball/nss/dist/out/include
-Iworkdir/UnpackedTarball/nss/dist/public/nss
-Iworkdir/UnpackedTarball/nss/dist/out/include -fuse-ld=lld
--ld-path=~/llvm/inst/bin/ld.lld -Wl,--gdb-index
-Lworkdir/UnpackedTarball/nss/dist/out/lib -pthread conftest.c >&5
> conftest.c:109:16: error: incompatible pointer to integer conversion
passing 'void *' to parameter of type 'pthread_t' (aka 'unsigned long')
[-Wint-conversion]
> pthread_detach(NULL);
> ^~~~
> ~/llvm/inst/lib/clang/16.0.0/include/stddef.h:89:16: note: expanded from
macro 'NULL'
> # define NULL ((void*)0)
> ^~~~~~~~~~
> /usr/include/pthread.h:269:38: note: passing argument to parameter '__th'
here
> extern int pthread_detach (pthread_t __th) __THROW;
> ^
> 1 error generated.
> configure:19249: $? = 1
Change-Id: I3f2b8836e7aba6536e2877b492b43de588804f86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137758
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 49a5c32d6e29c6551531763bde126bdcc36ec93e)
diff --git a/external/openldap/UnpackedTarball_openldap.mk
b/external/openldap/UnpackedTarball_openldap.mk
index 999a1eddad0b..98c88a28ccc5 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -21,6 +21,7 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,openldap,\
$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
external/openldap/configure-c99.patch \
+ external/openldap/Wint-conversion.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openldap/Wint-conversion.patch
b/external/openldap/Wint-conversion.patch
new file mode 100644
index 000000000000..60e14c991cc0
--- /dev/null
+++ b/external/openldap/Wint-conversion.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -19241,7 +19241,7 @@
+ int
+ main ()
+ {
+-pthread_detach(NULL);
++pthread_t t; pthread_detach(t);
+ ;
+ return 0;
+ }
commit 90ef30f79285bf6041275d8c42dfc6248225b832
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat May 7 21:29:20 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:13:48 2024 +0200
external/openldap: Implicit int in configure check
...causing
> checking for compatible POSIX regex... no
> configure: error: broken POSIX regex!
> make[1]: *** [external/openldap/ExternalProject_openldap.mk:40:
workdir/ExternalProject/openldap/build] Error 1
due to
> conftest.c:88:1: error: type specifier missing, defaults to 'int'; ISO
C99 and later do not support implicit int [-Wimplicit-int]
with Clang 15 trunk after
<https://github.com/llvm/llvm-project/commit/2cb2cd242ca08d0bbd2a51a41f1317442e5414fc>
"Change the behavior of implicit int diagnostics"
Change-Id: I8fb70ce21a73293e20bbc5b09c133141aa9b0ca1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133995
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit ed977f0b6c849739d3c843c8425442265e2eb7ca)
diff --git a/external/openldap/UnpackedTarball_openldap.mk
b/external/openldap/UnpackedTarball_openldap.mk
index 61a083ddcd8a..999a1eddad0b 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -20,6 +20,7 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,openldap,\
$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
+ external/openldap/configure-c99.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openldap/configure-c99.patch
b/external/openldap/configure-c99.patch
new file mode 100644
index 000000000000..f1c3da6c4c23
--- /dev/null
+++ b/external/openldap/configure-c99.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -14691,7 +14691,7 @@
+ #include <sys/types.h>
+ #include <regex.h>
+ static char *pattern, *string;
+-main()
++int main()
+ {
+ int rc;
+ regex_t re;
commit 3abaff87d77611809a9415954b9cf065a09f8621
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 15 08:19:55 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:02:32 2024 +0200
external/nss: Fix -Wincompatible-function-pointer-types
...with recent Clang 16 trunk since
<https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62>
"Default implicit function pointer conversions diagnostic to be an error",
causing
> ../../../pr/tests/testfile.c:126:41: error: incompatible function pointer
types passing 'void (*)(void *)' to parameter of type 'void *(*)(void *)'
[-Wincompatible-function-pointer-types]
> if (!pthread_create(&tid, NULL, start, arg)) {
> ^~~~~
> /usr/include/pthread.h:204:15: note: passing argument to parameter
'__start_routine' here
> void *(*__start_routine) (void *),
> ^
and
> ../../../pr/tests/testfile.c:576:31: error: incompatible function pointer
types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type
'void (*)(void *)' [-Wincompatible-function-pointer-types]
> DirTest, &thrarg,
> ^~~~~~~
> ../../../pr/tests/testfile.c:93:36: note: passing argument to parameter
'start' here
> void (*start)(void *arg),
> ^
Change-Id: I642e5ca69289993c86abafded65ac23a63fd837e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138267
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 5b5f6b147f5f2a02476a14ed2d8feb247d5a7c79)
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index af289a2226fd..6f9e482c8f3c 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-bz1646594.patch.1 \
external/nss/macos-dlopen.patch.0 \
external/nss/nss-restore-manual-pre-dependencies.patch.1 \
+ external/nss/Wincompatible-function-pointer-types.patch.0 \
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
diff --git a/external/nss/Wincompatible-function-pointer-types.patch.0
b/external/nss/Wincompatible-function-pointer-types.patch.0
new file mode 100644
index 000000000000..1e9b7550e1da
--- /dev/null
+++ b/external/nss/Wincompatible-function-pointer-types.patch.0
@@ -0,0 +1,234 @@
+--- nspr/pr/tests/testfile.c
++++ nspr/pr/tests/testfile.c
+@@ -86,7 +86,7 @@
+ #endif
+ #define TMPDIR_LEN 64
+ char testdir[TMPDIR_LEN];
+-static PRInt32 PR_CALLBACK DirTest(void *argunused);
++static void PR_CALLBACK DirTest(void *argunused);
+ PRInt32 dirtest_failed = 0;
+
+ PRThread* create_new_thread(PRThreadType type,
+@@ -123,7 +123,7 @@
+ if (native_thread) {
+ #if defined(_PR_PTHREADS)
+ pthread_t tid;
+- if (!pthread_create(&tid, NULL, start, arg)) {
++ if (!pthread_create(&tid, NULL, (void *(*)(void *))start, arg)) {
+ return((PRThread *) tid);
+ }
+ else {
+@@ -594,7 +594,7 @@
+ return 0;
+ }
+
+-static PRInt32 PR_CALLBACK DirTest(void *arg)
++static void PR_CALLBACK DirTest(void *arg)
+ {
+ struct dirtest_arg *tinfo = (struct dirtest_arg *) arg;
+ PRFileDesc *fd_file;
+@@ -618,14 +618,14 @@
+ printf(
+ "testfile failed to create dir %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ fd_dir = PR_OpenDir(TEST_DIR);
+ if (fd_dir == NULL) {
+ printf(
+ "testfile failed to open dirctory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ strcpy(pathname, TEST_DIR);
+@@ -645,7 +645,7 @@
+ printf(
+ "testfile failed to create/open file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ PR_Close(fd_file);
+ }
+@@ -664,7 +664,7 @@
+ printf(
+ "testfile failed to create/open hidden file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ PR_Close(fd_file);
+@@ -681,7 +681,7 @@
+ if (hfile == INVALID_HANDLE_VALUE) {
+ printf("testfile failed to create/open hidden file %s [0, %d]
",
+ pathname, GetLastError());
+- return -1;
++ return;
+ }
+ CloseHandle(hfile);
+
+@@ -696,7 +696,7 @@
+ if (hfile == INVALID_HANDLE_VALUE) {
+ printf("testfile failed to create/open hidden file %s [0, %d]
",
+ pathname, GetLastError());
+- return -1;
++ return;
+ }
+ CloseHandle(hfile);
+
+@@ -707,7 +707,7 @@
+ if (fd_file == NULL) {
+ printf("testfile failed to create/open hidden file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ PR_Close(fd_file);
+ #endif /* XP_UNIX */
+@@ -720,14 +720,14 @@
+ printf(
+ "testfile failed to close dirctory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ fd_dir = PR_OpenDir(TEST_DIR);
+ if (fd_dir == NULL) {
+ printf(
+ "testfile failed to reopen dirctory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ /*
+@@ -750,14 +750,14 @@
+ printf(
+ "testfile failed to GetFileInfo file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ if (info.type != PR_FILE_FILE) {
+ printf(
+ "testfile incorrect fileinfo for file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ }
+ if (num_files != 0)
+@@ -765,7 +765,7 @@
+ printf(
+ "testfile failed to find all files in directory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ PR_CloseDir(fd_dir);
+@@ -781,7 +781,7 @@
+ printf(
+ "testfile failed to reopen dirctory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ DPRINTF(("Listing non-hidden files in directory %s
",TEST_DIR));
+@@ -789,7 +789,7 @@
+ DPRINTF((" %s
",dirEntry->name));
+ if (!strcmp(HIDDEN_FILE_NAME, dirEntry->name)) {
+ printf("testfile found hidden file %s
", pathname);
+- return -1;
++ return;
+ }
+
+ }
+@@ -803,7 +803,7 @@
+ printf(
+ "testfile failed to delete hidden file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ PR_CloseDir(fd_dir);
+@@ -815,41 +815,41 @@
+ printf(
+ "testfile failed to rename directory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ if (PR_FAILURE == PR_MkDir(TEST_DIR, 0777)) {
+ printf(
+ "testfile failed to recreate dir %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ if (PR_SUCCESS == PR_Rename(renamename, TEST_DIR)) {
+ printf(
+ "testfile renamed directory to existing name %s
",
+ renamename);
+- return -1;
++ return;
+ }
+
+ if (PR_FAILURE == PR_RmDir(TEST_DIR)) {
+ printf(
+ "testfile failed to rmdir %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ if (PR_FAILURE == PR_Rename(renamename, TEST_DIR)) {
+ printf(
+ "testfile failed to rename directory %s [%d, %d]
",
+ renamename, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ fd_dir = PR_OpenDir(TEST_DIR);
+ if (fd_dir == NULL) {
+ printf(
+ "testfile failed to reopen directory %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+
+ strcpy(pathname, TEST_DIR);
+@@ -865,7 +865,7 @@
+ printf(
+ "testfile failed to delete file %s [%d, %d]
",
+ pathname, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ }
+
+@@ -875,14 +875,13 @@
+ printf(
+ "testfile failed to rmdir %s [%d, %d]
",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+- return -1;
++ return;
+ }
+ PR_EnterMonitor(tinfo->mon);
+ tinfo->done = 1;
+ PR_Notify(tinfo->mon);
+ PR_ExitMonitor(tinfo->mon);
+
+- return 0;
+ }
+ /************************************************************************/
+
commit cc81ab5dfb9a5a8346b95421f650ca92d37dee53
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 3 17:08:35 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 14:02:32 2024 +0200
external/redland: Fix -Wint-conversion
...with recent Clang 16 trunk since
<https://github.com/llvm/llvm-project/commit/7068aa98412ade19a34b7ed126f4669f581b2311>
"Strengthen -Wint-conversion to default to an error", causing
> raptor_parse.c:260:66: error: incompatible pointer to integer conversion
returning 'void *' from a function with result type 'int' [-Wint-conversion]
> RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
> ^~~~
and
> raptor_serialize.c:243:66: error: incompatible pointer to integer
conversion returning 'void *' from a function with result type 'int'
[-Wint-conversion]
> RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
> ^~~~
Change-Id: I2c1083b78777589b992c180d8759e2313bf2fe42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137756
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 87eff817eb723e249783f16bf69a8b4cef53e3cb)
diff --git a/external/redland/UnpackedTarball_raptor.mk
b/external/redland/UnpackedTarball_raptor.mk
index 92bc586a3e60..cd3d076dd11f 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1
\
external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1
\
external/redland/raptor/libtool.patch \
+ external/redland/raptor/Wint-conversion.patch \
external/redland/raptor/raptor-libxml2-11.patch.1 \
))
diff --git a/external/redland/raptor/Wint-conversion.patch
b/external/redland/raptor/Wint-conversion.patch
new file mode 100644
index 000000000000..fb85f4f13518
--- /dev/null
+++ b/external/redland/raptor/Wint-conversion.patch
@@ -0,0 +1,22 @@
+--- src/raptor_parse.c
++++ src/raptor_parse.c
+@@ -257,7 +257,7 @@
+ int
+ raptor_world_get_parsers_count(raptor_world* world)
+ {
+- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0);
+
+ raptor_world_open(world);
+
+--- src/raptor_serialize.c
++++ src/raptor_serialize.c
+@@ -240,7 +240,7 @@
+ int
+ raptor_world_get_serializers_count(raptor_world* world)
+ {
+- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0);
+
+ raptor_world_open(world);
+
commit a5812553aaf9bf6a907b00368789d41f60cedfbf
Author: Martin Jambor <mjam...@suse.cz>
AuthorDate: Wed Jun 7 18:11:45 2023 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 13:49:56 2024 +0200
Add cstdlib include necessary to build with gcc14 libstdc++ (tdf#155715)
Without explicitely including <cstdlib>, compiling some files
including store/source/storbase.hxx (such as store/source/storpage.cxx
which includes it through store/source/storpage.hxx) will result in
errors:
error: ‘malloc’ is not a member of ‘std’
and
error: ‘free’ is not a member of ‘std’
This patch simply adds the necessary include.
Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit db98a3f1b1a703ea8e1284b8815eea2274abb2db)
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 0c21acbb3ad3..0c9f9c77d974 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -33,6 +33,7 @@
#include <store/types.h>
+#include <cstdlib>
#include <memory>
#include <utility>
commit 2417a89302548408d522fa5bbd265aa818565bf1
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Sun Dec 24 13:12:52 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 13:49:56 2024 +0200
-Werror=calloc-transposed-args
Change-Id: I7b8b020bdbcd5b4db4cb478cc5fe1225f19ae0cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161268
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit 4663c56edf788a37545f253e028db99e480feb34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172463
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit dc59440aa41835f03268c41fd95c87c887697681)
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 5ea77495daa6..e6e324d02251 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -619,7 +619,7 @@ static oslThreadIdentifier insertThreadId (pthread_t
hThread)
if (pEntry == nullptr)
{
- pEntry = static_cast<HashEntry*>(calloc(sizeof(HashEntry), 1));
+ pEntry = static_cast<HashEntry*>(calloc(1, sizeof(HashEntry)));
pEntry->Handle = hThread;
diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx
index 4cbe1da785c6..8414f3ed54f8 100644
--- a/sal/rtl/hash.cxx
+++ b/sal/rtl/hash.cxx
@@ -76,7 +76,7 @@ static StringHashTable * rtl_str_hash_new(sal_uInt32 nSize)
pHash->nEntries = 0;
pHash->nSize = getNextSize (nSize);
- pHash->pData = static_cast< rtl_uString ** >(calloc(sizeof(rtl_uString *),
pHash->nSize));
+ pHash->pData = static_cast< rtl_uString ** >(calloc(pHash->nSize,
sizeof(rtl_uString *)));
return pHash;
}
commit a554a015f1583ddeea446347a8c98fda278978f8
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sat Sep 7 00:42:57 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Sep 9 13:49:56 2024 +0200
Python: upgrade to 3.8.20
Downloaded from
https://www.python.org/ftp/python/3.8.20/Python-3.8.20.tar.xz
Change-Id: I142d52236bcd4011359889ce6e64898ca08999c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172983
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit f61641cbd6a06f6669b7390599925a3133e17ce1)
diff --git a/configure.ac b/configure.ac
index 2fb40861f96b..1fb775f8b7d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8796,7 +8796,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.20
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index 62b7772ee5f7..ccb57a4cf7c7 100644
--- a/download.lst
+++ b/download.lst
@@ -480,8 +480,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM :=
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
-PYTHON_TARBALL := Python-3.8.19.tar.xz
+PYTHON_SHA256SUM :=
6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4
+PYTHON_TARBALL := Python-3.8.20.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
