Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
@ -1 +1 @@
|
|||||||
cca54440dd47414055507a5007cd9b663699f3e2 SOURCES/fontforge-20200314.tar.gz
|
c4372106460089c0495558abc8e1d6436d2f9bf2 SOURCES/fontforge-20201107.tar.gz
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/fontforge-20200314.tar.gz
|
SOURCES/fontforge-20201107.tar.gz
|
||||||
|
180
SOURCES/0001-Fix-errors-in-French-and-Italian-translations.patch
Normal file
180
SOURCES/0001-Fix-errors-in-French-and-Italian-translations.patch
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
diff -urN fontforge-20201107.old/po/fr.po fontforge-20201107/po/fr.po
|
||||||
|
--- fontforge-20201107.old/po/fr.po 2020-11-08 02:12:58.000000000 +0530
|
||||||
|
+++ fontforge-20201107/po/fr.po 2024-04-02 16:30:42.942148536 +0530
|
||||||
|
@@ -280,8 +280,8 @@
|
||||||
|
"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é."
|
||||||
|
|
||||||
|
@@ -303,8 +303,8 @@
|
||||||
|
"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 "Anchor Lost"
|
||||||
|
@@ -322,7 +322,7 @@
|
||||||
|
|
||||||
|
#, 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 "Different Fonts"
|
||||||
|
msgstr "Pas la même fonte"
|
||||||
|
@@ -497,8 +497,8 @@
|
||||||
|
"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 "Use CID Map"
|
||||||
|
@@ -1245,7 +1245,7 @@
|
||||||
|
"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 ?"
|
||||||
|
|
||||||
|
@@ -4469,7 +4469,7 @@
|
||||||
|
"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
|
||||||
|
@@ -4477,7 +4477,7 @@
|
||||||
|
"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)"
|
||||||
|
|
||||||
|
#, c-format
|
||||||
|
@@ -4530,8 +4530,8 @@
|
||||||
|
"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 ""
|
||||||
|
@@ -4571,8 +4571,8 @@
|
||||||
|
"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 ""
|
||||||
|
@@ -8025,7 +8025,7 @@
|
||||||
|
#, 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 "Correcting References"
|
||||||
|
msgstr "Correction des références"
|
||||||
|
@@ -10455,7 +10455,7 @@
|
||||||
|
#. 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"
|
||||||
|
|
||||||
|
msgid "Set Width..."
|
||||||
|
msgstr "Définir chasse..."
|
||||||
|
@@ -11984,7 +11984,7 @@
|
||||||
|
#. 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"
|
||||||
|
|
||||||
|
msgid ""
|
||||||
|
"This glyph should display spiro points, but unfortunately this version of "
|
||||||
|
@@ -23093,7 +23093,7 @@
|
||||||
|
"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 "
|
||||||
|
@@ -26890,7 +26890,7 @@
|
||||||
|
"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 ?"
|
||||||
|
|
||||||
|
diff -urN fontforge-20201107.old/po/it.po fontforge-20201107/po/it.po
|
||||||
|
--- fontforge-20201107.old/po/it.po 2020-11-08 02:12:58.000000000 +0530
|
||||||
|
+++ fontforge-20201107/po/it.po 2024-04-02 16:29:54.500334426 +0530
|
||||||
|
@@ -503,8 +503,8 @@
|
||||||
|
"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 "Use CID Map"
|
||||||
|
@@ -1196,7 +1196,7 @@
|
||||||
|
"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?"
|
||||||
|
|
||||||
|
@@ -4233,7 +4233,7 @@
|
||||||
|
"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
|
||||||
|
@@ -24660,7 +24660,7 @@
|
||||||
|
|
||||||
|
#, 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,27 +0,0 @@
|
|||||||
From ee14a6389d19e2f45219134058e07f10585fa6d3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jeremy Tan <jtanx@outlook.com>
|
|
||||||
Date: Thu, 2 Apr 2020 18:03:47 +0800
|
|
||||||
Subject: [PATCH] Call gdk_set_allowed_backends before gdk_init
|
|
||||||
|
|
||||||
Fixes #4247
|
|
||||||
---
|
|
||||||
fontforgeexe/startui.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
|
|
||||||
index 06f5200a4..114bb7fb6 100644
|
|
||||||
--- a/fontforgeexe/startui.c
|
|
||||||
+++ b/fontforgeexe/startui.c
|
|
||||||
@@ -1182,8 +1182,8 @@ int fontforge_main( int argc, char **argv ) {
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#ifdef FONTFORGE_CAN_USE_GDK
|
|
||||||
- gdk_init(&argc, &argv);
|
|
||||||
gdk_set_allowed_backends("win32,quartz,x11");
|
|
||||||
+ gdk_init(&argc, &argv);
|
|
||||||
#endif
|
|
||||||
ensureDotFontForgeIsSetup();
|
|
||||||
#if defined(__MINGW32__) && !defined(_NO_LIBCAIRO)
|
|
||||||
--
|
|
||||||
2.26.0
|
|
||||||
|
|
@ -1,161 +0,0 @@
|
|||||||
From 1a03ca2de0b4c99ee72b330b56e89cc90fe773ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jeremy Tan <jtanx@outlook.com>
|
|
||||||
Date: Sat, 4 Apr 2020 11:43:34 +1100
|
|
||||||
Subject: [PATCH] Minor changes for backwards compatibility with older versions
|
|
||||||
of Sphinx
|
|
||||||
|
|
||||||
Closes #4256
|
|
||||||
---
|
|
||||||
doc/sphinx/conf.py | 3 +++
|
|
||||||
doc/sphinx/techref/splinefont.rst | 26 ++++++++++++-------------
|
|
||||||
doc/sphinx/ui/misc/fontforge-themes.rst | 2 +-
|
|
||||||
3 files changed, 17 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
|
|
||||||
index 4b22e2eaf6..f2df68676e 100644
|
|
||||||
--- a/doc/sphinx/conf.py
|
|
||||||
+++ b/doc/sphinx/conf.py
|
|
||||||
@@ -68,6 +68,9 @@
|
|
||||||
# Don't copy source rst files into the output
|
|
||||||
html_copy_source = False
|
|
||||||
|
|
||||||
+# Set the main page
|
|
||||||
+master_doc = 'index'
|
|
||||||
+
|
|
||||||
# Custom roles must be in the prolog, not the epilog!
|
|
||||||
rst_prolog = '''
|
|
||||||
.. role:: small
|
|
||||||
diff --git a/doc/sphinx/techref/splinefont.rst b/doc/sphinx/techref/splinefont.rst
|
|
||||||
index 98248f7a5e..60399d3912 100644
|
|
||||||
--- a/doc/sphinx/techref/splinefont.rst
|
|
||||||
+++ b/doc/sphinx/techref/splinefont.rst
|
|
||||||
@@ -195,7 +195,7 @@ The bounding box of a :ref:`Spline <splinefont.Spline>`,
|
|
||||||
:ref:`SplineChar <splinefont.SplineChar>`, :ref:`RefChar <splinefont.RefChar>`,
|
|
||||||
:ref:`Image <splinefont.ImageList>`, or whatever else needs a bounding box.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.BDFFloat
|
|
||||||
|
|
||||||
typedef struct bdffloat {
|
|
||||||
@@ -206,7 +206,7 @@ The bounding box of a :ref:`Spline <splinefont.Spline>`,
|
|
||||||
|
|
||||||
The floating selection in a :ref:`BDFChar <splinefont.BDFChar>`.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.Undoes
|
|
||||||
|
|
||||||
typedef struct undoes {
|
|
||||||
@@ -277,7 +277,7 @@ both the splines and the bitmaps of a character.
|
|
||||||
ut_mult is used when doing a copy from the FontView where you are copying more
|
|
||||||
than one character.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.BDFChar
|
|
||||||
|
|
||||||
typedef struct bdfchar {
|
|
||||||
@@ -318,7 +318,7 @@ represented by a byte rather than a bit. There is a clut for this in the BDFFont
|
|
||||||
The last thing in the BDFChar is a (/an optional) floating selection. Only
|
|
||||||
present if the user has made a selection or done a paste or something like that.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.BDFFont
|
|
||||||
|
|
||||||
typedef struct bdffont {
|
|
||||||
@@ -345,7 +345,7 @@ contains a count of the number of entries in the array, and then the array
|
|
||||||
itself. Currently the number of entries here is always 16, but that could
|
|
||||||
change.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.SplinePoint
|
|
||||||
|
|
||||||
enum pointtype { pt_curve, pt_corner, pt_tangent };
|
|
||||||
@@ -405,7 +405,7 @@ drawing it. They are cached so they don't need to be regenerated each time.
|
|
||||||
There's a different set of lines for every scale (as there is a different amount
|
|
||||||
of visible detail). They get freed and regenerated if the Spline changes.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.Spline
|
|
||||||
|
|
||||||
typedef struct spline1d {
|
|
||||||
@@ -439,7 +439,7 @@ some are used in other places too.
|
|
||||||
The Spline1D structures give the equations for the x and y coordinates
|
|
||||||
respectively (splines[0] is for x, splines[1] is for y).
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.SplinePointList
|
|
||||||
|
|
||||||
typedef struct splinepointlist {
|
|
||||||
@@ -463,7 +463,7 @@ to). A SplinePointList is a connected path. There are three cases:
|
|
||||||
Generally a series of paths will make up a character, and they are linked
|
|
||||||
together on the next field.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.RefChar
|
|
||||||
|
|
||||||
typedef struct refchar {
|
|
||||||
@@ -498,7 +498,7 @@ themselves). The selected field indicates that the reference is selected. The bb
|
|
||||||
field provides a transformed bounding box. And the sc field points to the
|
|
||||||
SplineChar we are referring to.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.KernPair
|
|
||||||
|
|
||||||
typedef struct kernpair {
|
|
||||||
@@ -514,7 +514,7 @@ offset between them (or rather the difference from what their respective left
|
|
||||||
and right bearings would lead you to believe it should be). Next points to the
|
|
||||||
next kernpair.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.Hints
|
|
||||||
|
|
||||||
typedef struct hints {
|
|
||||||
@@ -532,7 +532,7 @@ y space) of where the stem starts, and width is how long it is. Width may be
|
|
||||||
negative (in which case base is where the stem ends). Next points to the next
|
|
||||||
hint for the character.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.ImageList
|
|
||||||
|
|
||||||
typedef struct imagelist {
|
|
||||||
@@ -551,7 +551,7 @@ not support any other transformations on images). The bounding box is after the
|
|
||||||
transformations have been applied. The next field points to the next image, and
|
|
||||||
selected indicates whether this one is selected or not.
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.SplineChar
|
|
||||||
|
|
||||||
typedef struct splinechar {
|
|
||||||
@@ -623,7 +623,7 @@ follow this one. For instance the combination "VA" might need kerning, then the
|
|
||||||
SplineChar representing "V" would have a pointer to a
|
|
||||||
:ref:`KernPair <splinefont.KernPair>` with data on "A".
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: splinefont.SplineFont
|
|
||||||
|
|
||||||
typedef struct splinefont {
|
|
||||||
diff --git a/doc/sphinx/ui/misc/fontforge-themes.rst b/doc/sphinx/ui/misc/fontforge-themes.rst
|
|
||||||
index 8df505634f..5bf3f6edd5 100644
|
|
||||||
--- a/doc/sphinx/ui/misc/fontforge-themes.rst
|
|
||||||
+++ b/doc/sphinx/ui/misc/fontforge-themes.rst
|
|
||||||
@@ -4,7 +4,7 @@ FontForge color schemes
|
|
||||||
The following are some suggestions for color schemes. You simply copy these into
|
|
||||||
your ~/.Xdefaults file and then run
|
|
||||||
|
|
||||||
-.. code-block::
|
|
||||||
+.. code-block:: default
|
|
||||||
:name: fontforge-themes.shell
|
|
||||||
|
|
||||||
$ xrdb ~/.Xdefaults
|
|
@ -1,22 +1,19 @@
|
|||||||
%global gettext_package FontForge
|
%global gettext_package FontForge
|
||||||
%global gittag0 20200314
|
|
||||||
|
|
||||||
Name: fontforge
|
Name: fontforge
|
||||||
Version: 20200314
|
Version: 20201107
|
||||||
Release: 6%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Outline and bitmap font editor
|
Summary: Outline and bitmap font editor
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://fontforge.github.io/
|
URL: http://fontforge.github.io/
|
||||||
Source0: https://github.com/fontforge/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/fontforge/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# https://github.com/fontforge/fontforge/pull/4253
|
# Fix translations with gettext-0.22, https://github.com/fontforge/fontforge/pull/5257
|
||||||
Patch0: fontforge-20200314-Call-gdk_set_allowed_backends-before-gdk_init.patch
|
Patch0: 0001-Fix-errors-in-French-and-Italian-translations.patch
|
||||||
# https://github.com/fontforge/fontforge/pull/4257
|
|
||||||
Patch1: fontforge-20200314-minor-backward-compatible-sphinx-changes.patch
|
|
||||||
# https://github.com/fontforge/fontforge/pull/5367
|
# https://github.com/fontforge/fontforge/pull/5367
|
||||||
# Fixes CVE-2024-25081 and CVE-2024-25082
|
# Fixes CVE-2024-25081 and CVE-2024-25082
|
||||||
Patch2: Fix_Splinefont_shell_invocation.patch
|
Patch1: https://patch-diff.githubusercontent.com/raw/fontforge/fontforge/pull/5367.patch#/Fix_Splinefont_shell_invocation.patch
|
||||||
|
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Requires: autotrace
|
Requires: autotrace
|
||||||
@ -41,11 +38,16 @@ BuildRequires: libspiro-devel
|
|||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: readline-devel
|
BuildRequires: readline-devel
|
||||||
BuildRequires: libappstream-glib
|
BuildRequires: libappstream-glib
|
||||||
|
BuildRequires: woff2-devel
|
||||||
# F25 build is failing add following to fix
|
# F25 build is failing add following to fix
|
||||||
BuildRequires: shared-mime-info
|
BuildRequires: shared-mime-info
|
||||||
# F33 onward need now
|
# F33 onward need now
|
||||||
BuildRequires: gtk3-devel
|
BuildRequires: gtk3-devel
|
||||||
BuildRequires: python3-sphinx
|
BuildRequires: python3-sphinx
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
|
%py_provides python3-fontforge
|
||||||
|
%py_provides python3-psMat
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FontForge (former PfaEdit) is a font editor for outline and bitmap
|
FontForge (former PfaEdit) is a font editor for outline and bitmap
|
||||||
@ -74,31 +76,22 @@ This package contains documentation files for %{name}.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch -P 0 -p1
|
%patch -P 0 -p1
|
||||||
%patch -P 1 -p1
|
%patch -P 1 -p1
|
||||||
%patch -P 2 -p1
|
|
||||||
|
|
||||||
# Remove tests that requires Internet access
|
# Remove tests that requires Internet access
|
||||||
sed -i '45d;83d;101d;102d;114d;115d;125d' tests/CMakeLists.txt
|
sed -i '45d;83d;101d;102d;114d;115d;127d' tests/CMakeLists.txt
|
||||||
rm tests/test003.pe tests/test130.pe tests/test0101.py tests/test929.py
|
rm tests/test003.pe tests/test130.pe tests/test0101.py tests/test929.py
|
||||||
# Remove tests for s390x
|
# Remove tests for s390x
|
||||||
rm tests/test0004.py tests/test1009.py tests/test1010.py
|
rm tests/test0004.py tests/test1009.py tests/test1010.py
|
||||||
# Remove desktop-file-validate warning
|
|
||||||
sed -i '5d' desktop/org.fontforge.FontForge.desktop
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf build && mkdir build
|
|
||||||
pushd build
|
|
||||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||||
|
%cmake -DCMAKE_BUILD_TYPE=Release \
|
||||||
%cmake .. -DCMAKE_BUILD_TYPE=Release
|
-DENABLE_WOFF2=ON
|
||||||
|
%cmake_build
|
||||||
%{make_build}
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
%cmake_install
|
||||||
%{make_install}
|
|
||||||
popd
|
|
||||||
|
|
||||||
|
|
||||||
desktop-file-install \
|
desktop-file-install \
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||||
@ -116,7 +109,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
|
|||||||
%find_lang %{gettext_package}
|
%find_lang %{gettext_package}
|
||||||
|
|
||||||
%check
|
%check
|
||||||
pushd build
|
pushd %{__cmake_builddir}
|
||||||
make check
|
make check
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -142,43 +135,113 @@ popd
|
|||||||
%doc %{_pkgdocdir}
|
%doc %{_pkgdocdir}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Apr 04 2024 Parag Nemade <pnemade AT redhat DOT com> - 20200314-6
|
* Tue Apr 02 2024 Parag Nemade <pnemade AT redhat DOT com> - 20201107-6
|
||||||
- Resolves: RHEL-26715 - fontforge: various flaws
|
- Resolves: RHEL-26716 - CVE-2024-25081 and CVE-2024-25082 fontforge: various flaws
|
||||||
(CVE-2024-25081 and CVE-2024-25082)
|
|
||||||
|
|
||||||
* Mon Dec 14 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-5
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com>
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Mon Feb 01 2021 Parag Nemade <pnemade AT redhat DOT com> - 20201107-3
|
||||||
- The %%find_lang should run as part of %%install only
|
- The %%find_lang should run as part of %%install only
|
||||||
|
|
||||||
* Mon Dec 07 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-4
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-2
|
||||||
- Minor changes for backwards compatibility with older versions of Sphinx
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
Resolves: rhbz#1646212
|
|
||||||
|
|
||||||
* Wed Apr 08 2020 Parag Nemade <pnemade AT redhat DOT com> - 20170731-15
|
* Wed Nov 25 2020 Parag Nemade <pnemade AT redhat DOT com> - 20201107-1
|
||||||
- Resolves:rh#1821664 - out-of-bounds write in sfd.c
|
- Update to 20201107 version (#1895648)
|
||||||
|
- removed %%gittag0 macro, as it cause problem to automated package update script
|
||||||
|
|
||||||
* Thu Jan 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 20170731-14
|
* Sun Nov 22 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 20200314-10
|
||||||
- Resolves:rh#1790974 - out-of-bounds write in sfd.c
|
- Add py_provides macros to provide python3-fontforge, python3-psMat, etc.
|
||||||
|
|
||||||
* Sun Jun 02 2019 Parag Nemade <pnemade AT redhat DOT com> - 20170731-13
|
* Wed Aug 05 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-9
|
||||||
- Resolves:rh#1665940 - harden the missing splinerefigure.c file
|
- Fix FTBFS bug by fixing glossary.rst and using new CMake macros
|
||||||
|
|
||||||
* Fri May 31 2019 Parag Nemade <pnemade AT redhat DOT com> - 20170731-12
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-8
|
||||||
- Resolves:rh#1665940 - Fixed covscan patch to fix some font packages build
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
* Mon May 20 2019 Parag Nemade <pnemade AT redhat DOT com> - 20170731-11
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-7
|
||||||
- Resolves:rh#1682233 - Fixed gating.yml rule
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
* Sat May 18 2019 Parag Nemade <pnemade AT redhat DOT com> - 20170731-10
|
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 20200314-6
|
||||||
- Resolves:rh#1682233 - fontforge changes blocked until gating tests are added
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
* Mon May 13 2019 Parag Nemade <pnemade AT redhat DOT com> - 20170731-9
|
* Sat May 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-5
|
||||||
- Resolves:rh#1665940 - fontforge: Use after free during dejavu-fonts build
|
- Resolves:rhbz#1830502 - Add missing WOFF2 support
|
||||||
|
|
||||||
* Tue Oct 30 2018 Parag Nemade <pnemade AT redhat DOT com> - 20170731-8
|
* Wed Apr 15 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-4
|
||||||
- Resolves:rh#1644224 - fix some issues from covscan patch
|
- Resolves:rhbz#1823525 - fontforge fails to build with Sphinx 3.0.0
|
||||||
|
|
||||||
* Sat Sep 22 2018 Parag Nemade <pnemade AT redhat DOT com> - 20170731-7
|
* Thu Apr 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-3
|
||||||
- Resolves:rh#1602497 - Fix some covscan issues
|
- Fix the GDK backend UI issues
|
||||||
|
- Move back to using GDK backend
|
||||||
|
|
||||||
|
* Fri Mar 27 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-2
|
||||||
|
- Enabled X11 and 2012 theme
|
||||||
|
|
||||||
|
* Wed Mar 25 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-1
|
||||||
|
- Update to 20200314 version (#1813578)
|
||||||
|
|
||||||
|
* Sun Feb 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 20190801-6
|
||||||
|
- another fix for rh#1790042 - CVE-2020-5395:out-of-bounds write in sfd.c
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190801-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 16 2020 Parag Nemade <pnemade AT redhat DOT com> - 20190801-4
|
||||||
|
- Resolves:rh#1790042 - CVE-2020-5395:out-of-bounds write in sfd.c
|
||||||
|
|
||||||
|
* Tue Aug 27 2019 Kevin Fenzi <kevin@scrye.com> - 20190801-3
|
||||||
|
- Rebuild for new libspiro
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 20190801-2
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Thu Aug 15 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190801-1
|
||||||
|
- Update to 20190801 version (#1739819)
|
||||||
|
- Upstream moved to use Glib's GHashTable over uthash
|
||||||
|
- Upstream dropped requiring bundling copy of gnulib
|
||||||
|
|
||||||
|
* Fri Aug 02 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-4
|
||||||
|
- Fix the conditional for rh#1728058
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190413-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 23 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-2
|
||||||
|
- make the code compatible with python-3.8 (rh#1728058)
|
||||||
|
|
||||||
|
* Sat Apr 13 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190413-1
|
||||||
|
- Update to 20190413 version (#1689629)
|
||||||
|
|
||||||
|
* Mon Mar 25 2019 Parag Nemade <pnemade AT redhat DOT com> - 20190317-1
|
||||||
|
- Update to 20190317 release (#1689629)
|
||||||
|
|
||||||
|
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 20170731-12
|
||||||
|
- Rebuild for readline 8.0
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 23 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-10
|
||||||
|
- Rebuilt for #1595421
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170731-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 04 2018 Kevin Fenzi <kevin@scrye.com> - -8
|
||||||
|
- Update bundled gnulib. Fixes bug #1596037
|
||||||
|
|
||||||
|
* Thu Jun 28 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-7
|
||||||
|
- Rebuilt for Python 3.7.0 final (#1595421)
|
||||||
|
|
||||||
|
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 20170731-6
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 20170731-5
|
* Sun Feb 11 2018 Sandro Mani <manisandro@gmail.com> - 20170731-5
|
||||||
- Rebuild (giflib)
|
- Rebuild (giflib)
|
||||||
|
Loading…
Reference in New Issue
Block a user