From nobody Tue Feb 13 23:45:02 2024 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 4TZHxV5xtMz5B6CB; Tue, 13 Feb 2024 23:45:02 +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 4TZHxV5RkDz4mX5; Tue, 13 Feb 2024 23:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707867902; 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=d25MaSeHCqK0hzpBmT4rnW+pwZ2sTgxxBWPl91q76uI=; b=vdXWKFYUys2yXsdB6bHC1QWQBBbSc1voEIqz4pZ5twuAByuuYbTd24MOqGfhCIFRyrLD2V aWzetqYrf5Whf2XoR6veU/N3Sl9zw5fzF5EDGGHpqXcjCyHsnUPFYA5tPjZUnD/qPL1d4I qFIvWdP3KxqTx6WFM5+vRS6hbXgZ7dAgZUVRK+pHsR3OcSBge+/8Fx1yv1RXPjX0xPZFvw WaGqZPexHf6dqxsMbQ16klDhqLD1cBlRQ85MsshcwDIt00Ossv5TgHhqCGAO0W/1NuQh8P Y+8pysf3fnaGm1tmWb+MG/sjo7tYt2MJmedVBMgCiDG2zfqYBAw6g0vJtZRhMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707867902; a=rsa-sha256; cv=none; b=gt8q6tf0TRAyxGPR0AMvXoGTE06HbYY+5D8+L7UbeJSj0UK/ILfvLy1vz1kx3fl3YgLuii 0ws+LQMiYTVyKoxPthAIhjmFpokwqPToGPxqvX3wF4sdyZNG8NnWXcMqIcg2jHzTLdxqWs 1B4lY2n/gMfT05ABsn4zOXk9EUmPzMU7bfVYAvsHcaA17AIIASjlKkL358csXlBt6aRvOZ kCv6emnJaNbtAVoXt6SYAvHtXw5DywjLZ7EOYKEf/1SBCrBel6Q40Tw2Zm7YuwXl43eHjC 5HIOWJTje4WC2+cMmpZfZd13nbnLWAT0ZvTEfh7cfHal/OE9XLE/qT1OdJPXjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707867902; 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=d25MaSeHCqK0hzpBmT4rnW+pwZ2sTgxxBWPl91q76uI=; b=SR3fQ8TlXbcvxt9jQMbgoB8DMzj+lyGw3W4iVdDdWBTXEkcH+FoCXRKgXMN/D5nqAzBl5C pfQ929Dpe6GltmfCPJoR+6Ttzd7UVxNBJvbZHA7mzqi3yqBeqnrWmx8Mo2lxfTymKYYZDv 0b9ashpi1iLHO8TAJRCpfjNgiVxB6DUuBUHSDPIqWfB6larq8tR2wcy7ykyUPD1lvuglAX VFMjsnj61KBeuB3wYGTMKbJCPtk8rH8Z9rfdAPfysq0Gi+z9sW6mn1hrYPS0hvtx+AGAzT al3Fu1JTpigsmZJvM3lBtGHn27gJe3CF2UDEJtxlwB5CqRi5+p4W8GX84m+z+A== 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 4TZHxV4VKRzbsy; Tue, 13 Feb 2024 23:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DNj2XG044816; Tue, 13 Feb 2024 23:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DNj2PH044813; Tue, 13 Feb 2024 23:45:02 GMT (envelope-from git) Date: Tue, 13 Feb 2024 23:45:02 GMT Message-Id: <202402132345.41DNj2PH044813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: dde6195c8d21 - main - editors/openoffice-*: Fix build 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: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dde6195c8d21cfcab6d1415d56a5f09b8d924452 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=dde6195c8d21cfcab6d1415d56a5f09b8d924452 commit dde6195c8d21cfcab6d1415d56a5f09b8d924452 Author: Don Lewis AuthorDate: 2024-02-13 23:37:59 +0000 Commit: Don Lewis CommitDate: 2024-02-13 23:44:43 +0000 editors/openoffice-*: Fix build Tweak our declaration for __cxa_allocate_exception() so that it matches the one that sometimes shows up in /usr/include/c++/v1/cxxabi.h. Clang now treats the subtle differences as an error. No PORTREVISION bump for this build fix. There should not be any functional change to the generated code if it was buildable before this fix. --- ...patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx | 11 +++++++++++ ...tch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx | 11 +++++++++++ ...bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx | 5 +++-- ...h-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx | 11 +++++++++++ ...ch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx | 11 +++++++++++ ...patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx | 11 +++++++++++ ...tch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx | 11 +++++++++++ ...bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx | 3 ++- ...h-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx | 11 +++++++++++ ...ch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx | 11 +++++++++++ 10 files changed, 93 insertions(+), 3 deletions(-) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx new file mode 100644 index 000000000000..fae5635bd797 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx +@@ -61,7 +61,7 @@ namespace CPPU_CURRENT_NAMESPACE + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, + void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx new file mode 100644 index 000000000000..0bcac37f3a23 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx index acba73004356..b36fd8309b2f 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx @@ -1,4 +1,4 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx.orig 2019-09-17 22:55:10 UTC +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx.orig 2020-10-06 14:16:16 UTC +++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx @@ -35,6 +35,7 @@ namespace CPPU_CURRENT_NAMESPACE @@ -15,7 +15,8 @@ +#endif /* __GLIBCXX__ */ extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); extern "C" void __cxa_throw ( void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx new file mode 100644 index 000000000000..3266d04affd6 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx +@@ -65,7 +65,7 @@ extern "C" void *__cxa_allocate_exception( + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx new file mode 100644 index 000000000000..0aec998ac85b --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx new file mode 100644 index 000000000000..3bf2f4003750 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx +@@ -61,7 +61,7 @@ namespace CPPU_CURRENT_NAMESPACE + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, + void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx new file mode 100644 index 000000000000..7744a82a6cd4 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx index acba73004356..7b230a1dbb81 100644 --- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx @@ -15,7 +15,8 @@ +#endif /* __GLIBCXX__ */ extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); extern "C" void __cxa_throw ( void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx new file mode 100644 index 000000000000..6e2cc713c800 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx +@@ -65,7 +65,7 @@ extern "C" void *__cxa_allocate_exception( + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx new file mode 100644 index 000000000000..e1ec4b7824a7 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); +