Skip to content

Commit

Permalink
Update fontforge FindOrMakeEncoding patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ViliusSutkus89 committed Nov 2, 2023
1 parent ec949b6 commit 65d3803
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion fontforge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ tasks.extractSrc {
srcDir.resolve("gutils/gio.c").patch(projectDir.resolve("patches/gutils-gio.no-pthread-cancel.patch"))

// fontforgeexe/startnoui.c
// srcDir.resolve("fontforgeexe/startnoui.c").patch(projectDir.resolve("patches/fontforgeexe-startnoui.FindOrMakeEncoding.patch"))
srcDir.resolve("fontforgeexe/startnoui.c").patch(projectDir.resolve("patches/fontforgeexe-startnoui.FindOrMakeEncoding.patch"))

// android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/pwd.h
// #if __ANDROID_API__ >= 26
Expand Down
19 changes: 8 additions & 11 deletions fontforge/patches/fontforgeexe-startnoui.FindOrMakeEncoding.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
--- startnoui.c 2017-07-22 08:00:39.126236006 +0300
+++ startnoui.c 2023-11-02 14:20:43.522000000 +0200
@@ -106,8 +106,8 @@
bindtextdomain("FontForge", getLocaleDir());
textdomain("FontForge");
+++ startnoui.c 2023-11-02 15:42:45.446000000 +0200
@@ -27,6 +27,7 @@
#include "fontforgevw.h"
#include "scripting.h"
#include "start.h"
+#include "encoding.h"

- if ( default_encoding==NULL )
- default_encoding=FindOrMakeEncoding("ISO8859-1");
+ //if ( default_encoding==NULL )
+ //default_encoding=FindOrMakeEncoding("ISO8859-1");
if ( default_encoding==NULL )
default_encoding=&custom; /* In case iconv is broken */
CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */
#ifndef _NO_LIBUNICODENAMES
#include <libunicodenames.h> /* need to open a database when we start */

0 comments on commit 65d3803

Please sign in to comment.