On Sun, Jan 08 2023, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
> On Sun, Jan 08 2023, Jérémie Courrèges-Anglas <j...@wxcvbn.org> wrote:

[...]

>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/mail/cyrus-imapd.txt
> [patch]
> imap/relocate_by_id.c:116:14: error: incompatible integer to pointer 
> conversion assigning to 'const char *' from 'int' [-Wint-conversion]
>     progname = basename(argv[0]);
>              ^ ~~~~~~~~~~~~~~~~~
>

[...]

>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/x11/gnome/gcr.txt
> [patch]
> ../gcr-3.41.1/gcr/gcr-record.c:615:6: error: incompatible integer to pointer 
> conversion assigning to 'gchar *' (aka 'char *') from 'int' [-Wint-conversion]
>         end = strptime (raw, "%Y-%m-%d", &tm);
>             ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
>> https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-03/x11/gnome/gitg.txt
> libgitg-ext/libgitg-ext-1.0.so.0.0.p/gitg-ext-message-bus.c:440:6: error: 
> incompatible pointer to integer conversion assigning to 'GType' (aka 
> 'unsigned long') from 'gconstpointer' (aka 'const void *') [-Wint-conversion]
>         ret = _tmp1_;
>             ^ ~~~~~~
>

Some clang 15 fixes for cyrus and gcr.  The gcr diff points out that we
require some #defines to expose strptime, where Linux doesn't.  Defining
_XOPEN_VERSION=4 appears to be the canonical way to access it but I'm
not completely sold on that.  ok?

gitg also fails (see above) but I haven't cooked a patch, feel free to
beat me to it.

llvm 15 test material:
git branch: https://github.com/jcourreges/openbsd-src/tree/llvm15-6
amd64 snaps: https://pbuild-amd64.wxcvbn.org/pub/OpenBSD/snapshots/amd64/


Index: mail/cyrus-imapd/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/cyrus-imapd/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- mail/cyrus-imapd/Makefile   18 Dec 2022 10:46:17 -0000      1.141
+++ mail/cyrus-imapd/Makefile   10 Jan 2023 20:03:10 -0000
@@ -3,6 +3,7 @@ PORTROACH=              limitw:1,even
 COMMENT=               Cyrus IMAP server
 
 V=                     3.6.0
+REVISION=              0
 DISTNAME=              cyrus-imapd-${V}
 
 SHARED_LIBS += cyrus                     0.0 # 0.0
Index: mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c
===================================================================
RCS file: mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c
diff -N mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c        10 Jan 2023 
20:01:48 -0000
@@ -0,0 +1,13 @@
+Include appropriate header for basename(3).
+
+Index: imap/relocate_by_id.c
+--- imap/relocate_by_id.c.orig
++++ imap/relocate_by_id.c
+@@ -42,6 +42,7 @@
+ 
+ #include <config.h>
+ 
++#include <libgen.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
Index: x11/gnome/gcr/Makefile
===================================================================
RCS file: /home/cvs/ports/x11/gnome/gcr/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- x11/gnome/gcr/Makefile      4 Nov 2022 08:49:18 -0000       1.78
+++ x11/gnome/gcr/Makefile      10 Jan 2023 20:02:50 -0000
@@ -4,7 +4,7 @@ COMMENT=                library for bits of crypto UI 
 
 GNOME_PROJECT=         gcr
 GNOME_VERSION=         3.41.1
-REVISION=              0
+REVISION=              1
 
 SHARED_LIBS += gck-1                     2.1 # 0.0.0
 SHARED_LIBS += gcr-base-3                3.1 # 1.0.0
Index: x11/gnome/gcr/patches/patch-gck_meson_build
===================================================================
RCS file: x11/gnome/gcr/patches/patch-gck_meson_build
diff -N x11/gnome/gcr/patches/patch-gck_meson_build
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/gnome/gcr/patches/patch-gck_meson_build 10 Jan 2023 20:02:03 -0000
@@ -0,0 +1,11 @@
+Index: gck/meson.build
+--- gck/meson.build.orig
++++ gck/meson.build
+@@ -78,6 +78,7 @@ gck_cflags = [
+   '-DP11_KIT_API_SUBJECT_TO_CHANGE',
+   '-DPKCS11_REGISTRY_DIR="@0@"'.format(get_option('prefix') / 
get_option('libdir') / 'pkcs11'),
+   '-D_XOPEN_SOURCE',   # Needed for strptime()
++  '-D_XOPEN_VERSION=4',   # Needed for strptime()
+   '-D_DEFAULT_SOURCE', # Needed for timegm
+ ]
+ 
Index: x11/gnome/gcr/patches/patch-gcr_meson_build
===================================================================
RCS file: x11/gnome/gcr/patches/patch-gcr_meson_build
diff -N x11/gnome/gcr/patches/patch-gcr_meson_build
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/gnome/gcr/patches/patch-gcr_meson_build 10 Jan 2023 20:02:11 -0000
@@ -0,0 +1,11 @@
+Index: gcr/meson.build
+--- gcr/meson.build.orig
++++ gcr/meson.build
+@@ -147,6 +147,7 @@ gcr_base_cflags = [
+   '-DGCK_API_SUBJECT_TO_CHANGE',
+   '-DP11_KIT_API_SUBJECT_TO_CHANGE',
+   '-D_XOPEN_SOURCE',   # Needed for strptime()
++  '-D_XOPEN_VERSION=4',   # Needed for strptime()
+ ]
+ 
+ gcr_base_symbolmap = meson.current_source_dir() / 'libgcr-base.map'

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Attachment: signature.asc
Description: PGP signature

Reply via email to