Skip to content

Commit 24cfce4

Browse files
tobtohttobtoht
committed
depends: link libxcb statically
1 parent 53efca0 commit 24cfce4

File tree

5 files changed

+51
-3
lines changed

5 files changed

+51
-3
lines changed

‎depends/packages/libxcb.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $(package)_dependencies=xcb_proto libXau
77
$(package)_patches = remove_pthread_stubs.patch
88

99
define $(package)_set_vars
10-
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen --without-launchd
10+
$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen --without-launchd
1111
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1212
# Disable unneeded extensions.
1313
# More info is available from: https://doc.qt.io/qt-5.15/linux-requirements.html

‎depends/packages/libxcb_util_image.mk‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ $(package)_download_path=https://xcb.freedesktop.org/dist
44
$(package)_file_name=xcb-util-image-$($(package)_version).tar.gz
55
$(package)_sha256_hash=cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42
66
$(package)_dependencies=libxcb libxcb_util
7-
$(package)_patches=missing_xcb_aux.patch
7+
$(package)_patches=missing_xcb_aux.patch skip_tests.patch
88

99
define $(package)_set_vars
1010
$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
1111
$(package)_config_opts+= --disable-dependency-tracking --enable-option-checking
1212
endef
1313

1414
define $(package)_preprocess_cmds
15+
rm -rf test && \
1516
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
16-
patch -p1 < $($(package)_patch_dir)/missing_xcb_aux.patch
17+
patch -p1 < $($(package)_patch_dir)/missing_xcb_aux.patch && \
18+
patch -p1 < $($(package)_patch_dir)/skip_tests.patch
1719
endef
1820

1921
define $(package)_config_cmds

‎depends/packages/qt.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $(package)_patches := dont_hardcode_pwd.patch
1414
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
1515
$(package)_patches += qtbase_avoid_native_float16.patch
1616
$(package)_patches += qtbase_avoid_qmain.patch
17+
$(package)_patches += qtbase_libxau_static.patch
1718
$(package)_patches += qtbase_platformsupport.patch
1819
$(package)_patches += qtbase_plugins_cocoa.patch
1920
$(package)_patches += qtbase_skip_tools.patch
@@ -260,6 +261,7 @@ define $(package)_preprocess_cmds
260261
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
261262
patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_native_float16.patch && \
262263
patch -p1 -i $($(package)_patch_dir)/qtbase_avoid_qmain.patch && \
264+
patch -p1 -i $($(package)_patch_dir)/qtbase_libxau_static.patch && \
263265
patch -p1 -i $($(package)_patch_dir)/qtbase_platformsupport.patch && \
264266
patch -p1 -i $($(package)_patch_dir)/qtbase_plugins_cocoa.patch && \
265267
patch -p1 -i $($(package)_patch_dir)/static_fixes.patch && \

‎depends/patches/libxcb_util_image/skip_tests.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/Makefile.in b/Makefile.in
2+
index a92450f..befc524 100644
3+
--- a/Makefile.in
4+
+++ b/Makefile.in
5+
@@ -347,7 +347,7 @@ top_srcdir = @top_srcdir@
6+
xcbincludedir = @xcbincludedir@
7+
ACLOCAL_AMFLAGS = -I m4
8+
MAINTAINERCLEANFILES = ChangeLog INSTALL
9+
-SUBDIRS = image test
10+
+SUBDIRS = image
11+
EXTRA_DIST = autogen.sh
12+
all: config.h
13+
$(MAKE) $(AM_MAKEFLAGS) all-recursive
14+
diff --git a/configure b/configure
15+
index d00e06d..49af52b 100755
16+
--- a/configure
17+
+++ b/configure
18+
@@ -18633,7 +18633,7 @@ $as_echo "yes" >&6; }
19+
20+
fi
21+
22+
-ac_config_files="$ac_config_files Makefile image/Makefile test/Makefile image/xcb-image.pc"
23+
+ac_config_files="$ac_config_files Makefile image/Makefile image/xcb-image.pc"
24+
25+
cat >confcache <<\_ACEOF
26+
# This file is a shell script that caches the results of configure
27+
@@ -19662,7 +19662,6 @@ do
28+
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
29+
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
30+
"image/Makefile") CONFIG_FILES="$CONFIG_FILES image/Makefile" ;;
31+
- "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
32+
"image/xcb-image.pc") CONFIG_FILES="$CONFIG_FILES image/xcb-image.pc" ;;
33+
34+
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

‎depends/patches/qt/qtbase_libxau_static.patch‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/qtbase/src/gui/configure.cmake
2+
+++ b/qtbase/src/gui/configure.cmake
3+
@@ -499,6 +499,7 @@ qt_config_compile_test(xcb_syslibs
4+
XCB::XFIXES
5+
XCB::XKB
6+
XCB::XCB
7+
+ X11::Xau
8+
CODE
9+
"// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
10+
#define explicit dont_use_cxx_explicit

0 commit comments

Comments
 (0)