diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-08-03 17:08:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-11-27 23:31:31 +0100 |
| commit | 84ce65ebf1fb7b1fd8945b42ae588a505a50bb89 (patch) | |
| tree | 09460eab657f18f5535d0da11c5271d972b4207a /external | |
| parent | external/coinmp: Adapt to std::bind2nd gone from C++17 (diff) | |
| download | core-84ce65ebf1fb7b1fd8945b42ae588a505a50bb89.tar.gz core-84ce65ebf1fb7b1fd8945b42ae588a505a50bb89.zip | |
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 <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143331
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/redland/UnpackedTarball_raptor.mk | 1 | ||||
| -rw-r--r-- | external/redland/raptor/Wint-conversion.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index fbdc8b6f5510..619116c3380c 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 \ )) # vim: set noet sw=4 ts=4: 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); + |