external: remove a couple of gcc9 patches
Baseline uses GCC 12 now Change-Id: Id9a0f79aa801aa342fd943cebeb0f528f4964d84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173235 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
parent
d39e7878b3
commit
5c88efbcfa
4 changed files with 0 additions and 55 deletions
1
external/icu/UnpackedTarball_icu.mk
vendored
1
external/icu/UnpackedTarball_icu.mk
vendored
|
@ -31,7 +31,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
|
|||
external/icu/icu4c-scriptrun.patch.1 \
|
||||
external/icu/icu4c-rtti.patch.1 \
|
||||
external/icu/icu4c-clang-cl.patch.1 \
|
||||
external/icu/gcc9.patch \
|
||||
external/icu/c++20-comparison.patch.1 \
|
||||
external/icu/Wdeprecated-copy-dtor.patch \
|
||||
external/icu/icu4c-windows-cygwin-cross.patch.1 \
|
||||
|
|
26
external/icu/gcc9.patch
vendored
26
external/icu/gcc9.patch
vendored
|
@ -1,26 +0,0 @@
|
|||
--- source/i18n/unicode/format.h
|
||||
+++ source/i18n/unicode/format.h
|
||||
@@ -22,6 +22,13 @@
|
||||
|
||||
#ifndef FORMAT_H
|
||||
#define FORMAT_H
|
||||
+
|
||||
+#ifdef __GNUC__
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC
|
||||
+#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang
|
||||
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
|
||||
+#endif
|
||||
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
@@ -314,5 +314,9 @@
|
||||
|
||||
#endif /* U_SHOW_CPLUSPLUS_API */
|
||||
|
||||
+#ifdef __GNUC__
|
||||
+#pragma GCC diagnostic pop
|
||||
+#endif
|
||||
+
|
||||
#endif // _FORMAT
|
||||
//eof
|
|
@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
|
|||
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
|
||||
external/liborcus/rpath.patch.0 \
|
||||
external/liborcus/gcc9.patch.0 \
|
||||
external/liborcus/libtool.patch.0 \
|
||||
))
|
||||
|
||||
|
|
27
external/liborcus/gcc9.patch.0
vendored
27
external/liborcus/gcc9.patch.0
vendored
|
@ -1,27 +0,0 @@
|
|||
--- include/orcus/types.hpp
|
||||
+++ include/orcus/types.hpp
|
||||
@@ -8,6 +8,14 @@
|
||||
#ifndef INCLUDED_ORCUS_TYPES_HPP
|
||||
#define INCLUDED_ORCUS_TYPES_HPP
|
||||
|
||||
+#ifdef __GNUC__
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC
|
||||
+#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang
|
||||
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
|
||||
+#pragma GCC diagnostic ignored "-Wshadow"
|
||||
+#endif
|
||||
+
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
@@ -629,5 +637,9 @@ ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN;
|
||||
|
||||
}
|
||||
|
||||
+#ifdef __GNUC__
|
||||
+#pragma GCC diagnostic pop
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
Loading…
Reference in a new issue