mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-12 03:24:08 +00:00
Code Issues Projects Releases Wiki Activity

fontforge: Fix build with gettext 0.22

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-09-07 12:39:35 -07:00
parent 154fc9f5a6
commit 7554afa9b3
2 changed files with 386 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

385
meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch Normal file
View File

@@ -0,0 +1,385 @@
From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Sep 2023 12:35:12 -0700
Subject: [PATCH] Fix Translations containing invalid directives %hs
Found with gettext 0.22
Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime.
https://bugs.gentoo.org/908868
https://savannah.gnu.org/bugs/index.php?64333
https://github.com/fontforge/fontforge/issues/5251
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fontforgeexe/searchview.c | 2 +-
po/ca.po | 4 ++--
po/de.po | 4 ++--
po/en_GB.po | 4 ++--
po/fr.po | 40 +++++++++++++++++++--------------------
po/hr.po | 4 ++--
po/it.po | 8 ++++----
po/ja.po | 4 ++--
po/ko.po | 4 ++--
po/pl.po | 4 ++--
po/uk.po | 4 ++--
po/vi.po | 4 ++--
12 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c
index 1cb39a221..7e1c109cb 100644
--- a/fontforgeexe/searchview.c
+++ b/fontforgeexe/searchview.c
@@ -516,7 +516,7 @@ return( true );
if ( ask_if_difficult==2 && !searcher->isvisible )
return( false );
if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1,
- _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"),
+ _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"),
i==0?_("Search Pattern"):_("Replace Pattern"),
r->sc->name)==1 )
return( false );
diff --git a/po/ca.po b/po/ca.po
index e2349b6ef..6c920b7c0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12347,11 +12347,11 @@ msgstr "Tai"
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n"
+"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n"
"que no existeix en el nou tipus.\n"
"Voleu eliminar la referència?"
diff --git a/po/de.po b/po/de.po
index 41430ffae..8a31aeaa2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15765,11 +15765,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen "
+"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen "
"Schrift nicht existiert.\n"
"Soll der Referenz entfernt werden?"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9bd2d62bb..fce64c97d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -728,11 +728,11 @@ msgstr "Template Colour"
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"The %1$s in the search dialogue contains a reference to %2$.20hs which does "
+"The %1$s in the search dialogue contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
diff --git a/po/fr.po b/po/fr.po
index 26e446b38..d130f89bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
#. GT: $4 is the changed flag ('*' for the changed items)
#, c-format
msgid "%1$.80s at %2$d from %3$.90s%4$s"
-msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
+msgstr "%1$.80s à %2$d de %3$.90s%4$s"
#. GT: This is the title for a window showing a bitmap character
#. GT: It will look something like:
@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
#. GT: $4 is the font name
#, c-format
msgid "%1$.80s at %2$d size %3$d from %4$.80s"
-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s"
#, c-format
msgid "%1$s from lookup subtable %2$.50s"
@@ -7433,7 +7433,7 @@ msgid ""
"Reverting the file will lose those changes.\n"
"Is that what you want?"
msgstr ""
-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n"
+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
"Revenir vous fera perdre toutes les modifications.\n"
"Voulez vous vraiment revenir ?"
@@ -19077,11 +19077,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui "
+"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui "
"n'existe pas dans la nouvelle fonte.\n"
"Faut-il supprimer la référence ?"
@@ -19925,7 +19925,7 @@ msgid ""
"The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
"encodings"
msgstr ""
-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des "
"codages différents"
#, c-format
@@ -19933,7 +19933,7 @@ msgid ""
"The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
"one cubic)"
msgstr ""
-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres "
+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres "
"différents (quadratique et cubique)"
msgid "The generated font won't work with ATM"
@@ -19968,8 +19968,8 @@ msgid ""
"The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
"than in %3$.30s"
msgstr ""
-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que "
-"dans %3$.30hs"
+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que "
+"dans %3$.30s"
#, c-format
msgid ""
@@ -19984,8 +19984,8 @@ msgid ""
"The glyph %1$.30s in font %2$.30s has a different number of references than "
"in %3$.30s"
msgstr ""
-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent "
-"dans %3$.30hs"
+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent "
+"dans %3$.30s"
#, c-format
msgid ""
@@ -20457,7 +20457,7 @@ msgstr ""
#, c-format
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"
+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s"
msgid "The paths that make up this glyph intersect one another"
msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres"
@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
#, c-format
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."
+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s."
msgid "There is another glyph in the font with this name"
msgstr "Il y a un autre glyphe dans la fonte avec ce nom"
@@ -21441,8 +21441,8 @@ msgid ""
"been able to find is %1$.20s-%2$.20s-%4$d.\n"
"Shall I use that or let you search?"
msgstr ""
-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais "
-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n"
+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais "
+"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n"
"Devrais-je utiliser cette valeur ou préférez vous chercher ?"
msgid ""
@@ -21770,7 +21770,7 @@ msgid ""
"with a 0 offset for this combination. Would you like to alter this kerning "
"class entry (or create a kerning pair for just these two glyphs)?"
msgstr ""
-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n"
+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n"
"avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette "
"partie\n"
"de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 "
@@ -24551,8 +24551,8 @@ msgid ""
"referred to.\n"
"It will not be copied."
msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le "
+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le "
"glyphe auquel il se référait.\n"
"Le glyphe ne sera pas copié."
@@ -24562,8 +24562,8 @@ msgid ""
"But %1$s does not exist in this font.\n"
"Would you like to copy the original splines (or delete the reference)?"
msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte.\n"
+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
+"Mais %1$s n'existe pas dans cette fonte.\n"
"Voulez vous copier le contour d'origine (ou supprimer la référence)?"
msgid ""
diff --git a/po/hr.po b/po/hr.po
index d261d4ca7..ac41b9250 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -20156,11 +20156,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne "
+"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne "
"postoji u fontu.\n"
"Želiš li dozvoliti uklanjanje reference?"
diff --git a/po/it.po b/po/it.po
index e13711485..d0c3ea987 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2303,7 +2303,7 @@ msgid ""
"Reverting the file will lose those changes.\n"
"Is that what you want?"
msgstr ""
-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n"
+"Il font %1$.40s nel file %2$.40s è stato modificato.\n"
"Ripristinando il file perderai tutte le modifiche.\n"
"È quello che vuoi fare?"
@@ -5835,7 +5835,7 @@ msgid ""
"The glyph %1$.30s has a different number of contours in font %2$.30s than in "
"%3$.30s"
msgstr ""
-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto "
+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto "
"a %3$.30s"
#, c-format
@@ -6235,8 +6235,8 @@ msgid ""
"been able to find is %1$.20s-%2$.20s-%4$d.\n"
"Shall I use that or let you search?"
msgstr ""
-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma "
-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n"
+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma "
+"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n"
"Devo usare questo valore o preferisci cercare tu stesso?"
msgid ""
diff --git a/po/ja.po b/po/ja.po
index ed9f5a645..206ae82d1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11458,11 +11458,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま"
+"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま"
"す.\n"
"参照を削除しますか?"
diff --git a/po/ko.po b/po/ko.po
index 971b4db03..4d5c8d40d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -20920,11 +20920,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있"
+"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있"
"다.\n"
"참조를 제거해야 하는가?"
diff --git a/po/pl.po b/po/pl.po
index 2bbbf00be..c1fd5a454 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -19552,11 +19552,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie "
+"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie "
"istnieje w nowym foncie.\n"
"Czy usunąć to odwołanie?"
diff --git a/po/uk.po b/po/uk.po
index e3768acc3..3302a1005 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -19860,11 +19860,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не "
+"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не "
"існує у новому шрифті.\n"
"Вилучити це посилання?"
diff --git a/po/vi.po b/po/vi.po
index 6aee8bb3f..f5eb739e6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -17109,11 +17109,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn "
+"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn "
"tại trong phông mới.\n"
"Bạn có muốn gỡ bỏ tham chiếu này không?"
--
2.42.0

1
meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
View File

@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
file://0001-include-sys-select-on-non-glibc-platforms.patch \
file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \
file://0001-cmake-Use-alternate-way-to-detect-libm.patch \
file://0001-Fix-Translations-containing-invalid-directives-hs.patch \
"
S = "${WORKDIR}/git"