build: static link various xcb libs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76edb5f9761d6611bd4c3603bda65360463ab0bc..a450e6bc8295dbe679efa76c22f1a7ab5ac9a1b3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,13 @@ get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIB
 get_directory_property(DEVICE_TREZOR_READY DIRECTORY "monero" DEFINITION DEVICE_TREZOR_READY)
 get_directory_property(TREZOR_DEP_LIBS DIRECTORY "monero" DEFINITION TREZOR_DEP_LIBS)
 
+# libXau
+# workaround for: undefined reference to `XauGetBestAuthByAddr'
+if (DEPENDS AND UNIX AND NOT APPLE)
+    find_library(LIBXAU_LIBRARY Xau)
+    message(STATUS "libXau: libraries at ${LIBXAU_LIBRARY}")
+endif()
+
 # pthread
 find_package(Threads REQUIRED)
 

diff --git a/contrib/AppImage/build-appimage.sh b/contrib/AppImage/build-appimage.sh
index 1119baed8ae88a2e62ba6d72014b195feef41ae6..750ecf8529e64a245611acb240ce147bd5ae608b 100755 (executable)
--- a/contrib/AppImage/build-appimage.sh
+++ b/contrib/AppImage/build-appimage.sh
@@ -10,7 +10,6 @@ APPDIR="$PWD/feather.AppDir"
 mkdir -p "$APPDIR"
 mkdir -p "$APPDIR/usr/share/applications/"
 mkdir -p "$APPDIR/usr/bin"
-mkdir -p "$APPDIR/usr/lib"
 
 cp "src/assets/feather.desktop" "$APPDIR/usr/share/applications/feather.desktop"
 cp "src/assets/feather.desktop" "$APPDIR/feather.desktop"
@@ -18,22 +17,6 @@ cp "src/assets/images/appicons/64x64.png" "$APPDIR/feather.png"
 cp "build/bin/feather" "$APPDIR/usr/bin/feather"
 chmod +x "$APPDIR/usr/bin/feather"
 
-mkdir -p "${APPDIR}/usr/lib"
-
-XCB_LIBS=(libxcb-cursor.so.0 libxcb-render.so.0 libxcb-xfixes.so.0 libxcb-icccm.so.4 libxcb-render-util.so.0
-          libxcb-xkb.so.1 libxcb-image.so.0 libxcb-shape.so.0 libxkbcommon.so.0 libxcb-keysyms.so.1
-          libxcb-shm.so.0 libxkbcommon-x11.so.0 libxcb-randr.so.0 libxcb-sync.so.1)
-
-for lib in "${XCB_LIBS[@]}"
-do
-    echo "${lib}"
-    cp "/feather/contrib/depends/${HOST}/lib/${lib}" "${APPDIR}/usr/lib/"
-    "${HOST}-strip" "${APPDIR}/usr/lib/${lib}"
-    patchelf --set-rpath "\$ORIGIN" "${APPDIR}/usr/lib/${lib}"
-done
-
-patchelf --set-rpath "\$ORIGIN/../lib" "$APPDIR/usr/bin/feather"
-
 cp "contrib/AppImage/AppRun" "$APPDIR/"
 chmod +x "$APPDIR/AppRun"
 

