diff --git a/peazip-fix_aarch64.patch b/peazip-fix_aarch64.patch new file mode 100644 index 0000000..575c6e2 --- /dev/null +++ b/peazip-fix_aarch64.patch @@ -0,0 +1,24 @@ +diff -purN peazip-6.6.1.src.orig/rmd160.pas peazip-6.6.1.src/rmd160.pas +--- peazip-6.6.1.src.orig/rmd160.pas 2018-11-27 15:51:25.463922229 +0100 ++++ peazip-6.6.1.src/rmd160.pas 2018-11-27 15:55:25.321937426 +0100 +@@ -125,7 +125,7 @@ implementation + + + {$ifdef FPC} +- {$ifndef CPUARM} ++ {$if not(defined(CPUARM)) and not(defined(CPUAARCH64))} + {$asmmode intel} + {$endif} + {$endif} +diff -purN peazip-6.6.1.src.orig/tsc.pas peazip-6.6.1.src/tsc.pas +--- peazip-6.6.1.src.orig/tsc.pas 2018-11-27 15:51:25.463922229 +0100 ++++ peazip-6.6.1.src/tsc.pas 2018-11-27 16:05:25.150978582 +0100 +@@ -95,7 +95,7 @@ function _CheckRDTSC: boolean; + + implementation + +-{$ifdef CPUARM} ++{$if defined(CPUARM) or defined(CPUAARCH64)} + + {$ifdef WINCE} + diff --git a/peazip.changes b/peazip.changes index 01be048..018a1bb 100644 --- a/peazip.changes +++ b/peazip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 27 16:58:19 UTC 2018 - Guillaume GARDET + +- Add patch to fix build on aarch64: + * peazip-fix_aarch64.patch + ------------------------------------------------------------------- Sun Oct 28 18:21:09 UTC 2018 - Luigi Baldoni diff --git a/peazip.spec b/peazip.spec index d816d38..b403293 100644 --- a/peazip.spec +++ b/peazip.spec @@ -28,6 +28,8 @@ Source0: https://sourceforge.net/projects/peazip/files/%{version}/peazip- Source1: altconf.txt Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf Patch0: peazip-desktop.patch +# PATCH-FIX-UPSTREAM: https://sourceforge.net/p/peazip/tickets/492/ +Patch1: peazip-fix_aarch64.patch # PATCH-FIX-OPENSUSE peazip-build_PIE.patch -- aloisio@gmx.com Patch2: peazip-build_PIE.patch # PATCH-FIX-OPENSUSE peazip-help_path.patch set correct path for the pdf guide -- aloisio@gmx.com @@ -83,6 +85,7 @@ This subpackage contains the KF5 integration. %prep %setup -q -n %{name}-%{version}.src %patch0 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1