From 0359a9bea42a211e66cc288cdb92174a572e867b Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 19 Oct 2023 17:00:31 +0300 Subject: [PATCH] python3 libffi icu4c boost rebuild list --- ...forge-20190801-fix-metainfo.xml-file.patch | 41 ----- ...30101-workaround-broken-translations.patch | 159 ++++++++++++++++++ desktop/font/fontforge/pspec.xml | 2 +- 3 files changed, 160 insertions(+), 42 deletions(-) delete mode 100644 desktop/font/fontforge/files/fontforge-20190801-fix-metainfo.xml-file.patch create mode 100644 desktop/font/fontforge/files/fontforge-20230101-workaround-broken-translations.patch diff --git a/desktop/font/fontforge/files/fontforge-20190801-fix-metainfo.xml-file.patch b/desktop/font/fontforge/files/fontforge-20190801-fix-metainfo.xml-file.patch deleted file mode 100644 index 471ee7d2d6..0000000000 --- a/desktop/font/fontforge/files/fontforge-20190801-fix-metainfo.xml-file.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b26f33f178d1049070537166e3fac08b690de4d1 Mon Sep 17 00:00:00 2001 -From: muelli -Date: Tue, 6 Aug 2019 12:58:30 +0200 -Subject: [PATCH] appdata: remove spaces to comply with xml syntax - -The attribute had an illegal whitespace. appstream-glib validate complained: - -org.fontforge.FontForge.metainfo.xml: failed to parse org.fontforge.FontForge.metainfo.xml: Error on line 56 char 15: Odd character ?l?, expected a ?=? after attribute name ?xml:? of element ?p? - - -Now it does not complain about the syntax anymore, but instead about the description: -org.fontforge.FontForge.metainfo.xml: FAILED: -? style-invalid : Not enough

tags for a good description [0/1] -Validation of files failed ---- - desktop/org.fontforge.FontForge.metainfo.xml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/desktop/org.fontforge.FontForge.metainfo.xml b/desktop/org.fontforge.FontForge.metainfo.xml -index 1ff9ea03e..3583e6da2 100644 ---- a/desktop/org.fontforge.FontForge.metainfo.xml -+++ b/desktop/org.fontforge.FontForge.metainfo.xml -@@ -49,15 +49,15 @@ -

- Apprendre à utiliser FontForge est facile, et il y a plusieurs tutoriels disponibles en commençant - par les bases jusqu'à des fonctionnalités plus avancées telles que la fabrication et l'utilisation de scripts.

--

-+

- FontForge je program za uređivanje konturnih i bitmap fontova. Omogućuje stvaranje, - uređivanje ili konvertiranje raznih vrsta fontova, uključujući PostScript, TrueType, - OpenType, CID, multiple-master, CFF, SVG i BitMap (bdf, FON, NFNT) fontove.

--

-+

- FontForge je slobodan softver otvorenog kȏda te je izrađen za razne operacijske - sustave. FontForge se može koristiti u grafičkom načinu rada ili putem naredbenog - retka.

--

-+

- FontForge je lako naučiti. Na raspolaganju stoje različiti priručnici – od osnovnih - vježbi, sve do naprednijih funkcija, kao što su izrada i upotreba skriptova.

-

