Attachment #232182 for bug #262267

View | Details | Raw Unified | Return to bug 262267
Collapse All | Expand All





PORTNAME=	a2png
PORTVERSION=	0.1.5
PORTREVISION=	11
CATEGORIES=	graphics
MASTER_SITES=	SF


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_armv6=	fails to build: parse.c:(.text+0x174): undefined reference to 'fgettok'
BROKEN_armv7=	fails to build: parse.c:(.text+0x174): undefined reference to 'fgettok'
BROKEN_i386=	fails to build: parse.c:(.text+0x135): undefined reference to 'fgettok'

LIB_DEPENDS=	libgd.so:graphics/gd

USES=		tar:bzip2 localbase
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-gd
CFLAGS+=	-DDEFAULT_FONTPATH='\"${FONTROOTDIR}/TTF:${FONTROOTDIR}/Type1:${FONTROOTDIR}\"'
BINARY_ALIAS=	gdlib-config=true
PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz

FONTROOTDIR?=	${LOCALBASE}/share/fonts

pre-configure:
	${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/gdlib-config
	${CHMOD} +x ${WRKDIR}/gdlib-config

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1




--- src/image.c.orig	2006-10-05 13:36:26 UTC
+++ src/image.c
@@ -148,7 +148,6 @@ void image_resize_crop(engine_t *e, const int width_px
 	#endif
 }
 
-inline
 void image_set_foreground(engine_t *p, const rgb_t* color) {
 	#ifdef ENABLE_CAIRO
 	static const double alpha = 1.0;
@@ -286,7 +285,6 @@ image_points_t image_get_font_max_metrics(engine_t *p,
 	return r;
 }
 
-inline
 void image_move_to(engine_t *en, const image_point_t x, const image_point_t y) {
 	en->pos.x = x;
 	en->pos.y = y;
@@ -296,7 +294,6 @@ void image_move_to(engine_t *en, const image_point_t x
 	#endif
 }
 
-inline
 image_points_t image_get_position(engine_t *en) {
 	#ifdef ENABLE_CAIRO
 	static image_points_t r;

Added Link Here

(-)b/graphics/a2png/files/patch-src_image.h (+9 lines)
1	--- src/image.h.orig 2021-12-03 16:02:51 UTC
2	+++ src/image.h
3	@@ -22,5 +22,6 @@ void image_putc(engine_t *en, const char c);
4	void image_set_foreground(engine_t p, const rgb_t color);
5	void image_fill_rect(engine_t *en, const image_point_t x1, const image_point_t y1, const image_point_t x2, const image_point_t y2);
6	void image_move_to(engine_t *en, const image_point_t x, const image_point_t y);
7	+void image_show_text(engine_t en, const char text);
8
9	#endif




--- src/parse.c.orig	2006-10-05 13:36:26 UTC
+++ src/parse.c
@@ -22,9 +22,8 @@ void scan_rgb(const char* s, rgb_t* color) {
 
 // returns 1 if not EOF, 0 if EOF
 // see note in parse_html for a rationale of this rather odd tokenizer function
-inline
 int fgettok(FILE *f, char* buf, size_t buflen) {
-	char c;
+	int c;
 
 	// read until we get start of a token
 	do {

Return to bug 262267

Lines 2-8 Link Here

(-)b/graphics/a2png/Makefile (-10 / +3 lines)
2		2
3	PORTNAME= a2png	3	PORTNAME= a2png
4	PORTVERSION= 0.1.5	4	PORTVERSION= 0.1.5
5	PORTREVISION= 10	5	PORTREVISION= 11
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8		8
Lines 12-35 COMMENT= Converts plain ASCII text into PNG bitmap images Link Here
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	BROKEN_armv6= fails to build: parse.c:(.text+0x174): undefined reference to 'fgettok'
16	BROKEN_armv7= fails to build: parse.c:(.text+0x174): undefined reference to 'fgettok'
17	BROKEN_i386= fails to build: parse.c:(.text+0x135): undefined reference to 'fgettok'
18
19	LIB_DEPENDS= libgd.so:graphics/gd	15	LIB_DEPENDS= libgd.so:graphics/gd
20		16
21	USES= tar:bzip2 localbase	17	USES= tar:bzip2 localbase
22	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --enable-gd --with-gdlib-config-path=${WRKDIR}	19	CONFIGURE_ARGS= --enable-gd
24	CFLAGS+= -DDEFAULT_FONTPATH='\"${FONTROOTDIR}/TTF:${FONTROOTDIR}/Type1:${FONTROOTDIR}\"'	20	CFLAGS+= -DDEFAULT_FONTPATH='\"${FONTROOTDIR}/TTF:${FONTROOTDIR}/Type1:${FONTROOTDIR}\"'
		21	BINARY_ALIAS= gdlib-config=true
25	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz	22	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
26		23
27	FONTROOTDIR?= ${LOCALBASE}/share/fonts	24	FONTROOTDIR?= ${LOCALBASE}/share/fonts
28		25
29	pre-configure:
30	${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/gdlib-config
31	${CHMOD} +x ${WRKDIR}/gdlib-config
32
33	do-install:	26	do-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
35	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	28	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

Added Link Here

(-)b/graphics/a2png/files/patch-src_image.c (+26 lines)
1	--- src/image.c.orig 2006-10-05 13:36:26 UTC
2	+++ src/image.c
3	@@ -148,7 +148,6 @@ void image_resize_crop(engine_t *e, const int width_px
4	#endif
5	}
6
7	-inline
8	void image_set_foreground(engine_t p, const rgb_t color) {
9	#ifdef ENABLE_CAIRO
10	static const double alpha = 1.0;
11	@@ -286,7 +285,6 @@ image_points_t image_get_font_max_metrics(engine_t *p,
12	return r;
13	}
14
15	-inline
16	void image_move_to(engine_t *en, const image_point_t x, const image_point_t y) {
17	en->pos.x = x;
18	en->pos.y = y;
19	@@ -296,7 +294,6 @@ void image_move_to(engine_t *en, const image_point_t x
20	#endif
21	}
22
23	-inline
24	image_points_t image_get_position(engine_t *en) {
25	#ifdef ENABLE_CAIRO
26	static image_points_t r;

Added Link Here

(-)b/graphics/a2png/files/patch-src_parse.c (-1 / +13 lines)
0	-	1	--- src/parse.c.orig 2006-10-05 13:36:26 UTC
		2	+++ src/parse.c
		3	@@ -22,9 +22,8 @@ void scan_rgb(const char* s, rgb_t* color) {
		4
		5	// returns 1 if not EOF, 0 if EOF
		6	// see note in parse_html for a rationale of this rather odd tokenizer function
		7	-inline
		8	int fgettok(FILE f, char buf, size_t buflen) {
		9	- char c;
		10	+ int c;
		11
		12	// read until we get start of a token
		13	do {