From nobody Fri Feb 16 09:10:05 2024 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 4TbmNY5PRDz5BKHF; Fri, 16 Feb 2024 09:10:05 +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 4TbmNY4tprz40jK; Fri, 16 Feb 2024 09:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708074605; 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=/VOsY+94tdJBejiTmwIEABhuqNNkUsTEVxl243pKIlA=; b=HrtlZwbxGw3LUftFyjTOQ60GHkKLzO1Y7qP+v3+8ZmCkYyerA9kfkr97YdQW+dgRUfmuAw kayxgg2GVGyl7nXrpT7o8vdD81fKp6vbq59AqyfKheHz5En/nLNDvTZGZPSqOs9fW+qGpm 5dWb/XtEnOpUJVA33WgbudUo+EDXvJV2xjb4k8wZrpv27RBhYtgpJ3+vI7qh6u/FdYc+JV O/8lc4ESbcdQQYwCzHh4ZUwOZgRU4t9WKDgxMtfOYngC0ggzll1RMRAw9yLpbNoGcMiHiD 8xTpA7At8ZqeRGOoKj5Tzup4NfQ6REr2taCspDqiG8FAX+kHgbY8eplrIEyWGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708074605; 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=/VOsY+94tdJBejiTmwIEABhuqNNkUsTEVxl243pKIlA=; b=hl4h/Bg9ztljEiW1DuPEmPX+6icqSC6qq30rqLa8/CV/sXLtKKfOA5ScLgvVCNwlzJahYc ku7qhYeSnv0tSpHdbn836mGtdoJVocpcSk5JvV4ERB+v7WzviGZ1O/QxmRc0RE+IsJ2hkb nB1G96Ud8vi2wLh6xZsmpYC2uuf5sVltLjNBKTsxGqJNnJuYMwN03baRuy/X17110kgX4P SyUd9Abgk/aKJ6S06M5JeY5z+GUBj7BvqkgBYdIwusidIHkZkDY8MNastpgFvI+C3Qg6Hz lj+d6UalU5x2+xAaVy5YeDdV5JI3/Lk/KWUJqmHhHSzvDVoF4J5XnqoVgZFV9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708074605; a=rsa-sha256; cv=none; b=M4BBhVA24u0AZBqOzDCB/vAbP2hYBx1mytXLrFqyD35wMH0G/9dNcqYShpNkkA7+slMnk9 9Jp2+5Yryjw0VVccPEDDclu8OBqZtBdWInEPT1XoMg0GOAaVrWRipczF+mtrFkwn/ZH8tK 8IGp/5ap652+LCP//D87qfTO+JuLeaShqIW8VUIndKZ0Qhp2Zb5hSr1S8PzqGiBvvZMuGa mZ+gtebPd0S4b6O5Dj8vLKC6LFfU5TfxjAsxWYWI/nKOlUPi10KMJKP7MvrEYqRLkei7aj axH6Mf4SeEwIaYJE0JPvB0isE8uSU6mjPO8NwP1Efg8pSPUYsBHk7bJDZKrDZw== 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 4TbmNY3xyBzJVN; Fri, 16 Feb 2024 09:10:05 +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 41G9A5IX036082; Fri, 16 Feb 2024 09:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G9A5ZW036077; Fri, 16 Feb 2024 09:10:05 GMT (envelope-from git) Date: Fri, 16 Feb 2024 09:10:05 GMT Message-Id: <202402160910.41G9A5ZW036077@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Don Lewis Subject: git: 14be24161950 - 2024Q1 - editors/openoffice-*: Fix build 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: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 14be24161950017f400a9e83560fbb71501e6d43 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=14be24161950017f400a9e83560fbb71501e6d43 commit 14be24161950017f400a9e83560fbb71501e6d43 Author: Don Lewis AuthorDate: 2024-02-13 23:37:59 +0000 Commit: Don Lewis CommitDate: 2024-02-16 09:04:21 +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. (cherry picked from commit dde6195c8d21cfcab6d1415d56a5f09b8d924452) --- ...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)); +