Remove upstreamed patches and add new BR: gtkmm3.0-devel

Signed-off-by: Parag Nemade <pnemade@fedoraproject.org>

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -21,3 +21,7 @@ fontforge_full-20100501.tar.bz2
 /gnulib-b324052.tar.gz
 /fontforge-20190317.tar.gz
 /fontforge-20190413.tar.gz
+/fontforge-20200314.tar.gz
+/fontforge-20201107.tar.gz
+/fontforge-20230101.tar.gz
+/fontforge-20251009.tar.gz

0001-Fix-errors-in-French-and-Italian-translations.patch

@@ -0,0 +1,181 @@
+From 472e238cafcff113c7be9815a13ff864540d5ef9 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 6 Jul 2023 19:15:53 -0400
+Subject: [PATCH] Fix errors in French and Italian translations
+
+With gettext-0.22, these mismatches trigger errors:
+
+'msgstr' is not a valid C format string, unlike 'msgid'. Reason: In the
+directive number 2, the argument size specifier is invalid.
+---
+ po/fr.po | 36 ++++++++++++++++++------------------
+ po/it.po |  8 ++++----
+ 2 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/po/fr.po b/po/fr.po
+index 26e446b38..cb492d7a0 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 ?"
+ 
+@@ -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/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 ""
+-- 
+2.41.0
+

Fix_Splinefont_shell_invocation.patch

