Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
From 644c3380f75b20a11755e7052aa632887f3eee2b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 7 Jul 2022 12:32:47 -0700
|
||||
Subject: [PATCH] cmake: Use alternate way to detect libm
|
||||
|
||||
The standard package provided with MathLib cmake module does not work
|
||||
when libm is folded into libc starting glibc 2.35+
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 7 ++++++-
|
||||
contrib/fonttools/CMakeLists.txt | 2 +-
|
||||
fontforge/CMakeLists.txt | 2 +-
|
||||
fontforgeexe/CMakeLists.txt | 2 +-
|
||||
4 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e234cb6e9..284ba2d20 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -115,9 +115,14 @@ else()
|
||||
endif()
|
||||
find_package(Iconv REQUIRED)
|
||||
find_package(LibXml2 REQUIRED)
|
||||
-find_package(MathLib REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
+include(CheckLibraryExists)
|
||||
+CHECK_LIBRARY_EXISTS(m pow "" HAVE_LIB_M)
|
||||
+if (HAVE_LIB_M)
|
||||
+ set(EXTRA_LIBS ${EXTRA_LIBS} m)
|
||||
+endif (HAVE_LIB_M)
|
||||
+
|
||||
check_include_file(pthread.h HAVE_PTHREAD_H)
|
||||
if(HAVE_PTHREAD_H)
|
||||
find_package(Threads)
|
||||
diff --git a/contrib/fonttools/CMakeLists.txt b/contrib/fonttools/CMakeLists.txt
|
||||
index d6c698877..1608af152 100644
|
||||
--- a/contrib/fonttools/CMakeLists.txt
|
||||
+++ b/contrib/fonttools/CMakeLists.txt
|
||||
@@ -15,7 +15,7 @@ add_executable(woff woff.c)
|
||||
|
||||
target_link_libraries(acorn2sfd PRIVATE fontforge)
|
||||
target_link_libraries(dewoff PRIVATE ZLIB::ZLIB)
|
||||
-target_link_libraries(pcl2ttf PRIVATE MathLib::MathLib)
|
||||
+target_link_libraries(pcl2ttf PRIVATE ${EXTRA_LIBS})
|
||||
target_link_libraries(ttf2eps PRIVATE fontforge)
|
||||
target_link_libraries(woff PRIVATE ZLIB::ZLIB)
|
||||
|
||||
diff --git a/fontforge/CMakeLists.txt b/fontforge/CMakeLists.txt
|
||||
index 9a052f360..067ef40df 100644
|
||||
--- a/fontforge/CMakeLists.txt
|
||||
+++ b/fontforge/CMakeLists.txt
|
||||
@@ -237,7 +237,7 @@ target_link_libraries(fontforge
|
||||
GLIB::GLIB
|
||||
Intl::Intl
|
||||
PRIVATE
|
||||
- MathLib::MathLib
|
||||
+ ${EXTRA_LIBS}
|
||||
Iconv::Iconv
|
||||
ZLIB::ZLIB
|
||||
)
|
||||
diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt
|
||||
index e2982c39d..8829993ea 100644
|
||||
--- a/fontforgeexe/CMakeLists.txt
|
||||
+++ b/fontforgeexe/CMakeLists.txt
|
||||
@@ -121,7 +121,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT)
|
||||
target_link_libraries(fontforgeexe PRIVATE Python3::Python)
|
||||
endif()
|
||||
|
||||
-target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv MathLib::MathLib)
|
||||
+target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv ${EXTRA_LIBS})
|
||||
install(TARGETS fontforgeexe RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
if(UNIX)
|
||||
@@ -0,0 +1,29 @@
|
||||
From f5a19ad9b2aea85dab28e7c61ac39404631fad2d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 6 Jul 2022 04:54:23 -0700
|
||||
Subject: [PATCH] fontforgeexe: Use env to find fontforge
|
||||
|
||||
This helps in avoiding to encode build paths into interpeter
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
fontforgeexe/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt
|
||||
index b2d663b88..e2a8fee54 100644
|
||||
--- a/fontforgeexe/CMakeLists.txt
|
||||
+++ b/fontforgeexe/CMakeLists.txt
|
||||
@@ -118,7 +118,7 @@ if(UNIX)
|
||||
foreach(_script fontimage.pe fontlint.pe sfddiff.pe)
|
||||
get_filename_component(_output \"\${_script}\" NAME_WE)
|
||||
file(READ \"${CMAKE_CURRENT_SOURCE_DIR}/\${_script}\" _input)
|
||||
- file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!\${CMAKE_INSTALL_PREFIX}/bin/fontforge -lang=ff\\n\${_input}\")
|
||||
+ file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!/usr/bin/env fontforge -lang=ff\\n\${_input}\")
|
||||
endforeach()
|
||||
" COMPONENT nativescripts)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fontimage" "${CMAKE_CURRENT_BINARY_DIR}/fontlint" "${CMAKE_CURRENT_BINARY_DIR}/sfddiff"
|
||||
--
|
||||
2.37.0
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From 798f2816130838f3618212291de6ab0ea814c868 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 29 Sep 2019 20:39:02 -0700
|
||||
Subject: [PATCH] include sys/select on non-glibc platforms
|
||||
|
||||
musl needs sys/select.h for defining fd_set
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gdraw/gdraw.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/gdraw/gdraw.c
|
||||
+++ b/gdraw/gdraw.c
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "gkeysym.h"
|
||||
#include "ustring.h"
|
||||
|
||||
-#if __Mac
|
||||
+#if __Mac || (defined(__linux__) && !defined(__GLIBC__))
|
||||
# include <sys/select.h>
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
SUMMARY = "A font editor"
|
||||
HOMEPAGE = "http://fontforge.github.io/en-US/"
|
||||
LICENSE = "BSD-3-Clause & GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LICENSE;md5=d042f3d2a8fd7208b704a499168e3c89 \
|
||||
"
|
||||
|
||||
DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro"
|
||||
DEPENDS:append:class-target = " libxi"
|
||||
|
||||
inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg
|
||||
|
||||
REQUIRED_DISTRO_FEATURES:append:class-target = " x11"
|
||||
|
||||
# tag 20220308
|
||||
SRCREV = "a1dad3e81da03d5d5f3c4c1c1b9b5ca5ebcfcecf"
|
||||
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"
|
||||
|
||||
EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
|
||||
PACKAGECONFIG = "readline"
|
||||
PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline"
|
||||
|
||||
CFLAGS += "-fno-strict-aliasing"
|
||||
LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
|
||||
BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
|
||||
|
||||
#do_configure:prepend() {
|
||||
# uthash sources are expected in uthash/src
|
||||
# mkdir -p ${S}/uthash/src
|
||||
# cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src
|
||||
#}
|
||||
|
||||
PACKAGES =+ "${PN}-python"
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/appdata \
|
||||
${datadir}/metainfo \
|
||||
${datadir}/mime \
|
||||
"
|
||||
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python"
|
||||
RDEPENDS:${PN}-python = "python3"
|
||||
|
||||
# for e.g kde's oxygen-fonts
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -0,0 +1,14 @@
|
||||
# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
SUMMARY = "LibSpiro is an adaptation of Spiro formula and functions into a sharable library"
|
||||
HOMEPAGE = "https://github.com/fontforge/libspiro"
|
||||
LICENSE = "GPL-3.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz"
|
||||
SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be"
|
||||
|
||||
inherit autotools
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user