diff --git a/0001-build-resolve-i586-compile-error.patch b/0001-build-resolve-i586-compile-error.patch new file mode 100644 index 0000000..e1b0019 --- /dev/null +++ b/0001-build-resolve-i586-compile-error.patch @@ -0,0 +1,36 @@ +From b13e1bf5522baa86021a6ff40e1e29e84e84538a Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 30 Oct 2023 08:01:14 +0100 +Subject: [PATCH] build: resolve i586 compile error + +edb2mt.cpp: In function 'read_col': +edb2mt.cpp:211:65: error: cannot convert 'size_t*' {aka 'unsigned +int*'} to 'size64_t*' {aka 'long long unsigned int*'} +--- + tools/edb2mt.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tools/edb2mt.cpp b/tools/edb2mt.cpp +index 159b2c4fc..8ed992b95 100644 +--- a/tools/edb2mt.cpp ++++ b/tools/edb2mt.cpp +@@ -206,12 +206,14 @@ static void read_col(libesedb_record_t *row, unsigned int x, + throw az_error("EE-1014", err); + } else if (is_lval) { + ese_lval_ptr lv; ++ uint64_t dsize64 = 0; + if (libesedb_record_get_long_value(row, x, &unique_tie(lv), &~unique_tie(err)) < 1) + throw az_error("EE-1018", err); +- if (libesedb_long_value_get_data_size(lv.get(), &dsize, &~unique_tie(err)) < 1) ++ if (libesedb_long_value_get_data_size(lv.get(), &dsize64, &~unique_tie(err)) < 1) + throw az_error("EE-1019", err); +- if (dsize == 0) ++ if (dsize64 == 0) + return; ++ dsize = std::max(dsize64, static_cast(UINT32_MAX)); + udata.resize(dsize); + if (libesedb_long_value_get_data(lv.get(), + TOU8(udata.data()), dsize, &~unique_tie(err)) < 1) +-- +2.42.0 + diff --git a/gromox.changes b/gromox.changes index ea209d8..38dcf73 100644 --- a/gromox.changes +++ b/gromox.changes @@ -13,6 +13,7 @@ Sun Oct 29 18:44:37 UTC 2023 - Jan Engelhardt * oxvcard: export to .vcf now positions the VERSION property in accordance with the vCard 4.0 specification. * oxcmail: cease gratuitous RTF conversion of calendar items. +- Add 0001-build-resolve-i586-compile-error.patch ------------------------------------------------------------------- Wed Oct 18 13:01:38 UTC 2023 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index a06873a..7014c21 100644 --- a/gromox.spec +++ b/gromox.spec @@ -28,6 +28,7 @@ URL: https://grommunio.com/ Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.zst Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.asc Source8: %name.keyring +Patch1: 0001-build-resolve-i586-compile-error.patch BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: gcc-c++