Attachment 239312 Details for Bug 268790 – graphics/gimp-app: fix build with clang 15

[patch] graphics/gimp-app: fix build with clang 15

graphics__gimp-app-fix-clang15-build-1.diff (text/plain), 1.40 KB, created by Dimitry Andric on 2023-01-06 20:01:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2023-01-06 20:01:39 UTC

Size: 1.40 KB

patch

obsolete

>commit 63e262354140406cb5af1c84b5d4164d0fc70871
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Fri Jan 6 20:57:09 2023 +0100
>
>    graphics/gimp-app: fix build with clang 15
>    
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    graphics/gimp-app failed to build with clang 15:
>    
>      file-dicom.c:605:26: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gint32' (aka 'int') [-Wint-conversion]
>                        return NULL;
>                               ^~~~
>    
>    This is because the return statement is a function that should return an
>    integer, not a pointer. Replace it with the error value -1, as used
>    elsewhere in the function.
>
>diff --git a/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c
>new file mode 100644
>index 000000000000..a95402dd819d
>--- /dev/null
>+++ b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c
>@@ -0,0 +1,11 @@
>+--- plug-ins/common/file-dicom.c.orig	2022-06-12 20:26:00 UTC
>++++ plug-ins/common/file-dicom.c
>+@@ -602,7 +602,7 @@ load_image (const gchar  *filename,
>+                                (gchar *) value, samples_per_pixel);
>+                   g_free (dicominfo);
>+                   fclose (DICOM);
>+-                  return NULL;
>++                  return -1;
>+                 }
>+ 
>+               break;

Actions: View | Diff

Attachments on bug 268790: 239312