Ports: Update fontconfig's patches to use git patches

This commit is contained in:
Ali Mohammad Pur 2022-05-16 19:21:36 +04:30 committed by Ali Mohammad Pur
parent 4fa66c91d5
commit d383bae7d3
Notes: sideshowbarker 2024-07-17 10:51:03 +09:00
4 changed files with 54 additions and 14 deletions

View file

@ -1,6 +1,17 @@
--- fontconfig-2.13.94/src/fccompat.c 2021-10-24 21:16:27.503925061 -0700
+++ fontconfig-2.13.94/src/fccompat.c 2021-10-24 21:16:21.115917517 -0700
@@ -184,54 +184,6 @@
From d84d340b3b9b87902011065a1ea4e97c7f3eb095 Mon Sep 17 00:00:00 2001
From: Brendan Coles <bcoles@gmail.com>
Date: Tue, 26 Oct 2021 11:34:34 +0000
Subject: [PATCH 1/2] Stub out FcRandom()
---
src/fccompat.c | 51 --------------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/src/fccompat.c b/src/fccompat.c
index 65ac84c..96e4087 100644
--- a/src/fccompat.c
+++ b/src/fccompat.c
@@ -184,54 +184,6 @@ FcRandom(void)
{
int32_t result;
@ -55,7 +66,7 @@
static FcBool initialized = FcFalse;
if (initialized != FcTrue)
@@ -240,9 +192,6 @@
@@ -240,9 +192,6 @@ FcRandom(void)
initialized = FcTrue;
}
result = rand ();
@ -65,3 +76,6 @@
return result;
}
--
2.36.1

View file

@ -0,0 +1,24 @@
From f131d47415cb23f90c62c51d1483ea4555bd1a19 Mon Sep 17 00:00:00 2001
From: Sahan Fernando <sahan.h.fernando@gmail.com>
Date: Sat, 22 Jan 2022 00:54:01 +1100
Subject: [PATCH 2/2] Manually link against lxml2 and ldl
---
fontconfig.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
index 61b35fb..a3c45eb 100644
--- a/fontconfig.pc.in
+++ b/fontconfig.pc.in
@@ -13,6 +13,6 @@ Description: Font configuration and customization library
Version: @VERSION@
Requires: @PKGCONFIG_REQUIRES@
Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
-Libs: -L${libdir} -lfontconfig
+Libs: -L${libdir} -lfontconfig -lxml2 -ldl
Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
--
2.36.1

View file

@ -0,0 +1,12 @@
# Patches for fontconfig on SerenityOS
## `0001-Stub-out-FcRandom.patch`
Stub out FcRandom()
## `0002-Manually-link-against-lxml2-and-ldl.patch`
Manually link against lxml2 and ldl

View file

@ -1,10 +0,0 @@
--- fontconfig-2.13.94/fontconfig.pc.in 2022-01-22 00:48:25.582046535 +1100
+++ fontconfig-2.13.94/fontconfig.pc.in 2022-01-22 00:48:10.821896885 +1100
@@ -13,6 +13,6 @@
Version: @VERSION@
Requires: @PKGCONFIG_REQUIRES@
Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
-Libs: -L${libdir} -lfontconfig
+Libs: -L${libdir} -lfontconfig -lxml2 -ldl
Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@