Byron Hambly
4d44b94179
Merge 5a4eb56e3f into merged_master (Bitcoin PR bitcoin/bitcoin#28571 )
2025-08-06 15:09:53 +02:00
Byron Hambly
a5a7453419
Merge 8113ac0ab4 into merged_master (Bitcoin PR bitcoin/bitcoin#28543 )
2025-08-06 15:09:33 +02:00
Byron Hambly
710207546a
Merge e9a4793b82 into merged_master (Bitcoin PR bitcoin/bitcoin#28432 )
2025-08-01 14:05:39 +02:00
Byron Hambly
4283911318
Merge f01416e23c into merged_master (Bitcoin PR bitcoin/bitcoin#28479 )
2025-08-01 11:36:51 +02:00
Byron Hambly
e7563b7194
Merge b097a689ed into merged_master (Bitcoin PR bitcoin/bitcoin#28422 )
2025-07-21 09:40:56 +02:00
Byron Hambly
a82bdaefba
Merge 8371914604 into merged_master (Bitcoin PR bitcoin/bitcoin#28337 )
2025-07-05 15:42:54 +02:00
Byron Hambly
f86b72b128
Merge a8bd0fef25 into merged_master (Bitcoin PR bitcoin/bitcoin#27999 )
2025-06-30 15:00:23 +02:00
Byron Hambly
16d9ef4a8c
Merge 35b01e8504 into merged_master (Bitcoin PR bitcoin/bitcoin#27676 )
2025-06-28 09:59:07 +02:00
Byron Hambly
0edd956e39
Merge 0c84a0e484 into merged_master (Bitcoin PR bitcoin/bitcoin#27798 )
2025-06-27 21:53:23 +02:00
Byron Hambly
cefd2b04ba
Merge 25202cace9 into merged_master (Bitcoin PR bitcoin/bitcoin#27721 )
2025-06-23 15:21:04 +02:00
Byron Hambly
832718cc6a
Merge 5f70cd3997 into merged_master (Bitcoin PR bitcoin/bitcoin#27685 )
2025-06-20 16:28:57 +02:00
Byron Hambly
f02f14329c
Merge 29c36f0706 into merged_master (Bitcoin PR bitcoin/bitcoin#27493 )
2025-06-20 11:15:47 +02:00
Byron Hambly
02aa369f40
Merge 397ed22162 into merged_master (Bitcoin PR bitcoin/bitcoin#27508 )
2025-05-14 11:55:24 +02:00
Byron Hambly
5eac2deb20
Merge f3f5c97126 into merged_master (Bitcoin PR bitcoin/bitcoin#27496 )
2025-05-09 12:00:21 +02:00
Byron Hambly
a41021b283
Merge abbc17048a into merged_master (Elements PR #1432 )
2025-04-16 11:16:26 +02:00
Byron Hambly
e932571ba3
Merge d908877c47 into merged_master (Bitcoin PR bitcoin/bitcoin#27447 )
2025-04-14 09:01:50 +02:00
Byron Hambly
81650394ca
Merge 5d9d6f7fbc into merged_master (Bitcoin PR bitcoin/bitcoin#27462 )
2025-04-14 08:35:06 +02:00
Byron Hambly
5ec654dcfe
Merge 75d807ac9a into merged_master (Bitcoin PR bitcoin/bitcoin#27406 )
2025-04-12 13:11:58 +02:00
Byron Hambly
c084b71d47
Merge a8649984d8 into merged_master (Bitcoin PR bitcoin/bitcoin#27387 )
2025-04-12 12:06:23 +02:00
Byron Hambly
8dbf4f8f14
Merge b759cefe93 into merged_master (Bitcoin PR bitcoin/bitcoin#27301 )
2025-04-11 22:51:26 +02:00
Byron Hambly
99ab6b3c4e
Merge 20bd591345 into merged_master (Bitcoin PR bitcoin/bitcoin#27314 )
2025-04-11 22:43:31 +02:00
Byron Hambly
27d305e465
Merge 3e835ca958 into merged_master (Bitcoin PR bitcoin/bitcoin#27328 )
2025-04-11 22:28:03 +02:00
Byron Hambly
8760fc18fe
Merge ad62bd5d6a into merged_master (Bitcoin PR bitcoin/bitcoin#27312 )
2025-04-11 22:27:58 +02:00
Byron Hambly
eb59d3c251
Merge e60a58f191 into merged_master (Bitcoin PR bitcoin/bitcoin#27118 )
2025-04-09 12:13:36 +02:00
Byron Hambly
e6d96fe380
Merge 07a23b4946 into merged_master (Bitcoin PR bitcoin/bitcoin#26994 )
2025-04-05 15:39:26 +02:00
Byron Hambly
c6f8c73658
Merge fe86616bb4 into merged_master (Bitcoin PR bitcoin/bitcoin#26421 )
2025-04-05 14:59:22 +02:00
Byron Hambly
72033ba8de
Merge ab5b26f072 into merged_master (Bitcoin PR bitcoin/bitcoin#21995 )
2025-04-05 14:52:01 +02:00
Byron Hambly
cc507e7cd6
Merge ceb74b844c into merged_master (Bitcoin PR bitcoin/bitcoin#26998 )
2025-04-05 08:41:44 +02:00
Tom Trevethan
8ee10f9792
Merge 228edafc66 into merged_master (Bitcoin PR bitcoin/bitcoin#23619 )
2025-04-04 15:49:03 +00:00
Tom Trevethan
563c186893
Merge 69f35d20a6 into merged_master (Bitcoin PR bitcoin/bitcoin#22811 )
2025-04-04 14:28:40 +00:00
Tom Trevethan
c578bcd7a0
Merge 483a4bb819 into merged_master (Bitcoin PR bitcoin/bitcoin#26834 )
2025-04-04 14:23:06 +00:00
Tom Trevethan
290fe7fbed
Merge eee2c28985 into merged_master (Bitcoin PR bitcoin/bitcoin#26945 )
2025-04-04 13:38:40 +00:00
Byron Hambly
f3ce820494
Merge 50ac8f5774 into merged_master (Bitcoin PR bitcoin/bitcoin#25987 )
2025-04-04 11:02:07 +02:00
Byron Hambly
d111c1543f
Merge f99b85642f into merged_master (Bitcoin PR bitcoin/bitcoin#26944 )
2025-04-04 09:05:11 +02:00
Byron Hambly
30024a78c8
Merge 10a5f19037 into merged_master (Bitcoin PR bitcoin/bitcoin#26833 )
2025-04-02 23:02:19 +02:00
Tom Trevethan
ccdf761293
Merge e1fb7381be into merged_master (Bitcoin PR bitcoin/bitcoin#26672 )
2025-03-26 15:34:30 +00:00
Tom Trevethan
416d79d48b
Merge 3eaf7be6ad into merged_master (Bitcoin PR bitcoin/bitcoin#24279 )
2025-03-25 19:47:17 +00:00
fanquake
8821acdace
bdb: disable Werror for format-security
...
This is causing build failures in some build environments, like NixOS.
I don't think we are going to patch bdb at this point, and this warning
has existed for as long as we've used bdb.
Fixes #25211 .
Tested (in Docker) with:
```bash
docker run -it nixos/nix
nix-shell -p gitMinimal gcc12 libtool pkg-config curl gnumake patch autoconf automake
git clone https://github.com/bitcoin/bitcoin
make -C bitcoin/depends bdb
```
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Github-Pull: #25763
Rebased-From: b46c6ec52e
2025-03-10 16:56:29 +00:00
fanquake
ebc21211b4
build: suppress array-bounds errors in libxkbcommon
...
These occur when building with GCC 12.1.
It might be the case that these would be suppressed by updating the
package, but that would also require installing new build tools (meson),
as well as potentially more dependencies (wayland).
```bash
In function 'ExprCreateBoolean',
inlined from 'BoolVarCreate' at src/xkbcomp/ast-build.c:316:19:
src/xkbcomp/ast-build.c:119:23: error: array subscript 'ExprDef[0]' is partly outside array bounds of 'unsigned char[32]' [-Werror=array-bounds]
119 | expr->boolean.set = set;
| ~~~~~~~~~~~~~~~~~~^~~~~
In function 'ExprCreate',
inlined from 'ExprCreateBoolean' at src/xkbcomp/ast-build.c:118:5,
inlined from 'BoolVarCreate' at src/xkbcomp/ast-build.c:316:19:
src/xkbcomp/ast-build.c:75:21: note: object of size 32 allocated by 'malloc'
75 | ExprDef *expr = malloc(size);
| ^~~~~~~~~~~~
```
Github-Pull: #25436
Rebased-From: 1bdbbbdc46
2025-03-10 16:55:55 +00:00
Pavol Rusnak
7470961fb0
build, qt: bump Qt5 version to 5.15.3
...
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch
release, Qt 5.15.3 does not add any new functionality but provides bug fixes
and other improvements.
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md
* dropped patches:
- patches/qt/dont_use_avx_android_x86_64.patch
- patches/qt/fix_bigsur_style.patch
* adjusted patches:
- patches/qt/fix_android_jni_static.patch
- patches/qt/fix_limits_header.patch
- patches/qt/use_android_ndk23.patch
Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Github-Pull: bitcoin/bitcoin#24668
Rebased-From: ef20add4c9
2025-03-10 15:37:34 +00:00
Byron Hambly
091217861b
Merge 5488dc1eb4 into merged_master (Bitcoin PR bitcoin/bitcoin#26073 )
2025-03-03 16:39:13 +02:00
Byron Hambly
7213e48cf4
Merge 9c2854cda4 into merged_master (Bitcoin PR bitcoin/bitcoin#26578 )
2025-03-03 15:12:10 +02:00
Byron Hambly
c8eb5b8cc1
Merge bd551ad186 into merged_master (Elements PR #1393 )
2025-02-11 15:50:38 +02:00
Pablo Greco
7f10cd11c1
Update xcb_proto to 1.15.2, manually picked from 7cb88c8b46
2025-02-07 13:34:50 -08:00
Pablo Greco
871e9d2ea2
Update boost to 1.81, manually picked from e8b4201ba2
2025-02-07 13:33:59 -08:00
fanquake
848eec0936
depends: fix unusable memory_resource in macos qt build
...
See https://codereview.qt-project.org/c/qt/qtbase/+/482392 .
2023-10-03 13:31:19 +01:00
Hennadii Stepanov
79ef528511
build, macos: Fix qt package build with new Xcode 15 linker
2023-09-27 12:19:57 +01:00
fanquake
e9a4793b82
Merge bitcoin/bitcoin#28432 : build: Produce a .zip for macOS distribution
...
b5790c35f733ae0bd1e4a128111c29c38561d6b1https://github.com/bitcoin/bitcoin/pull/27099 revived with addressed [comments](https://github.com/bitcoin/bitcoin/pull/27099#issuecomment-1708705686 ).
From https://github.com/bitcoin/bitcoin/pull/27099#issue-1584429885 :
> Reviving the discussion around using a `.zip` for the distributed macOS binaries, as opposed to a `.dmg`.
>
> Given we only had a single report of the "no finder window" issue (#26176 ), I wonder if that means macOS users were able to figure it out, they gave up/didn't report, or, we just have very few macOS users.
>
> Related to #18128 .
That's how it looks on macOS:
ACKs for top commit:
Sjors:
tACK b5790c35f7b5790c35f7b5790c35f7
2023-09-20 11:40:47 +00:00
fanquake
b5790c35f7
build: remove dmg dependencies
2023-09-15 13:47:50 +01:00
Hennadii Stepanov
a128111c29
build: produce a .zip for macOS distribution
...
Instead of a .dmg.
Co-authored-by: fanquake <fanquake@gmail.com>
2023-09-15 13:47:50 +01:00
