diff --git a/0002-Change-GUINT_FROM_LE-to-GUINT16_FROM_LE.patch b/0002-Change-GUINT_FROM_LE-to-GUINT16_FROM_LE.patch new file mode 100644 index 0000000..372d372 --- /dev/null +++ b/0002-Change-GUINT_FROM_LE-to-GUINT16_FROM_LE.patch @@ -0,0 +1,65 @@ +From d79ad6d2c89cadb83eeb14321c862e4b4691fb97 Mon Sep 17 00:00:00 2001 +From: Jerry James +Date: Wed, 23 Aug 2023 12:07:54 -0600 +Subject: [PATCH] Change GUINT_FROM_LE to GUINT16_FROM_LE + +Signed-off-by: Jerry James +--- + libmsi/string.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/libmsi/string.c b/libmsi/string.c +index 988d6eb..0b20c0b 100644 +--- a/libmsi/string.c ++++ b/libmsi/string.c +@@ -495,14 +495,14 @@ string_table *msi_load_string_table( GsfInfile *stg, unsigned *bytes_per_strref + if( r != LIBMSI_RESULT_SUCCESS) + goto end; + +- if ( (poolsize > 4) && (GUINT_FROM_LE(pool[1]) & 0x8000) ) ++ if ( (poolsize > 4) && (GUINT16_FROM_LE(pool[1]) & 0x8000) ) + *bytes_per_strref = LONG_STR_BYTES; + else + *bytes_per_strref = sizeof(uint16_t); + + count = poolsize/4; + if( poolsize > 4 ) +- codepage = GUINT_FROM_LE(pool[0]) | ( (GUINT_FROM_LE(pool[1]) & ~0x8000) << 16 ); ++ codepage = GUINT16_FROM_LE(pool[0]) | ( (GUINT16_FROM_LE(pool[1]) & ~0x8000) << 16 ); + else + codepage = CP_ACP; + +@@ -516,10 +516,10 @@ string_table *msi_load_string_table( GsfInfile *stg, unsigned *bytes_per_strref + while ( i= 1.14.24-2 @@ -206,9 +208,6 @@ BuildRequires: mingw64-wavpack %endif %endif -# https://bugzilla.redhat.com/show_bug.cgi?id=1924216 -ExcludeArch: s390x - %description msitools is a collection of utilities to inspect and create Windows Installer files. It is useful in a cross-compilation environment such @@ -277,6 +276,9 @@ The libmsi1-devel package includes the header files for libmsi. %changelog +* Thu Sep 14 2023 Jerry James - 0.102-3 +- Fix build on s390x + * Thu Jul 20 2023 Fedora Release Engineering - 0.102-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild