summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2020-08-07 12:13:10 +0100
committerTim-Philipp Müller <tim@centricular.com>2020-08-07 12:13:10 +0100
commit89d4c22140842dd1640a3a9a401ce0d842e9a923 (patch)
tree96c745f872685f604d31d53f8a3ba2c071ce92aa /subprojects
parent7cb362d5861df09b990ea81bbbb66099cab3a2a5 (diff)
downloadcairo-89d4c22140842dd1640a3a9a401ce0d842e9a923.tar.gz
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).
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/.gitignore3
-rw-r--r--subprojects/fontconfig.wrap6
-rw-r--r--subprojects/gperf.wrap5
3 files changed, 10 insertions, 4 deletions
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@github.com:centricular/fontconfig.git
-revision=meson
+url=https://gitlab.freedesktop.org/fontconfig/fontconfig.git
+push-url=git@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