forked from pool/gromox
Accepting request 1123505 from server:mail
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1123505 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gromox?expand=0&rev=21
This commit is contained in:
commit
e700a9cb05
36
0001-build-resolve-i586-compile-error.patch
Normal file
36
0001-build-resolve-i586-compile-error.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From b13e1bf5522baa86021a6ff40e1e29e84e84538a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
|
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<uint64_t>(UINT32_MAX));
|
||||||
|
udata.resize(dsize);
|
||||||
|
if (libesedb_long_value_get_data(lv.get(),
|
||||||
|
TOU8(udata.data()), dsize, &~unique_tie(err)) < 1)
|
||||||
|
--
|
||||||
|
2.42.0
|
||||||
|
|
@ -13,6 +13,7 @@ Sun Oct 29 18:44:37 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
|||||||
* oxvcard: export to .vcf now positions the VERSION property in
|
* oxvcard: export to .vcf now positions the VERSION property in
|
||||||
accordance with the vCard 4.0 specification.
|
accordance with the vCard 4.0 specification.
|
||||||
* oxcmail: cease gratuitous RTF conversion of calendar items.
|
* 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 <jengelh@inai.de>
|
Wed Oct 18 13:01:38 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
@ -28,6 +28,7 @@ URL: https://grommunio.com/
|
|||||||
Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.zst
|
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
|
Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.asc
|
||||||
Source8: %name.keyring
|
Source8: %name.keyring
|
||||||
|
Patch1: 0001-build-resolve-i586-compile-error.patch
|
||||||
BuildRequires: automake >= 1.11
|
BuildRequires: automake >= 1.11
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
Loading…
Reference in New Issue
Block a user