From a860fea103c5bab321ed452986864247dd8109f2 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 2 Jul 2023 16:26:36 +0200 Subject: [PATCH] depends: remove native xcb libs --- contrib/depends/packages/native_libXau.mk | 34 --------------- contrib/depends/packages/native_libxcb.mk | 41 ------------------- .../depends/packages/native_libxcb_util.mk | 32 --------------- .../depends/packages/native_libxkbcommon.mk | 36 ---------------- contrib/depends/packages/native_qt.mk | 11 +---- contrib/depends/packages/native_xcb_proto.mk | 21 ---------- contrib/depends/packages/native_xproto.mk | 26 ------------ contrib/depends/packages/packages.mk | 2 +- 8 files changed, 3 insertions(+), 200 deletions(-) delete mode 100644 contrib/depends/packages/native_libXau.mk delete mode 100644 contrib/depends/packages/native_libxcb.mk delete mode 100644 contrib/depends/packages/native_libxcb_util.mk delete mode 100644 contrib/depends/packages/native_libxkbcommon.mk delete mode 100644 contrib/depends/packages/native_xcb_proto.mk delete mode 100644 contrib/depends/packages/native_xproto.mk diff --git a/contrib/depends/packages/native_libXau.mk b/contrib/depends/packages/native_libXau.mk deleted file mode 100644 index 45c8b6c..0000000 --- a/contrib/depends/packages/native_libXau.mk +++ /dev/null @@ -1,34 +0,0 @@ -package=native_libXau -$(package)_version=1.0.11 -$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/ -$(package)_file_name=libXau-$($(package)_version).tar.xz -$(package)_sha256_hash=f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb -$(package)_dependencies=native_xproto - -# When updating this package, check the default value of -# --disable-xthreads. It is currently enabled. -define $(package)_set_vars - $(package)_config_opts=--disable-shared --disable-lint-library --without-lint - $(package)_config_opts += --disable-dependency-tracking --enable-option-checking - $(package)_config_opts += --with-pic -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 lib/*.la -endef diff --git a/contrib/depends/packages/native_libxcb.mk b/contrib/depends/packages/native_libxcb.mk deleted file mode 100644 index 43b6d28..0000000 --- a/contrib/depends/packages/native_libxcb.mk +++ /dev/null @@ -1,41 +0,0 @@ -package=native_libxcb -$(package)_version=1.15 -$(package)_download_path=https://xcb.freedesktop.org/dist -$(package)_file_name=libxcb-$($(package)_version).tar.xz -$(package)_sha256_hash=cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059 -$(package)_dependencies=native_xcb_proto native_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-dependency-tracking --enable-option-checking -# Disable unneeded extensions. -# More info is available from: https://doc.qt.io/qt-5.15/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 -$(package)_config_opts += --disable-screensaver --disable-xevie --disable-xfree86-dri -$(package)_config_opts += --disable-xinput --disable-xprint --disable-selinux -$(package)_config_opts += --disable-xtest --disable-xv --disable-xvmc -endef - -define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \ - patch -p1 -i $($(package)_patch_dir)/remove_pthread_stubs.patch -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 lib/*.la -endef \ No newline at end of file diff --git a/contrib/depends/packages/native_libxcb_util.mk b/contrib/depends/packages/native_libxcb_util.mk deleted file mode 100644 index 2497341..0000000 --- a/contrib/depends/packages/native_libxcb_util.mk +++ /dev/null @@ -1,32 +0,0 @@ -package=native_libxcb_util -$(package)_version=0.4.1 -$(package)_download_path=https://xcb.freedesktop.org/dist -$(package)_file_name=xcb-util-$($(package)_version).tar.xz -$(package)_sha256_hash=5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 -$(package)_dependencies=native_libxcb - -define $(package)_set_vars -$(package)_config_opts = --disable-shared --disable-devel-docs --without-doxygen -$(package)_config_opts += --disable-dependency-tracking --enable-option-checking -$(package)_config_opts += --with-pic -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_libxkbcommon.mk b/contrib/depends/packages/native_libxkbcommon.mk deleted file mode 100644 index 55a12c7..0000000 --- a/contrib/depends/packages/native_libxkbcommon.mk +++ /dev/null @@ -1,36 +0,0 @@ -package=native_libxkbcommon -$(package)_version=0.8.4 -$(package)_download_path=https://xkbcommon.org/download/ -$(package)_file_name=libxkbcommon-$($(package)_version).tar.xz -$(package)_sha256_hash=60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b -$(package)_dependencies=native_libxcb - -# This package explicitly enables -Werror=array-bounds, which causes build failures -# with GCC 12.1+. Work around that by turning errors back into warnings. -# This workaround would be dropped if the package was updated, as that would require -# 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)_cflags += -Wno-error=array-bounds -endef - -define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux -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 lib/*.la -endef diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index 7fa1914..4a3d38c 100644 --- a/contrib/depends/packages/native_qt.mk +++ b/contrib/depends/packages/native_qt.mk @@ -4,9 +4,7 @@ $(package)_download_path=https://download.qt.io/official_releases/qt/6.5/$($(pac $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed -$(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 $(package)_patches += fast_fixed_dtoa_no_optimize.patch $(package)_patches += guix_cross_lib_path.patch @@ -91,6 +89,7 @@ $(package)_config_opts += -no-feature-printpreviewdialog $(package)_config_opts += -no-feature-printpreviewwidget $(package)_config_opts += -no-feature-sessionmanager #$(package)_config_opts += -no-feature-socks5 # Needed +$(package)_config_opts += -no-feature-spatialaudio $(package)_config_opts += -no-feature-sql $(package)_config_opts += -no-feature-syntaxhighlighter #$(package)_config_opts += -no-feature-textbrowser # Needed @@ -106,11 +105,9 @@ $(package)_config_opts += -no-feature-vnc #$(package)_config_opts += -no-feature-wizard # Needed $(package)_config_opts += -no-feature-fontconfig -$(package)_config_opts += -xcb $(package)_config_opts += -no-xcb-xlib $(package)_config_opts += -no-feature-xlib -#$(package)_config_opts += -feature-ffmpeg -#$(package)_config_opts += -feature-pulseaudio +$(package)_config_opts += -no-feature-xkbcommon # https://bugreports.qt.io/browse/QTBUG-99957 $(package)_config_opts += -no-pch @@ -125,10 +122,6 @@ ifneq (,$(findstring -stdlib=libc++,$($(1)_cxx))) $(package)_config_opts_x86_64 = -xplatform linux-clang-libc++ endif -$(package)_config_opts_aarch64_android += -android-arch arm64-v8a -$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a -$(package)_config_opts_x86_64_android += -android-arch x86_64 - endef define $(package)_fetch_cmds diff --git a/contrib/depends/packages/native_xcb_proto.mk b/contrib/depends/packages/native_xcb_proto.mk deleted file mode 100644 index b018879..0000000 --- a/contrib/depends/packages/native_xcb_proto.mk +++ /dev/null @@ -1,21 +0,0 @@ -package=native_xcb_proto -$(package)_version=1.15.2 -$(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto -$(package)_file_name=xcb-proto-$($(package)_version).tar.xz -$(package)_sha256_hash=7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed - -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 lib/python*/site-packages/xcbgen/__pycache__ -endef diff --git a/contrib/depends/packages/native_xproto.mk b/contrib/depends/packages/native_xproto.mk deleted file mode 100644 index 2d1077c..0000000 --- a/contrib/depends/packages/native_xproto.mk +++ /dev/null @@ -1,26 +0,0 @@ -package=native_xproto -$(package)_version=7.0.31 -$(package)_download_path=https://xorg.freedesktop.org/releases/individual/proto -$(package)_file_name=xproto-$($(package)_version).tar.bz2 -$(package)_sha256_hash=c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 - -define $(package)_set_vars - $(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs - $(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 diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 7132593..69ffb41 100644 --- 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 bc-ur -native_packages := native_libxcb native_xcb_proto native_libXau native_xproto native_libxkbcommon native_qt native_protobuf +native_packages := native_qt native_protobuf linux_packages := eudev libfuse libsquashfuse zstd appimage_runtime linux_native_packages =