From 040a1155d2416b43426dd5d210e1721482c05463 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 2 Aug 2023 01:41:47 -0400 Subject: [PATCH] Update wxi data for Fedora 39 https://gitlab.gnome.org/GNOME/msitools/-/merge_requests/65 Resolves: rhbz#2113528 --- 0001-Update-data-wixl.patch | 262 ++++++++++++++++++++++++++++++++++++ msitools.spec | 8 +- 2 files changed, 267 insertions(+), 3 deletions(-) create mode 100644 0001-Update-data-wixl.patch diff --git a/0001-Update-data-wixl.patch b/0001-Update-data-wixl.patch new file mode 100644 index 0000000..abab5d1 --- /dev/null +++ b/0001-Update-data-wixl.patch @@ -0,0 +1,262 @@ +From 880ad3e61f01578384770934a61b52088685ffce Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 2 Aug 2023 01:26:47 -0400 +Subject: [PATCH 1/4] wxi: enable pcre2 + +This is a follow-up to commit e781e05a3f7d0a38a385bc02098d2d3bdeab1741. + +Signed-off-by: Yaakov Selkowitz +--- + data/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/meson.build b/data/meson.build +index 65b9766..822edb8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -69,6 +69,7 @@ wxi_data = files( + 'wixl/p11-kit.wxi', + 'wixl/pango.wxi', + 'wixl/pcre.wxi', ++ 'wixl/pcre2.wxi', + 'wixl/pixman.wxi', + 'wixl/portablexdr.wxi', + 'wixl/readline.wxi', +-- +2.41.0 + +From 4f1966a0db2aec3df70038336192ac318a035503 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 2 Aug 2023 01:28:48 -0400 +Subject: [PATCH 2/4] wxi-validate: ignore ntdll.dll + +mingw{32,64}-librsvg2 in Fedora rawhide depend on this system DLL. + +Signed-off-by: Yaakov Selkowitz +--- + data/wxi-validate.pl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/wxi-validate.pl b/data/wxi-validate.pl +index 147e72a..2c47552 100755 +--- a/data/wxi-validate.pl ++++ b/data/wxi-validate.pl +@@ -72,6 +72,7 @@ my $dllbuiltin = "^(" . + "msvcrt|" . + "mswsock|" . + "ncrypt|" . ++ "ntdll|" . + "ole32|" . + "oleaut32|" . + "opengl32|" . +-- +2.41.0 + +From cd18e0b8ea20f7e5cff5c19c70d2cd18cb1e53c7 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 2 Aug 2023 01:30:12 -0400 +Subject: [PATCH 3/4] wxi: add dependencies to cairo + +Signed-off-by: Yaakov Selkowitz +--- + data/wixl/cairo.wxi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/data/wixl/cairo.wxi b/data/wixl/cairo.wxi +index d7fd501..98c9357 100644 +--- a/data/wixl/cairo.wxi ++++ b/data/wixl/cairo.wxi +@@ -1,4 +1,6 @@ + ++ ++ + + + +@@ -22,6 +24,8 @@ + + + ++ ++ + + + +-- +2.41.0 + +From 6e86dbc102f1cc56f79edf9b8e71eb69e1d6277e Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Wed, 2 Aug 2023 01:30:53 -0400 +Subject: [PATCH 4/4] wxi: update icu to 73.2 + +Signed-off-by: Yaakov Selkowitz +--- + data/wixl/icu.wxi | 88 +++++++++++++++++++++++++---------------------- + 1 file changed, 46 insertions(+), 42 deletions(-) + +diff --git a/data/wixl/icu.wxi b/data/wixl/icu.wxi +index 152bae5..bbc06a6 100644 +--- a/data/wixl/icu.wxi ++++ b/data/wixl/icu.wxi +@@ -3,7 +3,7 @@ + + + +- ++ + + + +@@ -37,29 +37,32 @@ + + + +- +- ++ ++ + +- +- ++ ++ ++ ++ ++ + + + + +- +- ++ ++ + + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ + + + +@@ -71,17 +74,17 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + +- +- ++ ++ + + +- ++ + + + +@@ -102,7 +105,7 @@ + + + +- ++ + + + +@@ -114,17 +117,17 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + +- +- ++ ++ + +- +- ++ ++ + + + +@@ -145,19 +148,20 @@ + + + +- +- ++ ++ ++ + +- ++ + +- +- +- ++ ++ ++ + + + +- +- ++ ++ + + + +@@ -167,9 +171,9 @@ + + + +- +- +- ++ ++ ++ + + + +-- +2.41.0 + diff --git a/msitools.spec b/msitools.spec index f3e0246..640b587 100644 --- a/msitools.spec +++ b/msitools.spec @@ -18,6 +18,8 @@ Summary: Windows Installer tools License: GPL-2.0-or-later URL: http://ftp.gnome.org/pub/GNOME/sources/%{name} Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz +# https://gitlab.gnome.org/GNOME/msitools/-/issues/55 +Patch0: 0001-Update-data-wixl.patch Requires: libgsf >= 1.14.24-2 @@ -35,7 +37,7 @@ BuildRequires: bison BuildRequires: perl-base BuildRequires: perl-XML-XPath # these are available in the RHEL/ELN buildroot -# pcre2 and srvany are also available but not used by the tests +# srvany is also available but not used by the tests BuildRequires: mingw32-gcc-c++ BuildRequires: mingw64-gcc-c++ BuildRequires: mingw32-gcc @@ -46,6 +48,8 @@ BuildRequires: mingw32-glib2 BuildRequires: mingw64-glib2 BuildRequires: mingw32-libffi BuildRequires: mingw64-libffi +BuildRequires: mingw32-pcre2 +BuildRequires: mingw64-pcre2 BuildRequires: mingw32-pixman BuildRequires: mingw64-pixman BuildRequires: mingw32-termcap @@ -133,8 +137,6 @@ BuildRequires: mingw32-libjpeg-turbo BuildRequires: mingw64-libjpeg-turbo BuildRequires: mingw32-libogg BuildRequires: mingw64-libogg -BuildRequires: mingw32-pcre -BuildRequires: mingw64-pcre BuildRequires: mingw32-libpng BuildRequires: mingw64-libpng BuildRequires: mingw32-libpsl