[cairo-commit] subprojects/fontconfig.wrap subprojects/.gitignore subprojects/gperf.wrap

[GitLab Mirror]

 subprojects/.gitignore      |    3 ++-
 subprojects/fontconfig.wrap |    6 +++---
 subprojects/gperf.wrap      |    5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 89d4c22140842dd1640a3a9a401ce0d842e9a923
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Aug 7 12:13:10 2020 +0100

    meson: update fontconfig wrap and add gperf wrap
    
    Update fontconfig wrap to upstream now that it's been merged.
    Add gperf wrap which is needed for fontconfig, same as in the
    upstream fontconfig repo (this can't be put into wrapdb yet
    because it requires changes to source files).

diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index e1affbbba..0cd778d45 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1,10 +1,11 @@
 /expat-2.2.5
 /freetype2
 /glib
+/gperf
 /fontconfig
 /libffi
 /proxy-libintl
-/zlib
+/zlib-*
 /packagecache
 /pixman
 /libpng*
diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap
index 083a49d6a..632933d70 100644
--- a/subprojects/fontconfig.wrap
+++ b/subprojects/fontconfig.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 directory=fontconfig
-url=https://github.com/centricular/fontconfig.git
-push-url=git at github.com:centricular/fontconfig.git
-revision=meson
+url=https://gitlab.freedesktop.org/fontconfig/fontconfig.git
+push-url=git at gitlab.freedesktop.org:fontconfig/fontconfig.git
+revision=master
diff --git a/subprojects/gperf.wrap b/subprojects/gperf.wrap
new file mode 100644
index 000000000..748973312
--- /dev/null
+++ b/subprojects/gperf.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=gperf
+url=https://gitlab.freedesktop.org/tpm/gperf.git
+push-url=https://gitlab.freedesktop.org/tpm/gperf.git
+revision=meson