Skip to content

Commit

Permalink
(#22727) fontconfig: update expat
Browse files Browse the repository at this point in the history
* fontconfig: update expat

* Revert expat on fontconfig<2.13.93

* Only revert expat on Mac

* alphabetize

* Simplify test package for <2.13.93

* Bump expat again

* Re-add return value

Co-authored-by: Uilian Ries <uilianries@gmail.com>

---------

Co-authored-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
Ahajha and uilianries authored Feb 15, 2024
1 parent 3136377 commit e49bd28
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 22 deletions.
2 changes: 1 addition & 1 deletion recipes/fontconfig/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def layout(self):

def requirements(self):
self.requires("freetype/2.13.2")
self.requires("expat/2.5.0")
self.requires("expat/2.6.0")
if self.settings.os == "Linux":
self.requires("util-linux-libuuid/2.39.2")

Expand Down
22 changes: 2 additions & 20 deletions recipes/fontconfig/all/test_package/test_package.c
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
#include <stdlib.h>

int main() {
FcConfig* config = FcInitLoadConfigAndFonts();
FcPattern* pat = FcNameParse((const FcChar8*)"Arial");
FcConfigSubstitute(config, pat, FcMatchPattern);
FcDefaultSubstitute(pat);
char* fontFile;
FcResult result;
FcPattern* font = FcFontMatch(config, pat, &result);
if (font) {
FcChar8* file = NULL;
if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
fontFile = (char*)file;
printf("%s\n",fontFile);
}
} else {
printf("Ops! I can't find any font!\n");
}
FcPatternDestroy(pat);
return EXIT_SUCCESS;
FcInit();
return 0;
}
2 changes: 1 addition & 1 deletion recipes/fontconfig/meson/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def layout(self):

def requirements(self):
self.requires("freetype/2.13.2")
self.requires("expat/2.5.0")
self.requires("expat/2.6.0")
if self.settings.os == "Linux":
self.requires("util-linux-libuuid/2.39.2")

Expand Down

0 comments on commit e49bd28

Please sign in to comment.