February 2022 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/fbzmq.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/fbzmq.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/fbzmq.git/commit/?id=02b7006458b21c…. Change: -%ifarch i686 x86_64 Thanks. Full change: ============ commit 02b7006458b21cb6b8a12bccd77611927d1d7e11 Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Mon Feb 28 12:31:52 2022 -0800 Update to 2022.02.21.00; drop static build Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org> diff --git a/fbzmq-no_monitor_test.patch b/fbzmq-no_monitor_test.patch deleted file mode 100644 index 3f14703..0000000 --- a/fbzmq-no_monitor_test.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 970fcdea3861f8d7d092176b8b00f5ce0f0ebc51 Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim <michel(a)michel-slm.name> -Date: Tue, 22 Dec 2020 21:09:08 -0800 -Subject: [PATCH] Disable ZmqMonitorTest - -Does not currently compile: - -``` -In file included from /usr/include/c++/11/x86_64-redhat-linux/bits/c++allocator.h:33, - from /usr/include/c++/11/bits/allocator.h:46, - from /usr/include/c++/11/string:41, - from /usr/include/c++/11/bits/locale_classes.h:40, - from /usr/include/c++/11/bits/ios_base.h:41, - from /usr/include/c++/11/ios:42, - from /usr/include/c++/11/ostream:38, - from /usr/include/glog/logging.h:43, - from /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/service/monitor/tests/ZmqMonitorTest.cpp:8: -In member function '__gnu_cxx::new_allocator<char>::deallocate(char*, unsigned long)', - inlined from 'std::allocator_traits<std::allocator<char> >::deallocate(std::allocator<char>&, char*, unsigned long)' at /usr/include/c++/11/bits/alloc_traits.h:492:23, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_destroy(unsigned long)' at /usr/include/c++/11/bits/basic_string.h:237:34, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dispose()' at /usr/include/c++/11/bits/basic_string.h:232:14, - inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()' at /usr/include/c++/11/bits/basic_string.h:658:19, - inlined from 'fbzmq::Error::~Error()' at /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/zmq/Common.h:26:8, - inlined from 'folly::expected_detail::ExpectedStorage<fbzmq::thrift::CounterValuesResponse, fbzmq::Error, (folly::expected_detail::StorageType)2>::clear()' at /usr/include/folly/Expected.h:378:29, - inlined from 'folly::expected_detail::ExpectedStorage<fbzmq::thrift::CounterValuesResponse, fbzmq::Error, (folly::expected_detail::StorageType)2>::~ExpectedStorage()' at /usr/include/folly/Expected.h:371:29, - inlined from 'folly::Expected<fbzmq::thrift::CounterValuesResponse, fbzmq::Error>::~Expected()' at /usr/include/folly/Expected.h:806:7, - inlined from 'ZmqMonitorTest_BasicOperation_Test::TestBody()' at /builddir/build/BUILD/fbzmq-2020.12.21.00/fbzmq/service/monitor/tests/ZmqMonitorTest.cpp:199:58: -/usr/include/c++/11/ext/new_allocator.h:139:26: error: 'operator delete(void*, unsigned long)' called on a pointer to an unallocated object '1B' [-Werror=free-nonheap-object] - 139 | ::operator delete(__p - | ~~~~~~~~~~~~~~~~~^~~~ - 140 | #if __cpp_sized_deallocation - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 141 | , __t * sizeof(_Tp) - | ~~~~~~~~~~~~~~~~~~~ - 142 | #endif - | ~~~~~~ - 143 | ); - | -``` - -Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name> ---- - fbzmq/CMakeLists.txt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/fbzmq/CMakeLists.txt b/fbzmq/CMakeLists.txt -index c534564e..2d4e3df9 100644 ---- a/fbzmq/CMakeLists.txt -+++ b/fbzmq/CMakeLists.txt -@@ -212,9 +212,9 @@ if (BUILD_TESTS) - add_executable(thread_data_test - service/stats/tests/ThreadDataTest.cpp - ) -- add_executable(zmq_monitor_test -- service/monitor/tests/ZmqMonitorTest.cpp -- ) -+ # add_executable(zmq_monitor_test -+ # service/monitor/tests/ZmqMonitorTest.cpp -+ # ) - add_executable(zmq_monitor_client_test - service/monitor/tests/ZmqMonitorClientTest.cpp - ) -@@ -292,11 +292,11 @@ if (BUILD_TESTS) - GTest::GTest - GTest::Main - ) -- target_link_libraries(zmq_monitor_test -- fbzmq -- GTest::GTest -- GTest::Main -- ) -+ # target_link_libraries(zmq_monitor_test -+ # fbzmq -+ # GTest::GTest -+ # GTest::Main -+ # ) - target_link_libraries(zmq_monitor_client_test - fbzmq - GTest::GTest -@@ -330,7 +330,7 @@ if (BUILD_TESTS) - add_test(SocketMonitorTest socket_monitor_test) - add_test(LogSampleTest log_sample_test) - add_test(ThreadDataTest thread_data_test) -- add_test(ZmqMonitorTest zmq_monitor_test) -+ # add_test(ZmqMonitorTest zmq_monitor_test) - add_test(ZmqMonitorClientTest zmq_monitor_client_test) - add_test(SystemMetricsTest system_metrics_test) - --- -2.28.0 - diff --git a/fbzmq-no_timeout_test.patch b/fbzmq-no_timeout_test.patch deleted file mode 100644 index b2d07f2..0000000 --- a/fbzmq-no_timeout_test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2cc5de197ecc424a669fc4cec9b26064c57b0e8f Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim <michel(a)michel-slm.name> -Date: Fri, 13 Nov 2020 15:53:23 -0800 -Subject: [PATCH] Disable timeout test - -Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name> ---- - fbzmq/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fbzmq/CMakeLists.txt b/fbzmq/CMakeLists.txt -index 5f3c8058..8560a752 100644 ---- a/fbzmq/CMakeLists.txt -+++ b/fbzmq/CMakeLists.txt -@@ -324,7 +324,7 @@ if (BUILD_TESTS) - add_test(SignalHandlerTest signal_handler_test) - add_test(ZmqEventLoopTest zmq_eventloop_test) - add_test(ZmqThrottleTest zmq_throttle_test) -- add_test(ZmqTimeoutTest zmq_timeout_test) -+ # add_test(ZmqTimeoutTest zmq_timeout_test) - add_test(CommonTest common_test) - add_test(ContextTest context_test) - add_test(MessageTest message_test) --- -2.28.0 - diff --git a/fbzmq.spec b/fbzmq.spec index 16db2a1..2b51c7c 100644 --- a/fbzmq.spec +++ b/fbzmq.spec @@ -1,25 +1,13 @@ -# link issues on some platforms: -# https://bugzilla.redhat.com/show_bug.cgi?id=1893332 -%ifarch i686 x86_64 -%bcond_without static -%else -%bcond_with static -%endif - %bcond_without tests Name: fbzmq -Version: 2021.12.20.00 -Release: 2%{?dist} +Version: 2022.02.21.00 +Release: %autorelease Summary: Framework for writing services in C++ while leveraging libzmq License: MIT URL: https://github.com/facebook/fbzmq -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# this test is failing -Patch0: %{name}-no_timeout_test.patch -# this test doesn't compile -Patch1: %{name}-no_monitor_test.patch +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Folly is known not to work on big-endian CPUs # https://bugzilla.redhat.com/show_bug.cgi?id=1910202 @@ -59,6 +47,7 @@ awesomeness of libzmq (message passing semantics). At a high level it provides Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake-filesystem +Obsoletes: %{name}-static < 2022.02.21.00-1 %description devel %{_description} @@ -66,45 +55,11 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%if %{with static} -%global _static_builddir static_build - -%package static -Summary: Static development libraries for %{name} -BuildRequires: fbthrift-static -BuildRequires: fizz-static -BuildRequires: folly-static -BuildRequires: wangle-static -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static %{_description} - -The %{name}-static package contains static libraries for -developing applications that use %{name}. -%endif - - %prep %autosetup -p1 %build -%if %{with static} -# static build -mkdir %{_static_builddir} -pushd %{_static_builddir} -%cmake .. \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_TESTS=OFF \ - -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name}-static \ - -DFBTHRIFT_ROOT=%{_libdir}/cmake/fbthrift-static \ - -DFIZZ_ROOT=%{_libdir}/cmake/fizz-static \ - -DFOLLY_ROOT=%{_libdir}/cmake/folly-static \ - -DWANGLE_ROOT=%{_libdir}/cmake/wangle-static -%cmake_build -popd -%endif - %cmake \ -DBUILD_SHARED_LIBS=ON \ %if %{with tests} @@ -119,15 +74,9 @@ popd %install -%if %{with static} -pushd %{_static_builddir} -%cmake_install -popd -%endif - %cmake_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %if %{with tests} @@ -151,15 +100,7 @@ popd %{_libdir}/*.so %{_libdir}/cmake/%{name} -%if %{with static} -%files static -%{_libdir}/*.a -%{_libdir}/cmake/%{name}-static -%endif %changelog -* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2021.12.20.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - %autochangelog diff --git a/sources b/sources index d31b998..a05e9a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fbzmq-2021.12.20.00.tar.gz) = 501ae000bb7c5d9a173b356a97cb9e5615c2cc71e6a78d3e5afb67cd1cc40e12ed630f970c181ac2380168d88f1179c7d250616d95a3c876ded92245db0036d7 +SHA512 (fbzmq-2022.02.21.00.tar.gz) = f9de46481e30aabd53255644924251ddb02b607911fe093502a94ed591e68adf901c8303014ca846505e0b3bddb6fed0e16f676432014249ebe5714438a1691f commit d267c295abe30a3cd423397617e46cc7fec8588c Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jan 20 02:42:59 2022 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/fbzmq.spec b/fbzmq.spec index 3a13cce..16db2a1 100644 --- a/fbzmq.spec +++ b/fbzmq.spec @@ -10,7 +10,7 @@ Name: fbzmq Version: 2021.12.20.00 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework for writing services in C++ while leveraging libzmq License: MIT @@ -159,4 +159,7 @@ popd %changelog +* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2021.12.20.00-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + %autochangelog

