From aa53cb7a2f04a59a4722c662e67b7a6ec04e32b5 Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Wed, 17 Jul 2019 16:21:50 -0400
Subject: [PATCH] depends: libX11: Make package headers-only

We're no longer building QT with libX11/XLib, however, libX11/XLib
headers are still required for parts of QT. In this commit we add a
minimal configure.ac for libX11/XLib that is headers-only.

This change allows us to remove all of libX11/XLib's dependencies.
---
 depends/packages/libX11.mk          | 22 +++++-----------------
 depends/packages/packages.mk        |  2 +-
 depends/packages/xextproto.mk       | 25 -------------------------
 depends/packages/xtrans.mk          | 26 --------------------------
 depends/patches/libX11/configure.ac |  6 ++++++
 5 files changed, 12 insertions(+), 69 deletions(-)
 delete mode 100644 depends/packages/xextproto.mk
 delete mode 100644 depends/packages/xtrans.mk
 create mode 100644 depends/patches/libX11/configure.ac

diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk
index f46bd9219e..abf21963e7 100644
--- a/depends/packages/libX11.mk
+++ b/depends/packages/libX11.mk
@@ -3,30 +3,18 @@ $(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)_dependencies=libxcb xtrans xextproto xproto
-
-define $(package)_set_vars
-  # See libXext for --disable-malloc0returnsnull rationale.
-  $(package)_config_opts=--disable-xkb --disable-static --disable-malloc0returnsnull
-  $(package)_config_opts_linux=--with-pic
-endef
+$(package)_patches=configure.ac
 
 define $(package)_preprocess_cmds
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
+  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)_build_cmds
-  $(MAKE)
-endef
-
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm lib/*.la
+  $(MAKE) -C include DESTDIR=$($(package)_staging_dir) install-x11includeHEADERS
 endef
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 93f0918fe9..7e39e205ef 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 xextproto libXext xtrans
+qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 libXext
 
 rapidcheck_packages = rapidcheck
 
diff --git a/depends/packages/xextproto.mk b/depends/packages/xextproto.mk
deleted file mode 100644
index 157b76edf6..0000000000
--- a/depends/packages/xextproto.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-package=xextproto
-$(package)_version=7.3.0
-$(package)_download_path=https://xorg.freedesktop.org/releases/individual/proto
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0
-
-define $(package)_preprocess_cmds
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
-endef
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-shared
-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/depends/packages/xtrans.mk b/depends/packages/xtrans.mk
deleted file mode 100644
index 6201d1d270..0000000000
--- a/depends/packages/xtrans.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-package=xtrans
-$(package)_version=1.3.4
-$(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a
-$(package)_dependencies=
-
-define $(package)_set_vars
-  $(package)_config_opts_linux=--disable-docs --without-xmlto --without-fop --without-xsltproc
-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/depends/patches/libX11/configure.ac b/depends/patches/libX11/configure.ac
new file mode 100644
index 0000000000..1c3bd41b3f
--- /dev/null
+++ b/depends/patches/libX11/configure.ac
@@ -0,0 +1,6 @@
+AC_PREREQ([2.60])
+AC_INIT([libX11], [1.6.2],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_FILES([include/Makefile])
+AC_OUTPUT