diff options
author | glozow <gloriajzhao@gmail.com> | 2024-05-24 11:16:33 +0100 |
---|---|---|
committer | glozow <gloriajzhao@gmail.com> | 2024-05-24 11:22:00 +0100 |
commit | 6d7a1e3670675fe4bcdd9b2df9bce7979ecd90fc (patch) | |
tree | 56a41f19fe50e8c056e96ea9a3c1b13ddfe978d7 /depends | |
parent | 0b4aa31c34b239ec7da36760a2670792184c3ba8 (diff) | |
parent | aa7e876953c460e8ff97a719fdb18f4f3ac4896f (diff) |
Merge bitcoin/bitcoin#29899: [26.x] archive 26.1 release notes + backports
aa7e876953c460e8ff97a719fdb18f4f3ac4896f [doc] add draft release notes for 26.2rc1 (glozow)
21d9aaae3226d76094d323c1de8e1470c5384622 p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo() (Jon Atack)
ec5ce2fb2b34cdf9691557121faa69298daa97f2 windeploy: Renew certificate (Ava Chow)
96d0e818c5801d4af5570241cd9949cddbacba5e rpc: Reword SighashFromStr error message (MarcoFalke)
6685affe92ce61a586d257b3ccdf0d97f8b9ef85 rpc: move UniValue in blockToJSON (willcl-ark)
7f45e0017417d1a100c60ff02cc72eb788b6f9c6 depends: Fix build of Qt for 32-bit platforms (laanwj)
f9b76bae57a79f55b3a6eff0a029b5dc21b1730c ci: Pull in qtbase5-dev instead of seperate low-level libraries (laanwj)
c587753f484d2ccb5b93a7cd37c7a8d491e03818 doc: Suggest installing dev packages for debian/ubuntu qt5 build (laanwj)
7ecdb0846dd7d5ff66aec961515c552a531d25f8 ci: Bump s390x to ubuntu:24.04 (MarcoFalke)
d9ef6cf934cbd8e9b2f8256de001ca44f74ad6e9 sign: don't assume we are parsing a sane Miniscript (Antoine Poinsot)
e4859c82c7b848554b4e9d27c2f8b8615422528e depends: fix mingw-w64 Qt DEBUG=1 build (fanquake)
bb46b90b2ec7c8a4955ed8c5711bbc128d803b76 Fix #29767, set m_synced = true after Commit() (nanlour)
bf5b6fc8a7c7e6c13520671bb7b2d4d1d110c2bb Throw error if invalid parameters passed to getnetworkhashps RPC endpoint (Jameson Lopp)
a81a9228fbaaa10d6308299f11d6093485d645e5 [rpc, bugfix] Enforce maximum value for setmocktime (dergoegge)
d39ea519c71ea9e0f2ed0ee79cc66ecaf35e86ee Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us (Luke Dashjr)
c21bbcc898d9c1fbc77ca93e46fc84ae22b68afa [doc] archive 26.1 release notes (glozow)
Pull request description:
Archives 26.1 release notes and adds draft release notes for 26.2rc1
Also backports:
- #29691
- #29869
- #28554
- #29747
- #29853
- #29856
- #29764
- #29776
- #29985
- #30094
- #29870
- #30149
- #30085
ACKs for top commit:
stickies-v:
re-ACK aa7e876953c460e8ff97a719fdb18f4f3ac4896f, only changes are fixing commit msg and transifex reference
willcl-ark:
ACK aa7e876953c460e8ff97a719fdb18f4f3ac4896f
Tree-SHA512: b81ba6092640de696d782114cdf43e7ed1d63ea0a3231cade30653c2743d87700e0f852a1b1fcc42ae313b2d4f004e6026ddbad87d58c2fde0a660e90026ed98
Diffstat (limited to 'depends')
-rw-r--r-- | depends/packages/qt.mk | 3 | ||||
-rw-r--r-- | depends/patches/qt/zlib-timebits64.patch | 31 |
2 files changed, 34 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 047d1d5aee..12820dd65b 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -23,6 +23,7 @@ $(package)_patches += guix_cross_lib_path.patch $(package)_patches += fix-macos-linker.patch $(package)_patches += memory_resource.patch $(package)_patches += windows_lto.patch +$(package)_patches += zlib-timebits64.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=38b942bc7e62794dd072945c8a92bb9dfffed24070aea300327a3bb42f855609 @@ -180,6 +181,7 @@ $(package)_config_opts_mingw32 += -xplatform win32-g++ $(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'" $(package)_config_opts_mingw32 += "QMAKE_CXX = '$($(package)_cxx)'" $(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cxxflags) $($(package)_cppflags)'" +$(package)_config_opts_mingw32 += "QMAKE_LINK = '$($(package)_cxx)'" $(package)_config_opts_mingw32 += "QMAKE_LFLAGS = '$($(package)_ldflags)'" $(package)_config_opts_mingw32 += "QMAKE_LIB = '$($(package)_ar) rc'" $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-" @@ -255,6 +257,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \ patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \ patch -p1 -i $($(package)_patch_dir)/windows_lto.patch && \ + patch -p1 -i $($(package)_patch_dir)/zlib-timebits64.patch && \ mkdir -p qtbase/mkspecs/macx-clang-linux &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ diff --git a/depends/patches/qt/zlib-timebits64.patch b/depends/patches/qt/zlib-timebits64.patch new file mode 100644 index 0000000000..139c1dfa77 --- /dev/null +++ b/depends/patches/qt/zlib-timebits64.patch @@ -0,0 +1,31 @@ +From a566e156b3fa07b566ddbf6801b517a9dba04fa3 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Sat, 29 Jul 2023 22:13:09 -0700 +Subject: [PATCH] Avoid compiler complaints if _TIME_BITS defined when building + zlib. + +zlib does not use time_t, so _TIME_BITS is irrelevant. However it +may be defined anyway as part of a sledgehammer indiscriminately +applied to all builds. + +From https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch +--- + qtbase/src/3rdparty/zlib/src/gzguts.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/qtbase/src/3rdparty/zlib/src/gzguts.h b/qtbase/src/3rdparty/zlib/src/gzguts.h +index e23f831f5..f9375047e 100644 +--- a/qtbase/src/3rdparty/zlib/src/gzguts.h ++++ b/qtbase/src/3rdparty/zlib/src/gzguts.h +@@ -26,9 +26,8 @@ + # ifndef _LARGEFILE_SOURCE + # define _LARGEFILE_SOURCE 1 + # endif +-# ifdef _FILE_OFFSET_BITS +-# undef _FILE_OFFSET_BITS +-# endif ++# undef _FILE_OFFSET_BITS ++# undef _TIME_BITS + #endif + + #ifdef HAVE_HIDDEN |