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

Graphite2 (#8235)

Browse Source 
* fontforge, bump version

* graphite2, cleanup
This commit is contained in:
Schrijvers Luc
2023-04-02 15:29:17 +02:00
committed by GitHub
parent 7b0c0671ab
commit 8bbfbb90ad
5 changed files with 55 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
media-gfx/fontforge/fontforge-20170731.recipe
View File

@@ -1,105 +0,0 @@
SUMMARY="An outline font editor"
DESCRIPTION="An outline font editor that lets you create your own OpenType, \
TrueType, CID-keyed, multi-master fonts and more... or simply edit existing \
ones."
HOMEPAGE="http://fontforge.sourceforge.net"
COPYRIGHT="2000-2017 George Williams
The FontForge Project
"
LICENSE="BSD (3-clause)"
REVISION="3"
SOURCE_URI="https://github.com/fontforge/fontforge/releases/download/$portVersion/fontforge-dist-$portVersion.tar.xz"
CHECKSUM_SHA256="840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822"
SOURCE_DIR="fontforge-2.0.$portVersion"
PATCHES="fontforge-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 !x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
fontforge$secondaryArchSuffix = $portVersion
cmd:fontforge$secondaryArchSuffix
cmd:fontimage$secondaryArchSuffix
cmd:fontlint$secondaryArchSuffix
cmd:sfddiff$secondaryArchSuffix
lib:libfontforge$secondaryArchSuffix = 2.0.0 compat >= 2
lib:libfontforgeexe$secondaryArchSuffix = 2.0.0 compat >= 2
lib:libgioftp$secondaryArchSuffix = 2.0.0 compat >= 2
lib:libgunicode$secondaryArchSuffix = 4.0.0 compat >= 4
lib:libgutils$secondaryArchSuffix = 2.0.0 compat >= 2
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libltdl$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libpython3.6m$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
fontforge${secondaryArchSuffix}_devel = $portVersion
devel:libfontforge$secondaryArchSuffix = 2.0.0 compat >= 2
devel:libfontforgeexe$secondaryArchSuffix = 2.0.0 compat >= 2
devel:libgioftp$secondaryArchSuffix = 2.0.0 compat >= 2
devel:libgunicode$secondaryArchSuffix = 4.0.0 compat >= 4
devel:libgutils$secondaryArchSuffix = 2.0.0 compat >= 2
"
REQUIRES_devel="
fontforge$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libfreetype$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpython3.6m$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python3
cmd:tar
"
BUILD()
{
export LDFLAGS="-lnetwork $LDFLAGS"
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
for l in libfontforge libfontforgeexe libgioftp libgunicode libgutils; do
rm -f $libDir/$l.la
prepareInstalledDevelLib $l
done
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}

58
media-gfx/fontforge/fontforge-20190501~git.recipe → media-gfx/fontforge/fontforge-20230101.recipe
View File

@@ -7,14 +7,13 @@ COPYRIGHT="2000-2018 George Williams
The FontForge Project"
LICENSE="GNU GPL v3
BSD (3-clause)"
REVISION="6"
srcGitRev="e99cc504beb6b7765d72d9f4698ae1b727031aaa"
SOURCE_URI="https://github.com/fontforge/fontforge/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="bf99ec3da1f1467d96a48562367a8c472cd3ec6a2685f537d952da63aa304120"
REVISION="1"
SOURCE_URI="https://github.com/fontforge/fontforge/archive/refs/tags/$portVersion.tar.gz"
CHECKSUM_SHA256="ab0c4be41be15ce46a1be1482430d8e15201846269de89df67db32c7de4343f1"
SOURCE_FILENAME="fontforge-$portVersion.tar.gz"
SOURCE_DIR="fontforge-$srcGitRev"
PATCHES="fontforge-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 !x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -25,16 +24,15 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi
pythonVersion=3.9
PROVIDES="
fontforge$secondaryArchSuffix = $portVersion
cmd:fontforge$commandSuffix
cmd:fontimage$commandSuffix
cmd:fontlint$commandSuffix
cmd:sfddiff$commandSuffix
lib:libfontforge$secondaryArchSuffix = 3.0.0 compat >= 3
lib:libfontforgeexe$secondaryArchSuffix = 3.0.0 compat >= 3
lib:libgunicode$secondaryArchSuffix = 5.0.0 compat >= 5
lib:libgutils$secondaryArchSuffix = 3.0.1 compat >= 3
lib:libfontforge$secondaryArchSuffix = 4
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -51,7 +49,7 @@ REQUIRES="
lib:libncurses$secondaryArchSuffix
# lib:libpangocairo_1.0$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpython3.7m$secondaryArchSuffix
lib:libpython$pythonVersion$secondaryArchSuffix
lib:libreadline$secondaryArchSuffix
lib:libspiro$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
@@ -62,10 +60,7 @@ REQUIRES="
PROVIDES_devel="
fontforge${secondaryArchSuffix}_devel = $portVersion
devel:libfontforge$secondaryArchSuffix = 3.0.0 compat >= 3
devel:libfontforgeexe$secondaryArchSuffix = 3.0.0 compat >= 3
devel:libgunicode$secondaryArchSuffix = 5.0.0 compat >= 5
devel:libgutils$secondaryArchSuffix = 3.0.1 compat >= 3
devel:libfontforge$secondaryArchSuffix = 4
"
REQUIRES_devel="
fontforge$secondaryArchSuffix == $portVersion base
@@ -86,7 +81,7 @@ BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
# devel:libpangocairo_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpython3.7m$secondaryArchSuffix
devel:libpython$pythonVersion$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libspiro$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
@@ -95,37 +90,36 @@ BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:find
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:ninja
cmd:pkg_config$secondaryArchSuffix
cmd:python3.7
cmd:python3
"
BUILD()
{
export LDFLAGS="-lnetwork $LDFLAGS"
./bootstrap
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--enable-python-scripting=3
make $jobArgs
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-DBUILD_SHARED_LIBS=ON \
-DPYHOOK_INSTALL_DIR=$prefix/lib/python$pythonVersion/vendor-packages \
-DENABLE_GUI=OFF
make -C build $jobArgs
}
INSTALL()
{
make install
make -C build install
for l in libfontforge libfontforgeexe libgunicode libgutils; do
rm -f $libDir/$l.la
prepareInstalledDevelLib $l
done
fixPkgconfig
# we are not linux
rm -rf $dataDir/{applications,icons,metainfo,mime}
prepareInstalledDevelLib libfontforge
# devel package
packageEntries devel \

22
media-gfx/fontforge/patches/fontforge-20170731.patchset
View File

@@ -1,22 +0,0 @@
From c59f78f9735c2d8f1adca59a2f6d4bd0336cf969 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Fri, 3 Aug 2018 23:35:30 +0200
Subject: Haiku fix
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index 6906cb4..0cf17a8 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -2582,7 +2582,7 @@ extern void debug_printHint( StemInfo *h, char* msg );
#include "ustring.h"
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__HAIKU__)
#define BAD_LOCALE_HACK
typedef char* locale_t;
#define LC_GLOBAL_LOCALE ((locale_t)-1)
--
2.16.4

22
media-gfx/fontforge/patches/fontforge-20230101.patchset Normal file
View File

@@ -0,0 +1,22 @@
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

15
media-gfx/graphite2/graphite2-1.3.14.recipe
View File

@@ -4,7 +4,7 @@ complex non-Roman writing systems."
HOMEPAGE="http://graphite.sil.org/"
COPYRIGHT="2010-2018 SIL International"
LICENSE="GNU LGPL v2.1"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/silnrsi/graphite/releases/download/$portVersion/graphite2-$portVersion.tgz"
CHECKSUM_SHA256="f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d"
PATCHES="graphite2-$portVersion.patchset"
@@ -48,18 +48,17 @@ defineDebugInfoPackage graphite2$secondaryArchSuffix \
BUILD()
{
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-DLIB_SUFFIX=$secondaryArchSubDir \
.
make $jobArgs
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DLIB_SUFFIX=$secondaryArchSubDir
make -C build $jobArgs
}
INSTALL()
{
make install
make -C build install
prepareInstalledDevelLibs libgraphite2
prepareInstalledDevelLib libgraphite2
fixPkgconfig
# devel package