strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fontconfig android: Drop obsolete patch for API level < 21

Browse source 
Now that the minimum SDK version/API level has been bumped
to 21 in

    Change-Id: I875e784dd4e62993f51059ae6a280d425cb49c0a
    Author: Michael Weghorn <m.weghorn@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.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2023-12-05 10:01:47 +01:00
parent c2fc2c8c7c
commit 5ff64bfcf9
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
external/fontconfig/UnpackedTarball_fontconfig.mk vendored
View file

@ -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_set_patchlevel,fontconfig,0))
$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ $(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/fontconfig-2.12.1.patch.1 \
external/fontconfig/ubsan.patch \ external/fontconfig/ubsan.patch \
external/fontconfig/libfontconfig-bundled-soname.patch.0 \ external/fontconfig/libfontconfig-bundled-soname.patch.0 \

13
external/fontconfig/android_x86.patch vendored
View file

@ -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)