# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1507661142 14400
# Node ID b74853c2afa1052941f4709e78aa23111f1bef41
# Parent  102c3d608dd66f7e3858f9d093dea6ca414a7749
new x11 utility packages

diff -r 102c3d608dd6 -r b74853c2afa1 index.html
--- a/index.html	Tue Oct 10 14:44:52 2017 -0400
+++ b/index.html	Tue Oct 10 14:45:42 2017 -0400
@@ -2386,6 +2386,10 @@
         <td class="website"><a href="http://www.gnu.org/software/units/units.html">GNU Units</a></td>
     </tr>
     <tr>
+        <td class="package">util-macros</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">util-macrosi</a></td>
+    </tr>
+    <tr>
         <td class="package">uuid</td>
         <td class="website"><a href="http://www.mingw.org/">MingWG Windows API</a></td>
     </tr>
@@ -2462,6 +2466,30 @@
         <td class="website"><a href="http://xorg.freedesktop.org/">xcb</a></td>
     </tr>
     <tr>
+        <td class="package">xcb-util</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-util-cursor</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util-cursor</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-util-image</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util-image</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-util-keysyms</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util-keysyms</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-util-renderutil</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util-renderutil</a></td>
+    </tr>
+    <tr>
+        <td class="package">xcb-util-wm</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xcb-util-wm</a></td>
+    </tr>
+    <tr>
         <td class="package">xcursor</td>
         <td class="website"><a href="http://xorg.freedesktop.org/">xcursor</a></td>
     </tr>
@@ -2502,6 +2530,10 @@
         <td class="website"><a href="http://xorg.freedesktop.org/">xft</a></td>
     </tr>
     <tr>
+        <td class="package">xi</td>
+        <td class="website"><a href="http://xorg.freedesktop.org/">xi</a></td>
+    </tr>
+    <tr>
         <td class="package">xine-lib</td>
         <td class="website"><a href="http://www.xine-project.org/">xine-lib</a></td>
     </tr>
diff -r 102c3d608dd6 -r b74853c2afa1 src/qtbase.mk
--- a/src/qtbase.mk	Tue Oct 10 14:44:52 2017 -0400
+++ b/src/qtbase.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -1,4 +1,4 @@
-# This file is part of MXE.
+ # This file is part of MXE.
 # See index.html for further information.
 
 PKG             := qtbase
@@ -17,7 +17,7 @@
 endif
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
-    $(PKG)_DEPS += x11 xext xfixes xdmcp xrender xfixes xdamage xt xxf86vm
+    $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm
   endif
 endif
 
diff -r 102c3d608dd6 -r b74853c2afa1 src/util-macros.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util-macros.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := util-macros
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.19.1
+$(PKG)_CHECKSUM := 386e993ba339e561aa6d93073a4dcbab24e30bad
+$(PKG)_SUBDIR   := util-macros-$($(PKG)_VERSION)
+$(PKG)_FILE     := util-macros-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/util/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util-cursor.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util-cursor.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util-cursor
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.1.3
+$(PKG)_CHECKSUM := 26562eb6d4151307f7b6a53453d360ecfc0563ac
+$(PKG)_SUBDIR   := xcb-util-cursor-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-cursor-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := xcb xcb-util-image xcb-util-renderutil
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util-image.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util-image.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util-image
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.4.0
+$(PKG)_CHECKSUM := c9c9361781911a47b28f74fc6ebe0abd1273fae4
+$(PKG)_SUBDIR   := xcb-util-image-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-image-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := xcb xcb-util xproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util-keysyms.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util-keysyms.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util-keysyms
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.4.0
+$(PKG)_CHECKSUM := ff02ee8ac22c53848af50c0a6a6b00feb002c1cb
+$(PKG)_SUBDIR   := xcb-util-keysyms-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-keysyms-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := xproto
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util-renderutil.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util-renderutil.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util-renderutil
+$(PKG)_IGNORE   := 
+$(PKG)_VERSION  := 0.3.9
+$(PKG)_CHECKSUM := cb533b1d039f833f070e7d6398c221a31d30d5e2
+$(PKG)_SUBDIR   := xcb-util-renderutil-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-renderutil-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := xcb
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util-wm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util-wm.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util-wm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.4.1
+$(PKG)_CHECKSUM := 7006c52b961c123355320bfc30477cdf90c8bbb7
+$(PKG)_SUBDIR   := xcb-util-wm-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-wm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb-util.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xcb-util.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xcb-util
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.4.0
+$(PKG)_CHECKSUM := 7f2e9b7efcc2c34eb1d6ae312c3d73b075832e46
+$(PKG)_SUBDIR   := xcb-util-$($(PKG)_VERSION)
+$(PKG)_FILE     := xcb-util-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif
diff -r 102c3d608dd6 -r b74853c2afa1 src/xcb.mk
--- a/src/xcb.mk	Tue Oct 10 14:44:52 2017 -0400
+++ b/src/xcb.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := libxcb-$($(PKG)_VERSION)
 $(PKG)_FILE     := libxcb-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/xcb/$($(PKG)_FILE)
-$(PKG)_DEPS     := pthread-stubs xau xcb-proto
+$(PKG)_DEPS     := pthread-stubs util-macros xau xcb-proto
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
diff -r 102c3d608dd6 -r b74853c2afa1 src/xi.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xi.mk	Tue Oct 10 14:45:42 2017 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := xi
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.7.9
+$(PKG)_CHECKSUM := 70d1148c39c0eaa7d7c18370f20709383271f669
+$(PKG)_SUBDIR   := libXi-$($(PKG)_VERSION)
+$(PKG)_FILE     := libXi-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://xorg.freedesktop.org/archive/individual/lib/$($(PKG)_FILE)
+$(PKG)_DEPS     := inputproto xext xextproto xproto x11
+
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  define $(PKG)_BUILD
+  endef
+else
+  define $(PKG)_BUILD
+    mkdir '$(1)/.build'
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+  endef
+endif