View | Details | Raw Unified | Return to bug 260255
Collapse All | Expand All

(-)b/misc/free42/Makefile (-3 / +9 lines)
Lines 1-5 Link Here
1
PORTNAME=	free42
1
PORTNAME=	free42
2
DISTVERSION=	3.0.7
2
DISTVERSION=	3.0.7
3
PORTREVISION=	1
3
CATEGORIES=	misc
4
CATEGORIES=	misc
4
MASTER_SITES=	http://thomasokken.com/free42/upstream/
5
MASTER_SITES=	http://thomasokken.com/free42/upstream/
5
DISTNAME=	${PORTNAME}-nologo-${DISTVERSION}
6
DISTNAME=	${PORTNAME}-nologo-${DISTVERSION}
Lines 11-22 LICENSE= GPLv2 Link Here
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
LICENSE_FILE=	${WRKSRC}/COPYING
12
13
13
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
14
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
14
		libfreetype.so:print/freetype2
15
		libfreetype.so:print/freetype2 \
16
		libharfbuzz.so:print/harfbuzz
15
17
16
USES=		compiler dos2unix gmake gnome localbase pkgconfig tar:tgz xorg
18
USES=		compiler dos2unix gmake gnome localbase pkgconfig tar:tgz xorg
17
USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango
19
USE_GNOME=	atk cairo gdkpixbuf2 gtk30 pango
18
USE_XORG=	x11 xmu
20
USE_XORG=	x11 xmu
19
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
21
DOS2UNIX_FILES=	gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h \
22
		gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h \
23
		gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h \
24
		common/bid_functions.h \
25
		gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h
20
26
21
CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
27
CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
22
CXXFLAGS_clang=	-Wno-c++11-narrowing -Wno-constant-conversion # to accommodate some code breaking with clang-50
28
CXXFLAGS_clang=	-Wno-c++11-narrowing -Wno-constant-conversion # to accommodate some code breaking with clang-50
Lines 30-36 PLIST_FILES+= bin/${PORTNAME}${v} Link Here
30
.endfor
36
.endfor
31
37
32
post-extract:
38
post-extract:
33
	@cd ${BUILD_WRKSRC} && tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
39
	@cd ${BUILD_WRKSRC} && tar xfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
34
40
35
post-patch:
41
post-patch:
36
	@${REINPLACE_CMD} -e 's|(free42dirname)|("${DATADIR}/skins")|' \
42
	@${REINPLACE_CMD} -e 's|(free42dirname)|("${DATADIR}/skins")|' \
(-)b/misc/free42/files/patch-common_core__commands6.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- common/core_commands6.cc.orig	2021-03-17 00:38:17 UTC
1
--- common/core_commands6.cc.orig	2021-11-07 11:36:24 UTC
2
+++ common/core_commands6.cc
2
+++ common/core_commands6.cc
3
@@ -1096,8 +1096,8 @@ int docmd_stoflag(arg_struct *arg) {
3
@@ -1081,8 +1081,8 @@ int docmd_stoflag(arg_struct *arg) {
4
         p <<= 1;
4
         p <<= 1;
5
     }
5
     }
6
 
6
 
(-)b/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h (-2 / +20 lines)
Lines 1-6 Link Here
1
--- gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig	2021-03-25 17:43:14 UTC
1
--- gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig	2021-12-06 09:51:34 UTC
2
+++ gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
2
+++ gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
3
@@ -159,11 +159,7 @@ typedef unsigned    long fexcept_t;
3
@@ -36,17 +36,9 @@
4
 #ifndef _BID_FUNCTIONS_H
5
 #define _BID_FUNCTIONS_H
6
 
7
-#if !defined (__GNUC__) || defined(__QNX__)
8
 #include <wchar.h>
9
-#endif
10
 #include <ctype.h>
11
 
12
-// Fix system header issue on Sun solaris and define required type by ourselves
13
-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
14
-typedef int   wchar_t;
15
-#endif
16
-
17
-
18
 #ifdef IN_LIBGCC2
19
 // When we are built as the part of the gcc runtime library, libgcc,
20
 // we will use gcc types defined in bid_gcc_intrinsics.h.
21
@@ -159,11 +151,7 @@ typedef unsigned    long fexcept_t;
4
 typedef unsigned bid__int64 fexcept_t;
22
 typedef unsigned bid__int64 fexcept_t;
5
 #endif
23
 #endif
6
 #else
24
 #else
(-)b/misc/free42/files/patch-gtk_build-intel-lib.sh (-5 / +6 lines)
Lines 1-15 Link Here
1
--- gtk/build-intel-lib.sh.orig	2021-03-30 03:08:43 UTC
1
--- gtk/build-intel-lib.sh.orig	2021-11-07 11:36:24 UTC
2
+++ gtk/build-intel-lib.sh
2
+++ gtk/build-intel-lib.sh
3
@@ -43,6 +43,8 @@ fi
3
@@ -41,8 +41,8 @@ else
4
   ENDIAN_ARG=
5
 fi
4
 
6
 
5
 tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
7
-tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
6
 cd IntelRDFPMathLib20U1
8
 cd IntelRDFPMathLib20U1
7
+sed -i '' -e 's/\r//g' LIBRARY/src/bid_functions.h
9
+sed -i '' -e 's/\r//g' LIBRARY/src/bid_functions.h
8
+patch -p0 <../intel-lib-freebsd.patch
9
 patch -p0 <../intel-lib-linux.patch
10
 patch -p0 <../intel-lib-linux.patch
10
 
11
 
11
 # When building for architectures other than x86 or x86_64, I remove the
12
 # When building for architectures other than x86 or x86_64, I remove the
12
@@ -55,11 +57,11 @@ patch -p0 <../intel-lib-linux.patch
13
@@ -55,11 +55,11 @@ patch -p0 <../intel-lib-linux.patch
13
 # it to x86_64 works when targeting arm64, a 64-bit platform.
14
 # it to x86_64 works when targeting arm64, a 64-bit platform.
14
 # Of course, proceed with caution. Your mileage may vary.
15
 # Of course, proceed with caution. Your mileage may vary.
15
 
16
 
(-)a/misc/free42/files/patch-gtk_intel-lib-freebsd.patch (-18 lines)
Removed Link Here
1
--- gtk/intel-lib-freebsd.patch.orig	2021-03-25 18:27:04 UTC
2
+++ gtk/intel-lib-freebsd.patch
3
@@ -0,0 +1,14 @@
4
+--- LIBRARY/src/bid_functions.h.orig	2021-03-25 17:43:14 UTC
5
++++ LIBRARY/src/bid_functions.h
6
+@@ -159,11 +159,7 @@ typedef unsigned    long fexcept_t;
7
+ typedef unsigned bid__int64 fexcept_t;
8
+ #endif
9
+ #else
10
+-#ifdef __QNX__
11
+ #include <fenv.h>
12
+-#else
13
+-typedef unsigned short int fexcept_t;
14
+-#endif
15
+ #endif
16
+ #endif
17
+ 
18
- 

Return to bug 260255