@@ -0,0 +1,178 @@
+From a64099931ea004a08e074b08ad0984d92c25daa2 Mon Sep 17 00:00:00 2001
+From: Peter Kydas <pk@canva.com>
+Date: Tue, 6 Feb 2024 10:23:36 +1100
+Subject: [PATCH] fix splinefont shell command injection
+
+---
+ fontforge/splinefont.c | 125 +++++++++++++++++++++++++++++------------
+ 1 file changed, 90 insertions(+), 35 deletions(-)
+
+diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c
+index 239fdc035b..647daee109 100644
+--- a/fontforge/splinefont.c
++++ b/fontforge/splinefont.c
+@@ -788,11 +788,14 @@ return( name );
+ 
+ char *Unarchive(char *name, char **_archivedir) {
+     char *dir = getenv("TMPDIR");
+-    char *pt, *archivedir, *listfile, *listcommand, *unarchivecmd, *desiredfile;
++    char *pt, *archivedir, *listfile, *desiredfile;
+     char *finalfile;
+     int i;
+     int doall=false;
+     static int cnt=0;
++    gchar *command[5];
++    gchar *stdoutresponse = NULL;
++    gchar *stderrresponse = NULL;
+ 
+     *_archivedir = NULL;
+ 
+@@ -827,18 +830,30 @@ return( NULL );
+     listfile = malloc(strlen(archivedir)+strlen("/" TOC_NAME)+1);
+     sprintf( listfile, "%s/" TOC_NAME, archivedir );
+ 
+-    listcommand = malloc( strlen(archivers[i].unarchive) + 1 +
+-			strlen( archivers[i].listargs) + 1 +
+-			strlen( name ) + 3 +
+-			strlen( listfile ) +4 );
+-    sprintf( listcommand, "%s %s %s > %s", archivers[i].unarchive,
+-	    archivers[i].listargs, name, listfile );
+-    if ( system(listcommand)!=0 ) {
+-	free(listcommand); free(listfile);
+-	ArchiveCleanup(archivedir);
+-return( NULL );
+-    }
+-    free(listcommand);
++    command[0] = archivers[i].unarchive;
++    command[1] = archivers[i].listargs;
++    command[2] = name;
++    command[3] = NULL; // command args need to be NULL-terminated
++
++    if ( g_spawn_sync(
++                      NULL,
++                      command,
++                      NULL,
++                      G_SPAWN_SEARCH_PATH, 
++                      NULL, 
++                      NULL, 
++                      &stdoutresponse, 
++                      &stderrresponse, 
++                      NULL, 
++                      NULL
++                      ) == FALSE) { // did not successfully execute
++      ArchiveCleanup(archivedir);
++      return( NULL );
++    }
++    // Write out the listfile to be read in later
++    FILE *fp = fopen(listfile, "wb");
++    fwrite(stdoutresponse, strlen(stdoutresponse), 1, fp);
++    fclose(fp);
+ 
+     desiredfile = ArchiveParseTOC(listfile, archivers[i].ars, &doall);
+     free(listfile);
+@@ -847,22 +862,28 @@ return( NULL );
+ return( NULL );
+     }
+ 
+-    /* I tried sending everything to stdout, but that doesn't work if the */
+-    /*  output is a directory file (ufo, sfdir) */
+-    unarchivecmd = malloc( strlen(archivers[i].unarchive) + 1 +
+-			strlen( archivers[i].listargs) + 1 +
+-			strlen( name ) + 1 +
+-			strlen( desiredfile ) + 3 +
+-			strlen( archivedir ) + 30 );
+-    sprintf( unarchivecmd, "( cd %s ; %s %s %s %s ) > /dev/null", archivedir,
+-	    archivers[i].unarchive,
+-	    archivers[i].extractargs, name, doall ? "" : desiredfile );
+-    if ( system(unarchivecmd)!=0 ) {
+-	free(unarchivecmd); free(desiredfile);
+-	ArchiveCleanup(archivedir);
+-return( NULL );
++    command[0] = archivers[i].unarchive;
++    command[1] = archivers[i].extractargs;
++    command[2] = name;
++    command[3] = doall ? "" : desiredfile;
++    command[4] = NULL;
++
++    if ( g_spawn_sync(
++                      (gchar*)archivedir,
++                      command,
++                      NULL,
++                      G_SPAWN_SEARCH_PATH, 
++                      NULL, 
++                      NULL, 
++                      &stdoutresponse, 
++                      &stderrresponse, 
++                      NULL, 
++                      NULL
++                      ) == FALSE) { // did not successfully execute
++      free(desiredfile);
++      ArchiveCleanup(archivedir);
++      return( NULL );
+     }
+-    free(unarchivecmd);
+ 
+     finalfile = malloc( strlen(archivedir) + 1 + strlen(desiredfile) + 1);
+     sprintf( finalfile, "%s/%s", archivedir, desiredfile );
+@@ -885,20 +906,54 @@ struct compressors compressors[] = {
+ 
+ char *Decompress(char *name, int compression) {
+     char *dir = getenv("TMPDIR");
+-    char buf[1500];
+     char *tmpfn;
+-
++    gchar *command[4];
++    gint stdout_pipe;
++    gchar buffer[4096];
++    gssize bytes_read;
++    GByteArray *binary_data = g_byte_array_new();
++    
+     if ( dir==NULL ) dir = P_tmpdir;
+     tmpfn = malloc(strlen(dir)+strlen(GFileNameTail(name))+2);
+     strcpy(tmpfn,dir);
+     strcat(tmpfn,"/");
+     strcat(tmpfn,GFileNameTail(name));
+     *strrchr(tmpfn,'.') = '\0';
+-    snprintf( buf, sizeof(buf), "%s < %s > %s", compressors[compression].decomp, name, tmpfn );
+-    if ( system(buf)==0 )
+-return( tmpfn );
+-    free(tmpfn);
+-return( NULL );
++
++    command[0] = compressors[compression].decomp;
++    command[1] = "-c";
++    command[2] = name;
++    command[3] = NULL;
++
++    // Have to use async because g_spawn_sync doesn't handle nul-bytes in the output (which happens with binary data)
++    if (g_spawn_async_with_pipes(
++      NULL, 
++      command, 
++      NULL, 
++      G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
++      NULL, 
++      NULL,  
++      NULL,
++      NULL, 
++      &stdout_pipe, 
++      NULL, 
++      NULL) == FALSE) {
++      //command has failed
++      return( NULL );
++    }
++
++    // Read binary data from pipe and output to file
++    while ((bytes_read = read(stdout_pipe, buffer, sizeof(buffer))) > 0) {
++        g_byte_array_append(binary_data, (guint8 *)buffer, bytes_read);
++    }
++    close(stdout_pipe);
++
++    FILE *fp = fopen(tmpfn, "wb");
++    fwrite(binary_data->data, sizeof(gchar), binary_data->len, fp);
++    fclose(fp);
++    g_byte_array_free(binary_data, TRUE);
++
++		return(tmpfn);
+ }
+ 
+ static char *ForceFileToHaveName(FILE *file, char *exten) {

fontforge-20190413-python-3.8-pkg-config.patch

@@ -1,14 +0,0 @@
-diff -urN fontforge-20190413.old/m4/fontforge_arg_enable.m4 fontforge-20190413/m4/fontforge_arg_enable.m4
---- fontforge-20190413.old/m4/fontforge_arg_enable.m4	2019-04-13 13:08:39.000000000 +0530
-+++ fontforge-20190413/m4/fontforge_arg_enable.m4	2019-07-21 16:31:27.939734401 +0530
-@@ -116,8 +116,8 @@
- if test x"${i_do_have_python_scripting}" != xyes; then
-    i_want_python_ver=
- else
--   PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"], dnl   [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=maybe])],
--      [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"],,[i_do_have_python_scripting=no])],
-+   PKG_CHECK_MODULES([PYTHON],[python-"${PYTHON_VERSION}"-embed], dnl   [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"-embed],,[i_do_have_python_scripting=maybe])],
-+      [PKG_CHECK_MODULES([PYTHONDEV],[python-"${PYTHON_VERSION}"-embed],,[i_do_have_python_scripting=no])],
-       [i_do_have_python_scripting=no])
- dnl dnl TODO: have python3 AND python2, but only have python2 dev, but no python3 dev
- dnl if test x"${i_do_have_python_scripting}" = xmaybe; then

fontforge-20190801-cve-2020-5395-followup-fix.patch

@@ -1,28 +0,0 @@
-From b96273acc691ac8a36c6a8dd4de8e6edd7eaae59 Mon Sep 17 00:00:00 2001
-From: Fredrick Brennan <copypaste@kittens.ph>
-Date: Tue, 21 Jan 2020 15:16:00 +0800
-Subject: [PATCH] Fix crash on exit introduced in previous commit
-
-When the number of layers is greater than 2, as in Chomsky.sfd and most
-of my other fonts, FontForge will crash on exiting.
-
-This is just a simple mistake @skef made.
----
- fontforge/sfd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontforge/sfd.c b/fontforge/sfd.c
-index e8ca39ba83..9517d8cb12 100644
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -7998,9 +7998,9 @@ bool SFD_GetFontMetaData( FILE *sfd,
- 	int layer_cnt_tmp;
- 	getint(sfd,&layer_cnt_tmp);
- 	if ( layer_cnt_tmp>2 ) {
-+	    sf->layer_cnt = layer_cnt_tmp;
- 	    sf->layers = realloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
- 	    memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
--	    sf->layer_cnt = layer_cnt_tmp;
- 	}
-     }
-     else if ( strmatch(tok,"Layer:")==0 )

fontforge-20190801-cve-2020-5395.patch

@@ -1,78 +0,0 @@
-From 048a91e2682c1a8936ae34dbc7bd70291ec05410 Mon Sep 17 00:00:00 2001
-From: Skef Iterum <unknown>
-Date: Mon, 6 Jan 2020 03:05:06 -0800
-Subject: [PATCH] Fix for #4084 Use-after-free (heap) in the
- SFD_GetFontMetaData() function Fix for #4086 NULL pointer dereference in the
- SFDGetSpiros() function Fix for #4088 NULL pointer dereference in the
- SFD_AssignLookups() function Add empty sf->fontname string if it isn't set,
- fixing #4089 #4090 and many   other potential issues (many downstream calls
- to strlen() on the value).
-
----
- fontforge/sfd.c  | 19 ++++++++++++++-----
- fontforge/sfd1.c |  2 +-
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/fontforge/sfd.c b/fontforge/sfd.c
-index 731be201e0..e8ca39ba83 100644
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -4032,13 +4032,16 @@ static void SFDGetSpiros(FILE *sfd,SplineSet *cur) {
-     while ( fscanf(sfd,"%lg %lg %c", &cp.x, &cp.y, &cp.ty )==3 ) {
- 	if ( cur!=NULL ) {
- 	    if ( cur->spiro_cnt>=cur->spiro_max )
--		cur->spiros = realloc(cur->spiros,(cur->spiro_max+=10)*sizeof(spiro_cp));
-+		cur->spiros = realloc(cur->spiros,
-+		                      (cur->spiro_max+=10)*sizeof(spiro_cp));
- 	    cur->spiros[cur->spiro_cnt++] = cp;
- 	}
-     }
--    if ( cur!=NULL && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
-+    if (    cur!=NULL && cur->spiro_cnt>0
-+         && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
- 	if ( cur->spiro_cnt>=cur->spiro_max )
--	    cur->spiros = realloc(cur->spiros,(cur->spiro_max+=1)*sizeof(spiro_cp));
-+	    cur->spiros = realloc(cur->spiros,
-+	                          (cur->spiro_max+=1)*sizeof(spiro_cp));
- 	memset(&cur->spiros[cur->spiro_cnt],0,sizeof(spiro_cp));
- 	cur->spiros[cur->spiro_cnt++].ty = SPIRO_END;
-     }
-@@ -7992,10 +7995,12 @@ bool SFD_GetFontMetaData( FILE *sfd,
-     else if ( strmatch(tok,"LayerCount:")==0 )
-     {
- 	d->had_layer_cnt = true;
--	getint(sfd,&sf->layer_cnt);
--	if ( sf->layer_cnt>2 ) {
-+	int layer_cnt_tmp;
-+	getint(sfd,&layer_cnt_tmp);
-+	if ( layer_cnt_tmp>2 ) {
- 	    sf->layers = realloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
- 	    memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
-+	    sf->layer_cnt = layer_cnt_tmp;
- 	}
-     }
-     else if ( strmatch(tok,"Layer:")==0 )
-@@ -8948,6 +8953,10 @@ exit( 1 );
- 	}
-     }
- 
-+    // Many downstream functions assume this isn't NULL (use strlen, etc.)
-+    if ( sf->fontname==NULL)
-+	sf->fontname = copy("");
-+
-     if ( fromdir )
- 	sf = SFD_FigureDirType(sf,tok,dirname,enc,remap,had_layer_cnt);
-     else if ( sf->subfontcnt!=0 ) {
-diff --git a/fontforge/sfd1.c b/fontforge/sfd1.c
-index cf931059d0..b42f832678 100644
---- a/fontforge/sfd1.c
-+++ b/fontforge/sfd1.c
-@@ -674,7 +674,7 @@ void SFD_AssignLookups(SplineFont1 *sf) {
- 
-     /* Fix up some gunk from really old versions of the sfd format */
-     SFDCleanupAnchorClasses(&sf->sf);
--    if ( sf->sf.uni_interp==ui_unset )
-+    if ( sf->sf.uni_interp==ui_unset && sf->sf.map!=NULL )
- 	sf->sf.uni_interp = interp_from_encoding(sf->sf.map->enc,ui_none);
- 
-     /* Fixup for an old bug */

fontforge-20190801-fix-metainfo.xml-file.patch

@@ -1,41 +0,0 @@
-From b26f33f178d1049070537166e3fac08b690de4d1 Mon Sep 17 00:00:00 2001
-From: muelli <muelli@cryptobitch.de>
-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 <p> 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 @@
-     <p xml:lang="fr">
-   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.</p>
--    <p xml: lang = "hr">
-+    <p xml:lang = "hr">
-   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.</p>
--     <p xml: lang = "hr">
-+     <p xml:lang = "hr">
-   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.</p>
--     <p xml: lang = "hr">
-+     <p xml:lang = "hr">
-   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.</p>
-     <p xml:lang="uk">

fontforge.spec

@@ -1,28 +1,20 @@
 %global gettext_package FontForge
-%global gittag0 20190801
 
 Name:           fontforge
-Version:        20190801
-Release:        6%{?dist}
+Version:        20251009
+Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
-License:        GPLv3+
+License:        GPL-3.0-or-later
 URL:            http://fontforge.github.io/
-Source0:        https://github.com/fontforge/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         fontforge-20190413-python-3.8-pkg-config.patch
-# Below are upstream patches
-Patch1:         fontforge-20190801-fix-metainfo.xml-file.patch
-# https://github.com/fontforge/fontforge/issues/4084
-Patch2:         fontforge-20190801-cve-2020-5395.patch
-# https://github.com/fontforge/fontforge/issues/4164
-Patch3:         fontforge-20190801-cve-2020-5395-followup-fix.patch
+Source0:        https://github.com/fontforge/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Requires:       xdg-utils
-Requires:       autotrace
+Requires:       (autotrace or potrace)
 Requires:       hicolor-icon-theme
 
-BuildRequires:  gcc
-BuildRequires:  git
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
@@ -30,7 +22,6 @@ BuildRequires:  giflib-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libuninameslist-devel
 BuildRequires:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext
@@ -38,16 +29,20 @@ BuildRequires:  pango-devel
 BuildRequires:  cairo-devel
 BuildRequires:  libspiro-devel
 BuildRequires:  python3-devel
-BuildRequires:  gnulib-devel
-BuildRequires:  libtool-ltdl-devel
 BuildRequires:  readline-devel
 BuildRequires:  libappstream-glib
-# This is failing on aarch64 so drop it
-#BuildRequires:  python-ipython
+BuildRequires:  woff2-devel
 # F25 build is failing add following to fix
 BuildRequires:  shared-mime-info
-# F30 onward need now
-BuildRequires:  /usr/bin/pathfix.py
+# F33 onward need now
+BuildRequires:  gtk3-devel
+BuildRequires:  python3-sphinx
+BuildRequires: make
+# 20151009 version requires below
+BuildRequires: gtkmm3.0-devel
+
+%py_provides python3-fontforge
+%py_provides python3-psMat
 
 %description
 FontForge (former PfaEdit) is a font editor for outline and bitmap
@@ -56,14 +51,13 @@ fonts. It supports a range of font formats, including PostScript
 (Type2) and CID-keyed fonts.
 
 %package devel
-Summary: Development tools for fontforge
-Requires: %{name} = %{version}-%{release}
+Summary: Development files for fontforge
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-doc = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
-This package includes the libraries and header files you will need
-to compile applications against fontforge.
+This package includes the library files you will need to compile
+applications against fontforge.
 
 %package doc
 Summary: Documentation files for %{name}
@@ -74,57 +68,36 @@ This package contains documentation files for %{name}.
 
 
 %prep
-%setup -q
-%if 0%{?python3_version_nodots} >= 38
-%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-mkdir htdocs
-cp -pr doc/html/* htdocs
-chmod 644 htdocs/nonBMP/index.html
-# Fix bad line terminators
-%{__sed} -i 's/\r//' htdocs/Big5.txt
-%{__sed} -i 's/\r//' htdocs/corpchar.txt
-
+%autosetup
 
 %build
-./bootstrap --skip-git
 export CFLAGS="%{optflags} -fno-strict-aliasing"
-
-%configure PYTHON=python3
-make V=1 %{?_smp_mflags}
+%cmake -DCMAKE_BUILD_TYPE=Release \
+          -DENABLE_WOFF2=ON \
+          -DPYHOOK_INSTALL_DIR=%{python3_sitearch}
+%cmake_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}
+%cmake_install
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
   --add-category X-Fedora                                  \
   desktop/org.fontforge.FontForge.desktop
 
-# Let's remove the appdata file as it does not contain translation
-# and <name> tag.
-rm -f %{buildroot}%{_datadir}/appdata/*.appdata.xml
-rm -f %{buildroot}%{_metainfodir}/*.appdata.xml
-
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
-
-# The fontforge makefiles install htdocs as well, but we
-# prefer to have them under the standard RPM location, so
-# remove the extra copy
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/fontforge
-
 # remove unneeded .la and .a files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
+rm -f %{buildroot}%{_datadir}/doc/fontforge/{.buildinfo,.nojekyll}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
+
 # Find translations
 %find_lang %{gettext_package}
 
+%check
+%ctest
+
 %files -f %{gettext_package}.lang
 %doc AUTHORS
 %license LICENSE COPYING.gplv3
@@ -134,21 +107,138 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 %{_datadir}/fontforge
 %{_datadir}/icons/hicolor/*/apps/org.fontforge.FontForge*
 %{_mandir}/man1/*.1*
-%{_datadir}/pixmaps/org.fontforge.FontForge*
 %{_datadir}/mime/packages/fontforge.xml
-%{_metainfodir}/org.fontforge.FontForge.metainfo.xml
+%{_metainfodir}/org.fontforge.FontForge.appdata.xml
 %{python3_sitearch}/fontforge.so
 %{python3_sitearch}/psMat.so
 
 %files devel
-%{_includedir}/fontforge/
 %{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
 
 %files doc
-%doc htdocs
+%doc %{_pkgdocdir}
 
 %changelog
+* Fri Oct 10 2025 Parag Nemade <pnemade AT redhat DOT com> - 20251009-1
+- Update to 20251009 version (#2402960)
+- Remove upstream released patches
+- Add new BR: gtkmm3.0-devel
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jul 17 2025 Parag Nemade <pnemade AT redhat DOT com> - 20230101-17
+- Update for https://fedoraproject.org/wiki/Changes/CMake_ninja_default (rh#2381004)
+
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 20230101-16
+- Rebuilt for Python 3.14
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 14 2024 Gwyn Ciesla <gwync@protonmail.com> - 20230101-13
+- Patch for Python 3.13
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 20230101-12
+- Rebuilt for Python 3.13
+
+* Wed Feb 28 2024 Parag Nemade <pnemade AT redhat DOT com> - 20230101-11
+- Resolves: CVE-2024-25081 and CVE-2024-25082
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Aug 10 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 20230101-8
+- Drop unused libuninameslist dependency
+
+* Tue Aug 08 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 20230101-7
+- Allow potrace as an alternative to autotrace
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jul 07 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-5
+- Fix fr.po and it.po translations issue
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 20230101-4
+- Rebuilt for Python 3.12
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230101-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 02 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-2
+- Update license tag to SPDX format
+- Fix test failure
+
+* Mon Jan 02 2023 Parag Nemade <pnemade AT redhat DOT com> - 20230101-1
+- Update to 20230101 version (#2157290)
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220308-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 20220308-2
+- Rebuilt for Python 3.11
+
+* Thu Mar 10 2022 Parag Nemade <pnemade AT redhat DOT com> - 20220308-1
+- Update to 20220308 version (#2062047)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 20201107-4
+- Rebuilt for Python 3.10
+
+* Mon Feb 01 2021 Parag Nemade <pnemade AT redhat DOT com> - 20201107-3
+- The %%find_lang should run as part of %%install only
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201107-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Nov 25 2020 Parag Nemade <pnemade AT redhat DOT com> - 20201107-1
+- Update to 20201107 version (#1895648)
+- removed %%gittag0 macro, as it cause problem to automated package update script
+
+* Sun Nov 22 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 20200314-10
+- Add py_provides macros to provide python3-fontforge, python3-psMat, etc.
+
+* Wed Aug 05 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-9
+- Fix FTBFS bug by fixing glossary.rst and using new CMake macros
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-8
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200314-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 20200314-6
+- Rebuilt for Python 3.9
+
+* Sat May 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-5
+- Resolves:rhbz#1830502 - Add missing WOFF2 support
+
+* Wed Apr 15 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-4
+- Resolves:rhbz#1823525 - fontforge fails to build with Sphinx 3.0.0
+
+* Thu Apr 02 2020 Parag Nemade <pnemade AT redhat DOT com> - 20200314-3
+- 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
 

plans/fontforge.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt

pyconfig.patch

@@ -0,0 +1,24 @@
+--- pycontrib/FontCompare/setup.py~	2022-12-31 23:25:21.000000000 -0600
++++ pycontrib/FontCompare/setup.py	2024-06-14 15:14:14.119920623 -0500
+@@ -15,7 +15,6 @@
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ """
+ #!/usr/bin/env python
+-from distutils.core import setup
+ from setuptools import setup 
+ setup(name='Font Compare',
+       version='1.0',
+--- fontforge/python.c~	2022-12-31 23:25:21.000000000 -0600
++++ fontforge/python.c	2024-06-14 15:38:41.397897757 -0500
+@@ -19633,7 +19633,10 @@
+     if ( saved_progname )
+ 	free(saved_progname);
+     saved_progname = copy_to_wide_string(progname);
+-    Py_SetProgramName(saved_progname);
++    PyStatus status;
++    PyConfig config;
++    PyConfig_InitPythonConfig(&config);
++    status = PyConfig_SetString(&config, &config.program_name, saved_progname);
+ }
+ 
+ static wchar_t ** copy_argv(char *arg0, int argc ,char **argv) {

sources

@@ -1 +1 @@
-SHA512 (fontforge-20190801.tar.gz) = d60fc69f9c692dd85e89e9c336dc5f141254f4472b02586145dd00b8f3d0b7608f229e3f642db2a03a42c4b543a0557286d0b617ddc3a1080e2c1791d4ea83d5
+SHA512 (fontforge-20251009.tar.gz) = 2923c54e10585551c93102d8b7a389c9de3c629c1676fc8c576c9b9c3f1f6fe28f7a1e39fd5a57ab7eeadf0b17d722bf439ca94f0a788ceab6993e1a93ea7d5f

tests/generate-font.py

@@ -0,0 +1,14 @@
+import fontforge
+import os
+
+myFont = fontforge.open("Cantarell-Regular.ttf")
+myFont.generate("Cantarell-Regular.sfd")
+myFont.close()
+
+myFont = fontforge.open("Cantarell-Regular.sfd")
+myFont.generate("Cantarell-Regular.ttf")
+myFont.close()
+
+os.remove("Cantarell-Regular.ttf")
+os.remove("Cantarell-Regular.sfd")
+

tests/generate-sfd.pe

@@ -0,0 +1,7 @@
+#!/usr/bin/fontforge
+i=1
+Open($argv[i], 1)
+#Use gen_flags=Defualt fmflags value as -1  
+gen_flags = -1
+Generate("" + $fontname + ".sfd", "", gen_flags)
+

tests/main.fmf

@@ -0,0 +1,5 @@
+require:
+- fontforge
+test: bash ./run_tests.sh
+framework: shell
+

tests/run_tests.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+cp /usr/share/fontforge/pixmaps/Cantarell-Regular.ttf .
+
+echo "----------------------------------------------------------"
+echo "Executing get-font-metadata.py on Cantarell-Regular.ttf =>"
+/usr/bin/python3 get-font-metadata.py ./Cantarell-Regular.ttf
+
+echo "----------------------------------------------------------"
+echo "Executing generate-font.py on Cantarell-Regular.ttf =>"
+/usr/bin/python3 generate-font.py ./Cantarell-Regular.ttf
+
+echo "----------------------------------------------------------"
+cp /usr/share/fontforge/pixmaps/Cantarell-Regular.ttf .
+echo "Executing generate-sfd.pe on Cantarell-Regular.ttf =>"
+/usr/bin/fontforge -script generate-sfd.pe ./Cantarell-Regular.ttf
+rm Cantarell-Regular.ttf
+
+echo "----------------------------------------------------------"
+echo "Executing generate-ttf.pe on Cantarell-Regular.sfd =>"
+/usr/bin/fontforge -script generate-ttf.pe ./Cantarell-Regular.sfd
+echo "----------------------------------------------------------"
+

tests/runtests.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+NAME=fontforge
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm ${NAME}
+        rlAssertRpm ${NAME}-devel
+        rlShowPackageVersion ${NAME}
+        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
+        FEDORA_VERSION=$(rlGetDistroRelease)
+        rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "pushd $tmp"
+        rlFetchSrcForInstalled "${NAME}"
+        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
+        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
+        if [ -d BUILD/${NAME}-${VERSION}-build ]; then
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
+        else
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
+        fi
+        rlRun "set -o pipefail"
+        rlRun "NOCONFIGURE=1 ./autogen.sh"
+        rlRun "./configure --disable-static --with-graphite2 --with-gobject --enable-introspection"
+        rlRun "make check"
+        rlRun "retval=$?"
+        rlRun "echo $retval"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun -t -l "INSTALLED_VERSION=$(hb-info --version|awk 'NR==1 {print $3}')" \
+              0 "Get installed version"
+        rlAssertEquals "versions should be equal" "${VERSION}" "${INSTALLED_VERSION}"
+        rlGetTestState
+        rlLog "Number of failed asserts so far: ${ECODE}"
+        rlRun "popd" 0
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd
+

tests/scripts/run_tests.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-/usr/bin/fontforge -script generate.pe /usr/share/fontforge/python/test.sfd 
-/usr/bin/python3 get-font-metadata.py ./Untitled1.ttf

tests/tests.yml

@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      tests:
-        - simple:
-            dir: scripts/
-            run: ./run_tests.sh