guix: move some xcb libs to guix

diff --git a/contrib/depends/packages/native_libxcb_util_cursor.mk b/contrib/depends/packages/native_libxcb_util_cursor.mk
deleted file mode 100644 (file)
index 221bcae..0000000
--- a/contrib/depends/packages/native_libxcb_util_cursor.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-package=native_libxcb_util_cursor
-$(package)_version=0.1.4
-$(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
-$(package)_sha256_hash=cc8608ebb695742b6cf84712be29b2b66aa5f6768039528794fca0fa283022bf
-$(package)_dependencies=native_libxcb native_libxcb_util_render native_libxcb_util_image
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-static --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 .
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
-endef

diff --git a/contrib/depends/packages/native_libxcb_util_image.mk b/contrib/depends/packages/native_libxcb_util_image.mk
deleted file mode 100644 (file)
index 1251921..0000000
--- a/contrib/depends/packages/native_libxcb_util_image.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-package=native_libxcb_util_image
-$(package)_version=0.4.0
-$(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-image-$($(package)_version).tar.bz2
-$(package)_sha256_hash=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
-$(package)_dependencies=native_libxcb native_libxcb_util
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-static --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 .
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
-endef

diff --git a/contrib/depends/packages/native_libxcb_util_keysyms.mk b/contrib/depends/packages/native_libxcb_util_keysyms.mk
deleted file mode 100644 (file)
index 1dbbea8..0000000
--- a/contrib/depends/packages/native_libxcb_util_keysyms.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-package=native_libxcb_util_keysyms
-$(package)_version=0.4.0
-$(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.bz2
-$(package)_sha256_hash=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
-$(package)_dependencies=native_libxcb native_xproto
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-static --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 .
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
-endef

diff --git a/contrib/depends/packages/native_libxcb_util_render.mk b/contrib/depends/packages/native_libxcb_util_render.mk
deleted file mode 100644 (file)
index 3706c75..0000000
--- a/contrib/depends/packages/native_libxcb_util_render.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-package=native_libxcb_util_render
-$(package)_version=0.3.9
-$(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-renderutil-$($(package)_version).tar.bz2
-$(package)_sha256_hash=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
-$(package)_dependencies=native_libxcb
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-static --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 .
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
-endef

diff --git a/contrib/depends/packages/native_libxcb_util_wm.mk b/contrib/depends/packages/native_libxcb_util_wm.mk
deleted file mode 100644 (file)
index 89b31d0..0000000
--- a/contrib/depends/packages/native_libxcb_util_wm.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-package=native_libxcb_util_wm
-$(package)_version=0.4.1
-$(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-wm-$($(package)_version).tar.bz2
-$(package)_sha256_hash=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
-$(package)_dependencies=native_libxcb
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-static --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 .
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share/man share/doc lib/*.la
-endef

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index bdc08a6196193eb4be96308a341e5ecd6b34dc4d..8b204cbb8401e25cfc19259c9c2c05ba80d664ca 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -4,7 +4,7 @@ $(package)_download_path=https://download.qt.io/development_releases/qt/6.5/$($(
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=0cf7498b34900a1d9f6c070a44495f7171eb4a4cb66a7ceea53e8721c8812701
-$(package)_dependencies=native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_libxcb_util_cursor
+$(package)_dependencies=native_libxcb native_libxkbcommon
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
 $(package)_patches  = dont_hardcode_pwd.patch
@@ -186,6 +186,7 @@ define $(package)_config_cmds
   export PKG_CONFIG_LIBDIR=$(build_prefix)/lib/pkgconfig && \
   export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
   unset CMAKE_PREFIX_PATH && \
+  export CMAKE_PREFIX_PATH="$(QT_LIBS)" && \
   cd qtbase && \
   ./configure -top-level $($(package)_config_opts)
 endef

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index 812ba5afeb9aa0027150a01e542aafb84f499554..cbb43f514015af9f4123a3f1eabbc9b655cc0731 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -1,5 +1,5 @@
 packages := boost openssl libiconv unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip
-native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_cursor native_libxcb_util_wm native_qt native_protobuf
+native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_qt native_protobuf
 
 linux_packages := eudev liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime
 linux_native_packages =

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 71d64e47c5454c3754a7870fac64f1e735d96ebf..3449bd549acf2e7661a1a63717e1bd12fa10d486 100755 (executable)
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -67,6 +67,7 @@ store_path() {
 # includes/libs
 NATIVE_GCC="$(store_path gcc-toolchain)"
 NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
+QT_LIBS="$(store_path xcb-util):$(store_path xcb-util-renderutil):$(store_path xcb-util-keysyms):$(store_path xcb-util-cursor):$(store_path xcb-util-image):$(store_path xcb-util-wm)"
 
 unset LIBRARY_PATH
 unset CPATH
@@ -80,6 +81,7 @@ export C_INCLUDE_PATH="${NATIVE_GCC}/include"
 export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
 export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
 export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
+export QT_LIBS
 
 prepend_to_search_env_var() {
     export "${1}=${2}${!1:+:}${!1}"

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 282474621566054781756b92e4b42bea4bc82085..73563a7985904e5d91ff78709bddd2320541a6b5 100644 (file)
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -33,6 +33,7 @@
              (gnu packages shells)
              (gnu packages tls)
              (gnu packages version-control)
+             (gnu packages xorg)
              (guix build-system gnu)
              (guix build-system perl)
              (guix build-system python)
@@ -364,6 +365,13 @@ parse, modify and abstract ELF, PE and MachO formats.")
         git
         ;; Tests
         lief
+        ;; Xcb
+        xcb-util
+        xcb-util-cursor
+        xcb-util-image
+        xcb-util-keysyms
+        xcb-util-renderutil
+        xcb-util-wm
     )
   (let ((target (getenv "HOST")))
     (cond ((string-suffix? "-mingw32" target)