From nobody Sun May 1 09:12:20 2022 X-Original-To: dev-commits-ports-branches@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 BAAE71998B7A; Sun, 1 May 2022 09:12:20 +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 4KrgTw2kPWz4tcC; Sun, 1 May 2022 09:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651396340; 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=4a6dh3My+hdsdrAFmumHDsLvLSZorXabLmTufAAxiek=; b=BiTZIon2Ej1F3PBGOJhIqfyKRGklncNG5uHrU7vvSgGSx+oMU3M36LnteusThy3E1a9dJH CLicmiOh15VMZAWxRmuYWCG8MniXbPf7SMm8sod+ClbM4xtAKQt0dokM+TZAgzoH2phtVq kPg25EUOnPJQGUbvwhXfVj1Fl8n6JV4p88bb78NWSk0mpGnSmAkBCEugi/95Mn8uTZPZpr +Fe42AfvfeUpmQKYqXlkQUInikZB3p7raqlFxMcc+rCz8kmDmK3MkLXyenyvT6rNNC6yTt Y6qPCPCdC8ERMXHVxPsp3Wk97KKMbS/3agJPIxMyxKbniLeVvsS9tH+Avp30NQ== 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 3D606132C7; Sun, 1 May 2022 09:12:20 +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 2419CKM5098014; Sun, 1 May 2022 09:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2419CKD9098013; Sun, 1 May 2022 09:12:20 GMT (envelope-from git) Date: Sun, 1 May 2022 09:12:20 GMT Message-Id: <202205010912.2419CKD9098013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 2da3b360fc60 - 2022Q2 - editors/libreoffice: fix i386/powerpc libcxxrt ABI change detection List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 2da3b360fc609a03871e31c4c2c4830beeca478f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651396340; 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=4a6dh3My+hdsdrAFmumHDsLvLSZorXabLmTufAAxiek=; b=hUZT5lq4JnmVb2aCCeqHIlPpRSwtuPAAMgNZk6+tv1l5ipwWZ5/l+gqkfK7BSVVBs0I01F 6oItrZxADFYrf9RcgI4XNaVip6AvMnnD0vCRU7H1ZfCIoBndwmBLITRIJxSL9w1ZBktWzI z/oQXi4cbnlAuCEzsxzTNi1rq7lzUeSlnzU53SDVaelySUuiYhWyecZQVt4/OjrCzsMJvb Sea6z0PVU9xqFZ8Z+/rT0fomH0pYHHf4f0hWT6o7R//grdNOYFlBj5JSzfmi16Rod/uTKx GEWmiVbrLSUrohJH0Kc1WDYgXNuJ3uAdmnsiHy2ON0jpnYxTmHZuFk6b8m6xNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651396340; a=rsa-sha256; cv=none; b=b6EUZ3baV9DGxdGyEMVbRzELW6zwj+5BB9tVZRFz5/1tAxjkiAs8tTYl7QoMEtATdZSj7k ItJO1T1Q/CFaHFqzLnq4MX7ETNAudje8tKPo+FvmfqeyOJ8ayn78OSBDe5QPoZlWVV0FyG TCujM7RdtJI4yO6rrBgUkw9sTIpjip9TOVQg9tg0QIFHgZHqKwpDjKu281ffSpASZr4gY/ TV4DiGA2KWydQ2p1bKQBKmbxHYoOp7HbZCCxU48QFntR/8K/dEAT8n7XrLldZsz10GqwBc oOXdVTMzD3swF8alyoADT+Ejqg6o+AnVDqYZRjzNDKI9HzFYBXItBU3g0ltaNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=2da3b360fc609a03871e31c4c2c4830beeca478f commit 2da3b360fc609a03871e31c4c2c4830beeca478f Author: Tijl Coosemans AuthorDate: 2022-04-30 17:03:16 +0000 Commit: Tijl Coosemans CommitDate: 2022-05-01 09:09:13 +0000 editors/libreoffice: fix i386/powerpc libcxxrt ABI change detection This makes the bundled bridgetest_server/bridgetest_client working. Recently the size of struct __cxa_exception changed on 32 bit architectures. A patch committed in 35a5054819f1 lets libreoffice detect this by comparing a field of the struct against a known value. In the bridgetest it turns out this value isn't always the same, so use a different field instead. PR: 263596 (cherry picked from commit ca1c4839224a639c0ddd602a21b942efa4ca0952) --- editors/libreoffice/Makefile | 2 +- ...h-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx | 14 +++++++++----- ...ch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx | 10 +++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 7f4d00fcc486..f0f1edd13c73 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 3 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx index 439b9ea3adf4..ad195a344ce0 100644 --- a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx @@ -18,7 +18,7 @@ ::typelib_typedescription_getByName( &pTD, unoName.pData ); assert(pTD && "### unknown exception type! leaving out destruction => leaking!!!"); if (pTD) -@@ -262,8 +268,19 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -262,8 +268,23 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno) { @@ -29,10 +29,14 @@ + __cxxabiv1::__cxa_current_primary_exception()); + if (header) { + __cxxabiv1::__cxa_decrement_exception_refcount(header); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ uint64_t exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = reinterpret_cast<__cxxabiv1::__cxa_exception *>( + reinterpret_cast(header) - 12); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = nullptr; + } + } @@ -40,7 +44,7 @@ if (! header) { RuntimeException aRE( "no exception header!" ); -@@ -273,7 +290,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -273,7 +294,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * return; } @@ -49,7 +53,7 @@ typelib_TypeDescription * pExcTypeDescr = nullptr; OUString unoName( toUNOname( exceptionType->name() ) ); -@@ -292,7 +309,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * +@@ -292,7 +313,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * else { // construct uno exception any diff --git a/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx b/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx index c656588cb0a5..4c6e5f0a6941 100644 --- a/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx +++ b/editors/libreoffice/files/powerpc64/patch-bridges-source-cpp_uno-gcc3_linux_powerpc-except.cxx @@ -48,7 +48,7 @@ ::typelib_typedescription_getByName( &pTD, unoName.pData ); assert(pTD && "### unknown exception type! leaving out destruction => leaking!!!"); if (pTD) -@@ -218,39 +225,68 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * +@@ -218,39 +225,72 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * if (! pTypeDescr) terminate(); @@ -86,10 +86,14 @@ + __cxxabiv1::__cxa_current_primary_exception()); + if (header) { + __cxxabiv1::__cxa_decrement_exception_refcount(header); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ uint64_t exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = reinterpret_cast<__cxxabiv1::__cxa_exception *>( + reinterpret_cast(header) - 12); -+ if (header[-1].exceptionDestructor != &deleteException) { ++ exc_class = header[-1].unwindHeader.exception_class ++ & 0xffffffffffffff00; ++ if (exc_class != /* "GNUCC++" */ 0x474e5543432b2b00) { + header = nullptr; + } + }