diff --git a/desktop/font/fontforge/files/fontforge-20230101-workaround-broken-translations.patch b/desktop/font/fontforge/files/fontforge-20230101-workaround-broken-translations.patch new file mode 100644 index 0000000000..e195e433be --- /dev/null +++ b/desktop/font/fontforge/files/fontforge-20230101-workaround-broken-translations.patch @@ -0,0 +1,159 @@ +https://bugs.gentoo.org/908868 +https://savannah.gnu.org/bugs/index.php?64333 +https://github.com/fontforge/fontforge/issues/5251 + +From f80f80871c6e3777f9974a44058f494eb5353c66 Mon Sep 17 00:00:00 2001 +From: blockiv +Date: Thu, 22 Jun 2023 04:39:16 +0000 +Subject: [PATCH] Mark breaking translations as fuzzy + +--- a/po/fr.po ++++ b/po/fr.po +@@ -289,7 +289,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" + #. GT: $2 is the glyph's encoding + #. GT: $3 is the font name + #. GT: $4 is the changed flag ('*' for the changed items) +-#, c-format ++#, c-format, fuzzy + msgid "%1$.80s at %2$d from %3$.90s%4$s" + msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + +@@ -300,7 +300,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + #. GT: $2 is the glyph's encoding + #. GT: $3 is the pixel size of the bitmap font + #. GT: $4 is the font name +-#, c-format ++#, c-format, fuzzy + msgid "%1$.80s at %2$d size %3$d from %4$.80s" + msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" + +@@ -7427,7 +7427,7 @@ msgstr "" + "La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" + "Voulez-vous l'enregistrer ?" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -19920,7 +19920,7 @@ msgstr "" + "Le nom de la fonte commence avec une séquence d'ordre d'octet utf8. Ceci " + "n'est pas permis. %s" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" +@@ -19928,7 +19928,7 @@ msgstr "" + "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " + "codages différents" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" +@@ -19963,7 +19963,7 @@ msgstr "" + "Le glyphe %1$.30s dans %2$.30s a à la fois des références et des contours. " + "Ceci n'est pas supporté dans une fonte MM" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" +@@ -19979,7 +19979,7 @@ msgstr "" + "Le glyphe %1$.30s de la fonte %2$.30s a un nombre de points (ou de points de " + "contrôle) différent que dans %3$.30s" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" +@@ -20454,7 +20454,7 @@ msgstr "" + "individuellement. Cela peut être utile si vous vouliez\n" + "conserver les versions quadratiques et cubiques d'une fonte." + +-#, c-format ++#, c-format, fuzzy + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" + "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" +@@ -21040,7 +21040,7 @@ msgstr "" + msgid "There is already a subtable with that name, please pick another." + msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" + +-#, c-format ++#, c-format, fuzzy + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." + +@@ -21435,7 +21435,7 @@ msgstr "" + "Cette fonte ne précise pas de 'unitsPerEm', alors nous assumons que c'est " + "1000." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -21764,7 +21764,7 @@ msgstr "" + "Et sur в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n" + "Et sur toutes les lettres grecques minuscules. Et peut être tout le reste." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " +@@ -24544,7 +24544,7 @@ msgstr "" + "Vous voulez effacer %.30s qui est référencé par un\n" + "autre glyphe. Êtes-vous sûr(e) de vouloir poursuivre ?" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font, nor can I find the original character " +@@ -24556,7 +24556,7 @@ msgstr "" + "glyphe auquel il se référait.\n" + "Le glyphe ne sera pas copié." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font.\n" +--- a/po/it.po ++++ b/po/it.po +@@ -2297,7 +2297,7 @@ msgstr "Riferimento invertito" + msgid "Flipping" + msgstr "Ribaltamento" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -5830,7 +5830,7 @@ msgstr "" + msgid "The font does not contain a glyph named %s." + msgstr "Questo font non contiene un glifo chiamato %s." + +-#, c-format ++#, c-format, fuzzy + msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" +@@ -6229,7 +6229,7 @@ msgstr "" + msgid "This font does not specify font-face\n" + msgstr "Questo font non specifica il font-face\n" + +-#, c-format ++#, c-format, fuzzy + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +-- +2.41.0 diff --git a/desktop/font/fontforge/pspec.xml b/desktop/font/fontforge/pspec.xml index c240a1c45e..ff64fe957f 100644 --- a/desktop/font/fontforge/pspec.xml +++ b/desktop/font/fontforge/pspec.xml @@ -42,7 +42,7 @@ libjpeg-turbo-devel - + fontforge-20230101-workaround-broken-translations.patch