diff options
Diffstat (limited to 'package/xcb-proto')
| -rw-r--r-- | package/xcb-proto/Makefile | 17 | ||||
| -rw-r--r-- | package/xcb-proto/patches/patch-xcb-proto_pc_in | 10 |
2 files changed, 9 insertions, 18 deletions
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 8a070c474..fd4674b47 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.6 +PKG_VERSION:= 1.8 PKG_RELEASE:= 1 PKG_DESCR:= XML-XCB protocol descriptions PKG_SECTION:= devel PKG_BUILDDEP:= python2 -PKG_MD5SUM:= 8d29695e8faf5fcdce568c66eaeaa5ee -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768 +PKG_SITES:= http://xcb.freedesktop.org/dist/ PKG_OPTS:= dev devonly PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON @@ -19,20 +19,21 @@ PKGSC_XCB_PYTHON:= x11/misc include $(TOPDIR)/mk/package.mk $(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_PROTO})) +$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON})) include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) +CONFIGURE_ARGS+= --datadir=${STAGING_DIR}/usr/share -xcb-proto-install: +post-build: ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb - $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb - ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen xcb-python-install: + $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ + ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/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 diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in deleted file mode 100644 index b16750915..000000000 --- a/package/xcb-proto/patches/patch-xcb-proto_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- xcb-proto-1.6.orig/xcb-proto.pc.in 2008-08-27 10:12:22.000000000 +0200 -+++ xcb-proto-1.6/xcb-proto.pc.in 2011-01-24 16:11:29.000000000 +0100 -@@ -1,6 +1,6 @@ - prefix=@prefix@ - datarootdir=@datarootdir@ --datadir=@datadir@ -+datadir=${prefix}/../@datadir@ - xcbincludedir=@xcbincludedir@ - pythondir=@pythondir@ - |