Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
458
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
da097de0
Commit
da097de0
authored
7 years ago
by
Jean-Baptiste Kempf
Browse files
Options
Downloads
Patches
Plain Diff
Contribs: update fontconfig to 2.12.1
parent
3b76735d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/src/fontconfig/SHA512SUMS
+1
-1
1 addition, 1 deletion
contrib/src/fontconfig/SHA512SUMS
contrib/src/fontconfig/fontconfig-noxml2.patch
+13
-5
13 additions, 5 deletions
contrib/src/fontconfig/fontconfig-noxml2.patch
contrib/src/fontconfig/rules.mak
+1
-1
1 addition, 1 deletion
contrib/src/fontconfig/rules.mak
with
15 additions
and
7 deletions
contrib/src/fontconfig/SHA512SUMS
+
1
−
1
View file @
da097de0
a3eecb35a59c2f83e7fec1238ff288978643a1b2a2a7bff7b07bb62b2ccd48aa7a6b5b164472f019efd390e9eea5391313c070dcbd680a2e1227ea8ec125e28b
fontconfig-2.1
1
.1.tar.gz
0959a80522e09551e49ec7b2383b7dfb319d4e1c058ad0b55bb35d3f675acbb7ff08c9c30a8798b731070687f84dd3d2ff7e28aafac6ecfa9d3f85c5847c0955
fontconfig-2.1
2
.1.tar.gz
This diff is collapsed.
Click to expand it.
contrib/src/fontconfig/fontconfig-noxml2.patch
+
13
−
5
View file @
da097de0
...
...
@@ -102,13 +102,12 @@ diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c
#include "fcaliastail.h"
#undef __fcxml__
+#endif
diff -ruN fontconfig/src/fcinit.c fontconfig.new/src/fcinit.c
--- fontconfig/src/fcinit.c 2014-07-06 00:38:32.773443543 +0200
+++ fontconfig.new/src/fcinit.c 2014-07-04 22:37:41.036255327 +0200
@@ -44,11 +44,16 @@
config = FcConfigCreate ();
--- fontconfig-2.12.1/src/fcinit.c.orig 2017-04-08 11:38:02.488354178 +0200
+++ fontconfig-2.12.1/src/fcinit.c 2017-04-08 11:38:52.072351969 +0200
@@ -45,11 +45,16 @@
if (!config)
goto bail0;
FcConfigSetSysRoot (config, sysroot);
- if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
+ char path[MAX_PATH + 8];
+ GetWindowsDirectory( path, MAX_PATH + 1 );
...
...
@@ -123,3 +122,12 @@ diff -ruN fontconfig/src/fcinit.c fontconfig.new/src/fcinit.c
if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
goto bail1;
return config;
@@ -193,7 +202,7 @@
FcCacheFini ();
FcDefaultFini ();
FcObjectFini ();
- FcConfigPathFini ();
+// FcConfigPathFini ();
}
/*
This diff is collapsed.
Click to expand it.
contrib/src/fontconfig/rules.mak
+
1
−
1
View file @
da097de0
# fontconfig
FONTCONFIG_VERSION
:=
2.1
1
.1
FONTCONFIG_VERSION
:=
2.1
2
.1
FONTCONFIG_URL
:=
https://www.freedesktop.org/software/fontconfig/release/fontconfig-
$(
FONTCONFIG_VERSION
)
.tar.gz
PKGS
+=
fontconfig
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment