highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 23:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33851: depends: update xcb-util packages to latest versions

Browse Source 
f541b92cf2 depends: expat 2.7.3 (fanquake)
2ebf4356e6 depends: libxcb 1.17.0 (Hennadii Stepanov)
ba7ac870a3 depends: xcb_proto 1.17.0 (Hennadii Stepanov)
42d0692f91 depends: libxcb-util-cursor 0.1.6 (fanquake)
25b85919ab depends: libxcb 1.15 (fanquake)
d129384ca9 depends: libxcb-util-wm 0.4.2 (fanquake)
0b857ae9e5 depends: libxcb-util-renderutil 0.3.10 (fanquake)
35e50488b2 depends: libxcb-util-keysyms 0.4.1 (fanquake)
74b68ad28b depends: libxcb-util-image 0.4.1 (fanquake)
5bc0dde85d depends: libxcb-util 0.4.1 (fanquake)
8d07292c28 depends: libXau 1.0.12 (fanquake)

Pull request description:

  Update libxcb and related package versions:

  libXau 1.0.9 -> 1.0.12
  libxcb 1.14 -> 1.17
  libxcb_util 0.4.0 -> 0.4.1
  libxcb_util_cursor 0.1.5 -> 0.1.6
  libxcb_util_image 0.4.0 -> 0.4.1
  libxcb_util_keysyms 0.4.0 -> 0.4.1
  libxcb_util_render 0.3.9 -> 0.3.10
  libxcb_util_wm 0.4.1 -> 0.4.2
  xcb_proto 1.15.2 -> 1.17.0

  These recently became static in #33537.

  Also update expat 2.4.8 -> 2.7.3.

ACKs for top commit:
  hebasto:
    ACK f541b92cf2, due to the last commit, I also tested an LTO build on Ubuntu 25.10 using GCC 15.2.0.

Tree-SHA512: 63f32e22743d8fa59b6e78fa8ea301e5cfaa55832454a8bc87ebb18e3d03379e9354519acd040ce861b4b1f3879b9cf9fb724dca69f6e0f8d2ef9ebfa7a032bf
This commit is contained in:
Hennadii Stepanov
2025-11-20 15:04:01 +00:00
parent a07bd8415d f541b92cf2
commit e55c49f851
12 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
depends/packages/expat.mk
View File

