From: Felipe CorrĂȘa da Silva Sanches Date: Wed, 26 Mar 2025 21:23:18 +0000 (-0300) Subject: revert removal of `branch` values on METADATA.pb files X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9266%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git revert removal of `branch` values on METADATA.pb files This needs more careful review, as it seems that gftools-packager may still rely on that field. (followup to PR #9259) --- diff --git a/ofl/arima/METADATA.pb b/ofl/arima/METADATA.pb index 200ffc112b..0c3194b8c3 100644 --- a/ofl/arima/METADATA.pb +++ b/ofl/arima/METADATA.pb @@ -41,4 +41,5 @@ source { source_file: "DESCRIPTION.en_us.html" dest_file: "DESCRIPTION.en_us.html" } + branch: "master" } diff --git a/ofl/artifika/METADATA.pb b/ofl/artifika/METADATA.pb index d3fb322979..b3efbab76c 100644 --- a/ofl/artifika/METADATA.pb +++ b/ofl/artifika/METADATA.pb @@ -30,4 +30,5 @@ source { source_file: "fonts/ttf/Artifika-Regular.ttf" dest_file: "Artifika-Regular.ttf" } + branch: "master" } diff --git a/ofl/aubrey/METADATA.pb b/ofl/aubrey/METADATA.pb index 9771077031..b23eb31399 100644 --- a/ofl/aubrey/METADATA.pb +++ b/ofl/aubrey/METADATA.pb @@ -30,4 +30,5 @@ source { source_file: "fonts/TTF/Aubrey-Regular.ttf" dest_file: "Aubrey-Regular.ttf" } + branch: "master" } diff --git a/ofl/bhutukaexpandedone/METADATA.pb b/ofl/bhutukaexpandedone/METADATA.pb index a8e7198b29..2829d5eea2 100644 --- a/ofl/bhutukaexpandedone/METADATA.pb +++ b/ofl/bhutukaexpandedone/METADATA.pb @@ -32,6 +32,7 @@ source { source_file: "fonts/ttf/BhuTukaExpandedOne-Regular.ttf" dest_file: "BhuTukaExpandedOne-Regular.ttf" } + branch: "master" } stroke: "SLAB_SERIF" classifications: "DISPLAY" diff --git a/ofl/blaka/METADATA.pb b/ofl/blaka/METADATA.pb index 321e6be5b8..84d88705e8 100644 --- a/ofl/blaka/METADATA.pb +++ b/ofl/blaka/METADATA.pb @@ -32,5 +32,6 @@ source { source_file: "DESCRIPTION.en_us.html" dest_file: "DESCRIPTION.en_us.html" } + branch: "master" } primary_script: "Arab" diff --git a/ofl/blakahollow/METADATA.pb b/ofl/blakahollow/METADATA.pb index 3df7c4c287..ad56ffe310 100644 --- a/ofl/blakahollow/METADATA.pb +++ b/ofl/blakahollow/METADATA.pb @@ -32,5 +32,6 @@ source { source_file: "DESCRIPTION.en_us.html" dest_file: "DESCRIPTION.en_us.html" } + branch: "master" } primary_script: "Arab" diff --git a/ofl/blakaink/METADATA.pb b/ofl/blakaink/METADATA.pb index 010b1083b9..d97afc6c84 100644 --- a/ofl/blakaink/METADATA.pb +++ b/ofl/blakaink/METADATA.pb @@ -32,5 +32,6 @@ source { source_file: "DESCRIPTION.en_us.html" dest_file: "DESCRIPTION.en_us.html" } + branch: "master" } primary_script: "Arab" diff --git a/ofl/cactusclassicalserif/METADATA.pb b/ofl/cactusclassicalserif/METADATA.pb index 03615ed014..fae20f9553 100644 --- a/ofl/cactusclassicalserif/METADATA.pb +++ b/ofl/cactusclassicalserif/METADATA.pb @@ -30,6 +30,7 @@ source { source_file: "fonts/ttf/CactusClassicalSerif-Regular.ttf" dest_file: "CactusClassicalSerif-Regular.ttf" } + branch: "main" } primary_script: "Hant" primary_language: "yue_Hant" diff --git a/ofl/cairo/METADATA.pb b/ofl/cairo/METADATA.pb index c3403298a7..941d607659 100644 --- a/ofl/cairo/METADATA.pb +++ b/ofl/cairo/METADATA.pb @@ -39,5 +39,6 @@ source { source_file: "fonts/Cairo/variable/Cairo[slnt,wght].ttf" dest_file: "Cairo[slnt,wght].ttf" } + branch: "master" } primary_script: "Arab" diff --git a/ofl/cairoplay/METADATA.pb b/ofl/cairoplay/METADATA.pb index 64d9b89fd2..63bda4d04f 100644 --- a/ofl/cairoplay/METADATA.pb +++ b/ofl/cairoplay/METADATA.pb @@ -39,5 +39,6 @@ source { source_file: "fonts/CairoPlay/variable/CairoPlay[slnt,wght].ttf" dest_file: "CairoPlay[slnt,wght].ttf" } + branch: "master" } primary_script: "Arab" diff --git a/ofl/chocolateclassicalsans/METADATA.pb b/ofl/chocolateclassicalsans/METADATA.pb index ef01188ca8..95c7ca685d 100644 --- a/ofl/chocolateclassicalsans/METADATA.pb +++ b/ofl/chocolateclassicalsans/METADATA.pb @@ -30,6 +30,7 @@ source { source_file: "fonts/ttf/ChocolateClassicalSans-Regular.ttf" dest_file: "ChocolateClassicalSans-Regular.ttf" } + branch: "main" } primary_script: "Hant" primary_language: "yue_Hant" diff --git a/ofl/diplomata/METADATA.pb b/ofl/diplomata/METADATA.pb index 5e600b2393..ab983c36a3 100644 --- a/ofl/diplomata/METADATA.pb +++ b/ofl/diplomata/METADATA.pb @@ -27,6 +27,7 @@ source { source_file: "fonts/diplomata/ttf/Diplomata-Regular.ttf" dest_file: "Diplomata-Regular.ttf" } + branch: "master" } stroke: "SERIF" classifications: "DISPLAY" diff --git a/ofl/diplomatasc/METADATA.pb b/ofl/diplomatasc/METADATA.pb index 9535e9f560..2faadef4cd 100644 --- a/ofl/diplomatasc/METADATA.pb +++ b/ofl/diplomatasc/METADATA.pb @@ -27,6 +27,7 @@ source { source_file: "fonts/diplomatasc/ttf/DiplomataSC-Regular.ttf" dest_file: "DiplomataSC-Regular.ttf" } + branch: "master" } stroke: "SERIF" classifications: "DISPLAY" diff --git a/ofl/hedvigletterssans/METADATA.pb b/ofl/hedvigletterssans/METADATA.pb index fb99284461..7f7179a753 100644 --- a/ofl/hedvigletterssans/METADATA.pb +++ b/ofl/hedvigletterssans/METADATA.pb @@ -29,5 +29,6 @@ source { source_file: "fonts/HedvigLettersSans/ttf/HedvigLettersSans-Regular.ttf" dest_file: "HedvigLettersSans-Regular.ttf" } + branch: "main" } stroke: "SANS_SERIF" diff --git a/ofl/hedviglettersserif/METADATA.pb b/ofl/hedviglettersserif/METADATA.pb index 17762e400b..364aef0d2b 100644 --- a/ofl/hedviglettersserif/METADATA.pb +++ b/ofl/hedviglettersserif/METADATA.pb @@ -38,5 +38,6 @@ source { source_file: "fonts/HedvigLettersSerif/variable/HedvigLettersSerif[opsz].ttf" dest_file: "HedvigLettersSerif[opsz].ttf" } + branch: "main" } stroke: "SERIF" diff --git a/ofl/lxgwwenkaimonotc/METADATA.pb b/ofl/lxgwwenkaimonotc/METADATA.pb index 651350dfb4..db3292d9e9 100644 --- a/ofl/lxgwwenkaimonotc/METADATA.pb +++ b/ofl/lxgwwenkaimonotc/METADATA.pb @@ -60,6 +60,7 @@ source { source_file: "fonts/TTF/LXGWWenKaiMonoTC-Bold.ttf" dest_file: "LXGWWenKaiMonoTC-Bold.ttf" } + branch: "main" } primary_script: "Hant" primary_language: "zh_Hant" diff --git a/ofl/lxgwwenkaitc/METADATA.pb b/ofl/lxgwwenkaitc/METADATA.pb index 86bb42b692..49b53d459a 100644 --- a/ofl/lxgwwenkaitc/METADATA.pb +++ b/ofl/lxgwwenkaitc/METADATA.pb @@ -60,6 +60,7 @@ source { source_file: "fonts/TTF/LXGWWenKaiTC-Bold.ttf" dest_file: "LXGWWenKaiTC-Bold.ttf" } + branch: "main" } primary_script: "Hant" primary_language: "zh_Hant" diff --git a/ofl/mate/METADATA.pb b/ofl/mate/METADATA.pb index 1dfb105fb9..6300f2842a 100644 --- a/ofl/mate/METADATA.pb +++ b/ofl/mate/METADATA.pb @@ -40,6 +40,7 @@ source { source_file: "fonts/mate/ttf/Mate-Italic.ttf" dest_file: "Mate-Italic.ttf" } + branch: "master" } stroke: "SERIF" classifications: "DISPLAY" diff --git a/ofl/matesc/METADATA.pb b/ofl/matesc/METADATA.pb index 7e0e9c75d1..2f524e8899 100644 --- a/ofl/matesc/METADATA.pb +++ b/ofl/matesc/METADATA.pb @@ -27,4 +27,5 @@ source { source_file: "fonts/matesc/ttf/MateSC-Regular.ttf" dest_file: "MateSC-Regular.ttf" } + branch: "master" } diff --git a/ofl/playpensansarabic/METADATA.pb b/ofl/playpensansarabic/METADATA.pb index d8ebfac7f7..7a244dc183 100644 --- a/ofl/playpensansarabic/METADATA.pb +++ b/ofl/playpensansarabic/METADATA.pb @@ -35,6 +35,7 @@ source { source_file: "fonts/variable/PlaypenSansArabic[wght].ttf" dest_file: "PlaypenSansArabic[wght].ttf" } + branch: "main" } minisite_url: "https://www.type-together.com/making-playpen-sans" primary_script: "Arab" diff --git a/ofl/playpensanshebrew/METADATA.pb b/ofl/playpensanshebrew/METADATA.pb index 7e09a5ad81..26100c3552 100644 --- a/ofl/playpensanshebrew/METADATA.pb +++ b/ofl/playpensanshebrew/METADATA.pb @@ -35,6 +35,7 @@ source { source_file: "fonts/variable/PlaypenSansHebrew[wght].ttf" dest_file: "PlaypenSansHebrew[wght].ttf" } + branch: "main" } minisite_url: "https://www.type-together.com/making-playpen-sans" primary_script: "Hebr" diff --git a/ofl/playpensansthai/METADATA.pb b/ofl/playpensansthai/METADATA.pb index 68b4e51ecb..1fe58f07a4 100644 --- a/ofl/playpensansthai/METADATA.pb +++ b/ofl/playpensansthai/METADATA.pb @@ -35,6 +35,7 @@ source { source_file: "fonts/variable/PlaypenSansThai[wght].ttf" dest_file: "PlaypenSansThai[wght].ttf" } + branch: "main" } minisite_url: "https://www.type-together.com/making-playpen-sans" primary_script: "Thai" diff --git a/ofl/wireone/METADATA.pb b/ofl/wireone/METADATA.pb index 61c2dcb6dd..e2c5d263bc 100644 --- a/ofl/wireone/METADATA.pb +++ b/ofl/wireone/METADATA.pb @@ -30,6 +30,7 @@ source { source_file: "fonts/TTF/WireOne-Regular.ttf" dest_file: "WireOne-Regular.ttf" } + branch: "master" } stroke: "SANS_SERIF" classifications: "DISPLAY"