external/fontconfig/UnpackedTarball_fontconfig.mk | 1 -
external/fontconfig/android_x86.patch | 13 -------------
2 files changed, 14 deletions(-)
New commits:
commit 5ff64bfcf9bb8c27670c4cb44a778105008407ed
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Dec 5 10:01:47 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Dec 8 10:40:11 2023 +0100
fontconfig android: Drop obsolete patch for API level < 21
Now that the minimum SDK version/API level has been bumped
to 21 in
Change-Id: I875e784dd4e62993f51059ae6a280d425cb49c0a
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Dec 5 09:57:22 2023 +0100
android: Bump minSdkVersion to 21 (Android 5.0)
, this patch is no longer needed.
Change-Id: I391657caac76ed5b66f564a5888a35b5afb16ed0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160335
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk
b/external/fontconfig/UnpackedTarball_fontconfig.mk
index 25e5a33f1d75..ceb87ea062ad 100644
--- a/external/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -14,7 +14,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,f
$(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,0))
$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
- $(if $(filter ANDROID,$(OS)), external/fontconfig/android_x86.patch) \
external/fontconfig/fontconfig-2.12.1.patch.1 \
external/fontconfig/ubsan.patch \
external/fontconfig/libfontconfig-bundled-soname.patch.0 \
diff --git a/external/fontconfig/android_x86.patch
b/external/fontconfig/android_x86.patch
deleted file mode 100644
index c8c0fc14ee64..000000000000
--- a/external/fontconfig/android_x86.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Avoids "error: undefined symbol: posix_fadvise" if ANDROID_API_LEVEL is less
than 21.
-
---- src/fccache.c
-+++ src/fccache.c
-@@ -962,7 +962,7 @@
- {
- #if defined(HAVE_MMAP) || defined(__CYGWIN__)
- cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
--#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
-+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) &&
(!defined(__ANDROID_API__) || (__ANDROID_API__ >= 21))
- posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
- #endif
- if (cache == MAP_FAILED)
