From nobody Mon Dec 06 17:32:52 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE08818C4FA0; Mon, 6 Dec 2021 17:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J79Vr6d6Yz3jkh; Mon, 6 Dec 2021 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A55EE7CF2; Mon, 6 Dec 2021 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6HWqCZ068815; Mon, 6 Dec 2021 17:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6HWqiW068814; Mon, 6 Dec 2021 17:32:52 GMT (envelope-from git) Date: Mon, 6 Dec 2021 17:32:52 GMT Message-Id: <202112061732.1B6HWqiW068814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 1d7c16ff2465 - main - misc/free42: Fix build on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d7c16ff2465372af06c92d7c8f92f4a0a718bb2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638811973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JupuK8Xf901R9/WztBnwDTPege1TrQHzWULMGs9a+h8=; b=p4payD6UbRkON9lnrG7C0R+uHTvHxdFhOejJDca9S5m7SWrK0+6p2qqtyFULBhMkBPXOpr +Be0yzP7emlHbGT8/nupqhQ2rOKXyJtclPEEPFM6pq/4dVQe014W4MFyiQpSHs4SoqDPdl jeRkMsex9ddk8rLVE3sCkplEOKuxT5oBonOL9JCzddjBhc3SLSfOYpspEkVi9W5rUlkNtW Ugg0/JyA8QgDNywUxsQt8SHqaybXY42vc0RABGwue0d87ETCM+BlXUbQ4Z6TgMnNUOgkpP 70zzqYE5pQ7a5UqxKPYnxvfnK85g52D7/03WvFBfZcBvDqtQP3x+LXkI36cWnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638811973; a=rsa-sha256; cv=none; b=d2TYOzc0y9j1yx5kQf61eug7x//ScVfmjyXP6H8yH6uNLlbRoGRGFyW7s3vus+k9fcR2Se 6QCbu/99ZWZr3GywROa01uH4JWyH/ocPmi/lTHLJ81uw8B1ov8LoCzHi5qUInpKPkdmzDi gP53j/B6ndlS3h8Ok7HRyHhFKoRxeEBTNtcWr+7GAa+oVO2puKIEB1MLLQ9DeuPQazl+50 WqMBTzQ2aBBNJFH4vVgXkHbFuumsPPmomF0ALWsopaA9NMepURe+XWW1364PICLzGyA0vO juVomh6BzH3TXCvEH7x7/qU3ADgvxMlNBqss49cBg0aNVaIkyy6wxx9AOC83dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d7c16ff2465372af06c92d7c8f92f4a0a718bb2 commit 1d7c16ff2465372af06c92d7c8f92f4a0a718bb2 Author: Robert Clausecker AuthorDate: 2021-12-06 17:31:33 +0000 Commit: Yuri Victorovich CommitDate: 2021-12-06 17:32:49 +0000 misc/free42: Fix build on armv7 PR: 260255 --- misc/free42/Makefile | 12 +++++++++--- ...telRDFPMathLib20U1_LIBRARY_src_bid__functions.h | 22 ++++++++++++++++++++-- misc/free42/files/patch-gtk_build-intel-lib.sh | 11 ++++++----- .../free42/files/patch-gtk_intel-lib-freebsd.patch | 17 ----------------- 4 files changed, 35 insertions(+), 27 deletions(-) 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-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 +-#endif + #include + +-// 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 -+-#else -+-typedef unsigned short int fexcept_t; -+-#endif -+ #endif -+ #endif -+