From 170cb2953837a919e6358ab71f47de4fb2521560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sun, 14 Apr 2024 20:33:08 +0200 Subject: groups.d/261.native_packages_x11.group: xcb: manually set XCBPYTHON paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/261.native_packages_x11.group | 1 + patches/xcb-1.16.1_pre.local.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 patches/xcb-1.16.1_pre.local.patch diff --git a/groups.d/261.native_packages_x11.group b/groups.d/261.native_packages_x11.group index f0fb2f91..c81033a4 100644 --- a/groups.d/261.native_packages_x11.group +++ b/groups.d/261.native_packages_x11.group @@ -190,6 +190,7 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin"; : ${PKG_XCB_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_XCB_CONFIG_CACHE_EXTRA:="ac_cv_search_sendmsg=no"}; : ${PKG_XCB_CONFIGURE_ARGS_EXTRA:="--disable-randr PYTHON=${PREFIX}/bin/python3"}; +: ${PKG_XCB_ENV_VARS_EXTRA:="XCBPROTO_XCBPYTHONDIR=${PREFIX_NATIVE}/lib/python2.7/site-packages:XCBPROTO_XCBINCLUDEDIR=${PREFIX_NATIVE}/share/xcb"}; : ${PKG_XCB_PROTO_SHA256SUM:=a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119}; : ${PKG_XCB_PROTO_VERSION:=1.16.0}; : ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/proto/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.xz}; diff --git a/patches/xcb-1.16.1_pre.local.patch b/patches/xcb-1.16.1_pre.local.patch new file mode 100644 index 00000000..2f66288d --- /dev/null +++ b/patches/xcb-1.16.1_pre.local.patch @@ -0,0 +1,19 @@ +diff -ru libxcb-1.16.1.orig/configure libxcb-1.16.1/configure +--- libxcb-1.16.1.orig/configure 2024-03-02 20:38:27.000000000 +0100 ++++ libxcb-1.16.1/configure 2024-04-14 20:26:41.346651860 +0200 +@@ -21716,7 +21716,6 @@ + # Find the xcb-proto protocol descriptions + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking XCBPROTO_XCBINCLUDEDIR" >&5 + printf %s "checking XCBPROTO_XCBINCLUDEDIR... " >&6; } +-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XCBPROTO_XCBINCLUDEDIR" >&5 + printf "%s\n" "$XCBPROTO_XCBINCLUDEDIR" >&6; } + +@@ -21728,7 +21727,6 @@ + # Find the xcbgen Python package + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking XCBPROTO_XCBPYTHONDIR" >&5 + printf %s "checking XCBPROTO_XCBPYTHONDIR... " >&6; } +-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XCBPROTO_XCBPYTHONDIR" >&5 + printf "%s\n" "$XCBPROTO_XCBPYTHONDIR" >&6; } + -- cgit v1.2.3