From a6bf853d6d5fa095e60ae3cb35a9a1ecdef55fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 8 Mar 2023 23:17:40 +0700 Subject: [PATCH 01/20] boost: update to 1.82.0 --- common/shlibs | 73 ++--- srcpkgs/boost/patches/boost-sort.patch | 116 ------- .../container-failed-static-vector.patch | 10 +- srcpkgs/boost/patches/filesystem-test.patch | 24 -- .../patches/fix-boost-filesystem-285.patch | 306 ++++++++++++++++++ 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 | 74 ++--- srcpkgs/libboost_sync | 1 + 12 files changed, 398 insertions(+), 278 deletions(-) delete mode 100644 srcpkgs/boost/patches/boost-sort.patch delete mode 100644 srcpkgs/boost/patches/filesystem-test.patch create mode 100644 srcpkgs/boost/patches/fix-boost-filesystem-285.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 89f7e53081f8..e4d69419cfa7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -631,42 +631,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 -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::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()); - } - -@@ -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 -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/fix-boost-filesystem-285.patch b/srcpkgs/boost/patches/fix-boost-filesystem-285.patch new file mode 100644 index 000000000000..28f6f4734bfb --- /dev/null +++ b/srcpkgs/boost/patches/fix-boost-filesystem-285.patch @@ -0,0 +1,306 @@ +From 396eef1398a87463a234e7d313d637ea67df96b5 Mon Sep 17 00:00:00 2001 +From: Andrey Semashev +Date: Sun, 7 May 2023 20:58:27 +0300 +Subject: [PATCH] Restrict generic path comparison operators to avoid + ambiguities with std lib. + +Path comparison operators that accept arbitrary path source types now require +the other argument to be exactly path. This prevents the compiler from picking +those operators when the other argument is convertible to path. This can happen +even when neither of the arguments are actually paths, e.g. when the +comparison operators are brought into the current scope by a using directive. + +Fixes https://github.com/boostorg/filesystem/issues/285. +--- +diff --git a/boost/filesystem/path.hpp b/boost/filesystem/path.hpp +index 61278ef74..729e18812 100644 +--- a/boost/filesystem/path.hpp ++++ b/boost/filesystem/path.hpp +@@ -1287,20 +1287,26 @@ BOOST_FORCEINLINE bool operator==(path const& lhs, path const& rhs) + return lhs.compare(rhs) == 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator==(path const& lhs, Source const& rhs) ++>::type operator==(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) == 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator==(Source const& lhs, path const& rhs) ++>::type operator==(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) == 0; + } +@@ -1310,20 +1316,26 @@ BOOST_FORCEINLINE bool operator!=(path const& lhs, path const& rhs) + return lhs.compare(rhs) != 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator!=(path const& lhs, Source const& rhs) ++>::type operator!=(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) != 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator!=(Source const& lhs, path const& rhs) ++>::type operator!=(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) != 0; + } +@@ -1333,20 +1345,26 @@ BOOST_FORCEINLINE bool operator<(path const& lhs, path const& rhs) + return lhs.compare(rhs) < 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator<(path const& lhs, Source const& rhs) ++>::type operator<(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) < 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator<(Source const& lhs, path const& rhs) ++>::type operator<(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) > 0; + } +@@ -1356,20 +1374,26 @@ BOOST_FORCEINLINE bool operator<=(path const& lhs, path const& rhs) + return lhs.compare(rhs) <= 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator<=(path const& lhs, Source const& rhs) ++>::type operator<=(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) <= 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator<=(Source const& lhs, path const& rhs) ++>::type operator<=(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) >= 0; + } +@@ -1379,20 +1403,26 @@ BOOST_FORCEINLINE bool operator>(path const& lhs, path const& rhs) + return lhs.compare(rhs) > 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator>(path const& lhs, Source const& rhs) ++>::type operator>(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) > 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator>(Source const& lhs, path const& rhs) ++>::type operator>(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) < 0; + } +@@ -1402,35 +1432,41 @@ BOOST_FORCEINLINE bool operator>=(path const& lhs, path const& rhs) + return lhs.compare(rhs) >= 0; + } + +-template< typename Source > ++template< typename Path, typename Source > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator>=(path const& lhs, Source const& rhs) ++>::type operator>=(Path const& lhs, Source const& rhs) + { + return lhs.compare(rhs) >= 0; + } + +-template< typename Source > ++template< typename Source, typename Path > + BOOST_FORCEINLINE typename boost::enable_if_c< +- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value, ++ boost::conjunction< ++ boost::is_same< Path, path >, ++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type > ++ >::value, + bool +->::type operator>=(Source const& lhs, path const& rhs) ++>::type operator>=(Source const& lhs, Path const& rhs) + { + return rhs.compare(lhs) <= 0; + } + + + // Note: Declared as a template to delay binding to Boost.ContainerHash functions and make the dependency optional +-template< typename T > ++template< typename Path > + inline typename boost::enable_if_c< +- boost::is_same< T, path >::value, ++ boost::is_same< Path, path >::value, + std::size_t +->::type hash_value(T const& p) BOOST_NOEXCEPT ++>::type hash_value(Path const& p) BOOST_NOEXCEPT + { + #ifdef BOOST_WINDOWS_API + std::size_t seed = 0u; +- for (typename T::value_type const* it = p.c_str(); *it; ++it) ++ for (typename Path::value_type const* it = p.c_str(); *it; ++it) + hash_combine(seed, *it == L'/' ? L'\\' : *it); + return seed; + #else // BOOST_POSIX_API +diff --git a/libs/filesystem/test/Jamfile.v2 b/libs/filesystem/test/Jamfile.v2 +index d1ffc2a6f..5d70b08ec 100644 +--- a/libs/filesystem/test/Jamfile.v2 ++++ b/libs/filesystem/test/Jamfile.v2 +@@ -85,6 +85,7 @@ run operations_test.cpp : : : static BOOST_FILESYSTEM_VERSION=4 : + run operations_unit_test.cpp : $(HERE) : : shared BOOST_FILESYSTEM_VERSION=4 always_show_run_output ; + run copy_test.cpp : : : BOOST_FILESYSTEM_VERSION=4 ; + compile-fail cf_path_nullptr_test.cpp ; ++compile path_operator_ambiguity.cpp : gcc:on ; + run path_test.cpp : : : shared BOOST_FILESYSTEM_VERSION=4 ; + run path_test.cpp : : : static BOOST_FILESYSTEM_VERSION=4 : path_test_static ; + run path_test.cpp : : : shared BOOST_FILESYSTEM_VERSION=3 : path_test_v3 ; +diff --git a/libs/filesystem/test/path_operator_ambiguity.cpp b/libs/filesystem/test/path_operator_ambiguity.cpp +new file mode 100644 +index 000000000..5a43a63b6 +--- /dev/null ++++ b/libs/filesystem/test/path_operator_ambiguity.cpp +@@ -0,0 +1,53 @@ ++// Copyright Andrey Semashev 2023 ++// ++// Use, modification, and distribution is subject to the Boost Software ++// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at ++// http://www.boost.org/LICENSE_1_0.txt) ++// ++// See library home page at http://www.boost.org/libs/filesystem ++// ++// This test verifies that a using directive does not introduce operator ++// ambiguity with the standard library. ++// https://github.com/boostorg/filesystem/issues/285 ++ ++#include ++#include ++ ++using namespace boost::filesystem; ++ ++bool test_eq(char* arg) ++{ ++ return std::string("abc") == arg; ++} ++ ++bool test_ne(char* arg) ++{ ++ return std::string("def") != arg; ++} ++ ++bool test_lt(char* arg) ++{ ++ return std::string("ghi") < arg; ++} ++ ++bool test_gt(char* arg) ++{ ++ return std::string("jkl") > arg; ++} ++ ++bool test_le(char* arg) ++{ ++ return std::string("mno") <= arg; ++} ++ ++bool test_ge(char* arg) ++{ ++ return std::string("pqr") >= arg; ++} ++ ++int main(int, char* argv[]) ++{ ++ return test_eq(argv[0]) + test_ne(argv[0]) + ++ test_lt(argv[0]) + test_gt(argv[0]) + ++ test_le(argv[0]) + test_ge(argv[0]); ++} 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 - #include --#include - - #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 339ae920ed34..743ed9850772 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,8 +1,8 @@ # Template file for 'boost' pkgname=boost -version=1.81.0 -revision=2 -_version=${version/beta/b} +version=1.82.0 +revision=1 +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,18 @@ short_desc="Free peer-reviewed portable C++ source libraries" maintainer="John " 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=a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 python_version=3 +# please do NOT delete below lines, +# upgrade boost requires patching a lot of software, +# which requires months of planning +if [ "${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 +132,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 +179,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 +192,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 +217,6 @@ boost-devel_package() { } libboost_atomic_package() { - depends="boost" short_desc+=" - libboost_atomic" pkg_install() { vmove usr/lib/libboost_atomic.so.* @@ -217,7 +224,6 @@ libboost_atomic_package() { } libboost_chrono_package() { - depends="boost" short_desc+=" - libboost_chrono" pkg_install() { vmove usr/lib/libboost_chrono.so.* @@ -225,7 +231,6 @@ libboost_chrono_package() { } libboost_container_package() { - depends="boost" short_desc+=" - libboost_container" pkg_install() { vmove usr/lib/libboost_container.so.* @@ -233,7 +238,6 @@ libboost_container_package() { } libboost_context_package() { - depends="boost" short_desc+=" - libboost_context" pkg_install() { vmove usr/lib/libboost_context.so.* @@ -241,7 +245,6 @@ libboost_context_package() { } libboost_contract_package() { - depends="boost" short_desc+=" - libboost_contract" pkg_install() { vmove usr/lib/libboost_contract.so.* @@ -249,7 +252,6 @@ libboost_contract_package() { } libboost_coroutine_package() { - depends="boost" short_desc+=" - libboost_coroutine" pkg_install() { vmove usr/lib/libboost_coroutine.so.* @@ -257,7 +259,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 +266,6 @@ libboost_date_time_package() { } libboost_fiber_package() { - depends="boost" short_desc+=" - libboost_fiber" pkg_install() { vmove usr/lib/libboost_fiber.so.* @@ -273,7 +273,6 @@ libboost_fiber_package() { } libboost_filesystem_package() { - depends="boost" short_desc+=" - libboost_filesystem" pkg_install() { vmove usr/lib/libboost_filesystem.so.* @@ -281,7 +280,6 @@ libboost_filesystem_package() { } libboost_graph_package() { - depends="boost" short_desc+=" - libboost_graph" pkg_install() { vmove usr/lib/libboost_graph.so.* @@ -289,7 +287,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 +294,6 @@ libboost_graph_parallel_package() { } libboost_iostreams_package() { - depends="boost" short_desc+=" - libboost_iostreams" pkg_install() { vmove usr/lib/libboost_iostreams.so.* @@ -305,7 +301,6 @@ libboost_iostreams_package() { } libboost_locale_package() { - depends="boost" short_desc+=" - libboost_locale" pkg_install() { vmove usr/lib/libboost_locale.so.* @@ -313,7 +308,6 @@ libboost_locale_package() { } libboost_log_package() { - depends="boost" short_desc+=" - libboost_log" pkg_install() { vmove usr/lib/libboost_log.so.* @@ -321,7 +315,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 +322,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 +329,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 +336,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 +343,6 @@ libboost_math_c99l_package() { } libboost_json_package() { - depends="boost" short_desc+=" - libboost_json" pkg_install() { vmove usr/lib/libboost_json.so.* @@ -361,7 +350,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 +357,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 +364,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 +371,6 @@ libboost_math_tr1l_package() { } libboost_mpi_package() { - depends="boost" short_desc+=" - libboost_mpi" pkg_install() { vmove usr/lib/libboost_mpi.so.* @@ -393,7 +378,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 +387,6 @@ libboost_mpi-python3_package() { } libboost_nowide_package() { - depends="boost" short_desc+=" - libboost_nowide" pkg_install() { vmove usr/lib/libboost_nowide.so.* @@ -411,7 +394,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 +401,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 +408,6 @@ libboost_program_options_package() { } libboost_random_package() { - depends="boost" short_desc+=" - libboost_random" pkg_install() { vmove usr/lib/libboost_random.so.* @@ -435,7 +415,6 @@ libboost_random_package() { } libboost_regex_package() { - depends="boost" short_desc+=" - libboost_regex" pkg_install() { vmove usr/lib/libboost_regex.so.* @@ -443,7 +422,6 @@ libboost_regex_package() { } libboost_serialization_package() { - depends="boost" short_desc+=" - libboost_serialization" pkg_install() { vmove usr/lib/libboost_serialization.so.* @@ -451,7 +429,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 +436,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 +443,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 +464,6 @@ libboost_system_package() { } libboost_thread_package() { - depends="boost" short_desc+=" - libboost_thread" pkg_install() { vmove usr/lib/libboost_thread.so.* @@ -491,7 +471,6 @@ libboost_thread_package() { } libboost_timer_package() { - depends="boost" short_desc+=" - libboost_timer" pkg_install() { vmove usr/lib/libboost_timer.so.* @@ -499,7 +478,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 +485,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 +492,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 +499,6 @@ libboost_url_package() { } libboost_wave_package() { - depends="boost" short_desc+=" - libboost_wave" pkg_install() { vmove usr/lib/libboost_wave.so.* @@ -531,7 +506,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 af69e21dbc39b4648ddb2ee0db8fc43efeec17f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 11 May 2023 14:02:28 +0700 Subject: [PATCH 02/20] libreoffice: update to 7.5.3.2. --- srcpkgs/libreoffice/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 496d0f76d0c2..9414ffd34b9b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.5.1.2 -revision=2 +version=7.5.3.2 +revision=1 build_style=meta make_build_target="build" nocross="Several dependencies are nocross=yes" @@ -94,10 +94,10 @@ distfiles=" ${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz ${_addurl}/dragonbox-1.1.3.tar.gz " -checksum="920ddd15bc84cf60a33cf0c68bb66a8ded78d150463c15ebaa27cfb7f3a6c0b7 - 0e4e3d6388f9849d91afedac6126e1583c3a809cc28d095c909bf36eb82fd93a - e9a892fcb7616379efde8724366a8450f7157ce03b8893e385425d6f34f7a8b3 - a3fc9e7b6a8b3cbc853d5bc52cacac773737ec33a2fb4c0a62e08faf1b29b91a +checksum="14367aeed3a8ae01e17438679d93c4905ca7f9d2f2cb99e716ea297b8af2e048 + c558daabf366ab9eb26dcae14b25b7ec725817c4dd06205fced685493793d468 + c9c4edf276c1c024550455b9c98762ab8bfdc1a10df417dd78e469aa8b8baad3 + aef14e7808c10a78bbb6723029ecafb1e6a693e376ac2260ec935d45c098064f 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 From 1c73f91e184da874174972840bf4c0e83e25b7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 25 Apr 2023 16:14:41 +0700 Subject: [PATCH 03/20] logstalgia: for boost-1.82 --- srcpkgs/logstalgia/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template index f8a6cc94065e..34363498a6b3 100644 --- a/srcpkgs/logstalgia/template +++ b/srcpkgs/logstalgia/template @@ -1,14 +1,14 @@ # Template file for 'logstalgia' pkgname=logstalgia version=1.1.4 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="pkg-config" configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" +hostmakedepends="pkg-config" makedepends="freetype-devel glew-devel SDL2_image-devel boost-devel glm pcre2-devel" short_desc="Replay or stream website access logs as a retro arcade game" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/acaudwell/Logstalgia/" distfiles="$homepage/releases/download/$pkgname-$version/$pkgname-$version.tar.gz" checksum=c049eff405e924035222edb26bcc6c7b5f00a08926abdb7b467e2449242790a9 From 1e657f7c21f11299464d2b0611072d3189abe71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:28:32 +0700 Subject: [PATCH 04/20] fcitx5: update to 5.0.23. --- srcpkgs/fcitx5/patches/no-which.patch | 188 ------------------ .../fcitx5/patches/xbps-src-download.patch | 10 + srcpkgs/fcitx5/template | 4 +- 3 files changed, 12 insertions(+), 190 deletions(-) delete mode 100644 srcpkgs/fcitx5/patches/no-which.patch create mode 100644 srcpkgs/fcitx5/patches/xbps-src-download.patch diff --git a/srcpkgs/fcitx5/patches/no-which.patch b/srcpkgs/fcitx5/patches/no-which.patch deleted file mode 100644 index 4ef85bc54155..000000000000 --- a/srcpkgs/fcitx5/patches/no-which.patch +++ /dev/null @@ -1,188 +0,0 @@ ---- a/data/fcitx5-configtool.sh -+++ b/data/fcitx5-configtool.sh -@@ -5,14 +5,14 @@ - - export TEXTDOMAIN=fcitx5 - --if which kdialog > /dev/null 2>&1; then -+if command -v kdialog > /dev/null 2>&1; then - message() { - kdialog --msgbox "$1" - } - error() { - kdialog --error "$1" - } --elif which zenity > /dev/null 2>&1; then -+elif command -v zenity > /dev/null 2>&1; then - message() { - zenity --info --text="$1" - } -@@ -28,7 +28,7 @@ else - } - fi - --if which gettext > /dev/null 2>&1; then -+if command -v gettext > /dev/null 2>&1; then - _() { - gettext "$@" - } -@@ -108,7 +108,7 @@ detectDE() { - if [ x"$DE" = x"gnome" ]; then - # gnome-default-applications-properties is only available in GNOME 2.x - # but not in GNOME 3.x -- which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" -+ command -v gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" - fi - } - -@@ -119,7 +119,7 @@ run_kde() { - } - - run_qt() { -- if which fcitx5-config-qt > /dev/null 2>&1; then -+ if command -v fcitx5-config-qt > /dev/null 2>&1; then - exec fcitx5-config-qt - fi - return 1 -@@ -135,13 +135,13 @@ run_xdg() { - ;; - esac - -- if command="$(which xdg-open 2>/dev/null)"; then -+ if command="$(command -v xdg-open 2>/dev/null)"; then - exec "$command" "$HOME/.config/fcitx5" - fi - } - - _which_cmdline() { -- cmd="$(which "$1")" || return 1 -+ cmd="$(command -v "$1")" || return 1 - shift - echo "$cmd $*" - } ---- a/data/fcitx5-diagnose.sh -+++ b/data/fcitx5-diagnose.sh -@@ -123,7 +123,7 @@ __get_pretty_name() { - fi - } - --fcitx_exe="$(which fcitx5 2> /dev/null)" -+fcitx_exe="$(command -v fcitx5 2> /dev/null)" - - __conf_dir_init() { - # Don't do any fancy check here, it's the user's fault, which we should detect -@@ -214,9 +214,9 @@ if type dbus-send &> /dev/null; then - /controller org.fcitx.Fcitx.Controller1.DebugInfo 2> /dev/null) || return 1 - echo -n "${debuginfo}" - } --elif qdbus_exe=$(which qdbus 2> /dev/null) || \ -- qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \ -- qdbus_exe=$(which qdbus-qt5 2> /dev/null); then -+elif qdbus_exe=$(command -v qdbus 2> /dev/null) || \ -+ qdbus_exe=$(command -v qdbus-qt4 2> /dev/null) || \ -+ qdbus_exe=$(command -v qdbus-qt5 2> /dev/null); then - dbus_exe=${qdbus_exe} - dbus_get_name_owner() { - "${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \ -@@ -345,15 +345,15 @@ detectDE() { - if [ x"$DE" = x"gnome" ]; then - # gnome-default-applications-properties is only available in GNOME 2.x - # but not in GNOME 3.x -- which gnome-default-applications-properties > /dev/null 2>&1 || \ -+ command -v gnome-default-applications-properties > /dev/null 2>&1 || \ - DE="gnome3" -- which gnome-shell &> /dev/null && DE="gnome3" -+ command -v gnome-shell &> /dev/null && DE="gnome3" - fi - } - - maybe_gnome3() { - [[ $DE = gnome3 ]] && return 0 -- [[ $DE = generic ]] && which gnome-shell &> /dev/null && return 0 -+ [[ $DE = generic ]] && command -v gnome-shell &> /dev/null && return 0 - return 1 - } - -@@ -362,7 +362,7 @@ detectDE - # user and uid - - detect_user() { -- if which id &> /dev/null; then -+ if command -v id &> /dev/null; then - cur_user=$(id -un) - cur_uid=$(id -u) - else -@@ -373,7 +373,7 @@ detect_user() { - else - cur_uid="" - fi -- if which whoami &> /dev/null; then -+ if command -v whoami &> /dev/null; then - cur_user=$(whoami) - elif [[ -d /proc/$$/ ]]; then - cur_user=$(stat -c %U /proc/$$/) -@@ -395,7 +395,7 @@ _check_open_root() { - for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do - try_open "$f" && return 0 - done -- if which readlink &> /dev/null; then -+ if command -v readlink &> /dev/null; then - for f in /proc/1/exe /proc/1/cwd /proc/1/root; do - readlink "$f" &> /dev/null && return 0 - done -@@ -992,7 +992,7 @@ _find_config_gtk() { - return 0 - } - local config_gtk -- config_gtk="$(which "fcitx5-config-gtk" 2> /dev/null)" || return 1 -+ config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1 - echo "${config_gtk}" - _config_tool_gtk_exe="${config_gtk}" - } -@@ -1019,7 +1019,7 @@ _check_config_gtk() { - local version=$1 - local config_gtk config_gtk_name - write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}" -- if ! config_gtk="$(which "fcitx5-config-gtk${version}" 2> /dev/null)"; then -+ if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then - if ! _check_config_gtk_version "${version}"; then - write_error_eval \ - "$(_ 'Config GUI for gtk${1} not found.')" "${version}" -@@ -1040,7 +1040,7 @@ _check_config_qt() { - local config_qt config_qt_name - config_qt_name="fcitx5-config-qt" - write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}" -- if ! config_qt="$(which "${config_qt_name}" 2> /dev/null)"; then -+ if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then - write_error "$(_ 'Config GUI for qt not found.')" - return 1 - fi -@@ -1053,7 +1053,7 @@ _check_config_kcm() { - local version=$1 - local kcm_shell config_kcm - write_order_list "$(_ 'Config GUI for kde:')" -- if ! kcm_shell="$(which "kcmshell${version}" 2> /dev/null)"; then -+ if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then - write_error "$(print_not_found "kcmshell${version}")" - return 1 - fi -@@ -1069,7 +1069,7 @@ check_config_ui() { - local IFS=$'\n' - write_title 1 "$(_ 'Fcitx Configure UI:')" - write_order_list "$(_ 'Config Tool Wrapper:')" -- if ! fcitx_configtool="$(which fcitx5-configtool 2> /dev/null)"; then -+ if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then - write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool - else - write_eval "$(_ 'Found ${1} at ${2}.')" \ ---- a/test/xvfb_wrapper.sh -+++ b/test/xvfb_wrapper.sh -@@ -20,7 +20,7 @@ finish() - - trap finish EXIT - --if which xprop >/dev/null 2>&1; then -+if command -v xprop >/dev/null 2>&1; then - i=1 - while [ "$i" -lt 5 ]; do - if xprop -root >/dev/null 2>&1; then diff --git a/srcpkgs/fcitx5/patches/xbps-src-download.patch b/srcpkgs/fcitx5/patches/xbps-src-download.patch new file mode 100644 index 000000000000..2a380fb64459 --- /dev/null +++ b/srcpkgs/fcitx5/patches/xbps-src-download.patch @@ -0,0 +1,10 @@ +--- a/src/lib/fcitx-utils/Fcitx5Download.cmake.in ++++ b/src/lib/fcitx-utils/Fcitx5Download.cmake.in +@@ -1,4 +1,7 @@ + if (NOT EXISTS "@FCITX5_DOWNLOAD_DEST@") ++ if (DEFINED ENV{XBPS_MACHINE}) ++ message(FATAL_ERROR "Downloading @FCITX5_DOWNLOAD_URL@ is forbidden inside xbps-src") ++ endif() + message(STATUS "Downloading '@FCITX5_DOWNLOAD_URL@' to '@FCITX5_DOWNLOAD_DEST@'...") + file(DOWNLOAD + "@FCITX5_DOWNLOAD_URL@" diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 88a52d3063d6..1a6a84562397 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.0.21 +version=5.0.23 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="4e31c3ae5588134e2ef33494d6f71aa047a5c407edbcba27b016a74567308dbe +checksum="04f209a6406225ce19785f8d9d3bdb253944586edcfa9601414fcdda8a1b13a0 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes From 9538118bd3829c07f13ea428af71e4cbfc8360dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:28:38 +0700 Subject: [PATCH 05/20] fcitx5-anthy: update to 5.0.14. --- .../fcitx5-anthy/patches/fix-build-musl.patch | 18 ------------------ srcpkgs/fcitx5-anthy/template | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch diff --git a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch deleted file mode 100644 index bc19b7c5c406..000000000000 --- a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: fcitx5-anthy-5.0.4/src/utils.h -=================================================================== ---- fcitx5-anthy-5.0.4.orig/src/utils.h -+++ fcitx5-anthy-5.0.4/src/utils.h -@@ -28,11 +28,11 @@ bool key_is_keypad(const fcitx::Key &key - std::string keypad_to_string(const fcitx::KeyEvent &key); - void launch_program(std::string command); - --bool surrounding_get_safe_delta(uint from, uint to, int32_t *delta); -+bool surrounding_get_safe_delta(unsigned from, unsigned to, int32_t *delta); - - bool surrounding_get_anchor_pos_from_selection( - const std::string &surrounding_text, const std::string &selected_text, -- uint cursor_pos, uint *anchor_pos); -+ unsigned cursor_pos, unsigned *anchor_pos); - - inline char get_ascii_code(const fcitx::Key &key) { - auto chr = fcitx::Key::keySymToUnicode(key.sym()); diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template index 9492882522a7..653a78bb8f45 100644 --- a/srcpkgs/fcitx5-anthy/template +++ b/srcpkgs/fcitx5-anthy/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-anthy' pkgname=fcitx5-anthy -version=5.0.13 +version=5.0.14 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz" -checksum=106a7262235a966e049f739afbe8723923cb8636e455c0f266ddcba9a99f48e2 +checksum=0a874d70df4ef22f1eb868c27eaf66e3354e1609db8ded392544f8f6bc54a7b7 fcitx5-anthy-icons_package() { short_desc+=" - icons" From 52434b6264001664d42d0481ad36679ff00f3c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:28:42 +0700 Subject: [PATCH 06/20] fcitx5-chewing: update to 5.0.14. --- srcpkgs/fcitx5-chewing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template index d46eb2f53618..33bbfff524eb 100644 --- a/srcpkgs/fcitx5-chewing/template +++ b/srcpkgs/fcitx5-chewing/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chewing' pkgname=fcitx5-chewing -version=5.0.13 +version=5.0.14 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz" -checksum=5967dca77a6f12344a1028d699139613d08f8ce24123b4fb03e9877dbe15ed02 +checksum=7000d66a341e3bdb5bdf8c948c20bf1b6f4cb08b458d13d4d3c2e3fd6e30e6f8 lib32disabled=yes fcitx5-chewing-icons_package() { From 626301756a335b3d98570914898adae588a10349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:28:50 +0700 Subject: [PATCH 07/20] fcitx5-chinese-addons: update to 5.0.17. --- srcpkgs/fcitx5-chinese-addons/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index 7e9b8a24eedd..63829a2d3063 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons -version=5.0.16 -revision=2 +version=5.0.17 +revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake qt5-host-tools libime-utils" @@ -17,7 +17,7 @@ _pystroke_version=20121124 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" -checksum="a46a66cc203ce34d473a2d6a9c742984378faa2b1a3678d6208b3d35c2bafcf0 +checksum="9822aeac6b772d38df8bca4f806798d0cef8e8493cc601ddbe060b50b6f75f46 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" skip_extraction=" From b77ed2b31fb37a9000e04acf67f6219fca8c4984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:28:56 +0700 Subject: [PATCH 08/20] fcitx5-configtool: update to 5.0.17. --- srcpkgs/fcitx5-configtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template index 59ee0e6c406e..768e536c5133 100644 --- a/srcpkgs/fcitx5-configtool/template +++ b/srcpkgs/fcitx5-configtool/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-configtool' pkgname=fcitx5-configtool -version=5.0.16 +version=5.0.17 revision=1 build_style=cmake configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON" @@ -19,7 +19,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" -checksum=ee2bce5a65508b804ac8eb6b2ec06b200ed548e0ea830d2d01b956352bf4c81a +checksum=f8b6196d23d14a6acc9a2b3dbc3772b6e5b2e3a5147b78b649238a3d775786d5 lib32disabled=yes post_install() { From 0fb14a986b1c6b138e8a70269401016459b9e2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:02 +0700 Subject: [PATCH 09/20] fcitx5-gtk: update to 5.0.23. --- srcpkgs/fcitx5-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template index f5f42dde3c5e..6d5d0605a749 100644 --- a/srcpkgs/fcitx5-gtk/template +++ b/srcpkgs/fcitx5-gtk/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-gtk' pkgname=fcitx5-gtk -version=5.0.21 +version=5.0.23 revision=1 build_style=cmake build_helper=gir @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" -checksum=12375289971e5b95d358238f7737cc97d05a27874b33af7019e8599b924e2011 +checksum=ad124ce7f1bbca650dda47cb73c5572913419513eacf9ebe84c9f6753c920868 lib32disabled=yes build_options="gir" From 8d74f7c9f8188543d8149ce6a83d8e953dd4f02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:07 +0700 Subject: [PATCH 10/20] fcitx5-hangul: update to 5.0.11. --- srcpkgs/fcitx5-hangul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template index 9f515573712c..2796d4203b7f 100644 --- a/srcpkgs/fcitx5-hangul/template +++ b/srcpkgs/fcitx5-hangul/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-hangul' pkgname=fcitx5-hangul -version=5.0.10 +version=5.0.11 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz" -checksum=35d9233d3904c47abaf8d58910e183e351c7a657dd9d1964acd8fce4109d2bb9 +checksum=6894702e73ef431c7699698b55421494419383170b502aa98209a7eff3fdd0d3 lib32disabled=yes fcitx5-hangul-icons_package() { From 13b4db357ada96c85f4add1889805975881a70ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:12 +0700 Subject: [PATCH 11/20] fcitx5-qt: update to 5.0.17. --- srcpkgs/fcitx5-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index 2db07188cc1c..ee483190bc8a 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.0.16 +version=5.0.17 revision=1 build_style=cmake configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" -checksum=583ac1055f4bba32a60a41b502b8125409f3f424b2228d9b643c266180a04af3 +checksum=4268e7a1277692a79dcff08e662d1e74407e598a61d3d0386bc64a51809e91f4 lib32disabled=yes post_install() { From 1625cece8570324091fb283f2ae32a8d13846272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:18 +0700 Subject: [PATCH 12/20] fcitx5-rime: update to 5.0.16. --- srcpkgs/fcitx5-rime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template index 9ea510625429..9173ad893952 100644 --- a/srcpkgs/fcitx5-rime/template +++ b/srcpkgs/fcitx5-rime/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-rime' pkgname=fcitx5-rime -version=5.0.15 +version=5.0.16 revision=1 build_style=cmake configure_args="-DRIME_DATA_DIR=/usr/share/rime-data" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz" -checksum=705210aca13ef19fc5fa9223791eba8cc2d5d485b2094e075bda0414189c0263 +checksum=5076d90b95d67bde6beffb48a3c9d643c60f54e82dc6e7243eb794cada8c7834 lib32disabled=yes fcitx5-rime-icons_package() { From 0dacc0c53be566e6d01b0bceaa7dd761ad5b30d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:25 +0700 Subject: [PATCH 13/20] fcitx5-table-extra: update to 5.0.13. --- srcpkgs/fcitx5-table-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template index f1dd248d1822..cba0aac14413 100644 --- a/srcpkgs/fcitx5-table-extra/template +++ b/srcpkgs/fcitx5-table-extra/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-extra' pkgname=fcitx5-table-extra -version=5.0.12 +version=5.0.13 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz" -checksum=9a202b608c64f4733e940e479b403b3b63c68e531324cd20f9dac81d27bbe977 +checksum=6aec03e6cb1408d8447898226132e7226071535c0584e35e04159e4c5f74a016 From a98536a0fdaa5c28abbf8da8d23403a107cbb6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:31 +0700 Subject: [PATCH 14/20] fcitx5-table-other: update to 5.0.11. --- srcpkgs/fcitx5-table-other/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template index 2ba318f70da4..d83454814928 100644 --- a/srcpkgs/fcitx5-table-other/template +++ b/srcpkgs/fcitx5-table-other/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-other' pkgname=fcitx5-table-other -version=5.0.10 +version=5.0.11 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz" -checksum=cb4d4231878eb4b1fe60994e091b4279c8810b518f7da45630d5dfac7f2daa51 +checksum=3f61b7f0364cb7149eaeaeac6fce3d00ab72d6cb5bb884760a41d4738df3244c From b33d02f46b9ff034370beb86ed2737ad25426ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:36 +0700 Subject: [PATCH 15/20] fcitx5-unikey: update to 5.0.13. --- srcpkgs/fcitx5-unikey/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template index 3c0571ba7e28..962e30d790fc 100644 --- a/srcpkgs/fcitx5-unikey/template +++ b/srcpkgs/fcitx5-unikey/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-unikey' pkgname=fcitx5-unikey -version=5.0.12 +version=5.0.13 revision=1 build_style=cmake #configure_args="" @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz" -checksum=80f3e7329b2871fea51bb750e1107870b9864ac153ef6eabd11710e19e63ae89 +checksum=7e6db370927d5c76782c129fe39c142c83f85bc2abfd1d599bc91364b473d78e conflicts="fcitx-unikey>=0" fcitx5-unikey-macro-editor_package() { From d268df4490006915064fca0d2a1c4d2887959c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 14:29:43 +0700 Subject: [PATCH 16/20] fcitx5-zhuyin: update to 5.0.12. --- srcpkgs/fcitx5-zhuyin/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template index eb5695dff280..80228061da1f 100644 --- a/srcpkgs/fcitx5-zhuyin/template +++ b/srcpkgs/fcitx5-zhuyin/template @@ -1,7 +1,7 @@ # Template file for 'fcitx5-zhuyin' pkgname=fcitx5-zhuyin -version=5.0.11 -revision=2 +version=5.0.12 +revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin" makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel @@ -13,7 +13,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _model_version=20161206 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz" -checksum="f4aa14ae98700ce001add589f2ec79b2faa97b7000ba6162bd8f19f7b236af71 +checksum="5d9b9f78d2992c672e5bd85a2a89397f02d56dfb48134733ee4d408c96e110b8 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704" skip_extraction="model.text.${_model_version}.tar.gz" lib32disabled=yes From cf134f6218f8745f1137c98f122f2cc6770cc455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 20:40:21 +0700 Subject: [PATCH 17/20] libime: update to 1.0.17. --- srcpkgs/libime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template index 93b7c6c59194..dcf29ea8959e 100644 --- a/srcpkgs/libime/template +++ b/srcpkgs/libime/template @@ -1,6 +1,6 @@ # Template file for 'libime' pkgname=libime -version=1.0.16 +version=1.0.17 revision=1 build_style=cmake build_helper=qemu @@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz https://download.fcitx-im.org/data/${_lm_sc} https://download.fcitx-im.org/data/${_dict} https://download.fcitx-im.org/data/table.tar.gz" -checksum="07b1518f41747f0bff988135892da4b6d29b4b5a336bdf86361acbbce30a6608 +checksum="23f87b8104b9161bdc41fbac44294fef825d586260afc698f6a85ff20ea65407 a11bc97d275adaf195f9bac854368ae06cdb4a0fe1eecf59db5ae580615db4fa 971752f413188007e8d19158c11b85c955e25d7b321ec2275c4b3af6d8a85d26 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7" From 925f9f7449df593633fe5a206e4f503a5c05cadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 20:40:36 +0700 Subject: [PATCH 18/20] libime-jyutping: update to 1.0.6. --- srcpkgs/libime-jyutping/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template index 8dc8415e6017..aa2e219ae572 100644 --- a/srcpkgs/libime-jyutping/template +++ b/srcpkgs/libime-jyutping/template @@ -1,6 +1,6 @@ # Template file for 'libime-jyutping' pkgname=libime-jyutping -version=1.0.5 +version=1.0.6 revision=1 build_style=cmake build_helper=qemu @@ -16,7 +16,7 @@ _model_version=20180103 distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz" -checksum="316e6b485f428536abaab9d7ec45a2a0179447725f2c8b8066accbf84f4ebc3a +checksum="3ba22518003650f9608870ace491b9bd48eef449bb763a5f8919c8e294716499 e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071" skip_extraction="jyutping-dict-${_dict_version}.tar.xz From 8c2cdd099884d72b3fe4b586bcac68bee710fbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 Mar 2023 20:40:36 +0700 Subject: [PATCH 19/20] xcb-imdkit: update to 1.0.5. --- srcpkgs/xcb-imdkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template index b2e8947fe7d7..5700eec00567 100644 --- a/srcpkgs/xcb-imdkit/template +++ b/srcpkgs/xcb-imdkit/template @@ -1,6 +1,6 @@ # Template file for 'xcb-imdkit' pkgname=xcb-imdkit -version=1.0.4 +version=1.0.5 revision=1 build_style=cmake hostmakedepends="pkg-config extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-only" homepage="https://github.com/fcitx/xcb-imdkit" distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz" -checksum=824f6dd0c259a90314f628f7f4219465a413fb0d7651722b9f39bf8430ced0c9 +checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc post_install() { sed -i '/prefix=/!s,/usr,${exec_prefix},' \ From 739ffe9cacfa6eb49aadbb9582a34f87b65873f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 25 Apr 2023 16:14:30 +0700 Subject: [PATCH 20/20] *: revbump for boost-1.82 --- srcpkgs/0ad/template | 2 +- srcpkgs/Aegisub/template | 2 +- srcpkgs/Field3D/template | 2 +- srcpkgs/LGOGDownloader/template | 2 +- srcpkgs/Lucene++/template | 2 +- srcpkgs/PrusaSlicer/template | 2 +- srcpkgs/TSC/template | 2 +- srcpkgs/astroid/template | 2 +- srcpkgs/bastet/template | 2 +- srcpkgs/bitcoin/template | 2 +- srcpkgs/blender/template | 2 +- srcpkgs/cclive/template | 2 +- srcpkgs/cgal/template | 2 +- srcpkgs/codeblocks/template | 2 +- srcpkgs/colobot/template | 2 +- srcpkgs/cpp-hocon/template | 2 +- srcpkgs/cryfs/template | 2 +- srcpkgs/eclib/template | 2 +- srcpkgs/facter/template | 2 +- srcpkgs/fifengine/template | 2 +- srcpkgs/freecad/template | 2 +- srcpkgs/freeorion/template | 2 +- srcpkgs/gnucash/template | 2 +- srcpkgs/gnuradio-osmosdr/template | 2 +- srcpkgs/gnuradio-rds/template | 2 +- srcpkgs/gnuradio/template | 2 +- srcpkgs/gource/template | 2 +- srcpkgs/grive2/template | 2 +- srcpkgs/guitarix2/template | 2 +- srcpkgs/heaptrack/template | 2 +- srcpkgs/hugin/template | 2 +- srcpkgs/i2pd/template | 2 +- srcpkgs/icinga2/template | 2 +- srcpkgs/imagescan/template | 2 +- srcpkgs/imath/template | 2 +- srcpkgs/inkscape/template | 2 +- srcpkgs/innoextract/template | 2 +- srcpkgs/juCi++/template | 2 +- srcpkgs/kea/template | 2 +- srcpkgs/kig/template | 2 +- srcpkgs/leatherman/template | 2 +- srcpkgs/ledger/template | 2 +- srcpkgs/libbitcoin-blockchain/template | 2 +- srcpkgs/libbitcoin-client/template | 2 +- srcpkgs/libbitcoin-database/template | 2 +- srcpkgs/libbitcoin-explorer/template | 2 +- srcpkgs/libbitcoin-network/template | 2 +- srcpkgs/libbitcoin-node/template | 2 +- srcpkgs/libbitcoin-protocol/template | 2 +- srcpkgs/libbitcoin-server/template | 2 +- srcpkgs/libbitcoin-system/template | 2 +- srcpkgs/libcmis/template | 2 +- srcpkgs/libixion/template | 2 +- srcpkgs/liborcus/template | 2 +- srcpkgs/libphonenumber/template | 2 +- srcpkgs/librime/template | 2 +- srcpkgs/libtorrent-rasterbar/template | 2 +- srcpkgs/litecoin/template | 2 +- srcpkgs/mkvtoolnix/template | 2 +- srcpkgs/monero-gui/template | 2 +- srcpkgs/monero/template | 2 +- srcpkgs/mupen64plus/template | 2 +- srcpkgs/namecoin/template | 2 +- srcpkgs/ncmpcpp/template | 2 +- srcpkgs/opencamlib/template | 2 +- srcpkgs/openimageio/template | 2 +- srcpkgs/openmw/template | 2 +- srcpkgs/openscad/template | 2 +- srcpkgs/openvdb/template | 2 +- srcpkgs/osm2pgsql/template | 2 +- srcpkgs/poedit/template | 2 +- srcpkgs/povray/template | 2 +- srcpkgs/pulseeffects-legacy/template | 2 +- srcpkgs/pulseview/template | 2 +- srcpkgs/remwharead/template | 2 +- srcpkgs/rstudio/template | 2 +- srcpkgs/schroot/template | 2 +- srcpkgs/snapper/template | 2 +- srcpkgs/source-highlight/template | 2 +- srcpkgs/supercollider/template | 2 +- srcpkgs/supertux2/template | 2 +- srcpkgs/swiften/template | 2 +- srcpkgs/syncthingtray/template | 2 +- srcpkgs/tmfs/template | 2 +- srcpkgs/tomahawk/template | 2 +- srcpkgs/uhd/template | 2 +- srcpkgs/wesnoth/template | 2 +- srcpkgs/wsjtx/template | 2 +- 88 files changed, 88 insertions(+), 88 deletions(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index 8ad54317f15e..f085facb1fdd 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.26 -revision=4 +revision=5 archs="x86_64* i686* aarch64* armv7l* ppc64le*" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index 64f141ed6dd6..7a2bf765d3af 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -1,7 +1,7 @@ # Template file for 'Aegisub' pkgname=Aegisub version=3.3.2 -revision=7 +revision=8 build_style=cmake build_helper=cmake-wxWidgets-gtk3 cmake_builddir="BUILD" diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template index 5e430c0d86e4..6e4a351327ae 100644 --- a/srcpkgs/Field3D/template +++ b/srcpkgs/Field3D/template @@ -1,7 +1,7 @@ # Template file for 'Field3D' pkgname=Field3D version=1.7.3 -revision=6 +revision=7 build_style=cmake makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel" short_desc="Library for storing voxel data on disk and in memory" diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index fd0f265685bc..f9d281820035 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.9 -revision=4 +revision=5 build_style=cmake configure_args="$(vopt_bool qt USE_QT_GUI)" hostmakedepends="pkg-config" diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template index 287271b6b8fe..5cbc5262c63a 100644 --- a/srcpkgs/Lucene++/template +++ b/srcpkgs/Lucene++/template @@ -1,7 +1,7 @@ # Template file for 'Lucene++' pkgname=Lucene++ version=3.0.7 -revision=13 +revision=14 build_style=cmake configure_args="-Wno-dev" makedepends="boost-devel gtest-devel" diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 676680fb4297..e645926e76f7 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.4.2 -revision=4 +revision=5 build_style=cmake build_helper="qemu cmake-wxWidgets-gtk3" # Pre-Compiled Headers seems to be slower diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 6ae1f4fbfbd3..86ac15a7a2e3 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -1,7 +1,7 @@ # Template file for 'TSC' pkgname=TSC version=2.1.0 -revision=4 +revision=5 build_wrksrc=tsc build_style=cmake build_helper="qemu" diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index c9deaa7548c7..25d3da44e024 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.16 -revision=7 +revision=8 build_style=cmake build_helper=gir hostmakedepends="pkg-config scdoc protobuf gobject-introspection" diff --git a/srcpkgs/bastet/template b/srcpkgs/bastet/template index 4de219d38955..fabf4b51d5c7 100644 --- a/srcpkgs/bastet/template +++ b/srcpkgs/bastet/template @@ -1,7 +1,7 @@ # Template file for 'bastet' pkgname=bastet version=0.43.2 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes makedepends="boost-devel ncurses-devel" diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 83c404962c30..cf464ce35c46 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=22.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui" diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 61b42eb2e51e..d18bc88838ff 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=3.4.1 -revision=3 +revision=4 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index 2c8c56ff7110..365246f9ba33 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -1,7 +1,7 @@ # Template file for 'cclive' pkgname=cclive version=0.9.3 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel" diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index 5079bea9217b..272ad67aed14 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname=cgal version=4.14 -revision=5 +revision=6 build_style=cmake build_helper="qemu" makedepends="boost-devel eigen mpfr-devel" diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index 8aa7529a7bf2..af2c062d43c9 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -1,7 +1,7 @@ # Template file for 'codeblocks' pkgname=codeblocks version=20.03 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins --with-boost=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template index f0ab974ea202..bc73eac1cf88 100644 --- a/srcpkgs/colobot/template +++ b/srcpkgs/colobot/template @@ -2,7 +2,7 @@ pkgname=colobot # needs to be kept in sync with colobot-data (provides game assets) version=0.2.0 -revision=3 +revision=4 build_style=cmake configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND" hostmakedepends="gettext librsvg-utils perl po4a xmlstarlet" diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index 7e344c3d19c2..189bd97e8d1e 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon version=0.3.0 -revision=6 +revision=7 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config" diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 2167f25c54bc..58d4fdd5d7d7 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,7 +1,7 @@ # Template file for 'cryfs' pkgname=cryfs version=0.11.2 -revision=3 +revision=4 create_wrksrc=yes build_style=cmake configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template index 9faf35e9f42f..b20fb852a5ba 100644 --- a/srcpkgs/eclib/template +++ b/srcpkgs/eclib/template @@ -1,7 +1,7 @@ # Template file for 'eclib' pkgname=eclib version=20230424 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-flint --with-boost" makedepends="pari-devel ntl-devel flintlib-devel boost-devel" diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 22c3e97a242a..56eb4c3dca73 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.16 -revision=6 +revision=7 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib" diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index 814e68990dbd..b5cf789320c3 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.2 -revision=11 +revision=12 build_style=cmake hostmakedepends="swig python3" makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index f62023ee8ce4..e301f32d3540 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.20.2 -revision=3 +revision=4 build_style=cmake _inst_prefix=/usr/lib/${pkgname} diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index d4c079dd3af0..c57e2ccc0359 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.4.10.2 -revision=5 +revision=6 _release=${version}_2021-08-01.f663dad build_style=cmake hostmakedepends="cppcheck doxygen python3-pycodestyle" diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 3b3d1a4390e2..c648d0bff35d 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=4.13 -revision=2 +revision=3 build_style=cmake make_check_target=check configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1" diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index c8680ff1d478..a4cb14a2ac1e 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.4 -revision=1 +revision=2 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index 09a928d3759b..b1bc96848bf8 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=6 +revision=7 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 7c74168e8f59..3308afa6e2c3 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.5.1 -revision=1 +revision=2 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index ff427d1f2751..453e7e328f27 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -1,7 +1,7 @@ # Template file for 'gource' pkgname=gource version=0.54 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF --with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/" diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template index f29c4aa90cc1..5c524f78958d 100644 --- a/srcpkgs/grive2/template +++ b/srcpkgs/grive2/template @@ -1,7 +1,7 @@ # Template file for 'grive2' pkgname=grive2 version=0.5.3 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel" diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index 1aa3c491db87..6a294f6b962f 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,7 +1,7 @@ # Template file for 'guitarix2' pkgname=guitarix2 version=0.44.1 -revision=1 +revision=2 build_style=waf3 configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')" diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index 74bc604993a5..7388dd050647 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -1,7 +1,7 @@ # Template file for 'heaptrack' pkgname=heaptrack version=1.4.0 -revision=3 +revision=4 build_style=cmake configure_args="-DHEAPTRACK_BUILD_GUI=ON" hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index a8ab70e7eb5b..19cee114c73a 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2022.0.0 -revision=5 +revision=6 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 209f52225e96..237ee28d4db8 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,7 +1,7 @@ # Template file for 'i2pd' pkgname=i2pd version=2.46.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USE_UPNP=yes" makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index 8eeec55181d7..ea12ab75e114 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,7 +1,7 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.9.3 -revision=8 +revision=9 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index baf4f27023c2..9a4101e582a6 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -1,7 +1,7 @@ # Template file for 'imagescan' pkgname=imagescan version=3.65.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template index 6570b51fbf69..ee47207a3e51 100644 --- a/srcpkgs/imath/template +++ b/srcpkgs/imath/template @@ -1,7 +1,7 @@ # Template file for 'imath' pkgname=imath version=3.1.7 -revision=1 +revision=2 build_style=cmake configure_args="-DPYTHON=ON" hostmakedepends="python3-numpy" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 2e434be00841..870a4512a8e0 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=7 +revision=8 build_style=cmake # builds executables then runs checks # some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241 diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template index d468c0f0a51a..7d2e50b62245 100644 --- a/srcpkgs/innoextract/template +++ b/srcpkgs/innoextract/template @@ -1,7 +1,7 @@ # Template file for 'innoextract' pkgname=innoextract version=1.9 -revision=3 +revision=4 build_style=cmake hostmakedepends="extra-cmake-modules" makedepends="boost-devel liblzma-devel" diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 416bde7cc4d0..ad903e98b150 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.7.2 -revision=3 +revision=4 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" create_wrksrc=yes diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 5ab6b9199976..b0167032b111 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -1,7 +1,7 @@ # Template file for 'kea' pkgname=kea version=2.2.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr $(vopt_if mysql --with-mysql) diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 378da975c2ce..e479f46c3bea 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=22.12.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config qt5-host-tools qt5-qmake" diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index 16dcefe1852b..d0e44a5e970c 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,7 +1,7 @@ # Template file for 'leatherman' pkgname=leatherman version=1.12.4 -revision=5 +revision=6 build_style=cmake configure_args="-DLEATHERMAN_SHARED=ON" hostmakedepends="pkg-config python3" diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 9b5c1b6d0ce4..53335b1671e9 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -1,7 +1,7 @@ # Template file for 'ledger' pkgname=ledger version=3.2.1 -revision=3 +revision=4 build_style=cmake makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel" short_desc="Double-entry accounting system with a command-line reporting interface" diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template index 5127fd26bc64..9afd8560a287 100644 --- a/srcpkgs/libbitcoin-blockchain/template +++ b/srcpkgs/libbitcoin-blockchain/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-blockchain' pkgname=libbitcoin-blockchain version=3.6.0 -revision=9 +revision=10 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template index 423b6d8d8109..e2bdc9933ec8 100644 --- a/srcpkgs/libbitcoin-client/template +++ b/srcpkgs/libbitcoin-client/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-client' pkgname=libbitcoin-client version=3.6.0 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples" diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template index 78ccb8e6ea40..552a1eee211c 100644 --- a/srcpkgs/libbitcoin-database/template +++ b/srcpkgs/libbitcoin-database/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-database' pkgname=libbitcoin-database version=3.6.0 -revision=9 +revision=10 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template index 13bf082be10b..dfe13ab89d3c 100644 --- a/srcpkgs/libbitcoin-explorer/template +++ b/srcpkgs/libbitcoin-explorer/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-explorer' pkgname=libbitcoin-explorer version=3.6.0 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template index 81964af81a3f..2600e50c6096 100644 --- a/srcpkgs/libbitcoin-network/template +++ b/srcpkgs/libbitcoin-network/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-network' pkgname=libbitcoin-network version=3.6.0 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template index 07a4051a038e..bbf5ee272453 100644 --- a/srcpkgs/libbitcoin-node/template +++ b/srcpkgs/libbitcoin-node/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-node' pkgname=libbitcoin-node version=3.6.0 -revision=9 +revision=10 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template index fcd902174bf4..9458a9b2836b 100644 --- a/srcpkgs/libbitcoin-protocol/template +++ b/srcpkgs/libbitcoin-protocol/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-protocol' pkgname=libbitcoin-protocol version=3.6.0 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld" diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template index e2b5d9550f57..186bf2befbcc 100644 --- a/srcpkgs/libbitcoin-server/template +++ b/srcpkgs/libbitcoin-server/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-server' pkgname=libbitcoin-server version=3.6.0 -revision=9 +revision=10 archs="aarch64* ppc64* x86_64*" build_style=gnu-configure configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template index 81e1bf29918b..ac13e044c276 100644 --- a/srcpkgs/libbitcoin-system/template +++ b/srcpkgs/libbitcoin-system/template @@ -1,7 +1,7 @@ # Template file for 'libbitcoin-system' pkgname=libbitcoin-system version=3.6.0 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index aadba05fd19d..80239ba34f9a 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -1,7 +1,7 @@ # Template file for 'libcmis' pkgname=libcmis version=0.5.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="DOCBOOK2MAN=docbook2man --disable-werror" hostmakedepends="pkg-config docbook2x" diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index e44c9f9dc9c4..91f9956b0448 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.17.0 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 571429c9cd81..276b3b3a5989 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus version=0.17.2 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index 767c0ec9a7a7..0af9ced1bcff 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=10 +revision=11 build_wrksrc=cpp build_style=cmake build_helper=qemu diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template index b9916393765f..f4736e3b712d 100644 --- a/srcpkgs/librime/template +++ b/srcpkgs/librime/template @@ -1,7 +1,7 @@ # Template file for 'librime' pkgname=librime version=1.7.3 -revision=6 +revision=7 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++" diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 745f4b043a70..b34c92df1ee2 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -2,7 +2,7 @@ # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar version=1.2.18 -revision=2 +revision=3 build_style=cmake configure_args="-Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON -Dbuild_tests=ON" diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index b92b4dc9ad54..a7ed18603c20 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.18.1 -revision=10 +revision=11 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-openssl" diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 3cc62053b26d..27c83737e430 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=75.0.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index 46668d1a9a85..3a60a8d91b0f 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -1,7 +1,7 @@ # Template file for 'monero-gui' pkgname=monero-gui version=0.18.1.2 -revision=3 +revision=4 _monero_version=0.18.1.2 # the revision monero uses as a submodule for the specific version _randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 311324873e82..93a3c82fe4d6 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,7 +1,7 @@ # Template file for 'monero' pkgname=monero version=0.18.1.2 -revision=3 +revision=4 # the revision monero uses as a submodule for the specific version _randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c" _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c" diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index 1d93ec87c24d..9f8e98249408 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -1,7 +1,7 @@ # Template file for 'mupen64plus' pkgname=mupen64plus version=2.5.9 -revision=5 +revision=6 archs="x86_64* i686*" hostmakedepends="pkg-config which nasm" makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel" diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index de76d4464b29..5a77aabf8e5a 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.18.1 -revision=8 +revision=9 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index e9958d9043ba..a66f5f7e9e0c 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.9.2 -revision=8 +revision=9 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template index a04c5eb69f60..704b13d1da61 100644 --- a/srcpkgs/opencamlib/template +++ b/srcpkgs/opencamlib/template @@ -1,7 +1,7 @@ # Template file for 'opencamlib' pkgname=opencamlib version=2019.07 -revision=8 +revision=9 build_style=cmake configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}" hostmakedepends="python3" diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index b661bbf7ba57..9b38ace50f7e 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=2.4.9.0 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 5251a0283dc1..e3771c7aaf1a 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.47.0 -revision=4 +revision=5 build_style=cmake _recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea _bullet_tag=3.17 diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template index 12d7cfbdeeb8..a31b34b5fe39 100644 --- a/srcpkgs/openscad/template +++ b/srcpkgs/openscad/template @@ -1,7 +1,7 @@ # Template file for 'openscad' pkgname=openscad version=2021.01 -revision=4 +revision=5 build_style=qmake hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index d8ef5b4496b9..0084a3cb85ba 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -1,7 +1,7 @@ # Template file for 'openvdb' pkgname=openvdb version=9.0.0 -revision=5 +revision=6 build_style=cmake configure_args="-DOPENVDB_BUILD_VDB_VIEW=1" hostmakedepends="pkg-config" diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template index c3cd45f42116..4281609e911b 100644 --- a/srcpkgs/osm2pgsql/template +++ b/srcpkgs/osm2pgsql/template @@ -1,7 +1,7 @@ # Template file for 'osm2pgsql' pkgname=osm2pgsql version=1.6.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="boost" makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 813e7af7f95e..ed5827782484 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.2.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index 5ae25f1363f5..e7cf16f4b089 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -1,7 +1,7 @@ # Template file for 'povray' pkgname=povray version=3.7.0.8 -revision=8 +revision=9 build_style=gnu-configure _v=${version%.*.*} configure_args="COMPILED_BY=Void --disable-optimiz-arch" diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template index 72b296eb9575..ca614d7a5eae 100644 --- a/srcpkgs/pulseeffects-legacy/template +++ b/srcpkgs/pulseeffects-legacy/template @@ -1,7 +1,7 @@ # Template file for 'pulseeffects-legacy' pkgname=pulseeffects-legacy version=4.8.5 -revision=5 +revision=6 build_style=meson hostmakedepends="itstool pkg-config gettext glib-devel" makedepends="boost-devel gsettings-desktop-schemas-devel diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index a2520301eda7..0eb44a822c46 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -1,7 +1,7 @@ # Template file for 'pulseview' pkgname=pulseview version=0.4.2 -revision=4 +revision=5 build_style=cmake configure_args="-DDISABLE_WERROR=TRUE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template index 4af548c46743..12366e47c006 100644 --- a/srcpkgs/remwharead/template +++ b/srcpkgs/remwharead/template @@ -1,7 +1,7 @@ # Template file for 'remwharead' pkgname=remwharead version=0.10.0 -revision=5 +revision=6 build_style=cmake hostmakedepends="poco-devel asciidoc pkg-config" makedepends="poco-devel boost-devel" diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index d667cb554e79..bf4826d62773 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.4.1717 -revision=5 +revision=6 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index 36f6ee83b9a9..e6f6b9f171ad 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -2,7 +2,7 @@ pkgname=schroot reverts="1.7.2_9" version=1.6.10 -revision=14 +revision=15 _debian_version=12+deb11u1 build_style=cmake configure_args=" diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 64498d5f7ed4..07a8e34530f9 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.10.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index 216f1c89f534..5a8a4ac60d38 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.9 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 4b4326be2013..42b58d5b6e3e 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.11.1 -revision=5 +revision=6 build_style=cmake make_cmd=make configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 8611f947722f..2fa412a4199f 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -1,7 +1,7 @@ # Template file for 'supertux2' pkgname=supertux2 version=0.6.3 -revision=3 +revision=4 build_style=cmake configure_args=" -DAPPDATADIR=/usr/share/supertux2 diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index 4b02da4cd80b..ad439860c881 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,7 +1,7 @@ # Template file for 'swiften' pkgname=swiften version=4.0.3 -revision=4 +revision=5 hostmakedepends="scons pkg-config" makedepends="boost-devel openssl-devel libxml2-devel libidn-devel lua51-devel miniupnpc-devel sqlite-devel hunspell-devel" diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template index 049eb1aebde9..55d1086bd533 100644 --- a/srcpkgs/syncthingtray/template +++ b/srcpkgs/syncthingtray/template @@ -1,7 +1,7 @@ # Template file for 'syncthingtray' pkgname=syncthingtray version=1.4.1 -revision=1 +revision=2 build_style=cmake configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF -DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none) diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 8e6f44d3b5f0..af0dcf154082 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -1,7 +1,7 @@ # Template file for 'tmfs' pkgname=tmfs version=r5 -revision=9 +revision=10 build_style=cmake hostmakedepends="pkg-config" makedepends="fuse-devel boost-devel" diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index 5b251d6a464f..341645af8e44 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,7 +1,7 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=23 +revision=24 _commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f build_style=cmake configure_args="-Wno-dev -DBUILD_RELEASE=ON \ diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 954a08055844..46731dcdaf03 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -1,7 +1,7 @@ # Template file for 'uhd' pkgname=uhd version=4.0.0.0 -revision=3 +revision=4 build_wrksrc=host build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 9b0397647569..2d12c4038b9c 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,7 +1,7 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.16.6 -revision=3 +revision=4 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template index 20bc4737410d..44310303ab59 100644 --- a/srcpkgs/wsjtx/template +++ b/srcpkgs/wsjtx/template @@ -1,7 +1,7 @@ # Template file for 'wsjtx' pkgname=wsjtx version=2.6.1 -revision=1 +revision=2 build_wrksrc=wsjtx build_style=cmake configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE=