Index | Thread | Search

From:
Benoit Lecocq <blq@arcane-labs.net>
Subject:
Re: [llvm22] graphics/tgif build fixes
To:
Christian Weisgerber <naddy@mips.inka.de>
Cc:
<ports@openbsd.org>
Date:
Sat, 6 Jun 2026 08:21:13 +0200

Download raw body.

Thread

Le 05/06/2026 à 23:03, Christian Weisgerber a écrit :
> OK?

ok benoit@

> 
> -----------------------------------------------
> commit 99db7d4da4b0b42543b3aa057b72485ebd0b7281 (mystuff)
> from: Christian Weisgerber <naddy@mips.inka.de>
> date: Fri Jun  5 21:00:57 2026 UTC
>   
>   graphics/tgif: make C types coherent to appease llvm22
>   
> diff 345620ec5e74e234494767ff007c819e9ecb66ce 99db7d4da4b0b42543b3aa057b72485ebd0b7281
> commit - 345620ec5e74e234494767ff007c819e9ecb66ce
> commit + 99db7d4da4b0b42543b3aa057b72485ebd0b7281
> blob - 828bbcffba534021b362a37602e73b56a7ef0130
> blob + 426751374b96e5d586a7e9919a507960afe76798
> --- graphics/tgif/Makefile
> +++ graphics/tgif/Makefile
> @@ -3,7 +3,7 @@ COMMENT =	two-dimensional drawing tool and hyper-objec
>   VERSION =	4.2.5
>   DISTNAME =	tgif-QPL-${VERSION}
>   PKGNAME =	tgif-${VERSION}
> -REVISION =	0
> +REVISION =	1
>   CATEGORIES =	graphics
>   
>   HOMEPAGE =	http://bourbon.usc.edu/tgif/
> blob - /dev/null
> blob + afbe82b31c608d799fc17abec9cfcc8eda1c5cab (mode 644)
> --- /dev/null
> +++ graphics/tgif/patches/patch-tangram2_c
> @@ -0,0 +1,21 @@
> +Index: tangram2.c
> +--- tangram2.c.orig
> ++++ tangram2.c
> +@@ -1796,7 +1796,7 @@ char *args; /* semi-colon separated list (arg1;arg2;ar
> +    char arg[3][1024];
> +
> +    /* Extracts parameters from args */
> +-   if( !parseArgs( args, arg, 3, 1024 ) )
> ++   if( !parseArgs( args, &arg[0][0], 3, 1024 ) )
> +    {
> +         fprintf( stderr, "TGIF: Usage Tangram2GenerateChain( \"arg1;arg2;arg3\" )\n" );
> +         return;
> +@@ -1844,7 +1844,7 @@ char *args;
> +
> +
> +    /* Extracts parameters from args */
> +-   if( !parseArgs( args, arg, 12, 1024 ) )
> ++   if( !parseArgs( args, &arg[0][0], 12, 1024 ) )
> +    {
> +         return;
> +    }
> blob - /dev/null
> blob + c801d468e2caf3536671e430958a86ef5491ea9d (mode 644)
> --- /dev/null
> +++ graphics/tgif/patches/patch-tgcwdl_c
> @@ -0,0 +1,12 @@
> +Index: tgcwdl.c
> +--- tgcwdl.c.orig
> ++++ tgcwdl.c
> +@@ -152,7 +152,7 @@ static
> + void PixeltoRGB(pcwdi, pixel, pn_r, pn_g, pn_b)
> +    ColorWheelDlgInfo *pcwdi;
> +    int pixel;
> +-   unsigned int *pn_r, *pn_g, *pn_b;
> ++   unsigned char *pn_r, *pn_g, *pn_b;
> +    /* 0 <= r,g,b <= 255 */
> + {
> +    uint32_t pix=(uint32_t)(unsigned int)pixel;
>