1 0

Architecture specific change in rpms/cachelib.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/cachelib.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/cachelib.git/commit/?id=c746c7083be…. Change: +ExcludeArch: aarch64 Thanks. Full change: ============ commit 4913bb557a7d07dae467a6d62626f0de9939aa2b Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Mon Feb 28 12:08:06 2022 -0800 Add new patch and retire old merged patches Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org> diff --git a/cachelib-install_cachebench_so.patch b/cachelib-install_cachebench_so.patch deleted file mode 100644 index a7e4c5a..0000000 --- a/cachelib-install_cachebench_so.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ruN CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/cachebench/CMakeLists.txt CacheLib-install_cachebench_so/cachelib/cachebench/CMakeLists.txt ---- CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/cachebench/CMakeLists.txt 2021-11-29 13:01:49.000000000 -0800 -+++ CacheLib-install_cachebench_so/cachelib/cachebench/CMakeLists.txt 2021-12-22 11:23:22.159017377 -0800 -@@ -49,6 +49,15 @@ - ) - - -+if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS cachelib_cachebench -+ EXPORT cachelib-exports -+ DESTINATION ${LIB_INSTALL_DIR} -+ ) -+endif () -+ -+ - if (BUILD_TESTS) - add_library (cachebench_test_support INTERFACE ) - target_link_libraries (cachebench_test_support INTERFACE diff --git a/cachelib-ld_gtest.patch b/cachelib-ld_gtest.patch deleted file mode 100644 index 0e42dc9..0000000 --- a/cachelib-ld_gtest.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/common/CMakeLists.txt CacheLib-ld_gtest/cachelib/common/CMakeLists.txt ---- CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/common/CMakeLists.txt 2021-11-29 13:01:49.000000000 -0800 -+++ CacheLib-ld_gtest/cachelib/common/CMakeLists.txt 2021-12-22 10:21:59.259653149 -0800 -@@ -21,15 +21,11 @@ - CountDownLatch.cpp - ${BLOOM_THRIFT_FILES} - hothash/HotHashDetector.cpp -- hothash/HotHashDetectorTest.cpp - PercentileStats.cpp - PeriodicWorker.cpp - piecewise/GenericPieces.cpp -- piecewise/GenericPiecesTest.cpp - piecewise/RequestRange.cpp -- piecewise/RequestRangeTest.cpp - Serialization.cpp -- TestUtils.cpp - Utils.cpp - ) - add_dependencies(cachelib_common thrift_generated_files) -@@ -51,7 +47,12 @@ - - - if (BUILD_TESTS) -- add_library (common_test_support INTERFACE) -+ add_library (common_test_support INTERFACE -+ TestUtils.cpp -+ hothash/HotHashDetectorTest.cpp -+ piecewise/GenericPiecesTest.cpp -+ piecewise/RequestRangeTest.cpp -+ ) - target_link_libraries (common_test_support INTERFACE - cachelib_common - gflags diff --git a/cachelib-undo-thrift-codemod.patch b/cachelib-undo-thrift-codemod.patch new file mode 100644 index 0000000..f636a24 --- /dev/null +++ b/cachelib-undo-thrift-codemod.patch @@ -0,0 +1,412 @@ +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/CacheAllocator-inl.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/CacheAllocator-inl.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/CacheAllocator-inl.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/CacheAllocator-inl.h 2022-02-28 10:59:44.769907918 -0800 +@@ -3163,22 +3163,22 @@ + // TODO: + // Once everyone is on v8 or later, remove the outter if. + if (kCachelibVersion > 8) { +- if (*meta.ramFormatVersion() != kCacheRamFormatVersion) { ++ if (*meta.ramFormatVersion_ref() != kCacheRamFormatVersion) { + throw std::runtime_error( + folly::sformat("Expected cache ram format version {}. But found {}.", +- kCacheRamFormatVersion, *meta.ramFormatVersion())); ++ kCacheRamFormatVersion, *meta.ramFormatVersion_ref())); + } + } + +- if (*meta.accessType() != AccessType::kId) { ++ if (*meta.accessType_ref() != AccessType::kId) { + throw std::invalid_argument( +- folly::sformat("Expected {}, got {} for AccessType", *meta.accessType(), +- AccessType::kId)); ++ folly::sformat("Expected {}, got {} for AccessType", ++ *meta.accessType_ref(), AccessType::kId)); + } + +- if (*meta.mmType() != MMType::kId) { +- throw std::invalid_argument(folly::sformat("Expected {}, got {} for MMType", +- *meta.mmType(), MMType::kId)); ++ if (*meta.mmType_ref() != MMType::kId) { ++ throw std::invalid_argument(folly::sformat( ++ "Expected {}, got {} for MMType", *meta.mmType_ref(), MMType::kId)); + } + return meta; + } +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/ChainedHashTable-inl.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/ChainedHashTable-inl.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/ChainedHashTable-inl.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/ChainedHashTable-inl.h 2022-02-28 10:59:44.777907960 -0800 +@@ -241,12 +241,12 @@ + ht_{config_.getNumBuckets(), memStart, compressor, config_.getHasher(), + false /* resetMem */}, + locks_{config_.getLocksPower(), config_.getHasher()}, +- numKeys_(*object.numKeys()) { ++ numKeys_(*object.numKeys_ref()) { + if (config_.getBucketsPower() != +- static_cast<uint32_t>(*object.bucketsPower())) { ++ static_cast<uint32_t>(*object.bucketsPower_ref())) { + throw std::invalid_argument(folly::sformat( + "Hashtable bucket power not compatible. old = {}, new = {}", +- *object.bucketsPower(), ++ *object.bucketsPower_ref(), + config.getBucketsPower())); + } + +@@ -260,11 +260,11 @@ + // checking hasher magic id not equal to 0 is to ensure it'll be + // a warm roll going from a cachelib without hasher magic id to + // one with a magic id +- if (*object.hasherMagicId() != 0 && +- *object.hasherMagicId() != config_.getHasher()->getMagicId()) { ++ if (*object.hasherMagicId_ref() != 0 && ++ *object.hasherMagicId_ref() != config_.getHasher()->getMagicId()) { + throw std::invalid_argument(folly::sformat( + "Hash object's ID mismatch. expected = {}, actual = {}", +- *object.hasherMagicId(), config_.getHasher()->getMagicId())); ++ *object.hasherMagicId_ref(), config_.getHasher()->getMagicId())); + } + } + +@@ -476,10 +476,10 @@ + } + + serialization::ChainedHashTableObject object; +- *object.bucketsPower() = config_.getBucketsPower(); +- *object.locksPower() = config_.getLocksPower(); +- *object.numKeys() = numKeys_; +- *object.hasherMagicId() = config_.getHasher()->getMagicId(); ++ *object.bucketsPower_ref() = config_.getBucketsPower(); ++ *object.locksPower_ref() = config_.getLocksPower(); ++ *object.numKeys_ref() = numKeys_; ++ *object.hasherMagicId_ref() = config_.getHasher()->getMagicId(); + return object; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/DList.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/DList.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/DList.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/DList.h 2022-02-28 10:59:44.777907960 -0800 +@@ -94,18 +94,20 @@ + // @param compressor PtrCompressor object + DList(const DListObject& object, PtrCompressor compressor) + : compressor_(std::move(compressor)), +- head_(compressor_.unCompress(CompressedPtr{*object.compressedHead()})), +- tail_(compressor_.unCompress(CompressedPtr{*object.compressedTail()})), +- size_(*object.size()) {} ++ head_(compressor_.unCompress( ++ CompressedPtr{*object.compressedHead_ref()})), ++ tail_(compressor_.unCompress( ++ CompressedPtr{*object.compressedTail_ref()})), ++ size_(*object.size_ref()) {} + + /** + * Exports the current state as a thrift object for later restoration. + */ + DListObject saveState() const { + DListObject state; +- *state.compressedHead() = compressor_.compress(head_).saveState(); +- *state.compressedTail() = compressor_.compress(tail_).saveState(); +- *state.size() = size_; ++ *state.compressedHead_ref() = compressor_.compress(head_).saveState(); ++ *state.compressedTail_ref() = compressor_.compress(tail_).saveState(); ++ *state.size_ref() = size_; + return state; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/MultiDList.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/MultiDList.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/MultiDList.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/MultiDList.h 2022-02-28 10:59:44.777907960 -0800 +@@ -58,7 +58,7 @@ + // @param object saved MultiDList object + // @param compressor PtrCompressor object + MultiDList(const MultiDListObject& object, PtrCompressor compressor) { +- for (const auto& list : *object.lists()) { ++ for (const auto& list : *object.lists_ref()) { + lists_.emplace_back(std::make_unique<SingleDList>(list, compressor)); + } + } +@@ -69,7 +69,7 @@ + MultiDListObject saveState() const { + MultiDListObject state; + for (const auto& listPtr : lists_) { +- state.lists()->emplace_back(listPtr->saveState()); ++ state.lists_ref()->emplace_back(listPtr->saveState()); + } + return state; + } +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/SList.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/SList.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/datastruct/SList.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/datastruct/SList.h 2022-02-28 10:59:44.777907960 -0800 +@@ -85,12 +85,14 @@ + + explicit SList(const SListObject& object, PtrCompressor compressor) + : compressor_(std::move(compressor)), +- size_(*object.size()), +- head_(compressor_.unCompress(CompressedPtr{*object.compressedHead()})) { ++ size_(*object.size_ref()), ++ head_(compressor_.unCompress( ++ CompressedPtr{*object.compressedHead_ref()})) { + // TODO(bwatling): eventually we'll always have 'compressedTail' and we can + // remove the loop below. +- if (*object.compressedTail() >= 0) { +- tail_ = compressor_.unCompress(CompressedPtr{*object.compressedTail()}); ++ if (*object.compressedTail_ref() >= 0) { ++ tail_ = ++ compressor_.unCompress(CompressedPtr{*object.compressedTail_ref()}); + } else if (head_) { + tail_ = head_; + while (T* next = getNext(*tail_)) { +@@ -106,9 +108,9 @@ + */ + SListObject saveState() const { + SListObject state; +- *state.compressedHead() = compressor_.compress(head_).saveState(); +- *state.compressedTail() = compressor_.compress(tail_).saveState(); +- *state.size() = size_; ++ *state.compressedHead_ref() = compressor_.compress(head_).saveState(); ++ *state.compressedTail_ref() = compressor_.compress(tail_).saveState(); ++ *state.size_ref() = size_; + return state; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MM2Q.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MM2Q.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MM2Q.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MM2Q.h 2022-02-28 10:59:44.777907960 -0800 +@@ -71,14 +71,14 @@ + struct Config { + // Create from serialized config + explicit Config(SerializationConfigType configState) +- : Config(*configState.lruRefreshTime(), +- *configState.lruRefreshRatio(), +- *configState.updateOnWrite(), +- *configState.updateOnRead(), +- *configState.tryLockUpdate(), +- *configState.rebalanceOnRecordAccess(), +- *configState.hotSizePercent(), +- *configState.coldSizePercent()) {} ++ : Config(*configState.lruRefreshTime_ref(), ++ *configState.lruRefreshRatio_ref(), ++ *configState.updateOnWrite_ref(), ++ *configState.updateOnRead_ref(), ++ *configState.tryLockUpdate_ref(), ++ *configState.rebalanceOnRecordAccess_ref(), ++ *configState.hotSizePercent_ref(), ++ *configState.coldSizePercent_ref()) {} + + // @param time the refresh time in seconds to trigger an update in + // position upon access. An item will be promoted only once in each lru +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MM2Q-inl.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MM2Q-inl.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MM2Q-inl.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MM2Q-inl.h 2022-02-28 10:59:44.777907960 -0800 +@@ -21,9 +21,9 @@ + template <typename T, MM2Q::Hook<T> T::*HookPtr> + MM2Q::Container<T, HookPtr>::Container(const serialization::MM2QObject& object, + PtrCompressor compressor) +- : lru_(*object.lrus(), compressor), +- tailTrackingEnabled_(*object.tailTrackingEnabled()), +- config_(*object.config()) { ++ : lru_(*object.lrus_ref(), compressor), ++ tailTrackingEnabled_(*object.tailTrackingEnabled_ref()), ++ config_(*object.config_ref()) { + lruRefreshTime_ = config_.lruRefreshTime; + nextReconfigureTime_ = config_.mmReconfigureIntervalSecs.count() == 0 + ? std::numeric_limits<Time>::max() +@@ -32,9 +32,9 @@ + + // We need to adjust list positions if the previous version does not have + // tail lists (WarmTail & ColdTail), in order to potentially avoid cold roll +- if (object.lrus()->lists()->size() < LruType::NumTypes) { ++ if (object.lrus_ref()->lists_ref()->size() < LruType::NumTypes) { + XDCHECK_EQ(false, tailTrackingEnabled_); +- XDCHECK_EQ(object.lrus()->lists()->size() + 2, LruType::NumTypes); ++ XDCHECK_EQ(object.lrus_ref()->lists_ref()->size() + 2, LruType::NumTypes); + lru_.insertEmptyListAt(LruType::WarmTail, compressor); + lru_.insertEmptyListAt(LruType::ColdTail, compressor); + } +@@ -380,18 +380,18 @@ + serialization::MM2QObject MM2Q::Container<T, HookPtr>::saveState() + const noexcept { + serialization::MM2QConfig configObject; +- *configObject.lruRefreshTime() = lruRefreshTime_; +- *configObject.lruRefreshRatio() = config_.lruRefreshRatio; +- *configObject.updateOnWrite() = config_.updateOnWrite; +- *configObject.updateOnRead() = config_.updateOnRead; +- *configObject.hotSizePercent() = config_.hotSizePercent; +- *configObject.coldSizePercent() = config_.coldSizePercent; +- *configObject.rebalanceOnRecordAccess() = config_.rebalanceOnRecordAccess; ++ *configObject.lruRefreshTime_ref() = lruRefreshTime_; ++ *configObject.lruRefreshRatio_ref() = config_.lruRefreshRatio; ++ *configObject.updateOnWrite_ref() = config_.updateOnWrite; ++ *configObject.updateOnRead_ref() = config_.updateOnRead; ++ *configObject.hotSizePercent_ref() = config_.hotSizePercent; ++ *configObject.coldSizePercent_ref() = config_.coldSizePercent; ++ *configObject.rebalanceOnRecordAccess_ref() = config_.rebalanceOnRecordAccess; + + serialization::MM2QObject object; +- *object.config() = configObject; +- *object.tailTrackingEnabled() = tailTrackingEnabled_; +- *object.lrus() = lru_.saveState(); ++ *object.config_ref() = configObject; ++ *object.tailTrackingEnabled_ref() = tailTrackingEnabled_; ++ *object.lrus_ref() = lru_.saveState(); + return object; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMLru.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMLru.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMLru.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMLru.h 2022-02-28 10:59:44.777907960 -0800 +@@ -67,12 +67,13 @@ + struct Config { + // create from serialized config + explicit Config(SerializationConfigType configState) +- : Config(*configState.lruRefreshTime(), +- *configState.lruRefreshRatio(), +- *configState.updateOnWrite(), +- *configState.updateOnRead(), +- *configState.tryLockUpdate(), +- static_cast<uint8_t>(*configState.lruInsertionPointSpec())) {} ++ : Config( ++ *configState.lruRefreshTime_ref(), ++ *configState.lruRefreshRatio_ref(), ++ *configState.updateOnWrite_ref(), ++ *configState.updateOnRead_ref(), ++ *configState.tryLockUpdate_ref(), ++ static_cast<uint8_t>(*configState.lruInsertionPointSpec_ref())) {} + + // @param time the LRU refresh time in seconds. + // An item will be promoted only once in each lru refresh +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMLru-inl.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMLru-inl.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMLru-inl.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMLru-inl.h 2022-02-28 10:59:44.777907960 -0800 +@@ -28,11 +28,11 @@ + MMLru::Container<T, HookPtr>::Container(serialization::MMLruObject object, + PtrCompressor compressor) + : compressor_(std::move(compressor)), +- lru_(*object.lru(), compressor_), ++ lru_(*object.lru_ref(), compressor_), + insertionPoint_(compressor_.unCompress( +- CompressedPtr{*object.compressedInsertionPoint()})), +- tailSize_(*object.tailSize()), +- config_(*object.config()) { ++ CompressedPtr{*object.compressedInsertionPoint_ref()})), ++ tailSize_(*object.tailSize_ref()), ++ config_(*object.config_ref()) { + lruRefreshTime_ = config_.lruRefreshTime; + nextReconfigureTime_ = config_.mmReconfigureIntervalSecs.count() == 0 + ? std::numeric_limits<Time>::max() +@@ -307,20 +307,20 @@ + serialization::MMLruObject MMLru::Container<T, HookPtr>::saveState() + const noexcept { + serialization::MMLruConfig configObject; +- *configObject.lruRefreshTime() = ++ *configObject.lruRefreshTime_ref() = + lruRefreshTime_.load(std::memory_order_relaxed); +- *configObject.lruRefreshRatio() = config_.lruRefreshRatio; +- *configObject.updateOnWrite() = config_.updateOnWrite; +- *configObject.updateOnRead() = config_.updateOnRead; +- *configObject.tryLockUpdate() = config_.tryLockUpdate; +- *configObject.lruInsertionPointSpec() = config_.lruInsertionPointSpec; ++ *configObject.lruRefreshRatio_ref() = config_.lruRefreshRatio; ++ *configObject.updateOnWrite_ref() = config_.updateOnWrite; ++ *configObject.updateOnRead_ref() = config_.updateOnRead; ++ *configObject.tryLockUpdate_ref() = config_.tryLockUpdate; ++ *configObject.lruInsertionPointSpec_ref() = config_.lruInsertionPointSpec; + + serialization::MMLruObject object; +- *object.config() = configObject; +- *object.compressedInsertionPoint() = ++ *object.config_ref() = configObject; ++ *object.compressedInsertionPoint_ref() = + compressor_.compress(insertionPoint_).saveState(); +- *object.tailSize() = tailSize_; +- *object.lru() = lru_.saveState(); ++ *object.tailSize_ref() = tailSize_; ++ *object.lru_ref() = lru_.saveState(); + return object; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMTinyLFU.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMTinyLFU.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMTinyLFU.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMTinyLFU.h 2022-02-28 10:59:44.777907960 -0800 +@@ -80,13 +80,13 @@ + struct Config { + // create from serialized config + explicit Config(SerializationConfigType configState) +- : Config(*configState.lruRefreshTime(), +- *configState.lruRefreshRatio(), +- *configState.updateOnWrite(), +- *configState.updateOnRead(), +- *configState.tryLockUpdate(), +- *configState.windowToCacheSizeRatio(), +- *configState.tinySizePercent()) {} ++ : Config(*configState.lruRefreshTime_ref(), ++ *configState.lruRefreshRatio_ref(), ++ *configState.updateOnWrite_ref(), ++ *configState.updateOnRead_ref(), ++ *configState.tryLockUpdate_ref(), ++ *configState.windowToCacheSizeRatio_ref(), ++ *configState.tinySizePercent_ref()) {} + + // @param time the LRU refresh time in seconds. + // An item will be promoted only once in each lru refresh +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMTinyLFU-inl.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMTinyLFU-inl.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/allocator/MMTinyLFU-inl.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/allocator/MMTinyLFU-inl.h 2022-02-28 10:59:44.777907960 -0800 +@@ -21,7 +21,8 @@ + template <typename T, MMTinyLFU::Hook<T> T::*HookPtr> + MMTinyLFU::Container<T, HookPtr>::Container( + serialization::MMTinyLFUObject object, PtrCompressor compressor) +- : lru_(*object.lrus(), std::move(compressor)), config_(*object.config()) { ++ : lru_(*object.lrus_ref(), std::move(compressor)), ++ config_(*object.config_ref()) { + lruRefreshTime_ = config_.lruRefreshTime; + nextReconfigureTime_ = config_.mmReconfigureIntervalSecs.count() == 0 + ? std::numeric_limits<Time>::max() +@@ -300,18 +301,18 @@ + serialization::MMTinyLFUObject MMTinyLFU::Container<T, HookPtr>::saveState() + const noexcept { + serialization::MMTinyLFUConfig configObject; +- *configObject.lruRefreshTime() = ++ *configObject.lruRefreshTime_ref() = + lruRefreshTime_.load(std::memory_order_relaxed); +- *configObject.lruRefreshRatio() = config_.lruRefreshRatio; +- *configObject.updateOnWrite() = config_.updateOnWrite; +- *configObject.updateOnRead() = config_.updateOnRead; +- *configObject.windowToCacheSizeRatio() = config_.windowToCacheSizeRatio; +- *configObject.tinySizePercent() = config_.tinySizePercent; ++ *configObject.lruRefreshRatio_ref() = config_.lruRefreshRatio; ++ *configObject.updateOnWrite_ref() = config_.updateOnWrite; ++ *configObject.updateOnRead_ref() = config_.updateOnRead; ++ *configObject.windowToCacheSizeRatio_ref() = config_.windowToCacheSizeRatio; ++ *configObject.tinySizePercent_ref() = config_.tinySizePercent; + // TODO: May be save/restore the counters. + + serialization::MMTinyLFUObject object; +- *object.config() = configObject; +- *object.lrus() = lru_.saveState(); ++ *object.config_ref() = configObject; ++ *object.lrus_ref() = lru_.saveState(); + return object; + } + +diff '--color=auto' -ruN CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/compact_cache/allocators/CCacheAllocatorBase.h CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/compact_cache/allocators/CCacheAllocatorBase.h +--- CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85/cachelib/compact_cache/allocators/CCacheAllocatorBase.h 2022-02-28 10:07:30.000000000 -0800 ++++ CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85-undo-thrift-codemod/cachelib/compact_cache/allocators/CCacheAllocatorBase.h 2022-02-28 10:59:44.777907960 -0800 +@@ -44,7 +44,7 @@ + CCacheMetadata() : keySize_(0), valueSize_(0) {} + + CCacheMetadata(const SerializationType& object) +- : keySize_(*object.keySize()), valueSize_(*object.valueSize()) {} ++ : keySize_(*object.keySize_ref()), valueSize_(*object.valueSize_ref()) {} + + template <typename CCacheT> + void initializeOrVerify() { +@@ -65,8 +65,8 @@ + + SerializationType saveState() { + SerializationType object; +- *object.keySize() = keySize_; +- *object.valueSize() = valueSize_; ++ *object.keySize_ref() = keySize_; ++ *object.valueSize_ref() = valueSize_; + return object; + } + diff --git a/cachelib-versioned_so.patch b/cachelib-versioned_so.patch deleted file mode 100644 index 496ea32..0000000 --- a/cachelib-versioned_so.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ruN CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/CMakeLists.txt CacheLib-versioned_so/cachelib/CMakeLists.txt ---- CacheLib-e3703aade03d359d290936b334ab81ca4a856b41/cachelib/CMakeLists.txt 2021-11-29 13:01:49.000000000 -0800 -+++ CacheLib-versioned_so/cachelib/CMakeLists.txt 2021-12-22 14:22:35.444840967 -0800 -@@ -24,14 +24,18 @@ - - #configure_file(cachelib/cachelib_config.h.in cachelib_config.h) - --set(CACHELIB_MAJOR_VERSION 0) -+if (NOT DEFINED CACHELIB_MAJOR_VERSION) -+ set(CACHELIB_MAJOR_VERSION 0) -+endif () - set(CACHELIB_MINOR_VERSION 1) - set(CACHELIB_PATCH_VERSION 0) - set(CACHELIB_VERSION - ${CACHELIB_MAJOR_VERSION}.${CACHELIB_MINOR_VERSION}.${CACHELIB_PATCH_VERSION}) - - set(PACKAGE_NAME "cachelib") --set(PACKAGE_VERSION "${CACHELIB_VERSION}") -+if (NOT DEFINED PACKAGE_VERSION) -+ set(PACKAGE_VERSION "${CACHELIB_VERSION}") -+endif () - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") - set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") - set(PACKAGE_BUGREPORT "https://github.com/facebook/TBD") -@@ -361,6 +365,20 @@ - #NAMESPACE cachelib:: - DESTINATION ${CMAKE_INSTALL_DIR}) - -+if (BUILD_SHARED_LIBS) -+ set_target_properties( -+ cachelib_allocator -+ cachelib_cachebench -+ cachelib_common -+ cachelib_datatype -+ cachelib_navy -+ cachelib_shm -+ PROPERTIES -+ SOVERSION ${CACHELIB_MAJOR_VERSION} -+ VERSION ${PACKAGE_VERSION} -+ ) -+endif () -+ - if (BUILD_TESTS) - get_property(TEST_BINARIES GLOBAL PROPERTY TEST_BINARIES) - #message(STATUS "=== Test binaries : ${TEST_BINARIES} ===") commit 6a43db44e46038c5d76856f6e0eae551241f0b7f Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Mon Feb 28 11:01:49 2022 -0800 Update to snapshot from 20220228; use new-style versioning Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org> diff --git a/.gitignore b/.gitignore index c7443b2..ad2fa97 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8.tar.gz +/CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85.tar.gz diff --git a/cachelib.spec b/cachelib.spec index fd2cd66..d404dbe 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -6,9 +6,12 @@ %bcond_with tests %global forgeurl https://github.com/facebook/CacheLib -%global commit c4904ef2524f396eb432392f8308a69dda926bd8 +%global commit 03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20211220 +%global date 20220228 +# disable forge macro snapinfo generation +# https://pagure.io/fedora-infra/rpmautospec/issue/240 +%global distprefix %{nil} %forgemeta # see cachelib/allocator/CacheVersion.h's kCachelibVersion @@ -16,23 +19,18 @@ Name: cachelib -Version: %{major_ver} -# using -s seems to add the snapinfo twice in the generated filename -# https://pagure.io/fedora-infra/rpmautospec/issue/240 -Release: %autorelease -e %{date}git%{shortcommit} +Version: %{major_ver}^%{date}git%{shortcommit} +Release: %autorelease Summary: Pluggable caching engine for scale high performance cache services License: ASL 2.0 URL: %forgeurl Source0: %forgesource -# move TestUtils from cachelib_common to common_test_support to avoid ld issues -Patch0: %{name}-ld_gtest.patch -# need to install cachelib_cachebench when building shared libs -Patch1: %{name}-install_cachebench_so.patch -# and version them -Patch2: %{name}-versioned_so.patch +# cachelib builds broken by recent thrift codemod +Patch0: %{name}-undo-thrift-codemod.patch # needed on EL8; its gtest does not come with cmake files -Patch3: %{name}-find-gtest.patch +Patch1: %{name}-find-gtest.patch + # Folly is known not to work on big-endian CPUs # https://bugzilla.redhat.com/show_bug.cgi?id=1892151 @@ -90,10 +88,8 @@ applications that use %{name}. %prep %forgesetup %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %if 0%{?el8} -%patch3 -p1 +%patch1 -p1 %endif diff --git a/sources b/sources index 6428f23..838f6d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8.tar.gz) = 6ce0a8783bd88d1b4673832cad5305971fe92dadb4f8a1423eaf5828e97c3b0f0100a70bdf97e476d66e3824d8e3841e7d971979aa8c57b8fa2b357870dd96cc +SHA512 (CacheLib-03dcb9bbddb977b5ec6e9ba6c5b1a53cac521f85.tar.gz) = 5450820657ef531d6bf375d44d9bfa31c6d27dc42bb92faf594cebc2fe63f9130dfa2a02a7e7a3e5e34544a3446bdf2f6675c825439ed13ed91f04bf5c368e04 commit c746c7083be849a351073a024af30a488d6e076f Author: Michel Alexandre Salim <salimma(a)fedoraproject.org> Date: Thu Feb 24 19:33:14 2022 -0800 Fix for finding gtest on EL8; exclude aarch64 instead of %%arm64 Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org> diff --git a/cachelib-find-gtest.patch b/cachelib-find-gtest.patch new file mode 100644 index 0000000..b9cce71 --- /dev/null +++ b/cachelib-find-gtest.patch @@ -0,0 +1,70 @@ +diff '--color=auto' -ruN CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/cmake/FindGTest.cmake CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/cmake/FindGTest.cmake +--- CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/cmake/FindGTest.cmake 1969-12-31 16:00:00.000000000 -0800 ++++ CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/cmake/FindGTest.cmake 2022-02-24 20:08:51.087790319 -0800 +@@ -0,0 +1,54 @@ ++# Copyright (c) Facebook, Inc. and its affiliates. ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++# Find GTest ++# ++# This will define: ++# GTEST_FOUND ++# GTEST_INCLUDE_DIRS ++# GTEST_LIBRARIES ++# GTEST_MAIN_LIBRARIES ++# GTEST_BOTH_LIBRARIES ++ ++find_path(GTEST_INCLUDE_DIRS gtest/gtest.h ++ HINTS ++ $ENV{GTEST_ROOT}/include ++ ${GTEST_ROOT}/include ++) ++ ++find_library(GTEST_LIBRARIES ++ NAMES gtest ++ HINTS ++ $ENV{GTEST_ROOT} ++ ${GTEST_ROOT} ++) ++ ++find_library(GTEST_MAIN_LIBRARIES ++ NAMES gtest_main ++ HINTS ++ $ENV{GTEST_ROOT} ++ ${GTEST_ROOT} ++) ++ ++set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}) ++ ++mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args( ++ GTest GTEST_LIBRARIES GTEST_INCLUDE_DIRS GTEST_MAIN_LIBRARIES) ++ ++if(GTEST_FOUND AND NOT GTEST_FIND_QUIETLY) ++ message(STATUS "GTEST: ${GTEST_INCLUDE_DIRS}") ++endif() +diff '--color=auto' -ruN CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/CMakeLists.txt CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/CMakeLists.txt +--- CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8/cachelib/CMakeLists.txt 2021-12-20 07:22:18.000000000 -0800 ++++ CacheLib-c4904ef2524f396eb432392f8308a69dda926bd8-find-gtest/cachelib/CMakeLists.txt 2022-02-24 20:12:39.078602510 -0800 +@@ -93,7 +93,7 @@ + system filesystem regex context program_options thread) + find_package(Gflags REQUIRED) + find_package(Glog REQUIRED) +-find_package(GTest CONFIG REQUIRED) ++find_package(GTest REQUIRED) + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) diff --git a/cachelib.spec b/cachelib.spec index 449dfcb..fd2cd66 100644 --- a/cachelib.spec +++ b/cachelib.spec @@ -31,6 +31,8 @@ Patch0: %{name}-ld_gtest.patch Patch1: %{name}-install_cachebench_so.patch # and version them Patch2: %{name}-versioned_so.patch +# needed on EL8; its gtest does not come with cmake files +Patch3: %{name}-find-gtest.patch # Folly is known not to work on big-endian CPUs # https://bugzilla.redhat.com/show_bug.cgi?id=1892151 @@ -45,7 +47,7 @@ ExcludeArch: %{arm32} ExcludeArch: %{ix86} # build failure on aarch64 # https://bugzilla.redhat.com/show_bug.cgi?id=2036121 -ExcludeArch: %{arm64} +ExcludeArch: aarch64 BuildRequires: cmake BuildRequires: gcc-c++ @@ -86,7 +88,13 @@ applications that use %{name}. %prep -%forgeautosetup -p1 +%forgesetup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?el8} +%patch3 -p1 +%endif %build commit 63963821d9e9afe8d39fe7eea2bfcd33bc0175d4 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Wed Jan 19 22:47:24 2022 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>

1 0

Architecture specific change in rpms/fasttrack.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/fasttrack.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/fasttrack.git/commit/?id=d27fc1206c…. Change: -ExcludeArch: ppc64le s390x Thanks. Full change: ============ commit d27fc1206c67991247ecc7692186f481b103fb8f Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Mon Feb 28 08:50:24 2022 -0500 It’s increasingly clear that ffmpeg-enabled OpenCV should be considered a hard requirement, but OpenCV in Fedora has no plans to build with ffmpeg-free: https://github.com/FastTrackOrg/FastTrack/issues/43 https://bugzilla.redhat.com/show_bug.cgi?id=2058684 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 34de5f8..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/FastTrack-5.3.3.tar.gz -/FastTrack-5.3.4.tar.gz -/FastTrack-5.3.5.tar.gz -/FastTrack-6.0.1.tar.gz -/FastTrack-6.1.1.tar.gz -/FastTrack-6.2.0.tar.gz -/FastTrack-6.2.1.tar.gz diff --git a/FastTrack-6.0.1-do-not-override-compiler-flags.patch b/FastTrack-6.0.1-do-not-override-compiler-flags.patch deleted file mode 100644 index 2c7ef7d..0000000 --- a/FastTrack-6.0.1-do-not-override-compiler-flags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur FastTrack-6.0.1-original/src/FastTrack-Cli.pro FastTrack-6.0.1/src/FastTrack-Cli.pro ---- FastTrack-6.0.1-original/src/FastTrack-Cli.pro 2021-12-10 07:34:01.000000000 -0500 -+++ FastTrack-6.0.1/src/FastTrack-Cli.pro 2021-12-11 09:02:14.308584960 -0500 -@@ -12,13 +12,7 @@ - UI_DIR=build_cli - RCC_DIR=build_cli - -- QMAKE_CXXFLAGS += -std=c++17 -O3 -fopenmp -g -- QMAKE_CXXFLAGS_RELEASE -= -O1 -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O3 -- QMAKE_LFLAGS_RELEASE -= -O1 -- QMAKE_LFLAGS_RELEASE -= -O2 -- QMAKE_LFLAGS_RELEASE += -O3 -+ QMAKE_CXXFLAGS += -std=c++17 -fopenmp - - INCLUDEPATH += /usr/include/opencv4/ - INCLUDEPATH += /usr/local/include/opencv4/ -diff -Naur FastTrack-6.0.1-original/src/FastTrack.pro FastTrack-6.0.1/src/FastTrack.pro ---- FastTrack-6.0.1-original/src/FastTrack.pro 2021-12-10 07:34:01.000000000 -0500 -+++ FastTrack-6.0.1/src/FastTrack.pro 2021-12-11 09:01:49.291310282 -0500 -@@ -18,13 +18,7 @@ - UI_DIR=build - RCC_DIR=build - -- QMAKE_CXXFLAGS += -std=c++17 -O3 -fopenmp -g -Wconversion -- QMAKE_CXXFLAGS_RELEASE -= -O1 -- QMAKE_CXXFLAGS_RELEASE -= -O2 -- QMAKE_CXXFLAGS_RELEASE += -O3 -- QMAKE_LFLAGS_RELEASE -= -O1 -- QMAKE_LFLAGS_RELEASE -= -O2 -- QMAKE_LFLAGS_RELEASE += -O3 -+ QMAKE_CXXFLAGS += -std=c++17 -fopenmp -Wconversion - - INCLUDEPATH += /usr/include/opencv4/ - INCLUDEPATH += /usr/local/include/opencv4/ -diff -Naur FastTrack-6.0.1-original/Test/Test.pro FastTrack-6.0.1/Test/Test.pro ---- FastTrack-6.0.1-original/Test/Test.pro 2021-12-10 07:34:01.000000000 -0500 -+++ FastTrack-6.0.1/Test/Test.pro 2021-12-11 09:02:35.162813929 -0500 -@@ -12,8 +12,6 @@ - RCC_DIR=build - - --QMAKE_LFLAGS_RELEASE += -O3 -- - DEFINES += QT_DEPRECATED_WARNINGS - - -@@ -25,7 +23,7 @@ - ../src/autolevel.cpp \ - ../src/data.cpp \ - --QMAKE_CXXFLAGS += -std=c++17 -O3 -fopenmp -g -+QMAKE_CXXFLAGS += -std=c++17 -fopenmp - - INCLUDEPATH += /usr/include/opencv4/ - INCLUDEPATH += /usr/local/include/opencv4/ /usr/include/gtest diff --git a/README.md b/README.md deleted file mode 100644 index 0c8a12d..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# fasttrack - -The fasttrack package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..020e1c4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +It’s increasingly clear that ffmpeg-enabled OpenCV should be considered a hard requirement, but OpenCV in Fedora has no plans to build with ffmpeg-free: https://github.com/FastTrackOrg/FastTrack/issues/43 https://bugzilla.redhat.com/show_bug.cgi?id=2058684 diff --git a/fasttrack-cli.1 b/fasttrack-cli.1 deleted file mode 100644 index b7acec9..0000000 --- a/fasttrack-cli.1 +++ /dev/null @@ -1,189 +0,0 @@ -.TH FASTTRACK\-CLI "1" "September 2021" "" "User Commands" -.SH NAME -.B fasttrack\-cli -\(en Use FastTrack from the command line -.SH SYNOPSIS -.B fasttrack\-cli -.RI [ OPTION ]... -.RI [ FILE ]... -.SH OPTIONS -All arguments are mandatory except -.B \-\-backPath -and -.BR \-\-cfg . -Loading a configuration file with -.B \-\-cfg -overwrites any selected parameters. -.P -\[sc] -.TP -.B \-\-maxArea -maximal area of objects -.TP -.B \-\-minArea -minimal area of objects -.TP -.B \-\-lightBack -is the background light? -.BR 0 : -Yes, -.BR 1 : -No -.P -\[sc] -.TP -.B \-\-thresh -binary threshold, if -.B lightBack -is set to -.B 0 -(resp. -.BR 1 ), -pixels with values less (resp. more) than thresh are considered to belong to an -object -.TP -.B \-\-reg -registration method, -.BR 0 : -None, -.BR 1 : -Simple, -.BR 2 : -ECC, -.BR 3 : -Features -.P -\[sc] -.TP -.B \-\-spot -part of the object that features is used for the matching, -.BR 0 : -head, -.BR 1 : -tail, -.BR 2 : -body -.TP -.B \-\-normDist -normalization distance pixels -.TP -.B \-\-normAngle -normalization angle degrees -.TP -.B \-\-normArea -normalization area pixels -.TP -.B \-\-normPerim -normalization perimeter pixels -.TP -.B \-\-maxDist -maximal distance of matching in pixels; if an object travels more than this -distance, it is considered as a new object -.TP -.B \-\-maxTime -maximal time; if an object disappears more than this time, it is considered as -a new object -.P -\[sc] -.TP -.B \-\-nBack -number of images to compute the background -.TP -.B \-\-methBack -method to compute the background. -.BR 0 : -min, -.BR 1 : -max, -.BR 2 : -average -.TP -.B \-\-regBack -registration method to compute the background. -.BR 0 : -None, -.BR 1 : -Simple, -.BR 2 : -ECC, -.BR 3 : -Features -.P -\[sc] -.TP -.B \-\-xTop -roi x top corner -.BI (0: width \-1) -.TP -.B \-\-yTop -roi y top corner -.BI (0: height \-1) -.TP -.B \-\-xBottom -roi x top corner -.BI (0: xTop \-1)\fR, -set to -.B 0 -to avoid cropping -.TP -.B \-\-yBottom -roi y top corner -.BI (0: yTop \-1)\fR, -set to -.B 0 -to avoid cropping -.P -\[sc] -.TP -.B \-\-morph -morphological operation, -.BR 0 : -None, -.BR 1 : -Erode, -.BR 2 : -Dilate, -.BR 3 : -Open, -.BR 4 : -Close, -.BR 5 : -Gradient, -.BR 6 : -TopHat, -.BR 7 : -BlackHat, -.BR 8 : -HitMiss -.TP -.B \-\-morphSize -size of the kernel used in the morphological operation; can be omitted if no -operation are performed -.TP -.B \-\-morphType -type of the kernel used in the morphological operation; can be omitted if no -operation are performed, -.BR 0 : -Rect, -.BR 1 : -Cross, -.BR 2 : -Ellipse -.P -\[sc] -.TP -.B \-\-path -path to the movie or one image of a sequence -.TP -.B \-\-backPath -optional, path to a background image -.P -\[sc] -.TP -.B \-\-cfg -optional, path to a configuration file; if path is not included in the -configuration file, -.B \-\-path -option needs to be put before -.B \-\-cfg -option diff --git a/fasttrack.spec b/fasttrack.spec deleted file mode 100644 index d78fc12..0000000 --- a/fasttrack.spec +++ /dev/null @@ -1,229 +0,0 @@ -%global forgeurl https://github.com/FastTrackOrg/FastTrack -%global app_id sh.fasttrack.fasttrack - -# We don’t install the .desktop file for the CLI tool, because it is useless—a -# terminal window just appears briefly with an error message asking the user to -# provide the many necessary arguments. -%bcond_with cli_desktop_file - -Name: fasttrack -Summary: Multiple objects tracking software, easy to use, and performant. -Version: 6.2.1 -%forgemeta -Release: %autorelease - -URL: %{forgeurl} -# The entire source is GPLv3+, except src/assets/dark.qss and -# src/assets/light.qss, which are MIT; the effective license remains GPLv3+. -License: GPLv3+ - -Source0: %{forgesource} -# Downstream man page in groff_man(7) format, based on --help output -Source1: fasttrack-cli.1 - -# Do not override distribution compiler flags. This unconditionally patches out -# optimization flags upstream would prefer, so it is not suitable for offering -# upstream. -Patch0: FastTrack-6.0.1-do-not-override-compiler-flags.patch - -# qt6-qtbase missing on s390x -# https://bugzilla.redhat.com/show_bug.cgi?id=2012824 -# AutoLevelTest.AutoLevel fails on ppc64le since GCC 12 and/or “long double” -# change -# https://bugzilla.redhat.com/show_bug.cgi?id=2045367 -ExcludeArch: ppc64le s390x - -BuildRequires: gcc-c++ -BuildRequires: make - -# Currently, there is no qt6-qtwebengine package in Fedora, so we must build -# with NO_WEB enabled. This has three consequences: -# -# 1. The check for a newer available version at startup—which we would have -# patched out in src/mainwindow.cpp anyway, as it is not really suitable -# for a distribution package—does not occur. -# 2. The user manual browser for the online documentation is not available. -# 3. The package no longer needs to be -# ExclusiveArch: %%{qt6_qtwebengine_arches} -# -# Overall, this is satisfactory. - -# src/FastTrack.pro, src/FastTrack-Cli.pro: -# Qt components: core, gui, network, sql, svg, widgets -BuildRequires: qt6-qtbase-devel -BuildRequires: qt6-qtsvg-devel - -# dependencies.sh, src/FastTrack. -BuildRequires: pkgconfig(opencv4) - -# generateDocumentation.sh: user manual -BuildRequires: pandoc -# rsvg-convert, needed by pandoc to generate PDF -BuildRequires: librsvg2-tools -# pdflatex, needed by pandoc to generate PDF -BuildRequires: tex(latex) - -# Test/Test.pro -BuildRequires: gtest-devel -# test.sh -BuildRequires: python3-devel -BuildRequires: python3dist(pytest) -# Test/accuracyTest.py -BuildRequires: python3dist(numpy) -BuildRequires: python3dist(pandas) - -BuildRequires: desktop-file-utils -# Still required by guidelines for now -# (https://pagure.io/packaging-committee/issue/1053) -BuildRequires: libappstream-glib -# Matches what gnome-software and others use: -BuildRequires: appstream - -# For /usr/share/icons/hicolor/*/apps -Requires: hicolor-icon-theme - -%global common_description %{expand: -Tracking objects in video recording can be tedious. Existing software are -expensive, the learning curve can be steep, necessitate a powerful computer, -and the workflow can not be easily adapted when the project evolved. - -FastTrack is a free (as freedom) desktop tracking software, easy to install, -easy to use, and performant. The software can be downloaded for Linux, macOS, -and Windows, and a public API is available to embed the core of the software in -any C++/Qt project. - -Two main features are implemented in the software: - - • An automatic tracking algorithm that can detect and track objects - (conserving the objects’ identities across the video recording). - • A manual review of the tracking where errors can be corrected rapidly and - easily to achieve 100% accuracy.} - -%description %{common_description} - -This package contains the graphical user interface (fasttrack). - - -%package cli -Summary: %{summary} - -%if %{with cli_desktop_file} -# For /usr/share/icons/hicolor/*/apps -Requires: hicolor-icon-theme -%endif - -%description cli %{common_description} - -This package contains the command-line tool (fasttrack-cli). - - -%package doc -Summary: Documentation for FastTrack -BuildArch: noarch - -%description doc %{common_description} - -This package contains the user manual. - - -%prep -%forgeautosetup -p1 -cp -p '%{SOURCE1}' . - - -%build -pushd Test -%qmake_qt6 Test.pro -popd -%qmake_qt6 'CONFIG += NO_WEB' src/FastTrack-Cli.pro -mv Makefile Makefile-cli -%qmake_qt6 'CONFIG += NO_WEB' src/FastTrack.pro - -%make_build -%make_build -f Makefile-cli -pushd Test -%make_build -f Makefile -popd - -bash -x ./generateDocumentation.sh user - - -%install -%make_install INSTALL_ROOT='%{buildroot}' -%make_install -f Makefile-cli INSTALL_ROOT='%{buildroot}' - -# This is not the right place to install a raster icon; it should go in -# %%{_datadir}/icons/hicolor/SIZExSIZE/apps/. -rm -vf %{buildroot}%{_datadir}/icons/fasttrack.png -# Furthermore, it is 756x756, so we -# should rescale it to one or more standard sizes instead (16x16, 22x22, 24x24, -# 32x32, 36x36, 48x48, 64x64, 72x72, 96x96, 128x128, 192x192, 256x256, 512x512) -# and install in the corresponding directory or directories. -# -# To keep things simple, we install the scalable icon instead. -install -D -p -m 0644 'src/assets/icon.svg' \ - '%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/fasttrack.svg' - -install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 fasttrack-cli.1 - - -%check -# Still required by guidelines for now -# (https://pagure.io/packaging-committee/issue/1053) -appstream-util validate-relax --nonet \ - '%{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml' -# Matches what gnome-software and others use: -appstreamcli validate --nonet \ - '%{buildroot}%{_metainfodir}/%{app_id}.metainfo.xml' -desktop-file-validate \ -%if %{with cli_desktop_file} - '%{buildroot}%{_datadir}/applications/%{app_id}cli.desktop' \ -%endif - '%{buildroot}%{_datadir}/applications/%{app_id}.desktop' - -# test.sh -export QT_QPA_PLATFORM=offscreen -pushd Test/build -./Test -popd -pushd Test -%pytest accuracyTest.py -popd - - -%files -%license LICENSE -%doc changelog.md -%doc contributing.md -%doc readme.md -%{_bindir}/fasttrack - -%{_metainfodir}/%{app_id}.metainfo.xml -%{_datadir}/applications/%{app_id}.desktop -%{_datadir}/icons/hicolor/scalable/apps/fasttrack.svg - - -%files cli -%license LICENSE -%{_bindir}/fasttrack-cli -%{_mandir}/man1/fasttrack-cli.1* - -%if %{with cli_desktop_file} -%{_datadir}/applications/%{app_id}cli.desktop -# Icons are intentionally shared between base and -cli packages, as they are -# used in both desktop files, but a -data or -common subpackage would be -# overkill for icons. -%{_datadir}/icons/hicolor/scalable/apps/fasttrack.svg -%endif - - -%files doc -%license LICENSE -# Package only the PDF user manual, because the HTML one has a small amount of -# pre-minified GitHub CSS, which is not acceptable: -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Web_Assets/#_css -%doc manual/user/user_manual.pdf - - -%changelog -%autochangelog diff --git a/sources b/sources deleted file mode 100644 index a8382c2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (FastTrack-6.2.1.tar.gz) = 185ffcfc79a87c16d168aa66d7e3e27cf1f5be22f3c4bad4b46c0cca18c7adda3233e12c4e8810a70630f13630b6e88328690381535d2237fd8e64f0b4632085

1 0

Architecture specific change in rpms/qt6-qtwebchannel.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtwebchannel.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtwebchannel.git/commit/?id=6e9…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit 6e99aa6d8f5a72f59cdb97603618208b29eee107 Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtwebchannel.spec b/qt6-qtwebchannel.spec index 998519b..f9c3f74 100644 --- a/qt6-qtwebchannel.spec +++ b/qt6-qtwebchannel.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtwebchannel @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - WebChannel component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -111,6 +108,9 @@ popd %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qtremoteobjects.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtremoteobjects.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtremoteobjects.git/commit/?id=…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit dc08b29308726b82245579387c811bfcb774735d Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtremoteobjects.spec b/qt6-qtremoteobjects.spec index 38bfec7..b13b9d4 100644 --- a/qt6-qtremoteobjects.spec +++ b/qt6-qtremoteobjects.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtremoteobjects @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - Qt Remote Objects Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -107,6 +104,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qtvirtualkeyboard.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtvirtualkeyboard.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtvirtualkeyboard.git/commit/?i…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit d7f4e8572281538be08d95be31e33a33b595e1c8 Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtvirtualkeyboard.spec b/qt6-qtvirtualkeyboard.spec index 88e63af..6c6c376 100644 --- a/qt6-qtvirtualkeyboard.spec +++ b/qt6-qtvirtualkeyboard.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtvirtualkeyboard @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - VirtualKeyboard component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -112,6 +109,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qtimageformats.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtimageformats.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtimageformats.git/commit/?id=f…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit fbbc6b5a2a11a9f0bb90b2cc6c204d91f6e56dbc Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtimageformats.spec b/qt6-qtimageformats.spec index d66a1a1..c1d8733 100644 --- a/qt6-qtimageformats.spec +++ b/qt6-qtimageformats.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtimageformats @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - QtImageFormats component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -85,6 +82,9 @@ rm -rv src/3rdparty %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-3 +- Enable s390x builds + * Sun Feb 13 2022 Josef Ridky <jridky(a)redhat.com> - 6.2.3-2 - Rebuilt for libjasper.so.6 commit 35c41d56bce985275f19251c27ea973ed684a479 Author: Josef Řídký <jridky(a)redhat.com> Date: Sun Feb 13 13:46:00 2022 +0100 Rebuilt for libjasper.so.6 diff --git a/qt6-qtimageformats.spec b/qt6-qtimageformats.spec index 8d73951..d66a1a1 100644 --- a/qt6-qtimageformats.spec +++ b/qt6-qtimageformats.spec @@ -12,7 +12,7 @@ ExcludeArch: s390x Summary: Qt6 - QtImageFormats component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -85,6 +85,9 @@ rm -rv src/3rdparty %changelog +* Sun Feb 13 2022 Josef Ridky <jridky(a)redhat.com> - 6.2.3-2 +- Rebuilt for libjasper.so.6 + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qt5compat.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qt5compat.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qt5compat.git/commit/?id=2aa729…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit 2aa72970a7637ab84466694911fe168be022f8d0 Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec index 6104118..fdfe8a2 100644 --- a/qt6-qt5compat.spec +++ b/qt6-qt5compat.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qt5compat @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - Qt 5 Compatibility Libraries Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 Url: http://www.qt.io @@ -99,6 +96,9 @@ popd %{_qt6_libdir}/metatypes/qt6*_metatypes.json %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qtdeclarative.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtdeclarative.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtdeclarative.git/commit/?id=43…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit 43f02cf33079e29d5b604949c11a96ba19be5ecb Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec index a4adb8d..63eb442 100644 --- a/qt6-qtdeclarative.spec +++ b/qt6-qtdeclarative.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtdeclarative @@ -15,7 +12,7 @@ ExcludeArch: s390x Summary: Qt6 - QtDeclarative component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -313,6 +310,9 @@ make check -k -C tests ||: %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

Architecture specific change in rpms/qt6-qtpositioning.git
by githook-noreply＠fedoraproject.org 28 Feb '22

28 Feb '22

The package rpms/qt6-qtpositioning.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtpositioning.git/commit/?id=13…. Change: -ExcludeArch: s390x Thanks. Full change: ============ commit 136cbd9815d5024e7cbb91202fa18e25167b465f Author: Jan Grulich <jgrulich(a)redhat.com> Date: Fri Feb 25 14:54:45 2022 +0100 Enable s390x builds diff --git a/qt6-qtpositioning.spec b/qt6-qtpositioning.spec index 9538874..218c446 100644 --- a/qt6-qtpositioning.spec +++ b/qt6-qtpositioning.spec @@ -1,6 +1,3 @@ -# FIXME: qt6-qtdeclarative doesn't build on S390x -# BUG: https://bugreports.qt.io/browse/QTBUG-93101 -ExcludeArch: s390x %global qt_module qtpositioning @@ -12,7 +9,7 @@ ExcludeArch: s390x Summary: Qt6 - Positioning component Name: qt6-%{qt_module} Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -147,6 +144,9 @@ popd %changelog +* Fri Feb 25 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich <jgrulich(a)redhat.com> - 6.2.3-1 - 6.2.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes February 2022