Attachment #261036 for bug #287329




PORTNAME=	xcb-util-cursor
PORTVERSION=	0.1.5
CATEGORIES=	x11
MASTER_SITES=	http://xcb.freedesktop.org/dist/

MAINTAINER=	x11@FreeBSD.org
COMMENT=	XCB cursor library
WWW=		https://xcb.freedesktop.org/
PATCH_SITES= 	https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor/-/commit/
PATCHFILES=	d28a3227eb9e4bdeeb4dd93017c298808bbe62ee.patch:-p1
LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image

RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image

USES=		autoreconf gmake gperf tar:xz xorg xorg-cat:lib
USE_XORG=	xcb
INSTALL_TARGET=	install-strip

post-patch:
	@${REINPLACE_CMD} -e \
		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|' \
		${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11/xcb-util-cursor/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1478372663	1	TIMESTAMP = 1749152863
2	SHA256 (xorg/lib/xcb-util-cursor-0.1.3.tar.bz2) = 05a10a0706a1a789a078be297b5fb663f66a71fb7f7f1b99658264c35926394f	2	SHA256 (xorg/lib/xcb-util-cursor-0.1.5.tar.xz) = 0caf99b0d60970f81ce41c7ba694e5eaaf833227bb2cbcdb2f6dc9666a663c57
3	SIZE (xorg/lib/xcb-util-cursor-0.1.3.tar.bz2) = 295224	3	SIZE (xorg/lib/xcb-util-cursor-0.1.5.tar.xz) = 266788
		4	SHA256 (xorg/lib/d28a3227eb9e4bdeeb4dd93017c298808bbe62ee.patch) = 08a69cc2ce91abd9e672f75f5e1d622dabaefd629491b83a73fc9278a7d0a42a
		5	SIZE (xorg/lib/d28a3227eb9e4bdeeb4dd93017c298808bbe62ee.patch) = 2662




--- cursor/shape_to_id.gperf.orig	2013-08-28 14:00:29.539200308 +0200
+++ cursor/shape_to_id.gperf	2013-08-28 14:01:02.866194795 +0200
@@ -1,5 +1,5 @@
 struct shape_mapping { const char *name; int number; };
-const int cursor_shape_to_id(const char *name);
+int cursor_shape_to_id(const char *name);
 %%
 X_cursor,0
 arrow,1
@@ -79,7 +79,7 @@
 watch,75
 xterm,76
 %%
-const int cursor_shape_to_id(const char *name) {
+int cursor_shape_to_id(const char *name) {
 	struct shape_mapping *mapping = in_word_set(name, strlen(name));
 	return (mapping ? (mapping->number * 2) : -1);
 }

Removed Link Here

(-)a/x11/xcb-util-cursor/files/patch-cursor_cursor.h (-11 lines)
1	--- cursor/cursor.h.orig 2013-08-28 13:57:29.231213533 +0200
2	+++ cursor/cursor.h 2013-08-28 13:57:38.222207468 +0200
3	@@ -154,7 +154,7 @@
4	} __attribute__((packed)) xcint_image_t;
5
6	/* shape_to_id.c */
7	-const int cursor_shape_to_id(const char *name);
8	+int cursor_shape_to_id(const char *name);
9
10	/* parse_cursor_file.c */
11	int parse_cursor_file(xcb_cursor_context_t c, const int fd, xcint_image_t images, int nimg);

Return to bug 287329

Lines 1-30 Link Here

(-)b/x11/xcb-util-cursor/Makefile (-4 / +4 lines)
1	PORTNAME= xcb-util-cursor	1	PORTNAME= xcb-util-cursor
2	PORTVERSION= 0.1.3	2	PORTVERSION= 0.1.5
3	CATEGORIES= x11	3	CATEGORIES= x11
4	MASTER_SITES= http://xcb.freedesktop.org/dist/	4	MASTER_SITES= http://xcb.freedesktop.org/dist/
5
6	MAINTAINER= x11@FreeBSD.org	5	MAINTAINER= x11@FreeBSD.org
7	COMMENT= XCB cursor library	6	COMMENT= XCB cursor library
8	WWW= https://xcb.freedesktop.org/	7	WWW= https://xcb.freedesktop.org/
9		8	PATCH_SITES= https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor/-/commit/
		9	PATCHFILES= d28a3227eb9e4bdeeb4dd93017c298808bbe62ee.patch:-p1
10	LICENSE= MIT	10	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \	13	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
14	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \	14	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
15	${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image	15	${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image
16		16
17	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \	17	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
18	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \	18	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
19	${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image	19	${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image
20		20
21	USES= gmake gperf xorg xorg-cat:lib	21	USES= autoreconf gmake gperf tar:xz xorg xorg-cat:lib
22	USE_XORG= xcb	22	USE_XORG= xcb
23	INSTALL_TARGET= install-strip	23	INSTALL_TARGET= install-strip
24		24
25	post-patch:	25	post-patch:
26	@${REINPLACE_CMD} -e \	26	@${REINPLACE_CMD} -e \
27	's\|$${libdir}/pkgconfig\|$${prefix}/libdata/pkgconfig\|' \	27	's\|$${libdir}/pkgconfig\|$${prefix}/libdata/pkgconfig\|' \
28	${WRKSRC}/configure	28	${WRKSRC}/configure
29		29
30	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Removed Link Here

(-)a/x11/xcb-util-cursor/files/patch-cursor__shape_to_id.gperf (-18 lines)
1	--- cursor/shape_to_id.gperf.orig 2013-08-28 14:00:29.539200308 +0200
2	+++ cursor/shape_to_id.gperf 2013-08-28 14:01:02.866194795 +0200
3	@@ -1,5 +1,5 @@
4	struct shape_mapping { const char *name; int number; };
5	-const int cursor_shape_to_id(const char *name);
6	+int cursor_shape_to_id(const char *name);
7	%%
8	X_cursor,0
9	arrow,1
10	@@ -79,7 +79,7 @@
11	watch,75
12	xterm,76
13	%%
14	-const int cursor_shape_to_id(const char *name) {
15	+int cursor_shape_to_id(const char *name) {
16	struct shape_mapping *mapping = in_word_set(name, strlen(name));
17	return (mapping ? (mapping->number * 2) : -1);
18	}