@@ -1,23 +1,14 @@
package=expat
$(package)_version=2.4.8
$(package)_version=2.7.3
$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/
$(package)_file_name=$(package)-$($(package)_version).tar.xz
$(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=821ac9710d2c073eaf13e1b1895a9c9aa66c1157a99635c639fbff65cdbdd732
$(package)_build_subdir=build
$(package)_patches += cmake_minimum.patch
# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional
# definitions in endian.h, which are required for a working
# endianness check in configure when building with -flto.
define $(package)_set_vars
$(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DEXPAT_BUILD_TOOLS=OFF
$(package)_config_opts += -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF
$(package)_config_opts += -DBUILD_SHARED_LIBS=OFF
$(package)_cppflags += -D_DEFAULT_SOURCE
endef
define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch
endef
define $(package)_config_cmds

4
depends/packages/libXau.mk
View File

@@ -1,8 +1,8 @@
package=libXau
$(package)_version=1.0.9
$(package)_version=1.0.12
$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=1f123d8304b082ad63a9e89376400a3b1d4c29e67e3ea07b3f659cccca690eea
$(package)_sha256_hash=2402dd938da4d0a332349ab3d3586606175e19cb32cb9fe013c19f1dc922dcee
$(package)_dependencies=xproto
# When updating this package, check the default value of

10
depends/packages/libxcb.mk
View File

@@ -1,16 +1,16 @@
package=libxcb
$(package)_version=1.14
$(package)_version=1.17.0
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=$(package)-$($(package)_version).tar.xz
$(package)_sha256_hash=a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=2c69287424c9e2128cb47ffe92171e10417041ec2963bceafb65cb3fcf8f0b85
$(package)_dependencies=xcb_proto libXau
$(package)_patches = remove_pthread_stubs.patch
define $(package)_set_vars
$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen --without-launchd
$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
# Disable unneeded extensions.
# More info is available from: https://doc.qt.io/qt-5.15/linux-requirements.html
# More info is available from: https://doc.qt.io/qt-6/linux-requirements.html
$(package)_config_opts += --disable-composite --disable-damage --disable-dpms
$(package)_config_opts += --disable-dri2 --disable-dri3 --disable-glx
$(package)_config_opts += --disable-present --disable-record --disable-resource

4
depends/packages/libxcb_util.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util
$(package)_version=0.4.0
$(package)_version=0.4.1
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-$($(package)_version).tar.gz
$(package)_sha256_hash=0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7
$(package)_sha256_hash=21c6e720162858f15fe686cef833cf96a3e2a79875f84007d76f6d00417f593a
$(package)_dependencies=libxcb
define $(package)_set_vars

4
depends/packages/libxcb_util_cursor.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util_cursor
$(package)_version=0.1.5
$(package)_version=0.1.6
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
$(package)_sha256_hash=0e9c5446dc6f3beb8af6ebfcc9e27bcc6da6fe2860f7fc07b99144dfa568e93b
$(package)_sha256_hash=eae38b2dfc5c529a886e507ef576b12d2a20aa1f149608e4853af760f31be60b
$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
define $(package)_set_vars

4
depends/packages/libxcb_util_image.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util_image
$(package)_version=0.4.0
$(package)_version=0.4.1
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-image-$($(package)_version).tar.gz
$(package)_sha256_hash=cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42
$(package)_sha256_hash=0ebd4cf809043fdeb4f980d58cdcf2b527035018924f8c14da76d1c81001293b
$(package)_dependencies=libxcb libxcb_util
define $(package)_set_vars

4
depends/packages/libxcb_util_keysyms.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util_keysyms
$(package)_version=0.4.0
$(package)_version=0.4.1
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.gz
$(package)_sha256_hash=0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96
$(package)_sha256_hash=1fa21c0cea3060caee7612b6577c1730da470b88cbdf846fa4e3e0ff78948e54
$(package)_dependencies=libxcb xproto
define $(package)_set_vars

4
depends/packages/libxcb_util_render.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util_render
$(package)_version=0.3.9
$(package)_version=0.3.10
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-renderutil-$($(package)_version).tar.gz
$(package)_sha256_hash=55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5
$(package)_sha256_hash=e04143c48e1644c5e074243fa293d88f99005b3c50d1d54358954404e635128a
$(package)_dependencies=libxcb
define $(package)_set_vars

4
depends/packages/libxcb_util_wm.mk
View File

@@ -1,8 +1,8 @@
package=libxcb_util_wm
$(package)_version=0.4.1
$(package)_version=0.4.2
$(package)_download_path=https://xcb.freedesktop.org/dist
$(package)_file_name=xcb-util-wm-$($(package)_version).tar.gz
$(package)_sha256_hash=038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334
$(package)_sha256_hash=dcecaaa535802fd57c84cceeff50c64efe7f2326bf752e16d2b77945649c8cd7
$(package)_dependencies=libxcb
define $(package)_set_vars

6
depends/packages/xcb_proto.mk
View File

@@ -1,8 +1,8 @@
package=xcb_proto
$(package)_version=1.15.2
$(package)_version=1.17.0
$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
$(package)_file_name=xcb-proto-$($(package)_version).tar.xz
$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed
$(package)_file_name=xcb-proto-$($(package)_version).tar.gz
$(package)_sha256_hash=392d3c9690f8c8202a68fdb89c16fd55159ab8d65000a6da213f4a1576e97a16
define $(package)_config_cmds
$($(package)_autoconf)

13
depends/patches/expat/cmake_minimum.patch
View File

@@ -1,13 +0,0 @@
build: set minimum required CMake to 3.16
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@
# Unlike most of Expat,
# this file is copyrighted under the BSD-license for buildsystem files of KDE.
-cmake_minimum_required(VERSION 3.1.3)
+cmake_minimum_required(VERSION 3.16)
# This allows controlling documented build time switches
# when Expat is pulled in using the add_subdirectory function, e.g.

4
depends/patches/libxcb/remove_pthread_stubs.patch
View File

@@ -1,10 +1,10 @@
Remove uneeded pthread-stubs dependency
--- a/configure
+++ b/configure
@@ -19695,7 +19695,7 @@ fi
@@ -21028,7 +21028,7 @@ fi
NEEDED="xau >= 0.99.2"
case $host_os in
linux*) ;;
linux*|darwin*|solaris*|dragonfly*|freebsd*|netbsd*) ;;
- *) NEEDED="$NEEDED pthread-stubs" ;;
+ *) NEEDED="$NEEDED" ;;
esac