diff options
Diffstat (limited to 'package/xcb-proto')
| -rw-r--r-- | package/xcb-proto/Makefile | 20 | ||||
| -rw-r--r-- | package/xcb-proto/patches/patch-xcb-proto_pc_in | 13 |
2 files changed, 21 insertions, 12 deletions
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index db4a7c63b..5e45e6afd 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,28 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.12 -PKG_RELEASE:= 2 -PKG_HASH:= cfa49e65dd390233d560ce4476575e4b76e505a0e0bacdfb5ba6f8d0af53fd59 +PKG_VERSION:= 1.14.1 +PKG_RELEASE:= 1 +PKG_HASH:= 85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd PKG_DESCR:= xml-xcb protocol descriptions PKG_SECTION:= dev/header -HOST_BUILDDEP:= python2-host +HOST_BUILDDEP:= python3-host PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON -PKGSC_XCB_PYTHON:= x11/misc - include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) @@ -38,13 +34,13 @@ post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb -xcb-python-install: +xcb-proto-install: $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen - ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${IDIR_XCB_PROTO}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in new file mode 100644 index 000000000..c5404312e --- /dev/null +++ b/package/xcb-proto/patches/patch-xcb-proto_pc_in @@ -0,0 +1,13 @@ +--- xcb-proto-1.14.orig/xcb-proto.pc.in 2020-02-22 21:16:54.000000000 +0100 ++++ xcb-proto-1.14/xcb-proto.pc.in 2023-01-04 18:28:01.354784124 +0100 +@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + datadir=@datadir@ + libdir=@libdir@ +-xcbincludedir=${pc_sysrootdir}@xcbincludedir@ +-pythondir=${pc_sysrootdir}@pythondir@ ++xcbincludedir=@xcbincludedir@ ++pythondir=@pythondir@ + + Name: XCB Proto + Description: X protocol descriptions for XCB |