diff --git a/contrib/depends/packages/libxcb.mk b/contrib/depends/packages/libxcb.mk
index 56e484a9b80b9f6a3020e29f8d4eab8aaeec03fb..93409199ccc721c84565f35467152d46de78c3bc 100644 (file)
--- a/contrib/depends/packages/libxcb.mk
+++ b/contrib/depends/packages/libxcb.mk
@@ -7,10 +7,10 @@ $(package)_dependencies=xcb_proto libXau
 $(package)_patches = remove_pthread_stubs.patch
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen --without-launchd
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen --without-launchd
 $(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.5/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

diff --git a/contrib/depends/packages/libxcb_util_cursor.mk b/contrib/depends/packages/libxcb_util_cursor.mk
index f02a8ba8d73f15b3521957a4179eed64c57f441d..f5bc5683e3935af3464642f30067fa8a8541957a 100644 (file)
--- a/contrib/depends/packages/libxcb_util_cursor.mk
+++ b/contrib/depends/packages/libxcb_util_cursor.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=cc8608ebb695742b6cf84712be29b2b66aa5f6768039528794fca0fa2
 $(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
 $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
 endef
 

diff --git a/contrib/depends/packages/libxcb_util_image.mk b/contrib/depends/packages/libxcb_util_image.mk
index 02ec8180599754cff88933d56744e12b05b3585a..6556fb0fb4ab363bc58aaab2b938d652e9f44893 100644 (file)
--- a/contrib/depends/packages/libxcb_util_image.mk
+++ b/contrib/depends/packages/libxcb_util_image.mk
@@ -4,14 +4,17 @@ $(package)_download_path=https://xcb.freedesktop.org/dist
 $(package)_file_name=xcb-util-image-$($(package)_version).tar.xz
 $(package)_sha256_hash=ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d
 $(package)_dependencies=libxcb libxcb_util
+$(package)_patches = no-tests.patch
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
 $(package)_config_opts+= --disable-dependency-tracking --enable-option-checking
 endef
 
 define $(package)_preprocess_cmds
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
+  patch -p1 -i $($(package)_patch_dir)/no-tests.patch && \
+  autoreconf -i
 endef
 
 define $(package)_config_cmds

diff --git a/contrib/depends/packages/libxcb_util_keysyms.mk b/contrib/depends/packages/libxcb_util_keysyms.mk
index b1ab27fdd5ddfadce4e7c60766a4515f9c0adf38..7871501f5bda611bca98cc97f463def52ea66553 100644 (file)
--- a/contrib/depends/packages/libxcb_util_keysyms.mk
+++ b/contrib/depends/packages/libxcb_util_keysyms.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a
 $(package)_dependencies=libxcb xproto
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
 $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
 endef
 

diff --git a/contrib/depends/packages/libxcb_util_render.mk b/contrib/depends/packages/libxcb_util_render.mk
index 4c1f33fbfa9cf10370529b82399e8460aa333b57..a73afb4b067f684999c7fd8827d092ea6292e0f0 100644 (file)
--- a/contrib/depends/packages/libxcb_util_render.mk
+++ b/contrib/depends/packages/libxcb_util_render.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa
 $(package)_dependencies=libxcb
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
 $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
 endef
 

diff --git a/contrib/depends/packages/libxcb_util_wm.mk b/contrib/depends/packages/libxcb_util_wm.mk
index ee14b678b3a7300a6d92f765e43981f0669049b8..edb8a3cc7700dc0fd81a0711354151114f51a522 100644 (file)
--- a/contrib/depends/packages/libxcb_util_wm.mk
+++ b/contrib/depends/packages/libxcb_util_wm.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4
 $(package)_dependencies=libxcb
 
 define $(package)_set_vars
-$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
+$(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
 $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
 endef
 

diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk
index 4c8e68f79e470db0fbcf2a62ec553eb41c5f9c68..502b6af2c97ca190e56902692df87e6a7f378368 100644 (file)
--- a/contrib/depends/packages/libxkbcommon.mk
+++ b/contrib/depends/packages/libxkbcommon.mk
@@ -11,7 +11,7 @@ $(package)_dependencies=libxcb
 # a different build system (Meson)
 define $(package)_set_vars
 $(package)_config_opts = --enable-option-checking --disable-dependency-tracking
-$(package)_config_opts += --disable-static --disable-docs
+$(package)_config_opts += --disable-shared --disable-docs
 $(package)_cflags += -Wno-error=array-bounds
 endef
 

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index 9e6d1315c14108467154c18b69bbedd149858d4a..6dd1bf3b7076d134e818e43a4988aa7d97bffe75 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -30,6 +30,8 @@ $(package)_patches += windows_func_fix.patch
 $(package)_patches += WindowsToolchain.cmake
 $(package)_patches += revert_f99ee441.patch
 $(package)_patches += CVE-2023-34410-qtbase-6.5.diff
+$(package)_patches += xcb-util-image-fix.patch
+$(package)_patches += libxau-fix.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
@@ -266,6 +268,8 @@ define $(package)_preprocess_cmds
   cd qtbase && \
   patch -p1 -i $($(package)_patch_dir)/revert_f99ee441.patch && \
   patch -p1 -i $($(package)_patch_dir)/CVE-2023-34410-qtbase-6.5.diff && \
+  patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \
+  patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
   cd ../qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch

diff --git a/contrib/depends/patches/libxcb_util_image/no-tests.patch b/contrib/depends/patches/libxcb_util_image/no-tests.patch
new file mode 100644 (file)
index 0000000..2249879
--- /dev/null
+++ b/contrib/depends/patches/libxcb_util_image/no-tests.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile.am b/Makefile.am
+index 23956fd..0f4c3c9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,5 +12,5 @@ ChangeLog:
+ 
+ dist-hook: ChangeLog INSTALL
+ 
+-SUBDIRS = image test
++SUBDIRS = image
+ EXTRA_DIST = autogen.sh README.md
+diff --git a/configure.ac b/configure.ac
+index 9cf3f5a..0949d55 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,6 @@ PKG_CHECK_MODULES(XCB_UTIL, xcb-util)
+ AC_CONFIG_FILES([
+       Makefile
+       image/Makefile
+-      test/Makefile
+       image/xcb-image.pc
+ ])
+ AC_OUTPUT

diff --git a/contrib/depends/patches/qt/libxau-fix.patch b/contrib/depends/patches/qt/libxau-fix.patch
new file mode 100644 (file)
index 0000000..b3e4c9e
--- /dev/null
+++ b/contrib/depends/patches/qt/libxau-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
+index 1ff24eebaf..1ce02f058e 100644
+--- a/src/gui/configure.cmake
++++ b/src/gui/configure.cmake
+@@ -499,6 +499,7 @@ qt_config_compile_test(xcb_syslibs
+         XCB::XFIXES
+         XCB::XKB
+         XCB::XCB
++        X11::Xau
+     CODE
+ "// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
+ #define explicit dont_use_cxx_explicit

diff --git a/contrib/depends/patches/qt/xcb-util-image-fix.patch b/contrib/depends/patches/qt/xcb-util-image-fix.patch
new file mode 100644 (file)
index 0000000..72cccac
--- /dev/null
+++ b/contrib/depends/patches/qt/xcb-util-image-fix.patch
@@ -0,0 +1,31 @@
+undefined reference to `xcb_aux_create_gc'
+
+diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
+index dc60289401..703f7739d8 100644
+--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
+@@ -108,7 +108,6 @@ set(XCB_known_components
+     EWMH
+     GLX
+     ICCCM
+-    IMAGE
+     KEYSYMS
+     PRESENT
+     RANDR
+@@ -118,6 +117,7 @@ set(XCB_known_components
+     SCREENSAVER
+     SYNC
+     UTIL
++    IMAGE
+     XEVIE
+     XF86DRI
+     XINERAMA
+@@ -142,7 +142,7 @@ endforeach()
+ set(XCB_XCB_component_deps)
+ set(XCB_COMPOSITE_component_deps XCB XFIXES)
+ set(XCB_DAMAGE_component_deps XCB XFIXES)
+-set(XCB_IMAGE_component_deps XCB SHM)
++set(XCB_IMAGE_component_deps XCB SHM UTIL)
+ set(XCB_RENDERUTIL_component_deps XCB RENDER)
+ set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
+ set(XCB_XVMC_component_deps XCB XV)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d4877da475e7db72aff01d382485e0b19390195..75f422a4d41a8c75ebbd1e552e4d9c62fe1b0a9e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -301,6 +301,10 @@ if(DEPENDS AND APPLE)
             ${CMAKE_OSX_SYSROOT}/lib/darwin/libclang_rt.osx.a)
 endif()
 
+if(DEPENDS AND UNIX AND NOT APPLE)
+    target_link_libraries(XCB::XCB INTERFACE ${LIBXAU_LIBRARY})
+endif()
+
 if(STACK_TRACE AND CMAKE_C_COMPILER_ID STREQUAL "GNU")
     target_link_libraries(feather -rdynamic)
 endif()