From nobody Sun Jan 23 20:03:24 2022 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 18A4B19845B4; Sun, 23 Jan 2022 20:03:25 +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 4JhkZN69Xsz4d2T; Sun, 23 Jan 2022 20:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642968205; 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=0AW9Un/Rx8AIzfU7IfUBZ0yrwzVdtj6RMCCxPjjIlf4=; b=Hbgn9CE3HxS0eEj1sZuszCDfxXj4IbN+LM5fg3Z9u2T4aKrP3J6Fx3G7oFwyHlWLWr1Hza 61s4CvAmpspiqpxhjFEpuIb51l1dLspvKMHKGqLmLq82mV2CXWeojW+ZgZKwyMoiRMlE4k yZcP95nH4yuRGs4t1EX0Ib20VUlcVAm5WCIY0P57Tid3X8PL4MiyFurSVkjGs0Etimu6x+ SJa7WyR6bOfssgDF4UaogwZi3q//nkTrTPEgW5RulN8xa5T6GY5y6hMiCh5qVXD2v2tLRp Hy/yvsdM6/Pu2O6yAm5C0mTBrOzSyunhDMETyCTwQf+iL/JWazIIb1EtHCXTZA== 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 AB15A639; Sun, 23 Jan 2022 20:03:24 +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 20NK3O13077705; Sun, 23 Jan 2022 20:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NK3Ond077704; Sun, 23 Jan 2022 20:03:24 GMT (envelope-from git) Date: Sun, 23 Jan 2022 20:03:24 GMT Message-Id: <202201232003.20NK3Ond077704@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 181ced015360 - 2022Q1 - x11/cde: MFH x11/cde fixes 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 181ced015360d1b86b57298da7be4422e0d28522 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642968205; 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=0AW9Un/Rx8AIzfU7IfUBZ0yrwzVdtj6RMCCxPjjIlf4=; b=ZRzWfAegnfbbQS5FGIkhVfq8WeQz0xcmnEU9NfHK4MtfhGdWXQDxb8ozHzPos5lRmAFFAl r0kwUUpMfjJp/gT05PWFdd6G0iZGg6en7aHwtZtiVlCVJhs50gjHTGrVVVVWYer7vUDh5e i1/C3a4LV3eJ1Y/67Ij7JdUddvx0ZJ2p+U6/TzeUFCw7/weUT8rMJbwHyG11/L2Aw6WchR S76ZymnzZ4QOUATPViPzeHo1cJ+nWwmjKuSv5S5o0HWlUegW9FURR+keSU4Gl6OFY5MlvB HFAFOc6Jri2rhUzQir/KUju7sPdPjHyxIBKvGPxCTgKNrhHUC3X/ym4DjVzJAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642968205; a=rsa-sha256; cv=none; b=DNnuEJLw6l2OFU8BXlFwRNbHsnngyk99bxBC6XPJAAateVJ7DSOxtxBlVUgZceGd9y3b92 DrGR7e47TAEClTuQkVUPvE/ypOXw1DrNiFE0/W7iNQ+38vg0PMaiFDxcKtj/HtNvfIxQuO kFhsqq02gv4EGdKA3Q2o5Hw6Yn1HDju7/3FI/Ns+38pQnV/kHRtUVOyQF8RQ489DhflLTm XGGYJSRFcC1Q8qzBQCN+2ABCyNFQy2F4XUZT0mei532qMLjBw2B52CPm66dO5o6hfYQTNq G7W9lzWonofXJ436Ch35qqb5Bm4DUn1TuAMWvUI/DkUUbCTjSb8lz6DztGvxtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=181ced015360d1b86b57298da7be4422e0d28522 commit 181ced015360d1b86b57298da7be4422e0d28522 Author: Cy Schubert AuthorDate: 2022-01-20 21:20:59 +0000 Commit: Cy Schubert CommitDate: 2022-01-23 20:02:29 +0000 x11/cde: MFH x11/cde fixes The following MFHs were requested by Robert Clausecker in PR/261359: Requested by: Robert Clausecker PR: 261359 -- x11/cde: Fix armv7 build In attempting to fix powerpc64le, c66a851d13783558a8fa17ffcf64759a0c1b5bab broke armv7. Fix it. PR: 261359 Reported by: Robert Clausecker Fixes: c66a851d13783558a8fa17ffcf64759a0c1b5bab (cherry picked from commit 47d8fb3af3f0e411edcb06a9c694813404c8fe39) -- x11/cde: Mark BROKEN on armv7 STAGEDIR contains numerous intermediate files likely used during the install process which are not in the final STAGEDIR on other platforms. An example of one of the 5830 orphaned files is: dt/app-defaults/C/ecp.2AeDmfIk. PR: 261359 (cherry picked from commit 03c319e5e9f2bd0244819d0d74159d98c10842d2) -- x11/cde: Handle undstrippable outputs Stripping unstrippable files results in ecp.* files. Deal with the fallout. PR: 261359, 261359 (cherry picked from commit ba5de232fe34dc71085e96d1df7937bea080f4d6) -- x11/cde: Fix a typo Reported by: adridg (cherry picked from commit 235153c84f41c06ba188bf3df297a6e87b2fe339) --- x11/cde/Makefile | 10 +++++++++- ...h-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c | 15 ++++++++++----- ...h-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c | 15 ++++++++++----- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/x11/cde/Makefile b/x11/cde/Makefile index a87ec364b298..257ecc4ea23c 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -40,6 +40,12 @@ MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message LDFLAGS+= -z muldefs #--allow-multiple-definition +.include + +.if ${ARCH} == powerpc64le +CPPFLAGS+= -DPOWERPC64LE +.endif + post-patch: @if [ -f /usr/include/iconv.h ]; then \ ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \ @@ -115,5 +121,7 @@ do-install: post-install: ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; + # Only a problem on armv7 so far + ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete -.include +.include diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c index f050420f5e21..004f6a5212b9 100644 --- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c +++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c @@ -1,20 +1,25 @@ ---- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig 2021-12-13 19:03:46 UTC -+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c -@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...) +--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig 2022-01-20 12:56:31.275926000 -0800 ++++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c 2022-01-20 12:59:47.461533000 -0800 +@@ -49,6 +49,9 @@ va_list* vp = va; Hash_region_f region = 0; void* handle; ++#ifdef POWERPC64LE + va_listarg tmpval; ++#endif va_start(ap, ref); -@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...) +@@ -151,7 +154,12 @@ va_copy(*vp, ap); vp++; } -- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#ifdef POWERPC64LE + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); ++#else + va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#endif break; case 0: if (vp > va) diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c index 5dcf7b11dafe..ae486604c41e 100644 --- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c +++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c @@ -1,20 +1,25 @@ ---- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig 2021-12-13 22:46:02 UTC -+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c -@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt, +--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig 2022-01-20 12:56:38.679529000 -0800 ++++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c 2022-01-20 13:02:26.179022000 -0800 +@@ -188,6 +188,9 @@ char** p_string; char* prv_f = 0; va_list prv_ap; ++#ifdef POWERPC64LE + va_listarg tmpval; ++#endif va_start(ap, fmt); if (!*s || *s == '\n') -@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt, +@@ -233,7 +236,12 @@ prv_f = f; f = va_arg(ap, char*); va_copy(prv_ap, ap); -- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#ifdef POWERPC64LE + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); ++#else + va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#endif continue; case 'c': p_char = va_arg(ap, char*);