pyrox.dev
lasso: fix build with gcc14
+12
pkgs/by-name/la/lasso/fix-gcc14-implicit-function-declaration.diff
+12
pkgs/by-name/la/lasso/fix-gcc14-implicit-function-declaration.diff
···
1
+
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
2
+
index 385858d174..bbc87d9f1e 100644
3
+
--- a/lasso/xml/tools.c
4
+
+++ b/lasso/xml/tools.c
5
+
@@ -47,6 +47,7 @@
6
+
#include <libxml/xmlIO.h>
7
+
8
+
#include <openssl/evp.h>
9
+
+#include <openssl/pem.h>
10
+
11
+
#include <xmlsec/base64.h>
12
+
#include <xmlsec/crypto.h>
+53
pkgs/by-name/la/lasso/fix-gcc14-incompatible-pointer.diff
+53
pkgs/by-name/la/lasso/fix-gcc14-incompatible-pointer.diff
···
1
+
From 1bf9184e1208e805f70ccb8ba06b4c3d63a1a04a Mon Sep 17 00:00:00 2001
2
+
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
3
+
Date: Wed, 24 Jan 2024 15:15:39 +0100
4
+
Subject: [PATCH] misc: adjust to structured error callback argument change in
5
+
libxml2 2.12 (#86080)
6
+
7
+
---
8
+
lasso/lasso.c | 8 +++++++-
9
+
lasso/xml/tools.c | 9 ++++++++-
10
+
2 files changed, 15 insertions(+), 2 deletions(-)
11
+
12
+
diff --git a/lasso/lasso.c b/lasso/lasso.c
13
+
index 9902512f..7ea5df44 100644
14
+
--- a/lasso/lasso.c
15
+
+++ b/lasso/lasso.c
16
+
@@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
17
+
#include "types.c"
18
+
19
+
static void
20
+
-lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, xmlErrorPtr error)
21
+
+lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data,
22
+
+#if LIBXML_VERSION >= 21200
23
+
+ const xmlError *error
24
+
+#else
25
+
+ xmlErrorPtr error
26
+
+#endif
27
+
+ )
28
+
{
29
+
g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message);
30
+
}
31
+
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
32
+
index 385858d1..014f4040 100644
33
+
--- a/lasso/xml/tools.c
34
+
+++ b/lasso/xml/tools.c
35
+
@@ -1449,7 +1449,14 @@ lasso_concat_url_query(const char *url, const char *query)
36
+
}
37
+
}
38
+
39
+
-static void structuredErrorFunc (void *userData, xmlErrorPtr error) {
40
+
+static void structuredErrorFunc (void *userData,
41
+
+#if LIBXML_VERSION >= 21200
42
+
+ const xmlError *error
43
+
+#else
44
+
+ xmlErrorPtr error
45
+
+#endif
46
+
+ )
47
+
+{
48
+
*(int*)userData = error->code;
49
+
}
50
+
51
+
--
52
+
2.49.0
53
+
+11
pkgs/by-name/la/lasso/package.nix
+11
pkgs/by-name/la/lasso/package.nix
···
32
32
url = "https://git.entrouvert.org/entrouvert/lasso/commit/ffaddeb015a61db3e52c391de00430107a23e2f1.patch";
33
33
hash = "sha256-D2npxpIuR/KrNYiKO3KXCvHEb/XVXUKIP0HQUd+w56k=";
34
34
})
35
+
# Fix GCC 14 implicit declaration of function
36
+
# backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/9767cdf7645a146bcc596a705ce32b855855a590
37
+
./fix-gcc14-implicit-function-declaration.diff
38
+
# Fix GCC 14 incompatible pointer
39
+
# backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/cbe2c45455d93ed793dc4be59e3d2d26f1bd1111
40
+
./fix-gcc14-incompatible-pointer.diff
41
+
# Fix GCC 14 int-conversion (xmlsec)
42
+
(fetchpatch {
43
+
url = "https://git.entrouvert.org/entrouvert/lasso/commit/66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch";
44
+
hash = "sha256-UkWxznKx2xAbjY29+NQ+cjIDhWLuyoWsmBTSiLUxWgU=";
45
+
})
35
46
];
36
47
37
48
nativeBuildInputs = [