diff --git a/media-gfx/fontforge/additional-files/fontforge-20141126.patchset b/media-gfx/fontforge/additional-files/fontforge-20141126.patchset deleted file mode 100644 index 7aef963a6..000000000 --- a/media-gfx/fontforge/additional-files/fontforge-20141126.patchset +++ /dev/null @@ -1,63 +0,0 @@ -From 780be69568af23c771f25a916c74c29aee7e3723 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 28 Nov 2014 19:41:17 +0000 -Subject: [PATCH] we don't have locale_t... - ---- - fontforge/splinefont.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h -index 45548d2..ae3297e 100644 ---- a/fontforge/splinefont.h -+++ b/fontforge/splinefont.h -@@ -3546,7 +3546,7 @@ char * delimit_null(const char * input, char delimiter); - - #include "ustring.h" - --#ifdef __MINGW32__ -+#if defined (__MINGW32__) || defined (__HAIKU__) - #define BAD_LOCALE_HACK - typedef char* locale_t; - #define LC_GLOBAL_LOCALE ((locale_t)-1) --- -1.8.3.4 - -From 780be69568af23c771f25a916c74c29aee7e3723 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 28 Nov 2014 19:41:17 +0000 -Subject: [PATCH] we don't have locale_t... - ---- - fontforge/splinefont.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h -index 45548d2..ae3297e 100644 ---- a/fontforge/splinefont.h -+++ b/fontforge/splinefont.h -@@ -3546,7 +3546,7 @@ char * delimit_null(const char * input, char delimiter); - - #include "ustring.h" - --#ifdef __MINGW32__ -+#if defined (__MINGW32__) || defined (__HAIKU__) - #define BAD_LOCALE_HACK - typedef char* locale_t; - #define LC_GLOBAL_LOCALE ((locale_t)-1) --- -1.8.3.4 - -diff --git a/fontforge/cvundoes.c b/fontforge/cvundoes.c -index 42ad37b..b06fe0a 100644 ---- a/fontforge/cvundoes.c -+++ b/fontforge/cvundoes.c -@@ -33,7 +33,7 @@ - #include "inc/gfile.h" - #include "psfont.h" - --#if defined(__MINGW32__)||defined(__CYGWIN__) -+#if defined(__MINGW32__)||defined(__CYGWIN__)||defined(__HAIKU__) - // no backtrace on windows yet - #else - #include diff --git a/media-gfx/fontforge/fontforge-20141126.recipe b/media-gfx/fontforge/fontforge-20170731.recipe similarity index 75% rename from media-gfx/fontforge/fontforge-20141126.recipe rename to media-gfx/fontforge/fontforge-20170731.recipe index b07b8b635..f3dc3a1e0 100644 --- a/media-gfx/fontforge/fontforge-20141126.recipe +++ b/media-gfx/fontforge/fontforge-20170731.recipe @@ -3,18 +3,17 @@ 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-2012 George Williams +COPYRIGHT="2000-2017 George Williams The FontForge Project " LICENSE="BSD (3-clause)" -SOURCE_URI="https://github.com/fontforge/fontforge/releases/download/$portVersion/fontforge-2014-11-26-Unix-Source.tar.gz" -SOURCE_FILENAME="fontforge-$portVersion.tar.gz" -CHECKSUM_SHA256="853d52c36d2da8a80c64def2483ddd9f79a028ec8fcea41ae46a7df2cc2cd38f" -ADDITIONAL_FILES="fontforge-$portVersion.patchset" +SOURCE_URI="https://github.com/fontforge/fontforge/releases/download/$portVersion/fontforge-dist-$portVersion.tar.xz" +CHECKSUM_SHA256="840adefbedd1717e6b70b33ad1e7f2b116678fa6a3d52d45316793b9fd808822" +SOURCE_DIR="fontforge-2.0.$portVersion" REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" -SECONDARY_ARCHITECTURES="!x86" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +PATCHES="fontforge-$portVersion.patchset" PROVIDES=" fontforge$secondaryArchSuffix = $portVersion @@ -34,23 +33,35 @@ REQUIRES=" lib:libglib_2.0$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix - lib:libpython2.7$secondaryArchSuffix + lib:libpython3.6m$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libltdl$secondaryArchSuffix " + +PROVIDES_devel=" + fontforge${secondaryArchSuffix}_devel = $portVersion + devel:libfontforge$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libfontforgeexe$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libgunicode$secondaryArchSuffix = 4.0.0 compat >= 4 + devel:libgutils$secondaryArchSuffix = 2.0.0 compat >= 2 + devel:libgioftp$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:libpython2.7$secondaryArchSuffix + devel:libpython3.6m$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -64,18 +75,15 @@ BUILD_PREREQUIRES=" cmd:libtool cmd:ld$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - cmd:python2.7 + cmd:python3 cmd:perl cmd:tar cmd:find - cmd:git " BUILD() { - patch -p1 -N < $portDir/additional-files/fontforge-$portVersion.patchset \ - || true - ./bootstrap --skip-git + export LDFLAGS="-lnetwork $LDFLAGS" runConfigure ./configure make $jobArgs } @@ -84,26 +92,13 @@ INSTALL() { make install - prepareInstalledDevelLibs libfontforge libfontforgeexe \ - libgioftp libgunicode libgutils + for l in libfontforge libfontforgeexe libgioftp libgunicode libgutils; do + rm -f $libDir/$l.la + prepareInstalledDevelLib $l + done fixPkgconfig # devel package packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - fontforge${secondaryArchSuffix}_devel = $portVersion - devel:libfontforge$secondaryArchSuffix = 2.0.0 compat >= 2 - devel:libfontforgeexe$secondaryArchSuffix = 2.0.0 compat >= 2 - devel:libgunicode$secondaryArchSuffix = 4.0.0 compat >= 4 - devel:libgutils$secondaryArchSuffix = 2.0.0 compat >= 2 - devel:libgioftp$secondaryArchSuffix = 2.0.0 compat >= 2 - " -REQUIRES_devel=" - fontforge$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix - " diff --git a/media-gfx/fontforge/patches/fontforge-20170731.patchset b/media-gfx/fontforge/patches/fontforge-20170731.patchset new file mode 100644 index 000000000..f38862c65 --- /dev/null +++ b/media-gfx/fontforge/patches/fontforge-20170731.patchset @@ -0,0 +1,22 @@ +From c59f78f9735c2d8f1adca59a2f6d4bd0336cf969 Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +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 +