Bug 270930 - graphics/xpaint: accommodate legacy source code for llvm [patch]
Summary: graphics/xpaint: accommodate legacy source code for llvm [patch]
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Fernando Apesteguía
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-04-19 07:24 UTC by Helge Oldach
Modified: 2023-05-08 16:34 UTC (History)
3 users (show)

See Also:
fernape: merge-quarterly+


Attachments
patch (411 bytes, patch)
2023-04-19 07:24 UTC, Helge Oldach
fuz: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Helge Oldach 2023-04-19 07:24:09 UTC
Created attachment 241578 [details]
patch

libtool: compile:  cc -DPACKAGE_NAME=\"XPaint\" -DPACKAGE_TARNAME=\"xpaint\" -DPACKAGE_VERSION=\"2.9.10.3\" "-DPACKAGE_STRING=\"XPaint 2.9.10.3\"" -DPACKAGE_BUGREPORT=\"Jean-Pierre.demailly@ujf-grenoble.fr\" -DPACKAGE_URL=\"\" -DPACKAGE=\"xpaint\" -DVERSION=\"2.9.10.3\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 "-DHAVE_XFT=/**/" -DHAVE_LIBZ=1 "-DHAVE_PNG_H=/**/" "-DHAVE_PNG=/**/" -DHAVE_PNG_GET_VALID=1 -DHAVE_PNG_SET_TRNS_TO_ALPHA=1 -DHAVE_JPEG=1 -DHAVE_TIFF=1 -DHAVE_OPENJPEG_H=1 -DHAVE_OPENJPEG=1 -DHAVE_SYSLOG_H=1 -DHAVE_LANGINFO_H=1 -DHAVE_DIRENT_H=1 -DHAVE_SYS_RESOURCE_H=1 -I. -I/usr/local/include/openjpeg-1.5 -isystem /usr/local/include -I/usr/include/X11 -g -O2 -fno-strict-aliasing -fPIC -DFEATURE_FRACTAL -DERRORBEEP -DHAVE_ICO -DHAVE_SGI -DHAVE_PGF -DSHAREDIR=\"/usr/local/share/xpaint\" -DXPAINT_VERSION=\"2.9.10.3\" -DXAW3D -DXAW3DG -DXAW3DXFT -DXAW_ARROW_SCROLLBARS -DXAW_INTERNATIONALIZATION -I.. -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft -MT readWriteJP2K.lo -MD -MP -MF .deps/readWriteJP2K.Tpo -c readWriteJP2K.c  -fPIC -DPIC -o .libs/readWriteJP2K.o
readWriteJP2K.c:72:52: error: incompatible integer to pointer conversion returning 'int' from a function with result type 'Image *' [-Wint-conversion]
        if ((fp = fopen(file_name, "rb")) == NULL) return (-1);
                                                          ^~~~
1 error generated.
*** [readWriteJP2K.lo] Error code 1

Trivial patch (by adding a cast) attached.
Comment 1 Robert Clausecker freebsd_committer freebsd_triage 2023-04-19 12:32:49 UTC
Comment on attachment 241578 [details]
patch

I can't test this as I don't run FreeBSD 14 yet.  But perhaps someone else can.

The attached patch needs to be added as a file to graphics/xpaint/files.
Comment 2 Helge Oldach 2023-04-19 12:53:54 UTC
(In reply to Robert Clausecker from comment #1)

This was noticed on stable/13-n255132-c79831b38a63 using the included llvm 15.0.7.
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-05-08 16:32:25 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f61b4dc8d512f35101ee052f1193a7a30fba66cc

commit f61b4dc8d512f35101ee052f1193a7a30fba66cc
Author:     Helge Oldach <freebsd@oldach.net>
AuthorDate: 2023-05-08 14:02:01 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-05-08 16:27:19 +0000

    graphics/xpaint: Fix build in current (llvm15)

    PR:             270930
    Reported by:    freebsd@oldach.net (maintainer)

 graphics/xpaint/files/patch-rw_readWriteJP2K.c (new) | 11 +++++++++++
 1 file changed, 11 insertions(+)
Comment 4 Fernando Apesteguía freebsd_committer freebsd_triage 2023-05-08 16:33:46 UTC
Committed and merged to 2023Q2,

Thanks!
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-05-08 16:34:27 UTC
A commit in branch 2023Q2 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=934488354fa45ff74cdac42e47c37701ccb77953

commit 934488354fa45ff74cdac42e47c37701ccb77953
Author:     Helge Oldach <freebsd@oldach.net>
AuthorDate: 2023-05-08 14:02:01 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-05-08 16:28:38 +0000

    graphics/xpaint: Fix build in current (llvm15)

    PR:             270930
    Reported by:    freebsd@oldach.net (maintainer)

    (cherry picked from commit f61b4dc8d512f35101ee052f1193a7a30fba66cc)

 graphics/xpaint/files/patch-rw_readWriteJP2K.c (new) | 11 +++++++++++
 1 file changed, 11 insertions(+)