From 97bb03bc572ee19e81a52fa2b81a09d4d4a4f51e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 2 Apr 2023 16:03:57 +0200
Subject: [PATCH] fontforge_2019, use correct patchset (#8238)

---
 .../patches/fontforge-20190501~git.patchset   | 45 +++++++++++++++++++
 .../patches/fontforge-20230101.patchset       | 22 ---------
 2 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 media-gfx/fontforge/patches/fontforge-20190501~git.patchset
 delete mode 100644 media-gfx/fontforge/patches/fontforge-20230101.patchset

diff --git a/media-gfx/fontforge/patches/fontforge-20190501~git.patchset b/media-gfx/fontforge/patches/fontforge-20190501~git.patchset
new file mode 100644
index 000000000..c9b02c670
--- /dev/null
+++ b/media-gfx/fontforge/patches/fontforge-20190501~git.patchset
@@ -0,0 +1,45 @@
+From 36e43aaf6451c49c20c9d70c1323d1d5a3fc232e Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 1 Apr 2023 11:47:25 +0200
+Subject: fontforge, revert patch for locale_t
+
+
+diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
+index 8f54ef4..643e3dd 100644
+--- a/fontforge/splinefont.h
++++ b/fontforge/splinefont.h
+@@ -2622,7 +2622,7 @@ extern void debug_printHint( StemInfo *h, char* msg );
+ 
+ #include "ustring.h"
+ 
+-#if defined(_WIN32) || defined(__HAIKU__)
++#if defined(_WIN32)
+ #define BAD_LOCALE_HACK
+ typedef char* locale_t;
+ #define LC_GLOBAL_LOCALE ((locale_t)-1)
+-- 
+2.37.3
+
+
+From 1c8bd45ff63dff8a9ac5a1f578da4a097adce43d Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 1 Apr 2023 12:31:07 +0200
+Subject: Don't use  -Werror=int-conversion on 32bit
+
+
+diff --git a/configure.ac b/configure.ac
+index 1ed4685..d124e94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -548,7 +548,7 @@ AM_CONDITIONAL([FONTTOOLS],[test x"${fontforge_extras}" = xyes])
+ # Create and Set FontForge Compiler Flags
+ 
+ my_cflags="${my_cflags} ${WARNING_CFLAGS}"
+-my_cflags="${my_cflags} -Werror=implicit-function-declaration -Werror=int-conversion"
++my_cflags="${my_cflags} -Werror=implicit-function-declaration"
+ if test x"${i_do_have_freetype_debugger}" != xno; then
+    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/src/truetype"
+    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include"
+-- 
+2.37.3
+
diff --git a/media-gfx/fontforge/patches/fontforge-20230101.patchset b/media-gfx/fontforge/patches/fontforge-20230101.patchset
deleted file mode 100644
index efb3200df..000000000
--- a/media-gfx/fontforge/patches/fontforge-20230101.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 23d3846a5271c55cb77853f8eed32ffdb4519eb8 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 1 Apr 2023 17:49:54 +0200
-Subject: Revert patch for locale_t
-
-
-diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
-index cd6f554..509d813 100644
---- a/fontforge/splinefont.h
-+++ b/fontforge/splinefont.h
-@@ -2630,7 +2630,7 @@ extern bool isSplinePointPartOfGuide( SplineFont *sf, SplinePoint *sp );
- 
- extern void debug_printHint( StemInfo *h, char* msg );
- 
--#if defined(_WIN32) || defined(__HAIKU__)
-+#if defined(_WIN32)
- #define BAD_LOCALE_HACK
- typedef char* locale_t;
- #define LC_GLOBAL_LOCALE ((locale_t)-1)
--- 
-2.37.3
-