haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fontforge, bump revision, fixes (moved to python3.9 with a patch) (#8239)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-04-02 18:31:23 +02:00
committed by GitHub
parent 97bb03bc57
commit a844a3cdae
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media-gfx/fontforge/fontforge-20190501~git.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="2000-2018 George Williams
The FontForge Project"
LICENSE="GNU GPL v3
BSD (3-clause)"
REVISION="6"
REVISION="7"
srcGitRev="e99cc504beb6b7765d72d9f4698ae1b727031aaa"
SOURCE_URI="https://github.com/fontforge/fontforge/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="bf99ec3da1f1467d96a48562367a8c472cd3ec6a2685f537d952da63aa304120"
@@ -108,13 +108,18 @@ BUILD_PREREQUIRES="
cmd:python3
"
TEST_REQUIRES="
cmd:wget
"
BUILD()
{
export LDFLAGS="-lnetwork $LDFLAGS"
./bootstrap
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--enable-python-scripting=3
--enable-python-scripting=3 \
--disable-static
make $jobArgs
}

31
media-gfx/fontforge/patches/fontforge-20190501~git.patchset
View File

@@ -1,4 +1,4 @@
From 36e43aaf6451c49c20c9d70c1323d1d5a3fc232e Mon Sep 17 00:00:00 2001
From 2259ad25123ad6254c412a8fa017657d8babd40d 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
@@ -21,10 +21,10 @@ index 8f54ef4..643e3dd 100644
2.37.3
From 1c8bd45ff63dff8a9ac5a1f578da4a097adce43d Mon Sep 17 00:00:00 2001
From b43decb01a4428a32b60cba25936f99c14280750 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
Subject: Don't use -Werror=int-conversion on 32bit
diff --git a/configure.ac b/configure.ac
@@ -43,3 +43,28 @@ index 1ed4685..d124e94 100644
--
2.37.3
From 5627c0819e05c49625e0d5a0597e3ee9d8c287ad Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 2 Apr 2023 17:04:10 +0200
Subject: Fix build with python newer then 3.7
diff --git a/m4/fontforge_arg_enable.m4 b/m4/fontforge_arg_enable.m4
index 26e02cd..533bf9d 100644
--- a/m4/fontforge_arg_enable.m4
+++ b/m4/fontforge_arg_enable.m4
@@ -116,8 +116,8 @@ fi
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
--
2.37.3