haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libxcb: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2017-10-26 15:24:53 +02:00
parent 09bcb8ad73
commit 24828f0333
3 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
x11-libs/libxcb/libxcb-1.6.recipe → x11-libs/libxcb/libxcb-1.12.recipe
View File

@@ -10,10 +10,10 @@ for one or the other."
HOMEPAGE="http://xcb.freedesktop.org/"
COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett"
LICENSE="MIT (no promotion)"
REVISION="4"
REVISION="1"
SOURCE_URI="http://xcb.freedesktop.org/dist/libxcb-$portVersion.tar.gz"
CHECKSUM_SHA256="df93b7d5afb0f970c73294636dc8cbc08f59bd39239cac4e6e0a46792ae7b759"
PATCHES="libxcb-$portVersion.patch"
CHECKSUM_SHA256="092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06"
PATCHES="libxcb-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -25,7 +25,9 @@ PROVIDES="
lib:libxcb_damage$secondaryArchSuffix
lib:libxcb_dpms$secondaryArchSuffix
lib:libxcb_dri2$secondaryArchSuffix
lib:libxcb_dri3$secondaryArchSuffix
lib:libxcb_glx$secondaryArchSuffix
lib:libxcb_present$secondaryArchSuffix
lib:libxcb_randr$secondaryArchSuffix
lib:libxcb_record$secondaryArchSuffix
lib:libxcb_render$secondaryArchSuffix
@@ -34,11 +36,10 @@ PROVIDES="
lib:libxcb_shape$secondaryArchSuffix
lib:libxcb_shm$secondaryArchSuffix
lib:libxcb_sync$secondaryArchSuffix
lib:libxcb_xevie$secondaryArchSuffix
lib:libxcb_xf86dri$secondaryArchSuffix
lib:libxcb_xfixes$secondaryArchSuffix
lib:libxcb_xinerama$secondaryArchSuffix
lib:libxcb_xprint$secondaryArchSuffix
lib:libxcb_xkb$secondaryArchSuffix
lib:libxcb_xtest$secondaryArchSuffix
lib:libxcb_xv$secondaryArchSuffix
lib:libxcb_xvmc$secondaryArchSuffix
@@ -56,7 +57,9 @@ PROVIDES_devel="
devel:libxcb_damage$secondaryArchSuffix
devel:libxcb_dpms$secondaryArchSuffix
devel:libxcb_dri2$secondaryArchSuffix
devel:libxcb_dri3$secondaryArchSuffix
devel:libxcb_glx$secondaryArchSuffix
devel:libxcb_present$secondaryArchSuffix
devel:libxcb_randr$secondaryArchSuffix
devel:libxcb_record$secondaryArchSuffix
devel:libxcb_render$secondaryArchSuffix
@@ -65,11 +68,10 @@ PROVIDES_devel="
devel:libxcb_shape$secondaryArchSuffix
devel:libxcb_shm$secondaryArchSuffix
devel:libxcb_sync$secondaryArchSuffix
devel:libxcb_xevie$secondaryArchSuffix
devel:libxcb_xf86dri$secondaryArchSuffix
devel:libxcb_xfixes$secondaryArchSuffix
devel:libxcb_xinerama$secondaryArchSuffix
devel:libxcb_xprint$secondaryArchSuffix
devel:libxcb_xkb$secondaryArchSuffix
devel:libxcb_xtest$secondaryArchSuffix
devel:libxcb_xv$secondaryArchSuffix
devel:libxcb_xvmc$secondaryArchSuffix
@@ -83,7 +85,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libxslt$secondaryArchSuffix >= 1.1.26
devel:xcb_proto$secondaryArchSuffix >= 1.6
devel:xcb_proto$secondaryArchSuffix >= 1.12
devel:libpthread_stubs$secondaryArchSuffix >= 0.3
devel:libxau$secondaryArchSuffix >= 1.0.5
"
@@ -105,6 +107,7 @@ BUILD()
libtoolize --force --copy --install
./autogen.sh -V
runConfigure ./configure
make $jobArgs
}
INSTALL()
@@ -119,7 +122,9 @@ INSTALL()
libxcb-damage \
libxcb-dpms \
libxcb-dri2 \
libxcb-dri3 \
libxcb-glx \
libxcb-present \
libxcb-randr \
libxcb-record \
libxcb-render \
@@ -128,11 +133,10 @@ INSTALL()
libxcb-shape \
libxcb-shm \
libxcb-sync \
libxcb-xevie \
libxcb-xf86dri \
libxcb-xfixes \
libxcb-xinerama \
libxcb-xprint \
libxcb-xkb \
libxcb-xtest \
libxcb-xv \
libxcb-xvmc

37
x11-libs/libxcb/patches/libxcb-1.12.patchset Normal file
View File

@@ -0,0 +1,37 @@
From 002b746f8948f0618e686b5b76b229efa55009ee Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 26 Oct 2017 14:53:57 +0200
Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index ec31542..a5afc88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,8 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
AC_SUBST(XCBPROTO_XCBPYTHONDIR)
AC_HEADER_STDC
-AC_SEARCH_LIBS(getaddrinfo, socket)
-AC_SEARCH_LIBS(connect, socket)
+AC_SEARCH_LIBS(getaddrinfo, [network socket])
+AC_SEARCH_LIBS(connect, [network socket])
# 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
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -437,7 +437,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
- addr.sun_len = SUN_LEN(&addr);
+ addr.sun_len = sizeof(&addr);
#endif
fd = _xcb_socket(AF_UNIX, SOCK_STREAM, 0);
if(fd == -1)
--
2.14.2

26
x11-libs/libxcb/patches/libxcb-1.6.patch
View File

@@ -1,26 +0,0 @@
diff -Naur libxcb-1.6/configure.ac libxcb-1.6-haiku/configure.ac
--- libxcb-1.6/configure.ac 2010-04-09 14:55:28.066584576 +0000
+++ libxcb-1.6-haiku/configure.ac 2010-05-03 01:14:47.611844096 +0000
@@ -69,8 +69,8 @@
AC_SUBST(XCBPROTO_XCBPYTHONDIR)
AC_HEADER_STDC
-AC_SEARCH_LIBS(getaddrinfo, socket)
-AC_SEARCH_LIBS(connect, socket)
+AC_SEARCH_LIBS(getaddrinfo, [network socket])
+AC_SEARCH_LIBS(connect, [network socket])
case $host_os in
linux*)
diff -Naur libxcb-1.6/src/xcb_util.c libxcb-1.6-haiku/src/xcb_util.c
--- libxcb-1.6/src/xcb_util.c 2010-04-09 14:54:58.006291456 +0000
+++ libxcb-1.6-haiku/src/xcb_util.c 2010-05-03 01:16:27.084672512 +0000
@@ -300,7 +300,7 @@
strcpy(addr.sun_path, file);
addr.sun_family = AF_UNIX;
#ifdef HAVE_SOCKADDR_SUN_LEN
- addr.sun_len = SUN_LEN(&addr);
+ addr.sun_len = sizeof(&addr);
#endif
fd = _xcb_socket(AF_UNIX, SOCK_STREAM, 0);
if(fd == -1)