From c1b8433e3e6b76316eae97b98e6a37c32e12bb2e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 4 Jul 2018 22:28:09 +0200
Subject: [PATCH] libxcb, bump version (#2736)

---
 ...{libxcb-1.12.recipe => libxcb-1.13.recipe} | 27 +++++++++++--------
 ...xcb-1.12.patchset => libxcb-1.13.patchset} |  6 ++---
 2 files changed, 19 insertions(+), 14 deletions(-)
 rename x11-libs/libxcb/{libxcb-1.12.recipe => libxcb-1.13.recipe} (89%)
 rename x11-libs/libxcb/patches/{libxcb-1.12.patchset => libxcb-1.13.patchset} (93%)

diff --git a/x11-libs/libxcb/libxcb-1.12.recipe b/x11-libs/libxcb/libxcb-1.13.recipe
similarity index 89%
rename from x11-libs/libxcb/libxcb-1.12.recipe
rename to x11-libs/libxcb/libxcb-1.13.recipe
index 026e99970..1c1be69ad 100644
--- a/x11-libs/libxcb/libxcb-1.12.recipe
+++ b/x11-libs/libxcb/libxcb-1.13.recipe
@@ -10,9 +10,9 @@ for one or the other."
 HOMEPAGE="https://xcb.freedesktop.org/"
 COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett"
 LICENSE="MIT (no promotion)"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://xcb.freedesktop.org/dist/libxcb-$portVersion.tar.gz"
-CHECKSUM_SHA256="092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06"
+CHECKSUM_SHA256="0bb3cfd46dbd90066bf4d7de3cad73ec1024c7325a4a0cbf5f4a0d4fa91155fb"
 PATCHES="libxcb-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -22,12 +22,14 @@ versionedXcbLibs="
 	libxcb
 	libxcb_randr
 	libxcb_sync
+	libxcb_xinput
 	libxcb_xkb
 	"
 libVersion=0.0.0
 libxcbVersion=1.1.0
 libxcb_randrVersion=0.1.0
 libxcb_syncVersion=1.0.0
+libxcb_xinputVersion=0.1.0
 libxcb_xkbVersion=1.0.0
 for i in lib $versionedXcbLibs; do
 	eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""
@@ -75,6 +77,7 @@ PROVIDES="
 	lib:libxcb_xf86dri$secondaryArchSuffix = $libVersionCompat
 	lib:libxcb_xfixes$secondaryArchSuffix = $libVersionCompat
 	lib:libxcb_xinerama$secondaryArchSuffix = $libVersionCompat
+	lib:libxcb_xinput$secondaryArchSuffix = $libxcb_xinputVersionCompat
 	lib:libxcb_xkb$secondaryArchSuffix = $libxcb_xkbVersionCompat
 	lib:libxcb_xtest$secondaryArchSuffix = $libVersionCompat
 	lib:libxcb_xv$secondaryArchSuffix = $libVersionCompat
@@ -82,8 +85,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libxslt$secondaryArchSuffix >= 1.1.26
-	lib:libxau$secondaryArchSuffix >= 1.0.5
+	lib:libxslt$secondaryArchSuffix
+	lib:libxau$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -107,6 +110,7 @@ PROVIDES_devel="
 	devel:libxcb_xf86dri$secondaryArchSuffix = $libVersionCompat
 	devel:libxcb_xfixes$secondaryArchSuffix = $libVersionCompat
 	devel:libxcb_xinerama$secondaryArchSuffix = $libVersionCompat
+	devel:libxcb_xinput$secondaryArchSuffix = $libxcb_xinputVersionCompat
 	devel:libxcb_xkb$secondaryArchSuffix = $libxcb_xkbVersionCompat
 	devel:libxcb_xtest$secondaryArchSuffix = $libVersionCompat
 	devel:libxcb_xv$secondaryArchSuffix = $libVersionCompat
@@ -114,17 +118,17 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxcb$secondaryArchSuffix == $portVersion base
-	devel:libxslt$secondaryArchSuffix >= 1.1.26
-	devel:libxau$secondaryArchSuffix >= 1.0.5
-	devel:libpthread_stubs$secondaryArchSuffix >= 0.3
+	devel:libxslt$secondaryArchSuffix
+	devel:libxau$secondaryArchSuffix
+	devel:libpthread_stubs$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libxslt$secondaryArchSuffix >= 1.1.26
-	devel:xcb_proto$secondaryArchSuffix >= 1.12
-	devel:libpthread_stubs$secondaryArchSuffix >= 0.3
-	devel:libxau$secondaryArchSuffix >= 1.0.5
+	devel:libxslt$secondaryArchSuffix
+	devel:xcb_proto$secondaryArchSuffix >= 1.13
+	devel:libpthread_stubs$secondaryArchSuffix
+	devel:libxau$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	devel:util_macros$secondaryArchSuffix
@@ -143,6 +147,7 @@ debugList=(
 	"$libDir"/libxcb.so.$libxcbVersion
 	"$libDir"/libxcb-randr.so.$libxcb_randrVersion
 	"$libDir"/libxcb-sync.so.$libxcb_syncVersion
+	"$libDir"/libxcb-xinput.so.$libxcb_xinputVersion
 	"$libDir"/libxcb-xkb.so.$libxcb_xkbVersion
 	)
 for i in $otherXcbLibs; do
diff --git a/x11-libs/libxcb/patches/libxcb-1.12.patchset b/x11-libs/libxcb/patches/libxcb-1.13.patchset
similarity index 93%
rename from x11-libs/libxcb/patches/libxcb-1.12.patchset
rename to x11-libs/libxcb/patches/libxcb-1.13.patchset
index ac58a281c..a1f5fef1f 100644
--- a/x11-libs/libxcb/patches/libxcb-1.12.patchset
+++ b/x11-libs/libxcb/patches/libxcb-1.13.patchset
@@ -5,7 +5,7 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index ec31542..a5afc88 100644
+index f880918..0a19ed2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -87,8 +87,8 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
@@ -20,10 +20,10 @@ index ec31542..a5afc88 100644
  # Find support for sending a message from a socket
  AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"])
 diff --git a/src/xcb_util.c b/src/xcb_util.c
-index a3357ef..98fd793 100644
+index a16270c..017c337 100644
 --- a/src/xcb_util.c
 +++ b/src/xcb_util.c
-@@ -437,7 +437,7 @@ static int _xcb_open_unix(char *protocol, const char *file)
+@@ -439,7 +439,7 @@ static int _xcb_open_unix(char *protocol, const char *file)
      strcpy(addr.sun_path, file);
      addr.sun_family = AF_UNIX;
  #ifdef HAVE_SOCKADDR_SUN_LEN