diff options
| author | Carl Dong <contact@carldong.me> | 2019-07-18 17:43:06 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2019-07-18 17:43:06 -0400 |
| commit | 0c55d8b58186ba69fffc147cd02b174450dac578 (patch) | |
| tree | fa16bd87dc3b9230dd9d6ec6f06de6ef1447b56c /depends/packages | |
| parent | 222e6cc52075cf6f866ce4a2e5900f0d6358f903 (diff) | |
| download | bitcoin-0c55d8b58186ba69fffc147cd02b174450dac578.tar.xz | |
depends: qt: Patch to remove dep on libX11
We can actually patch QT to remove its dependency on libX11's headers.
It turns it this wasn't that hard.
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/libX11.mk | 20 | ||||
| -rw-r--r-- | depends/packages/packages.mk | 2 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 5 |
3 files changed, 4 insertions, 23 deletions
diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk deleted file mode 100644 index abf21963e7..0000000000 --- a/depends/packages/libX11.mk +++ /dev/null @@ -1,20 +0,0 @@ -package=libX11 -$(package)_version=1.6.2 -$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/ -$(package)_file_name=$(package)-$($(package)_version).tar.bz2 -$(package)_sha256_hash=2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 -$(package)_patches=configure.ac - -define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \ - cp -f $($(package)_patch_dir)/configure.ac . -endef - -define $(package)_config_cmds - autoreconf --install --force --verbose && \ - $($(package)_autoconf) -endef - -define $(package)_stage_cmds - $(MAKE) -C include DESTDIR=$($(package)_staging_dir) install-x11includeHEADERS -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 09f9e68677..9edcd1eb38 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -3,7 +3,7 @@ packages:=boost openssl libevent qt_native_packages = native_protobuf qt_packages = qrencode protobuf zlib -qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 +qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig rapidcheck_packages = rapidcheck diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 902a42b962..6f369e2c52 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -5,10 +5,10 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00 $(package)_dependencies=openssl zlib -$(package)_linux_dependencies=freetype fontconfig libxcb libX11 +$(package)_linux_dependencies=freetype fontconfig libxcb $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch +$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=b36da7d93c3ab6fca56b32053bb73bc619c8b192bb89b74e3bcde2705f1c2a14 @@ -158,6 +158,7 @@ define $(package)_preprocess_cmds echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ patch -p1 -i $($(package)_patch_dir)/fix_riscv64_arch.patch &&\ + patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\ echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ |