From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Boost-1.82.0 LibreOffice-7.5.1.2
Date: Sun, 19 Mar 2023 16:13:26 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42862@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-libreoffice-update
https://github.com/void-linux/void-packages/pull/42862
Boost-1.82.0 LibreOffice-7.5.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
[skip ci][ci skip]
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-libreoffice-update-42862.patch --]
[-- Type: text/x-diff, Size: 56654 bytes --]
From ea9695632cb56f5c50cfed3699740411f3f64531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 8 Mar 2023 23:17:40 +0700
Subject: [PATCH 1/2] boost: update to 1.82.0.beta1
---
common/shlibs | 73 +++++------
srcpkgs/boost/patches/boost-sort.patch | 116 ------------------
.../container-failed-static-vector.patch | 10 +-
srcpkgs/boost/patches/filesystem-test.patch | 24 ----
srcpkgs/boost/patches/gil-test-failure.patch | 20 ++-
.../boost/patches/install-strip-destdir.patch | 4 +-
srcpkgs/boost/patches/iostream-test.patch | 8 +-
.../boost/patches/ptr-container-failure.patch | 14 ---
.../patches/revert-boost-phoenix-104.patch | 26 ++--
srcpkgs/boost/template | 75 ++++-------
srcpkgs/libboost_sync | 1 +
11 files changed, 94 insertions(+), 277 deletions(-)
delete mode 100644 srcpkgs/boost/patches/boost-sort.patch
delete mode 100644 srcpkgs/boost/patches/filesystem-test.patch
delete mode 100644 srcpkgs/boost/patches/ptr-container-failure.patch
create mode 120000 srcpkgs/libboost_sync
diff --git a/common/shlibs b/common/shlibs
index 8a7c321774fc..787c69939b16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -628,42 +628,43 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.81.0 libboost_context-1.81.0_1
-libboost_coroutine.so.1.81.0 libboost_coroutine-1.81.0_1
-libboost_container.so.1.81.0 libboost_container-1.81.0_1
-libboost_prg_exec_monitor.so.1.81.0 libboost_prg_exec_monitor-1.81.0_1
-libboost_timer.so.1.81.0 libboost_timer-1.81.0_1
-libboost_random.so.1.81.0 libboost_random-1.81.0_1
-libboost_filesystem.so.1.81.0 libboost_filesystem-1.81.0_1
-libboost_unit_test_framework.so.1.81.0 libboost_unit_test_framework-1.81.0_1
-libboost_math_c99.so.1.81.0 libboost_math_c99-1.81.0_1
-libboost_math_tr1.so.1.81.0 libboost_math_tr1-1.81.0_1
-libboost_nowide.so.1.81.0 libboost_nowide-1.81.0_1
-libboost_json.so.1.81.0 libboost_json-1.81.0_1
-libboost_regex.so.1.81.0 libboost_regex-1.81.0_1
-libboost_serialization.so.1.81.0 libboost_serialization-1.81.0_1
-libboost_chrono.so.1.81.0 libboost_chrono-1.81.0_1
-libboost_wserialization.so.1.81.0 libboost_wserialization-1.81.0_1
-libboost_graph.so.1.81.0 libboost_graph-1.81.0_1
-libboost_graph_parallel.so.1.81.0 libboost_graph_parallel-1.81.0_1
-libboost_log.so.1.81.0 libboost_log-1.81.0_1
-libboost_locale.so.1.81.0 libboost_locale-1.81.0_1
-libboost_program_options.so.1.81.0 libboost_program_options-1.81.0_1
-libboost_iostreams.so.1.81.0 libboost_iostreams-1.81.0_1
-libboost_system.so.1.81.0 libboost_system-1.81.0_1
-libboost_thread.so.1.81.0 libboost_thread-1.81.0_1
-libboost_log_setup.so.1.81.0 libboost_log_setup-1.81.0_1
-libboost_date_time.so.1.81.0 libboost_date_time-1.81.0_1
-libboost_wave.so.1.81.0 libboost_wave-1.81.0_1
-libboost_atomic.so.1.81.0 libboost_atomic-1.81.0_1
-libboost_type_erasure.so.1.81.0 libboost_type_erasure-1.81.0_1
-libboost_fiber.so.1.81.0 libboost_fiber-1.81.0_1
-libboost_stacktrace_noop.so.1.81.0 libboost_stacktrace_noop-1.81.0_1
-libboost_stacktrace_addr2line.so.1.81.0 libboost_stacktrace_addr2line-1.81.0_1
-libboost_stacktrace_basic.so.1.81.0 libboost_stacktrace_basic-1.81.0_1
-libboost_mpi.so.1.81.0 libboost_mpi-1.81.0_1
-libboost_mpi_python311.so.1.81.0 libboost_mpi-python3-1.81.0_1
-libboost_python311.so.1.81.0 boost-python3-1.81.0_1
+libboost_context.so.1.82.0 libboost_context-1.82.0.alpha_1
+libboost_coroutine.so.1.82.0 libboost_coroutine-1.82.0.alpha_1
+libboost_container.so.1.82.0 libboost_container-1.82.0.alpha_1
+libboost_prg_exec_monitor.so.1.82.0 libboost_prg_exec_monitor-1.82.0.alpha_1
+libboost_timer.so.1.82.0 libboost_timer-1.82.0.alpha_1
+libboost_random.so.1.82.0 libboost_random-1.82.0.alpha_1
+libboost_filesystem.so.1.82.0 libboost_filesystem-1.82.0.alpha_1
+libboost_unit_test_framework.so.1.82.0 libboost_unit_test_framework-1.82.0.alpha_1
+libboost_math_c99.so.1.82.0 libboost_math_c99-1.82.0.alpha_1
+libboost_math_tr1.so.1.82.0 libboost_math_tr1-1.82.0.alpha_1
+libboost_nowide.so.1.82.0 libboost_nowide-1.82.0.alpha_1
+libboost_json.so.1.82.0 libboost_json-1.82.0.alpha_1
+libboost_regex.so.1.82.0 libboost_regex-1.82.0.alpha_1
+libboost_serialization.so.1.82.0 libboost_serialization-1.82.0.alpha_1
+libboost_chrono.so.1.82.0 libboost_chrono-1.82.0.alpha_1
+libboost_wserialization.so.1.82.0 libboost_wserialization-1.82.0.alpha_1
+libboost_graph.so.1.82.0 libboost_graph-1.82.0.alpha_1
+libboost_graph_parallel.so.1.82.0 libboost_graph_parallel-1.82.0.alpha_1
+libboost_log.so.1.82.0 libboost_log-1.82.0.alpha_1
+libboost_locale.so.1.82.0 libboost_locale-1.82.0.alpha_1
+libboost_program_options.so.1.82.0 libboost_program_options-1.82.0.alpha_1
+libboost_iostreams.so.1.82.0 libboost_iostreams-1.82.0.alpha_1
+libboost_system.so.1.82.0 libboost_system-1.82.0.alpha_1
+libboost_sync.so.1.82.0 libboost_system-1.82.0.alpha_1
+libboost_thread.so.1.82.0 libboost_thread-1.82.0.alpha_1
+libboost_log_setup.so.1.82.0 libboost_log_setup-1.82.0.alpha_1
+libboost_date_time.so.1.82.0 libboost_date_time-1.82.0.alpha_1
+libboost_wave.so.1.82.0 libboost_wave-1.82.0.alpha_1
+libboost_atomic.so.1.82.0 libboost_atomic-1.82.0.alpha_1
+libboost_type_erasure.so.1.82.0 libboost_type_erasure-1.82.0.alpha_1
+libboost_fiber.so.1.82.0 libboost_fiber-1.82.0.alpha_1
+libboost_stacktrace_noop.so.1.82.0 libboost_stacktrace_noop-1.82.0.alpha_1
+libboost_stacktrace_addr2line.so.1.82.0 libboost_stacktrace_addr2line-1.82.0.alpha_1
+libboost_stacktrace_basic.so.1.82.0 libboost_stacktrace_basic-1.82.0.alpha_1
+libboost_mpi.so.1.82.0 libboost_mpi-1.82.0.alpha_1
+libboost_mpi_python311.so.1.82.0 libboost_mpi-python3-1.82.0.alpha_1
+libboost_python311.so.1.82.0 boost-python3-1.82.0.alpha_1
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost/patches/boost-sort.patch b/srcpkgs/boost/patches/boost-sort.patch
deleted file mode 100644
index 906c694ba1e2..000000000000
--- a/srcpkgs/boost/patches/boost-sort.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 2e6674d63f2f541a3fd32f50d593be0c71f686f8 Mon Sep 17 00:00:00 2001
-From: spreadsort <spreadsort@gmail.com>
-Date: Sat, 17 Dec 2022 17:18:17 -0500
-Subject: [PATCH] Delete non-critical
-
----
- .../boost/sort/spreadsort/detail/float_sort.hpp | 2 --
- .../boost/sort/spreadsort/detail/integer_sort.hpp | 6 ------
- .../boost/sort/spreadsort/detail/string_sort.hpp | 15 +++++----------
- 3 files changed, 5 insertions(+), 18 deletions(-)
-
-diff --git a/boost/sort/spreadsort/detail/float_sort.hpp b/boost/sort/spreadsort/detail/float_sort.hpp
-index 8d20bef..8682afd 100644
---- a/boost/sort/spreadsort/detail/float_sort.hpp
-+++ b/boost/sort/spreadsort/detail/float_sort.hpp
-@@ -777,7 +777,6 @@ namespace spreadsort {
- float_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift rshift)
- {
-- BOOST_STATIC_ASSERT(sizeof(boost::uintmax_t) >= sizeof(Div_type));
- boost::sort::pdqsort(first, last);
- }
-
-@@ -819,7 +818,6 @@ namespace spreadsort {
- float_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift rshift, Compare comp)
- {
-- BOOST_STATIC_ASSERT(sizeof(boost::uintmax_t) >= sizeof(Div_type));
- boost::sort::pdqsort(first, last, comp);
- }
- }
-diff --git a/boost/sort/spreadsort/detail/integer_sort.hpp b/boost/sort/spreadsort/detail/integer_sort.hpp
-index 77576d0..fad55b3 100644
---- a/boost/sort/spreadsort/detail/integer_sort.hpp
-+++ b/boost/sort/spreadsort/detail/integer_sort.hpp
-@@ -390,8 +390,6 @@ namespace spreadsort {
- //defaulting to boost::sort::pdqsort when integer_sort won't work
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last);
- }
-
-@@ -437,8 +435,6 @@ namespace spreadsort {
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift shift, Compare comp)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last, comp);
- }
-
-@@ -481,8 +477,6 @@ namespace spreadsort {
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift shift)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last);
- }
- }
-diff --git a/boost/sort/spreadsort/detail/string_sort.hpp b/boost/sort/spreadsort/detail/string_sort.hpp
-index fd67a55..e0c3f74 100644
---- a/boost/sort/spreadsort/detail/string_sort.hpp
-+++ b/boost/sort/spreadsort/detail/string_sort.hpp
-@@ -699,8 +699,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last);
- }
-
-@@ -725,8 +724,7 @@ namespace spreadsort {
- {
- typedef typename std::iterator_traits<RandomAccessIter>::value_type
- Data_type;
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, std::greater<Data_type>());
- }
-
-@@ -751,8 +749,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last);
- }
-
-@@ -779,8 +776,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Compare comp, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, comp);
- }
-
-@@ -806,8 +802,7 @@ namespace spreadsort {
- reverse_string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Compare comp, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, comp);
- }
- }
diff --git a/srcpkgs/boost/patches/container-failed-static-vector.patch b/srcpkgs/boost/patches/container-failed-static-vector.patch
index 98391ccf8ac2..90f984e67125 100644
--- a/srcpkgs/boost/patches/container-failed-static-vector.patch
+++ b/srcpkgs/boost/patches/container-failed-static-vector.patch
@@ -1,8 +1,6 @@
-Index: boost-1.81.0/libs/container/test/static_vector_test.cpp
-===================================================================
---- boost-1.81.0.orig/libs/container/test/static_vector_test.cpp
-+++ boost-1.81.0/libs/container/test/static_vector_test.cpp
-@@ -633,6 +633,7 @@ bool default_init_test()//Test for defau
+--- a/libs/container/test/static_vector_test.cpp
++++ b/libs/container/test/static_vector_test.cpp
+@@ -632,6 +632,7 @@ bool default_init_test()//Test for defau
{
di_vector_t v(Capacity, default_init);
}
@@ -10,7 +8,7 @@ Index: boost-1.81.0/libs/container/test/static_vector_test.cpp
{
di_vector_t v;
int *p = v.data();
-@@ -654,6 +655,7 @@ bool default_init_test()//Test for defau
+@@ -653,6 +654,7 @@ bool default_init_test()//Test for defau
v.~di_vector_t();
}
diff --git a/srcpkgs/boost/patches/filesystem-test.patch b/srcpkgs/boost/patches/filesystem-test.patch
deleted file mode 100644
index 593938d91c0d..000000000000
--- a/srcpkgs/boost/patches/filesystem-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d204b41dba231ffbb648d11c5bcbd3cd3c84f519 Mon Sep 17 00:00:00 2001
-From: Andrey Semashev <andrey.semashev@gmail.com>
-Date: Thu, 15 Dec 2022 15:53:42 +0300
-Subject: [PATCH] Use access() to check if the root directory is writable.
-
-This is more reliable than testing if the user is root as in some
-chroot environments root directory may be writable by a non-root user.
----
- test/operations_test.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/filesystem/test/operations_test.cpp b/libs/filesystem/test/operations_test.cpp
-index 4e3c2b966..65858a4e6 100644
---- a/libs/filesystem/test/operations_test.cpp
-+++ b/libs/filesystem/test/operations_test.cpp
-@@ -1232,7 +1232,7 @@ void create_directories_tests()
- BOOST_TEST(!ec);
-
- #ifdef BOOST_POSIX_API
-- if (geteuid() > 0)
-+ if (access("/", W_OK) != 0)
- {
- ec.clear();
- BOOST_TEST(!fs::create_directories("/foo", ec)); // may be OK on Windows
diff --git a/srcpkgs/boost/patches/gil-test-failure.patch b/srcpkgs/boost/patches/gil-test-failure.patch
index ae7b57c0a2ec..8774943021c8 100644
--- a/srcpkgs/boost/patches/gil-test-failure.patch
+++ b/srcpkgs/boost/patches/gil-test-failure.patch
@@ -1,7 +1,5 @@
-Index: boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/image_processing/hough_parameter.cpp
-+++ boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
+--- a/libs/gil/test/extension/image_processing/hough_parameter.cpp
++++ b/libs/gil/test/extension/image_processing/hough_parameter.cpp
@@ -26,7 +26,8 @@ void from_step_count_test()
for (std::size_t i = 0; i < param.step_count; ++i)
{
@@ -27,14 +25,12 @@ Index: boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
const auto bigger_dim = width > height ? width : height;
const double expected_angle = std::atan2(1.0, bigger_dim);
- BOOST_TEST(expected_angle == gil::minimum_angle_step({width, height}));
-+ BOOST_TEST(std::abs(expected_angle == gil::minimum_angle_step({width, height})) <= 0.00001);
++ BOOST_TEST(std::abs(expected_angle - gil::minimum_angle_step({width, height})) <= 0.00001);
}
int main()
-Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
-+++ boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
+--- a/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
++++ b/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
@@ -83,7 +83,10 @@ void test_image_assign_hsl()
float const hue = (x + 1.f) / w;
gil::hsl32f_pixel_t const p(hue, 1.0, v);
@@ -47,10 +43,8 @@ Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
}
}
}
-Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
-+++ boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
+--- a/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
++++ b/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
@@ -58,7 +58,10 @@ void test_image_assign_hsv()
float const hue = (x + 1.f) / w;
gil::hsv32f_pixel_t const p(hue, 1.0, v);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
index d931a5d41177..a50534a43c6d 100644
--- a/srcpkgs/boost/patches/install-strip-destdir.patch
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -6,7 +6,7 @@ its cmake config. This patch strips $DESTDIR out
of cmake config
--- a/tools/boost_install/boost-install.jam
+++ b/tools/boost_install/boost-install.jam
-@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+@@ -703,6 +703,16 @@ local rule path-native-fwd ( path )
return $(path) ;
}
@@ -23,7 +23,7 @@ of cmake config
local rule get-dir ( name : dir )
{
if [ path.is-rooted $(dir) ]
-@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+@@ -781,6 +791,7 @@ rule generate-cmake-config- ( target : s
if [ path.is-rooted $(cmakedir) ]
{
local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
diff --git a/srcpkgs/boost/patches/iostream-test.patch b/srcpkgs/boost/patches/iostream-test.patch
index f8f736cb55af..38ad90b7b358 100644
--- a/srcpkgs/boost/patches/iostream-test.patch
+++ b/srcpkgs/boost/patches/iostream-test.patch
@@ -1,11 +1,9 @@
-Index: boost-1.81.0/libs/iostreams/test/stream_state_test.cpp
-===================================================================
---- boost-1.81.0.orig/libs/iostreams/test/stream_state_test.cpp
-+++ boost-1.81.0/libs/iostreams/test/stream_state_test.cpp
+--- a/libs/iostreams/test/stream_state_test.cpp
++++ b/libs/iostreams/test/stream_state_test.cpp
@@ -165,7 +165,8 @@ test_suite* init_unit_test_suite(int, ch
#endif
- // MSSTL and libc++ don't handle exceptions from seek correctly
+ // MSSTL and libc++ don't handle exceptions from seekg correctly
-#if !defined(_CPPLIB_VER) && !defined(_LIBCPP_VERSION)
+// libstdc++?
+#if !defined(_CPPLIB_VER) && !defined(_LIBCPP_VERSION) && 0
diff --git a/srcpkgs/boost/patches/ptr-container-failure.patch b/srcpkgs/boost/patches/ptr-container-failure.patch
deleted file mode 100644
index e8f1889c9092..000000000000
--- a/srcpkgs/boost/patches/ptr-container-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/boostorg/ptr_container/issues/36
-Index: boost-1.81.0/libs/ptr_container/test/serialization.cpp
-===================================================================
---- boost-1.81.0.orig/libs/ptr_container/test/serialization.cpp
-+++ boost-1.81.0/libs/ptr_container/test/serialization.cpp
-@@ -203,8 +203,6 @@ void test_serialization_unordered_set_he
- std::remove( fn.c_str() );
-
- BOOST_CHECK_EQUAL( vec.size(), vec2.size() );
-- BOOST_CHECK_EQUAL( (*vec2.begin()).i, -1 );
-- BOOST_CHECK_EQUAL( (*++vec2.begin()).i, 0 );
- }
-
- template< class Map, class OArchive, class IArchive >
diff --git a/srcpkgs/boost/patches/revert-boost-phoenix-104.patch b/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
index 439b201d4c5d..7db361cd9b70 100644
--- a/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
+++ b/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
@@ -1,12 +1,14 @@
-See https://github.com/boostorg/phoenix/issues/111
-Index: boost-1.81.0.beta1/boost/phoenix/stl.hpp
-===================================================================
---- boost-1.81.0.beta1.orig/boost/phoenix/stl.hpp
-+++ boost-1.81.0.beta1/boost/phoenix/stl.hpp
-@@ -11,6 +11,5 @@
-
- #include <boost/phoenix/stl/algorithm.hpp>
- #include <boost/phoenix/stl/container.hpp>
--#include <boost/phoenix/stl/tuple.hpp>
-
- #endif
+https://github.com/boostorg/phoenix/pull/112
+diff --git a/boost/phoenix/stl/tuple.hpp b/boost/phoenix/stl/tuple.hpp
+index a83014ac..d04ad16e 100644
+--- a/boost/phoenix/stl/tuple.hpp
++++ b/boost/phoenix/stl/tuple.hpp
+@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
+ namespace placeholders {
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
+ #define BOOST_PP_LOCAL_MACRO(N) \
+- auto uarg##N = \
++ const auto uarg##N = \
+ boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
+ #include BOOST_PP_LOCAL_ITERATE()
+ }
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index fcd7bfa013e2..cc975fe5fc60 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
# Template file for 'boost'
pkgname=boost
-version=1.81.0
+version=1.82.0.beta1
revision=1
-_version=${version/beta/b}
+build_style=meta
hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config openmpi"
makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
libzstd-devel openmpi-devel"
@@ -11,10 +11,21 @@ short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="https://www.boost.org/"
-distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
+distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version%.rc*}/source/boost_${version//./_}.tar.bz2"
+checksum=edf4cb9e8e5a14412b91311438478ef6ce12afe2a54714eb2f0632a454c3d8d5
python_version=3
+# please do NOT delete below lines,
+# upgrade boost requires patching a lot of software,
+# which requires months of planning
+if [ "${version%alpha*}" != "$version" ]; then
+ _version=${version%.alpha}
+ distfiles="https://boostorg.jfrog.io/artifactory/main/develop/boost_${_version//./_}-snapshot.tar.bz2"
+elif [ "${version%beta*}" != "$version" ]; then
+ _version=${version/beta/b}
+ distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version%.rc*}/source/boost_${_version//./_}.tar.bz2"
+fi
+
replaces="libboost_program_options1.80>=0 libboost_math_c99f1.80>=0
libboost_stacktrace_basic1.80>=0 libboost_stacktrace_noop1.80>=0
libboost_iostreams1.80>=0 libboost_math_tr1l1.80>=0 libboost_filesystem1.80>=0
@@ -124,7 +135,7 @@ do_check() {
# required by boost::math
mkdir -p .temps
- for _testcase in libs/histogram/test/ libs/*/test/; do
+ for _testcase in libs/gil/test/ libs/*/test/; do
_testcase=${_testcase%/test/}
_component=${_testcase#libs/}
case " $_fail " in
@@ -171,13 +182,12 @@ do_install() {
cd $wrksrc
vconf site-config.jam
- # license
+ # license, not required for binary distribution
vlicense LICENSE_1_0.txt
}
boost-python3_package() {
- depends="boost python3"
- replaces="boost-python3-1.80>=0"
+ depends="python3"
shlib_requires="libpython${py3_ver}${py3_abiver}.so.1.0"
short_desc+=" - Python3 bindings"
pkg_install() {
@@ -185,6 +195,7 @@ boost-python3_package() {
}
}
boost-build_package() {
+ depends="boost"
conf_files="/etc/site-config.jam"
short_desc+=" - Boost.Build utility and framework"
provides="boost-jam-${version}_${revision}"
@@ -209,7 +220,6 @@ boost-devel_package() {
}
libboost_atomic_package() {
- depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
vmove usr/lib/libboost_atomic.so.*
@@ -217,7 +227,6 @@ libboost_atomic_package() {
}
libboost_chrono_package() {
- depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
vmove usr/lib/libboost_chrono.so.*
@@ -225,7 +234,6 @@ libboost_chrono_package() {
}
libboost_container_package() {
- depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
vmove usr/lib/libboost_container.so.*
@@ -233,7 +241,6 @@ libboost_container_package() {
}
libboost_context_package() {
- depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
vmove usr/lib/libboost_context.so.*
@@ -241,7 +248,6 @@ libboost_context_package() {
}
libboost_contract_package() {
- depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
vmove usr/lib/libboost_contract.so.*
@@ -249,7 +255,6 @@ libboost_contract_package() {
}
libboost_coroutine_package() {
- depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
vmove usr/lib/libboost_coroutine.so.*
@@ -257,7 +262,6 @@ libboost_coroutine_package() {
}
libboost_date_time_package() {
- depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
vmove usr/lib/libboost_date_time.so.*
@@ -265,7 +269,6 @@ libboost_date_time_package() {
}
libboost_fiber_package() {
- depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
vmove usr/lib/libboost_fiber.so.*
@@ -273,7 +276,6 @@ libboost_fiber_package() {
}
libboost_filesystem_package() {
- depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
vmove usr/lib/libboost_filesystem.so.*
@@ -281,7 +283,6 @@ libboost_filesystem_package() {
}
libboost_graph_package() {
- depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
vmove usr/lib/libboost_graph.so.*
@@ -289,7 +290,6 @@ libboost_graph_package() {
}
libboost_graph_parallel_package() {
- depends="boost"
short_desc+=" - libboost_graph_parallel"
pkg_install() {
vmove usr/lib/libboost_graph_parallel.so.*
@@ -297,7 +297,6 @@ libboost_graph_parallel_package() {
}
libboost_iostreams_package() {
- depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
vmove usr/lib/libboost_iostreams.so.*
@@ -305,7 +304,6 @@ libboost_iostreams_package() {
}
libboost_locale_package() {
- depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
vmove usr/lib/libboost_locale.so.*
@@ -313,7 +311,6 @@ libboost_locale_package() {
}
libboost_log_package() {
- depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
vmove usr/lib/libboost_log.so.*
@@ -321,7 +318,6 @@ libboost_log_package() {
}
libboost_log_setup_package() {
- depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
vmove usr/lib/libboost_log_setup.so.*
@@ -329,7 +325,6 @@ libboost_log_setup_package() {
}
libboost_math_c99_package() {
- depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
vmove usr/lib/libboost_math_c99.so.*
@@ -337,7 +332,6 @@ libboost_math_c99_package() {
}
libboost_math_c99f_package() {
- depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
vmove usr/lib/libboost_math_c99f.so.*
@@ -345,7 +339,6 @@ libboost_math_c99f_package() {
}
libboost_math_c99l_package() {
- depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
vmove usr/lib/libboost_math_c99l.so.*
@@ -353,7 +346,6 @@ libboost_math_c99l_package() {
}
libboost_json_package() {
- depends="boost"
short_desc+=" - libboost_json"
pkg_install() {
vmove usr/lib/libboost_json.so.*
@@ -361,7 +353,6 @@ libboost_json_package() {
}
libboost_math_tr1_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
vmove usr/lib/libboost_math_tr1.so.*
@@ -369,7 +360,6 @@ libboost_math_tr1_package() {
}
libboost_math_tr1f_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
vmove usr/lib/libboost_math_tr1f.so.*
@@ -377,7 +367,6 @@ libboost_math_tr1f_package() {
}
libboost_math_tr1l_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
vmove usr/lib/libboost_math_tr1l.so.*
@@ -385,7 +374,6 @@ libboost_math_tr1l_package() {
}
libboost_mpi_package() {
- depends="boost"
short_desc+=" - libboost_mpi"
pkg_install() {
vmove usr/lib/libboost_mpi.so.*
@@ -393,7 +381,6 @@ libboost_mpi_package() {
}
libboost_mpi-python3_package() {
- depends="boost"
short_desc+=" - libboost_mpi - Python 3 bindings"
shlib_requires="libpython${py3_ver}${py3_abiver}.so.1.0"
pkg_install() {
@@ -403,7 +390,6 @@ libboost_mpi-python3_package() {
}
libboost_nowide_package() {
- depends="boost"
short_desc+=" - libboost_nowide"
pkg_install() {
vmove usr/lib/libboost_nowide.so.*
@@ -411,7 +397,6 @@ libboost_nowide_package() {
}
libboost_prg_exec_monitor_package() {
- depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
vmove usr/lib/libboost_prg_exec_monitor.so.*
@@ -419,7 +404,6 @@ libboost_prg_exec_monitor_package() {
}
libboost_program_options_package() {
- depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
vmove usr/lib/libboost_program_options.so.*
@@ -427,7 +411,6 @@ libboost_program_options_package() {
}
libboost_random_package() {
- depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
vmove usr/lib/libboost_random.so.*
@@ -435,7 +418,6 @@ libboost_random_package() {
}
libboost_regex_package() {
- depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
vmove usr/lib/libboost_regex.so.*
@@ -443,7 +425,6 @@ libboost_regex_package() {
}
libboost_serialization_package() {
- depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
vmove usr/lib/libboost_serialization.so.*
@@ -451,7 +432,6 @@ libboost_serialization_package() {
}
libboost_stacktrace_addr2line_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
vmove usr/lib/libboost_stacktrace_addr2line.so.*
@@ -459,7 +439,6 @@ libboost_stacktrace_addr2line_package() {
}
libboost_stacktrace_basic_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
vmove usr/lib/libboost_stacktrace_basic.so.*
@@ -467,15 +446,20 @@ libboost_stacktrace_basic_package() {
}
libboost_stacktrace_noop_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
vmove usr/lib/libboost_stacktrace_noop.so.*
}
}
+libboost_sync_package() {
+ short_desc+=" - libboost_sync"
+ pkg_install() {
+ vmove usr/lib/libboost_sync.so.*
+ }
+}
+
libboost_system_package() {
- depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
vmove usr/lib/libboost_system.so.*
@@ -483,7 +467,6 @@ libboost_system_package() {
}
libboost_thread_package() {
- depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
vmove usr/lib/libboost_thread.so.*
@@ -491,7 +474,6 @@ libboost_thread_package() {
}
libboost_timer_package() {
- depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
vmove usr/lib/libboost_timer.so.*
@@ -499,7 +481,6 @@ libboost_timer_package() {
}
libboost_type_erasure_package() {
- depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
vmove usr/lib/libboost_type_erasure.so.*
@@ -507,7 +488,6 @@ libboost_type_erasure_package() {
}
libboost_unit_test_framework_package() {
- depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
vmove usr/lib/libboost_unit_test_framework.so.*
@@ -515,7 +495,6 @@ libboost_unit_test_framework_package() {
}
libboost_url_package() {
- depends="boost"
short_desc+=" - libboost_url"
pkg_install() {
vmove usr/lib/libboost_url.so.*
@@ -523,7 +502,6 @@ libboost_url_package() {
}
libboost_wave_package() {
- depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
vmove usr/lib/libboost_wave.so.*
@@ -531,7 +509,6 @@ libboost_wave_package() {
}
libboost_wserialization_package() {
- depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
vmove usr/lib/libboost_wserialization.so.*
diff --git a/srcpkgs/libboost_sync b/srcpkgs/libboost_sync
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_sync
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From 7c616c27245d443cb01356b78cea60662c4f8f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 11 Mar 2023 21:16:36 +0700
Subject: [PATCH 2/2] libreoffice: update to 7.5.1.2
---
srcpkgs/libreoffice-i18n-ckb | 1 +
srcpkgs/libreoffice-i18n-dsb | 1 +
srcpkgs/libreoffice-i18n-fur | 1 +
srcpkgs/libreoffice-i18n-fy | 1 +
srcpkgs/libreoffice-i18n-hsb | 1 +
srcpkgs/libreoffice-i18n-kab | 1 +
srcpkgs/libreoffice-i18n-szl | 1 +
srcpkgs/libreoffice-i18n-vec | 1 +
.../libreoffice/files/skia-no-execinfo.patch | 25 +++
srcpkgs/libreoffice/patches/boost-1.81.patch | 18 --
.../patches/libjvm-path-musl.patch | 15 ++
srcpkgs/libreoffice/patches/musl-java.patch | 12 +-
.../patches/musl-no-execinfo.patch | 10 ++
.../libreoffice/patches/no-slowcheck.patch | 11 ++
srcpkgs/libreoffice/template | 160 +++++++++---------
15 files changed, 149 insertions(+), 110 deletions(-)
create mode 120000 srcpkgs/libreoffice-i18n-ckb
create mode 120000 srcpkgs/libreoffice-i18n-dsb
create mode 120000 srcpkgs/libreoffice-i18n-fur
create mode 120000 srcpkgs/libreoffice-i18n-fy
create mode 120000 srcpkgs/libreoffice-i18n-hsb
create mode 120000 srcpkgs/libreoffice-i18n-kab
create mode 120000 srcpkgs/libreoffice-i18n-szl
create mode 120000 srcpkgs/libreoffice-i18n-vec
create mode 100644 srcpkgs/libreoffice/files/skia-no-execinfo.patch
delete mode 100644 srcpkgs/libreoffice/patches/boost-1.81.patch
create mode 100644 srcpkgs/libreoffice/patches/libjvm-path-musl.patch
create mode 100644 srcpkgs/libreoffice/patches/musl-no-execinfo.patch
create mode 100644 srcpkgs/libreoffice/patches/no-slowcheck.patch
diff --git a/srcpkgs/libreoffice-i18n-ckb b/srcpkgs/libreoffice-i18n-ckb
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-ckb
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-dsb b/srcpkgs/libreoffice-i18n-dsb
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-dsb
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-fur b/srcpkgs/libreoffice-i18n-fur
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-fur
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-fy b/srcpkgs/libreoffice-i18n-fy
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-fy
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-hsb b/srcpkgs/libreoffice-i18n-hsb
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-hsb
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-kab b/srcpkgs/libreoffice-i18n-kab
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-kab
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-szl b/srcpkgs/libreoffice-i18n-szl
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-szl
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice-i18n-vec b/srcpkgs/libreoffice-i18n-vec
new file mode 120000
index 000000000000..d5e3a56f3502
--- /dev/null
+++ b/srcpkgs/libreoffice-i18n-vec
@@ -0,0 +1 @@
+libreoffice
\ No newline at end of file
diff --git a/srcpkgs/libreoffice/files/skia-no-execinfo.patch b/srcpkgs/libreoffice/files/skia-no-execinfo.patch
new file mode 100644
index 000000000000..4495e8ab060c
--- /dev/null
+++ b/srcpkgs/libreoffice/files/skia-no-execinfo.patch
@@ -0,0 +1,25 @@
+--- a/tools/gpu/vk/VkTestUtils.cpp
++++ b/tools/gpu/vk/VkTestUtils.cpp
+@@ -26,7 +26,9 @@
+ #include <algorithm>
+
+ #if defined(SK_BUILD_FOR_UNIX)
+-#include <execinfo.h>
++ #if !defined(__linux__) || defined(__GLIBC__)
++ #include <execinfo.h>
++ #endif
+ #endif
+ #include "include/gpu/vk/GrVkBackendContext.h"
+ #include "include/gpu/vk/GrVkExtensions.h"
+@@ -104,9 +106,11 @@ static int should_include_debug_layer(co
+
+ static void print_backtrace() {
+ #if defined(SK_BUILD_FOR_UNIX)
++ #if !defined(__linux__) || defined(__GLIBC__)
+ void* stack[64];
+ int count = backtrace(stack, SK_ARRAY_COUNT(stack));
+ backtrace_symbols_fd(stack, count, 2);
++ #endif
+ #else
+ // Please add implementations for other platforms.
+ #endif
diff --git a/srcpkgs/libreoffice/patches/boost-1.81.patch b/srcpkgs/libreoffice/patches/boost-1.81.patch
deleted file mode 100644
index 83b44b62c490..000000000000
--- a/srcpkgs/libreoffice/patches/boost-1.81.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: libreoffice-7.4.2.3/unotools/source/i18n/resmgr.cxx
-===================================================================
---- libreoffice-7.4.2.3.orig/unotools/source/i18n/resmgr.cxx
-+++ libreoffice-7.4.2.3/unotools/source/i18n/resmgr.cxx
-@@ -127,8 +127,13 @@ namespace Translate
- if (aFind != aCache.end())
- return aFind->second;
- boost::locale::generator gen;
-+#if BOOST_VERSION < 108100
- gen.characters(boost::locale::char_facet);
- gen.categories(boost::locale::message_facet | boost::locale::information_facet);
-+#else
-+ gen.characters(boost::locale::char_facet_t::char_f);
-+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
-+#endif
- #if defined(ANDROID)
- OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
- #else
diff --git a/srcpkgs/libreoffice/patches/libjvm-path-musl.patch b/srcpkgs/libreoffice/patches/libjvm-path-musl.patch
new file mode 100644
index 000000000000..cab380500ac0
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/libjvm-path-musl.patch
@@ -0,0 +1,15 @@
+--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+@@ -80,7 +80,11 @@ char const* const* SunInfo::getLibraryPa
+ "/lib/" JFW_PLUGIN_ARCH "/client",
+ "/lib/" JFW_PLUGIN_ARCH "/server",
+ "/lib/" JFW_PLUGIN_ARCH "/native_threads",
+- ("/lib/" JFW_PLUGIN_ARCH)
++ "/lib/" JFW_PLUGIN_ARCH,
++ "/lib/client",
++ "/lib/server",
++ "/lib/native_threads",
++ "/lib",
+ };
+ *size = SAL_N_ELEMENTS(ar);
+ return ar;
diff --git a/srcpkgs/libreoffice/patches/musl-java.patch b/srcpkgs/libreoffice/patches/musl-java.patch
index 857651b3a217..f5205f3cb48e 100644
--- a/srcpkgs/libreoffice/patches/musl-java.patch
+++ b/srcpkgs/libreoffice/patches/musl-java.patch
@@ -1,8 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index 2c65a1200f69..ba4e6eb953ce 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -8829,7 +8829,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
+@@ -8910,7 +8910,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
@@ -11,7 +9,7 @@ index 2c65a1200f69..ba4e6eb953ce 100644
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -14569,7 +14569,7 @@ else
+@@ -14646,7 +14646,7 @@ else
case "$host_os" in
@@ -20,11 +18,9 @@ index 2c65a1200f69..ba4e6eb953ce 100644
if test "$ENABLE_JAVA" != ""; then
pathmunge "$JAVA_HOME/bin" "after"
fi
-diff --git a/configure b/configure
-index d738aec..80a8878 100755
--- a/configure
+++ b/configure
-@@ -21502,7 +21502,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
+@@ -22754,7 +22754,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
@@ -33,7 +29,7 @@ index d738aec..80a8878 100755
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -43329,7 +43329,7 @@ else
+@@ -46454,7 +46454,7 @@ else
case "$host_os" in
diff --git a/srcpkgs/libreoffice/patches/musl-no-execinfo.patch b/srcpkgs/libreoffice/patches/musl-no-execinfo.patch
new file mode 100644
index 000000000000..a430c5d15366
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/musl-no-execinfo.patch
@@ -0,0 +1,10 @@
+--- a/external/skia/UnpackedTarball_skia.mk
++++ b/external/skia/UnpackedTarball_skia.mk
+@@ -41,6 +41,7 @@ skia_patches := \
+ constexpr-template.patch.0 \
+ missing-include.patch.0 \
+ tdf147342.patch.0 \
++ skia-no-execinfo.patch.1 \
+
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
+
diff --git a/srcpkgs/libreoffice/patches/no-slowcheck.patch b/srcpkgs/libreoffice/patches/no-slowcheck.patch
new file mode 100644
index 000000000000..7037f5d31ba6
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/no-slowcheck.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,7 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+
+-gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
++gb_Top_MODULE_CHECK_TARGETS := unitcheck subsequentcheck perfcheck uicheck screenshot
+
+ .PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..9ac249d642a3 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,6 +1,6 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.4.3.2
+version=7.5.1.2
revision=1
build_style=meta
make_build_target="build"
@@ -14,14 +14,17 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
gtk+3-devel gtk4-devel hunspell-devel hyphen-devel libXt-devel libabw-devel glm
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel
- libfreehand-devel boost-devel bzip2-devel libxslt-devel
+ libfreehand-devel boost-devel zlib-devel bzip2-devel libxslt-devel
libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel
libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel liborcus-devel
libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel
- libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel
+ libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel nspr-devel
postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
- telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel
- qt6-base-devel libwebp-devel libgirepository-devel
+ telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel imath-devel
+ qt6-base-devel libwebp-devel libgirepository-devel icu-devel twaindsm-devel
+ libepoxy-devel libcurl-devel cairo-devel graphite-devel libjpeg-turbo-devel
+ expat-devel fontconfig-devel freetype-devel harfbuzz-devel gpgmepp-devel
+ lcms2-devel openssl-devel libpng-devel tiff-devel librevenge-devel
qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
depends="libreoffice-common>=${version}_${revision}"
depends+=" libreoffice-base>=${version}_${revision}"
@@ -42,6 +45,7 @@ depends+=" libreoffice-i18n-fr>=${version}_${revision}"
depends+=" libreoffice-i18n-it>=${version}_${revision}"
depends+=" libreoffice-i18n-pl>=${version}_${revision}"
depends+=" libreoffice-i18n-pt>=${version}_${revision}"
+checkdepends="gdb"
short_desc="Productivity suite"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
@@ -72,7 +76,7 @@ distfiles="
${_addurl}/libcmis-0.5.2.tar.xz
${_addurl}/libstaroffice-0.0.7.tar.xz
${_addurl}/libzmf-0.0.2.tar.xz
- ${_addurl}/pdfium-5058.tar.bz2
+ ${_addurl}/pdfium-5408.tar.bz2
${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
${_addurl}/dtoa-20180411.tgz
@@ -88,31 +92,12 @@ distfiles="
${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
- ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
- ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
- ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
- ${_addurl}/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
- ${_addurl}/liberation-narrow-fonts-ttf-1.07.6.tar.gz
- ${_addurl}/liberation-fonts-ttf-2.1.4.tar.gz
- ${_addurl}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
- ${_addurl}/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
- ${_addurl}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
- ${_addurl}/source-serif-pro-3.000R.tar.gz
- ${_addurl}/EmojiOneColor-SVGinOT-1.3.tar.gz
- ${_addurl}/noto-fonts-20171024.tar.gz
- ${_addurl}/culmus-0.133.tar.gz
- ${_addurl}/libre-hebrew-1.0.tar.gz
- ${_addurl}/alef-1.001.tar.gz
- ${_addurl}/ttf-kacst_2.01+mry.tar.gz
- ${_addurl}/Amiri-0.117.zip
- ${_addurl}/ReemKufi-1.2.zip
- ${_addurl}/Scheherazade-2.100.zip
- ${_addurl}/dragonbox-1.1.0.tar.gz
+ ${_addurl}/dragonbox-1.1.3.tar.gz
"
-checksum="ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b
- 3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389
- d08f4a2f16fb375903270facab527e28de57deb9ba452f9d449d5271d0f118a2
- d034df36118844f9958dc775069b3b8b08d11cbb8b4b27531449bc6543bccd20
+checksum="920ddd15bc84cf60a33cf0c68bb66a8ded78d150463c15ebaa27cfb7f3a6c0b7
+ 0e4e3d6388f9849d91afedac6126e1583c3a809cc28d095c909bf36eb82fd93a
+ e9a892fcb7616379efde8724366a8450f7157ce03b8893e385425d6f34f7a8b3
+ a3fc9e7b6a8b3cbc853d5bc52cacac773737ec33a2fb4c0a62e08faf1b29b91a
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
@@ -124,7 +109,7 @@ checksum="ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
- eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac
+ 7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
@@ -140,27 +125,7 @@ checksum="ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b
05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
- c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
- 4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
- 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
- 2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
- 8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
- 26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
- 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
- 09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
- e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
- 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
- d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
- 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
- c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
- f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
- b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
- dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
- 9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
- c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413
- 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
- 293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20
- "
+ 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384"
skip_extraction="
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -173,7 +138,7 @@ skip_extraction="
libcmis-0.5.2.tar.xz
libstaroffice-0.0.7.tar.xz
libzmf-0.0.2.tar.xz
- pdfium-5058.tar.bz2
+ pdfium-5408.tar.bz2
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
dtoa-20180411.tgz
@@ -189,26 +154,7 @@ skip_extraction="
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
- 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
- c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
- 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
- 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
- liberation-narrow-fonts-ttf-1.07.6.tar.gz
- liberation-fonts-ttf-2.1.4.tar.gz
- e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
- 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
- edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
- source-serif-pro-3.000R.tar.gz
- EmojiOneColor-SVGinOT-1.3.tar.gz
- noto-fonts-20171024.tar.gz
- culmus-0.133.tar.gz
- libre-hebrew-1.0.tar.gz
- alef-1.001.tar.gz
- ttf-kacst_2.01+mry.tar.gz
- Amiri-0.117.zip
- ReemKufi-1.2.zip
- Scheherazade-2.100.zip
- dragonbox-1.1.0.tar.gz
+ dragonbox-1.1.3.tar.gz
"
replaces="libreoffice-firebird<6.2.4.2_1"
@@ -220,14 +166,10 @@ case "$XBPS_TARGET_MACHINE" in
CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
;;
x86_64*|ppc64*) build_options_default="java"
- makedepends+=" apache-ant openjdk11 "
+ makedepends+=" openjdk11 apache-ant"
;;
esac
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
@@ -268,11 +210,14 @@ _add_lang() {
}"
}
+# _add_lang ab "Abkhazian"
_add_lang af "Afrikaans"
_add_lang am "Amharic"
+# _add_lang an "Aragonese"
_add_lang ar "Arabic"
_add_lang as "Assamese"
_add_lang ast "Asturian"
+# _add_lang az "Azerbaijani"
_add_lang be "Belarusian"
_add_lang bg "Bulgarian"
_add_lang bn "Bengali"
@@ -283,11 +228,13 @@ _add_lang brx "Bodo"
_add_lang bs "Bosnian"
_add_lang ca "Catalan"
_add_lang ca-valencia "Catalan (Valencian)" ca_valencia
+_add_lang ckb "Central Kurdish"
_add_lang cs "Czech"
_add_lang cy "Welsh (Cymraeg)"
_add_lang da "Danish"
_add_lang de "German"
_add_lang dgo "Dogri proper"
+_add_lang dsb "Lower Sorbian"
_add_lang dz "Dzongkha"
_add_lang el "Greek"
_add_lang en-GB "English (UK)" en_GB
@@ -298,8 +245,10 @@ _add_lang es "Spanish"
_add_lang et "Estonian"
_add_lang eu "Basque"
_add_lang fa "Persian (Farsi)"
-_add_lang fi "Finnish"
+_add_lang 'fi' "Finnish"
_add_lang fr "French"
+_add_lang fur "Friulian"
+_add_lang fy "Frisian"
_add_lang ga "Irish"
_add_lang gd "Scottish Gaelic"
_add_lang gl "Galician"
@@ -308,19 +257,24 @@ _add_lang gug "Guaraní (Paraguay)"
_add_lang he "Hebrew"
_add_lang hi "Hindi"
_add_lang hr "Croatian"
+_add_lang hsb "Upper Sorbian"
_add_lang hu "Hungarian"
_add_lang id "Indonesian"
_add_lang is "Icelandic"
_add_lang it "Italian"
_add_lang ja "Japanese"
+# _add_lang jv "Bedjond"
_add_lang ka "Georgian"
+_add_lang kab "Kabyle"
_add_lang kk "Kazakh"
+# _add_lang kl "Aklanon"
_add_lang km "Khmer"
_add_lang kmr-Latn "Kurmanji Kurdish (Latin)" kmr_Latn
_add_lang kn "Kannada"
_add_lang ko "Korean"
_add_lang kok "Konkani"
_add_lang ks "Kashmiri"
+# _add_lang ky "Aka-Kol"
_add_lang lb "Luxembourgish"
_add_lang lo "Lao"
_add_lang lt "Lithuanian"
@@ -349,6 +303,7 @@ _add_lang ro "Romanian"
_add_lang ru "Russian"
_add_lang rw "Kinyarwanda"
_add_lang sa-IN "Sanskrit (India)" sa_IN
+# _add_lang sah "Yakut"
_add_lang sat "Santali"
_add_lang sd "Sindhi"
_add_lang si "Sinhala"
@@ -362,18 +317,22 @@ _add_lang ss "Swati"
_add_lang st "Southern Sotho"
_add_lang sv "Swedish"
_add_lang sw-TZ "Swahili (Tanzania)" sw_TZ
+_add_lang szl "Silesian"
_add_lang ta "Tamil"
_add_lang te "Telugu"
_add_lang tg "Tajik"
_add_lang th "Thai"
+# _add_lang ti "Tigrinya/Tigrigna"
_add_lang tn "Tswana"
_add_lang tr "Turkish"
_add_lang ts "Tsonga"
_add_lang tt "Tatar"
_add_lang ug "Uyghur"
_add_lang uk "Ukrainian"
+# _add_lang ur "Urdu"
_add_lang uz "Uzbek"
_add_lang ve "Venda"
+_add_lang vec "Venetian"
_add_lang vi "Vietnamese"
_add_lang xh "Xhosa"
_add_lang zh-CN "Simplified Chinese (People's Republic of China)" zh_CN
@@ -381,6 +340,7 @@ _add_lang zh-TW "Traditional Chinese (Taiwan)" zh_TW
_add_lang zu "Zulu"
post_extract() {
+ local pkg f dir fname
local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
mkdir -p ${wrksrc}/external/tarballs
for pkg in ${skip_extraction} libreoffice-{dictionaries,help,translations}-${version}.tar.xz ; do
@@ -392,6 +352,13 @@ post_extract() {
ln -svf ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
fi
done
+ for f in ${FILESDIR}/*.patch; do
+ fname=${f##*/}
+ dir=${fname%%-*}
+ if [ -d "${wrksrc}/external/${dir}" ]; then
+ cp "$f" "${wrksrc}/external/${dir}/${fname}.1"
+ fi
+ done
}
post_patch() {
@@ -451,6 +418,7 @@ do_configure() {
opts+=" --enable-release-build"
opts+=" --enable-split-app-modules"
opts+=" --disable-dconf"
+ opts+=" --disable-epm"
# New strategy: enable all libs and headers, then disable what's missing
opts+=" --with-system-libs"
opts+=" --with-system-headers"
@@ -462,8 +430,7 @@ do_configure() {
# opts+=" --enable-ext-languagetool"
;;
esac
- # Includes many fonts we don't package individually
- opts+=" --with-fonts=yes"
+ opts+=" --without-fonts"
# skia sucks
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
@@ -504,9 +471,6 @@ do_configure() {
opts+=" --with-parallelism=${XBPS_MAKEJOBS}"
./configure ${opts} --with-lang="${_languages}"
-
- # Disable slowcheck target
- vsed -i Makefile -e "/gb_Top_MODULE_CHECK_TARGETS /s/ slowcheck//"
}
do_build() {
@@ -514,6 +478,11 @@ do_build() {
make ${makejobs} -C libreofficekit
}
+do_check() {
+ LO_JAVA_DIR="${wrksrc}/instdir/program/classes" \
+ make ${makejobs} check
+}
+
do_install() {
make DESTDIR="${DESTDIR}/all" PREFIXDIR=/usr distro-pack-install
@@ -559,6 +528,29 @@ libreoffice-draw_package() {
libreoffice-fonts_package() {
short_desc+=" - Fonts"
+ # libreoffice-fonts used to bundle those fonts
+ depends="
+ amiri-font
+ culmus
+ dejavu-fonts-ttf
+ font-adobe-source-code-pro
+ font-adobe-source-sans-pro-v2
+ font-adobe-source-serif-pro
+ font-alef
+ font-crosextra-caladea-ttf
+ font-crosextra-carlito-ttf
+ font-emoji-one-color
+ font-kacst
+ font-liberation-narrow-ttf
+ font-liberation-ttf
+ font-libertine-graphite-ttf
+ font-reem-kufi-ttf
+ font-sil-gentium-basic
+ font-sil-scheherazade
+ noto-fonts-ttf
+ noto-fonts-ttf-extra
+ "
+ build_style=meta
pkg_install() {
vmkdir usr/lib/libreoffice/share
mv ${DESTDIR}/all/usr/lib/libreoffice/share/fonts \
next reply other threads:[~2023-03-19 15:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 15:13 sgn [this message]
2023-04-04 13:37 ` Duncaen
2023-04-05 4:26 ` sgn
2023-04-05 4:27 ` sgn
2023-04-05 4:44 ` sgn
2023-04-25 6:40 ` [PR PATCH] [Updated] " sgn
2023-04-25 8:51 ` sgn
2023-04-25 9:17 ` sgn
2023-04-25 9:19 ` sgn
2023-05-11 7:04 ` sgn
2023-05-11 7:05 ` sgn
2023-05-11 7:49 ` sgn
2023-05-11 7:50 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42862@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).