From nobody Sat Mar 5 05:05:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1C34419E9083; Sat, 5 Mar 2022 05:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K9Xhw04Sdz52NL; Sat, 5 Mar 2022 05:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646456704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvWZIqDp1MgmuKLFL6j4TiPhqZzd/Ht/1NdMtEWmy94=; b=CSi6+Fy7gj/THFjLzqDE4ANdLrfBhDSN/wRx1ZKHzYJCTD84TIaIChcwOh+n7TkrKJq/2h bmXKzRmFC5poA7qqZwou69NtnnRFnjLWYL+55sZJZuX2mLuAuxo5WJnKPC4i8k2zpIA1tk qV1AZPhydam6k1ParsDtRSe6Bta23tj+3cpEu2JBIPtzS1kvbctcIaXMlUWPvr+CeNZ5m0 3HGa6Xm6fAJ0g9eHuzy2NrH6OSMCPLki4ErjAf4x8zjKGiF781GhN7omwEP1qZEstLgg8i 2vQD+9CcOgYJsK5d6x8EMxf3tVOa3aTUIjCtYrRYLhMDjNe2Ha28lIF9FMU+0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D71E51A55A; Sat, 5 Mar 2022 05:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 225553tJ023232; Sat, 5 Mar 2022 05:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225553LT023231; Sat, 5 Mar 2022 05:05:03 GMT (envelope-from git) Date: Sat, 5 Mar 2022 05:05:03 GMT Message-Id: <202203050505.225553LT023231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 06dfcbd2cbeb - main - graphics/a2png: Fix build with C99 inline semantics List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06dfcbd2cbebaf3b3b81744ed8adaa903f1b24b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646456704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AvWZIqDp1MgmuKLFL6j4TiPhqZzd/Ht/1NdMtEWmy94=; b=poPNPEwAgMmcdLl+T78Iej7NSDblAW7NBOr+SMYiaCz4x95vmsV6sIEdpg8kdtzK+yJDae U2RjlSjT3nXUWnB1rzbUg9dXGC/XFDVXeN4qCG+PTR81fo7LnQotgeItLIIsMP2Oo8u/+d CFmyNA5H/9tydfyYqlOmTrDlfta9dY5AhPTPYmqcdeGdsEle0fanHJDecVxSuyzRCLZ8e8 t+Z2O2UIptLHxkT0JtaPtqoNHQlURdvQbOXLWwhY+/LKMF+VjQwGoeuHUBN7YuJJ1FuQWK ssDBBbtUfXUuSDlOVWwz/8jz8rwC87Mmx75HitYsD4IFBaJ0cthfjtJlTdamdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646456704; a=rsa-sha256; cv=none; b=SskhUOW0qR6s2dr8wOFv/RcthateD8mb4LUvH39PimghhwEYxx/bq6Iz4OGlYE1JdCXmnO Vpc7N4jhxwajXIgiWuwiyKJcr7H4rJjvHnQdyQLeSmytfJYcG/Qx6HQcCowiXaqlOTSyi2 XEgYKzhyEJVPHWDuRxmvNMRsZuv18fTaR5kxBITwJAKRZw4vQP0keS/bq7J18YkNhD9OE/ tzhR8PlXZPlzPXxj6TQTcsWIBQkmyrFy/Hw7cns4PZWU2M902lnxe/1wBC25qQrWGu2wgw 6zeZt+3uwdGHQNOusTJ/vnFyYSbMuVViqq45DoOdjRxRO1rwyffWK8Q1kgGTIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=06dfcbd2cbebaf3b3b81744ed8adaa903f1b24b7 commit 06dfcbd2cbebaf3b3b81744ed8adaa903f1b24b7 Author: Robert Clausecker AuthorDate: 2022-03-05 05:02:38 +0000 Commit: Guangyuan Yang CommitDate: 2022-03-05 05:02:38 +0000 graphics/a2png: Fix build with C99 inline semantics - This fixes the build on arm and i386. PR: 262267 --- graphics/a2png/Makefile | 13 +++---------- graphics/a2png/files/patch-src_image.c | 26 ++++++++++++++++++++++++++ graphics/a2png/files/patch-src_image.h | 9 +++++++++ graphics/a2png/files/patch-src_parse.c | 13 +++++++++++++ 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile index 541763b4d11c..b8b644b7b957 100644 --- a/graphics/a2png/Makefile +++ b/graphics/a2png/Makefile @@ -2,7 +2,7 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= SF @@ -12,24 +12,17 @@ COMMENT= Converts plain ASCII text into PNG bitmap images 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 --with-gdlib-config-path=${WRKDIR} +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 diff --git a/graphics/a2png/files/patch-src_image.c b/graphics/a2png/files/patch-src_image.c new file mode 100644 index 000000000000..fbd52cdc7b95 --- /dev/null +++ b/graphics/a2png/files/patch-src_image.c @@ -0,0 +1,26 @@ +--- 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; diff --git a/graphics/a2png/files/patch-src_image.h b/graphics/a2png/files/patch-src_image.h new file mode 100644 index 000000000000..9186c20317fc --- /dev/null +++ b/graphics/a2png/files/patch-src_image.h @@ -0,0 +1,9 @@ +--- src/image.h.orig 2021-12-03 16:02:51 UTC ++++ src/image.h +@@ -22,5 +22,6 @@ void image_putc(engine_t *en, const char c); + void image_set_foreground(engine_t *p, const rgb_t* color); + 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); + void image_move_to(engine_t *en, const image_point_t x, const image_point_t y); ++void image_show_text(engine_t *en, const char* text); + + #endif diff --git a/graphics/a2png/files/patch-src_parse.c b/graphics/a2png/files/patch-src_parse.c new file mode 100644 index 000000000000..e94f0932f30b --- /dev/null +++ b/graphics/a2png/files/patch-src_parse.c @@ -0,0 +1,13 @@ +--- 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 {