From d4722b64faafaf9c7eade8b5ab6965534e1c1958 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Tue, 29 Dec 2020 13:49:47 -0500
Subject: [PATCH] libxtst (#278)

* Fix some x packages

* Add libtst
---
 build_info/libxtst-dev.control | 22 +++++++++++++
 build_info/libxtst-doc.control | 22 +++++++++++++
 build_info/libxtst6.control    | 19 +++++++++++
 libxext.mk                     |  6 ++--
 libxi.mk                       |  4 +--
 libxtst.mk                     | 60 ++++++++++++++++++++++++++++++++++
 6 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 build_info/libxtst-dev.control
 create mode 100644 build_info/libxtst-doc.control
 create mode 100644 build_info/libxtst6.control
 create mode 100644 libxtst.mk

diff --git a/build_info/libxtst-dev.control b/build_info/libxtst-dev.control
new file mode 100644
index 0000000000..bcd4b83013
--- /dev/null
+++ b/build_info/libxtst-dev.control
@@ -0,0 +1,22 @@
+Package: libxtst-dev
+Version: @DEB_LIBXTST_V@
+Architecture: @DEB_ARCH@
+Maintainer: @DEB_MAINTAINER@
+Section: Development
+Priority: optional
+Depends: libxtst6 (= @DEB_LIBXTST_V@), libx11-dev, libxext-dev, libxi-dev
+Description: X11 Record extension library (development headers)
+ libXtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+ .
+ This package contains the development headers for the library found in
+ libxtst6.  Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:https://www.X.org>
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXtst
diff --git a/build_info/libxtst-doc.control b/build_info/libxtst-doc.control
new file mode 100644
index 0000000000..9538e541f8
--- /dev/null
+++ b/build_info/libxtst-doc.control
@@ -0,0 +1,22 @@
+Package: libxtst-doc
+Version: @DEB_LIBXTST_V@
+Architecture: @DEB_ARCH@
+Maintainer: @DEB_MAINTAINER@
+Section: X_Window
+Priority: optional
+Depends: libxtst-dev (= @DEB_LIBXTST_V@)
+Description: X11 Record extension library (documentation)
+ libXtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+ .
+ This package contains the API documentation for the X Record and XTEST
+ extension libraries.  Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:https://www.X.org>
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXtst
diff --git a/build_info/libxtst6.control b/build_info/libxtst6.control
new file mode 100644
index 0000000000..e087174124
--- /dev/null
+++ b/build_info/libxtst6.control
@@ -0,0 +1,19 @@
+Package: libxtst6
+Version: @DEB_LIBXTST_V@
+Architecture: @DEB_ARCH@
+Maintainer: @DEB_MAINTAINER@
+Section: Libraries
+Priority: optional
+Depends: libx11-6, libxext6, libxi6
+Description: X11 Testing -- Record extension library
+ libXtst provides an X Window System client interface to the Record
+ extension to the X protocol.
+ .
+ The Record extension allows X clients to synthesise input events, which
+ is useful for automated testing.
+ .
+ More information about X.Org can be found at:
+ <URL:https://www.X.org>
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXtst
diff --git a/libxext.mk b/libxext.mk
index 76395b27bf..f0ba4dd057 100644
--- a/libxext.mk
+++ b/libxext.mk
@@ -8,8 +8,8 @@ DEB_LIBXEXT_V   ?= $(LIBXEXT_VERSION)-1
 
 libxext-setup: setup
 	wget -q -nc -P $(BUILD_SOURCE) https://xorg.freedesktop.org/archive/individual/lib/libXext-$(LIBXEXT_VERSION).tar.gz{,.sig}
-	$(call PGP_VERIFY,libxext-$(LIBXEXT_VERSION).tar.gz)
-	$(call EXTRACT_TAR,libxext-$(LIBXEXT_VERSION).tar.gz,libxext-$(LIBXEXT_VERSION),libxext)
+	$(call PGP_VERIFY,libXext-$(LIBXEXT_VERSION).tar.gz)
+	$(call EXTRACT_TAR,libXext-$(LIBXEXT_VERSION).tar.gz,libXext-$(LIBXEXT_VERSION),libxext)
 
 ifneq ($(wildcard $(BUILD_WORK)/libxext/.build_complete),)
 libxext:
@@ -60,4 +60,4 @@ libxext-package: libxext-stage
 	# libxext.mk Build cleanup
 	rm -rf $(BUILD_DIST)/libxext{6,-dev,-doc}
 
-.PHONY: libxext libxext-package
\ No newline at end of file
+.PHONY: libxext libxext-package
diff --git a/libxi.mk b/libxi.mk
index 65997e0f42..2de8234201 100644
--- a/libxi.mk
+++ b/libxi.mk
@@ -15,7 +15,7 @@ ifneq ($(wildcard $(BUILD_WORK)/libxi/.build_complete),)
 libxi:
 	@echo "Using previously built libxi."
 else
-libxi: libxi-setup libx11 xorgproto
+libxi: libxi-setup libx11 xorgproto libxext libxfixes
 	cd $(BUILD_WORK)/libxi && ./configure -C \
 		--host=$(GNU_HOST_TRIPLE) \
 		--prefix=/usr \
@@ -55,4 +55,4 @@ libxi-package: libxi-stage
 	# libxi.mk Build cleanup
 	rm -rf $(BUILD_DIST)/libxi{6,-dev}
 
-.PHONY: libxi libxi-package
\ No newline at end of file
+.PHONY: libxi libxi-package
diff --git a/libxtst.mk b/libxtst.mk
new file mode 100644
index 0000000000..69dfed61d2
--- /dev/null
+++ b/libxtst.mk
@@ -0,0 +1,60 @@
+ifneq ($(PROCURSUS),1)
+$(error Use the main Makefile)
+endif
+
+SUBPROJECTS     += libxtst
+LIBXTST_VERSION := 1.2.3
+DEB_LIBXTST_V   ?= $(LIBXTST_VERSION)
+
+libxtst-setup: setup
+	wget -q -nc -P $(BUILD_SOURCE) https://xorg.freedesktop.org/archive/individual/lib/libXtst-$(LIBXTST_VERSION).tar.gz{,.sig}
+	$(call PGP_VERIFY,libXtst-$(LIBXTST_VERSION).tar.gz)
+	$(call EXTRACT_TAR,libXtst-$(LIBXTST_VERSION).tar.gz,libXtst-$(LIBXTST_VERSION),libxtst)
+
+ifneq ($(wildcard $(BUILD_WORK)/libxtst/.build_complete),)
+libxtst:
+	@echo "Using previously built libxtst."
+else
+libxtst: libxtst-setup xorgproto libx11 libxi
+	cd $(BUILD_WORK)/libxtst && ./configure -C \
+		--host=$(GNU_HOST_TRIPLE) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var
+	+$(MAKE) -C $(BUILD_WORK)/libxtst
+	+$(MAKE) -C $(BUILD_WORK)/libxtst install \
+		DESTDIR=$(BUILD_STAGE)/libxtst
+	+$(MAKE) -C $(BUILD_WORK)/libxtst install \
+		DESTDIR=$(BUILD_BASE)
+	touch $(BUILD_WORK)/libxtst/.build_complete
+endif
+
+libxtst-package: libxtst-stage
+	# libxtst.mk Package Structure
+	rm -rf $(BUILD_DIST)/libxtst{6,-dev,-doc}
+	mkdir -p $(BUILD_DIST)/libxtst6/usr/lib \
+		$(BUILD_DIST)/libxtst-dev/usr/lib \
+		$(BUILD_DIST)/libxtst-doc/usr
+	
+	# libxtst.mk Prep libxtst6
+	cp -a $(BUILD_STAGE)/libxtst/usr/lib/libXtst.6.dylib $(BUILD_DIST)/libxtst6/usr/lib
+	
+	# libxtst.mk Prep libxtst-dev
+	cp -a $(BUILD_STAGE)/libxtst/usr/lib/{libXtst{.a,.dylib},pkgconfig} $(BUILD_DIST)/libxtst-dev/usr/lib
+	cp -a $(BUILD_STAGE)/libxtst/usr/include $(BUILD_DIST)/libxtst-dev/usr
+	
+	# libxtst.mk Prep libxtst-doc
+	cp -a $(BUILD_STAGE)/libxtst/usr/share $(BUILD_DIST)/libxtst-doc/usr
+	
+	# libxtst.mk Sign
+	$(call SIGN,libxtst6,general.xml)
+	
+	# libxtst.mk Make .debs
+	$(call PACK,libxtst6,DEB_LIBXTST_V)
+	$(call PACK,libxtst-dev,DEB_LIBXTST_V)
+	$(call PACK,libxtst-doc,DEB_LIBXTST_V)
+	
+	# libxtst.mk Build cleanup
+	rm -rf $(BUILD_DIST)/libxtst{6,-dev,-doc}
+
+.PHONY: libxtst libxtst-package