From: Yanone <post@yanone.de>
Date: Thu, 6 Oct 2022 11:37:12 +0000 (+0200)
Subject: Cairo: Version 3.120 added (#5328)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaef373d99dfcb06ec1a9500ad6f42d3d3f2eaf4;p=thirdparty%2Fgoogle%2Ffonts.git

Cairo: Version 3.120 added (#5328)

* [gftools-packager] Cairo: Version 3.120 added

* Cairo Version 3.120 taken from the upstream repo https://github.com/Gue3bara/Cairo at commit https://github.com/Gue3bara/Cairo/commit/f596f41991bc01d5865cdfb9fd751b8de04b6753.

* Cairo: inverting categories

Second category listed is the primary one

Co-authored-by: Rosalie Wagner <mail@rosaliewagner.com>
---

diff --git a/ofl/cairo/Cairo[slnt,wght].ttf b/ofl/cairo/Cairo[slnt,wght].ttf
new file mode 100644
index 0000000000..49faea5447
Binary files /dev/null and b/ofl/cairo/Cairo[slnt,wght].ttf differ
diff --git a/ofl/cairo/Cairo[wght].ttf b/ofl/cairo/Cairo[wght].ttf
deleted file mode 100644
index bc12af1074..0000000000
Binary files a/ofl/cairo/Cairo[wght].ttf and /dev/null differ
diff --git a/ofl/cairo/METADATA.pb b/ofl/cairo/METADATA.pb
index 02df17c8dd..fd996bfd4c 100644
--- a/ofl/cairo/METADATA.pb
+++ b/ofl/cairo/METADATA.pb
@@ -1,13 +1,14 @@
 name: "Cairo"
 designer: "Mohamed Gaber, Accademia di Belle Arti di Urbino"
 license: "OFL"
+category: "DISPLAY"
 category: "SANS_SERIF"
 date_added: "2019-03-21"
 fonts {
   name: "Cairo"
   style: "normal"
   weight: 400
-  filename: "Cairo[wght].ttf"
+  filename: "Cairo[slnt,wght].ttf"
   post_script_name: "Cairo-Regular"
   full_name: "Cairo Regular"
   copyright: "Copyright 2009 The Cairo Project Authors (https://github.com/Gue3bara/Cairo)"
@@ -16,8 +17,17 @@ subsets: "arabic"
 subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
+axes {
+  tag: "slnt"
+  min_value: -11.0
+  max_value: 11.0
+}
 axes {
   tag: "wght"
   min_value: 200.0
   max_value: 1000.0
 }
+source {
+  repository_url: "https://github.com/Gue3bara/Cairo"
+  commit: "f596f41991bc01d5865cdfb9fd751b8de04b6753"
+}
diff --git a/ofl/cairo/OFL.txt b/ofl/cairo/OFL.txt
index 1113c2ee28..f6e87d489b 100644
--- a/ofl/cairo/OFL.txt
+++ b/ofl/cairo/OFL.txt
@@ -2,7 +2,7 @@ Copyright 2009 The Cairo Project Authors (https://github.com/Gue3bara/Cairo)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-https://scripts.sil.org/OFL
+http://scripts.sil.org/OFL
 
 
 -----------------------------------------------------------
diff --git a/ofl/cairo/upstream.yaml b/ofl/cairo/upstream.yaml
new file mode 100644
index 0000000000..3fbdb7fab8
--- /dev/null
+++ b/ofl/cairo/upstream.yaml
@@ -0,0 +1,5 @@
+branch: master
+files:
+  OFL.txt: OFL.txt
+  fonts/Cairo/variable/Cairo[slnt,wght].ttf: Cairo[slnt,wght].ttf
+archive: