[cairo-commit] 2 commits - subprojects/fontconfig.wrap

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jul 1 12:01:16 UTC 2021

 subprojects/fontconfig.wrap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0eff09a1e3a7b035d01c739320bc87ae1077b57e
Merge: 716d144cb 13660ff92
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Thu Jul 1 12:01:14 2021 +0000

    Merge branch 'fix-fontconfig-subproject' into 'master'
    Fix fontconfig subproject
    See merge request cairo/cairo!193

commit 13660ff9252a0e43e15eac0c6e06c3b4d2807469
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Jul 1 06:55:59 2021 -0400

    Fix fontconfig subproject
    fontconfig has changed its default git branch from
    master to main, and deleted the master branch. This
    breaks GTK ci on MacOs, where we use build cairo and
    use its fontconfig subproject.

diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap
index 632933d70..b6b77f4fe 100644
--- a/subprojects/fontconfig.wrap
+++ b/subprojects/fontconfig.wrap
@@ -2,4 +2,4 @@
 push-url=git at gitlab.freedesktop.org:fontconfig/fontconfig.git

More information about the cairo-commit mailing list