Attachment 229941 Details for Bug 260255 – misc/free42: fix build on armv7

[patch] misc/free42: fix build on armv7

0001-misc-free42-fix-build-on-armv7.patch (text/plain), 6.36 KB, created by Robert Clausecker on 2021-12-06 12:49:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-12-06 12:49:24 UTC

Size: 6.36 KB

patch

obsolete

>From 481a465ce010aa06e08db079cfced901027fc142 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Mon, 6 Dec 2021 11:04:57 +0100
>Subject: [PATCH] misc/free42: fix build on armv7
>
>The port had originally been patched by extracting the Intel RDFP Math
>Library component ahead of time and then patching it.  A recent change
>had broken this mechanism, causing all patches to it to be ignored.
>
>Restore the original way this port was built and add a patch to fix an
>issue with defining wchar_t.  This makes the port build fine on armv7.
>
>While we are at it, make the build less verbose and add a missing
>dependency on harfbuzz.
>---
> misc/free42/Makefile                          | 12 +++++++---
> .../files/patch-common_core__commands6.cc     |  4 ++--
> ...FPMathLib20U1_LIBRARY_src_bid__functions.h | 22 +++++++++++++++++--
> .../free42/files/patch-gtk_build-intel-lib.sh | 11 +++++-----
> .../files/patch-gtk_intel-lib-freebsd.patch   | 17 --------------
> 5 files changed, 37 insertions(+), 29 deletions(-)
> delete mode 100644 misc/free42/files/patch-gtk_intel-lib-freebsd.patch
>
>diff --git a/misc/free42/Makefile b/misc/free42/Makefile
>index ca93e46b5573..3e91573fe174 100644
>--- a/misc/free42/Makefile
>+++ b/misc/free42/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	free42
> DISTVERSION=	3.0.7
>+PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	http://thomasokken.com/free42/upstream/
> DISTNAME=	${PORTNAME}-nologo-${DISTVERSION}
>@@ -11,12 +12,17 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>-		libfreetype.so:print/freetype2
>+		libfreetype.so:print/freetype2 \
>+		libharfbuzz.so:print/harfbuzz
> 
> USES=		compiler dos2unix gmake gnome localbase pkgconfig tar:tgz xorg
> USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango
> USE_XORG=	x11 xmu
>-DOS2UNIX_FILES=	gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h common/bid_functions.h gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h
>+DOS2UNIX_FILES=	gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h \
>+		gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h \
>+		gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h \
>+		common/bid_functions.h \
>+		gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h
> 
> CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
> CXXFLAGS_clang=	-Wno-c++11-narrowing -Wno-constant-conversion # to accommodate some code breaking with clang-50
>@@ -30,7 +36,7 @@ PLIST_FILES+=	bin/${PORTNAME}${v}
> .endfor
> 
> post-extract:
>-	@cd ${BUILD_WRKSRC} && tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
>+	@cd ${BUILD_WRKSRC} && tar xfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|(free42dirname)|("${DATADIR}/skins")|' \
>diff --git a/misc/free42/files/patch-common_core__commands6.cc b/misc/free42/files/patch-common_core__commands6.cc
>index 55583b8e7f28..8b8901300be4 100644
>--- a/misc/free42/files/patch-common_core__commands6.cc
>+++ b/misc/free42/files/patch-common_core__commands6.cc
>@@ -1,6 +1,6 @@
>---- common/core_commands6.cc.orig	2021-03-17 00:38:17 UTC
>+--- common/core_commands6.cc.orig	2021-11-07 11:36:24 UTC
> +++ common/core_commands6.cc
>-@@ -1096,8 +1096,8 @@ int docmd_stoflag(arg_struct *arg) {
>+@@ -1081,8 +1081,8 @@ int docmd_stoflag(arg_struct *arg) {
>          p <<= 1;
>      }
>  
>diff --git a/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h b/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
>index 1369a7f697f9..029ff1c2ad3a 100644
>--- a/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
>+++ b/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
>@@ -1,6 +1,24 @@
>---- gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig	2021-03-25 17:43:14 UTC
>+--- gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig	2021-12-06 09:51:34 UTC
> +++ gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
>-@@ -159,11 +159,7 @@ typedef unsigned    long fexcept_t;
>+@@ -36,17 +36,9 @@
>+ #ifndef _BID_FUNCTIONS_H
>+ #define _BID_FUNCTIONS_H
>+ 
>+-#if !defined (__GNUC__) || defined(__QNX__)
>+ #include <wchar.h>
>+-#endif
>+ #include <ctype.h>
>+ 
>+-// Fix system header issue on Sun solaris and define required type by ourselves
>+-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
>+-typedef int   wchar_t;
>+-#endif
>+-
>+-
>+ #ifdef IN_LIBGCC2
>+ // When we are built as the part of the gcc runtime library, libgcc,
>+ // we will use gcc types defined in bid_gcc_intrinsics.h.
>+@@ -159,11 +151,7 @@ typedef unsigned    long fexcept_t;
>  typedef unsigned bid__int64 fexcept_t;
>  #endif
>  #else
>diff --git a/misc/free42/files/patch-gtk_build-intel-lib.sh b/misc/free42/files/patch-gtk_build-intel-lib.sh
>index bbc7a71882a4..ab7a51844cc7 100644
>--- a/misc/free42/files/patch-gtk_build-intel-lib.sh
>+++ b/misc/free42/files/patch-gtk_build-intel-lib.sh
>@@ -1,15 +1,16 @@
>---- gtk/build-intel-lib.sh.orig	2021-03-30 03:08:43 UTC
>+--- gtk/build-intel-lib.sh.orig	2021-11-07 11:36:24 UTC
> +++ gtk/build-intel-lib.sh
>-@@ -43,6 +43,8 @@ fi
>+@@ -41,8 +41,8 @@ else
>+   ENDIAN_ARG=
>+ fi
>  
>- tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
>+-tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
>  cd IntelRDFPMathLib20U1
> +sed -i '' -e 's/\r//g' LIBRARY/src/bid_functions.h
>-+patch -p0 <../intel-lib-freebsd.patch
>  patch -p0 <../intel-lib-linux.patch
>  
>  # When building for architectures other than x86 or x86_64, I remove the
>-@@ -55,11 +57,11 @@ patch -p0 <../intel-lib-linux.patch
>+@@ -55,11 +55,11 @@ patch -p0 <../intel-lib-linux.patch
>  # it to x86_64 works when targeting arm64, a 64-bit platform.
>  # Of course, proceed with caution. Your mileage may vary.
>  
>diff --git a/misc/free42/files/patch-gtk_intel-lib-freebsd.patch b/misc/free42/files/patch-gtk_intel-lib-freebsd.patch
>deleted file mode 100644
>index 8cbba70bb94e..000000000000
>--- a/misc/free42/files/patch-gtk_intel-lib-freebsd.patch
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- gtk/intel-lib-freebsd.patch.orig	2021-03-25 18:27:04 UTC
>-+++ gtk/intel-lib-freebsd.patch
>-@@ -0,0 +1,14 @@
>-+--- LIBRARY/src/bid_functions.h.orig	2021-03-25 17:43:14 UTC
>-++++ LIBRARY/src/bid_functions.h
>-+@@ -159,11 +159,7 @@ typedef unsigned    long fexcept_t;
>-+ typedef unsigned bid__int64 fexcept_t;
>-+ #endif
>-+ #else
>-+-#ifdef __QNX__
>-+ #include <fenv.h>
>-+-#else
>-+-typedef unsigned short int fexcept_t;
>-+-#endif
>-+ #endif
>-+ #endif
>-+ 
>-- 
>2.32.0
>

Flags:

fuz: maintainer-approval? (yuri)

Actions: View | Diff

Attachments on bug 260255: 229941