rpm/peazip
SHA256
1
0
Fork 0
forked from pool/peazip
Code Pull Requests Activity

Accepting request 652205 from home:Guillaume_G:branches:openSUSE:Factory:ARM

Browse Source 
- Add patch to fix build on aarch64:
  * peazip-fix_aarch64.patch

OBS-URL: https://build.opensuse.org/request/show/652205
OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/peazip?expand=0&rev=40
This commit is contained in:
Luigi Baldoni 2018-11-27 17:59:22 +00:00 committed by Git OBS Bridge
parent 1361dbf455
commit 0b1d9c7af4
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
peazip-fix_aarch64.patch Normal file
View File

@ -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}

6
peazip.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 27 16:58:19 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch to fix build on aarch64:
* peazip-fix_aarch64.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 28 18:21:09 UTC 2018 - Luigi Baldoni <aloisio@gmx.com> Sun Oct 28 18:21:09 UTC 2018 - Luigi Baldoni <aloisio@gmx.com>

3
peazip.spec
View File

@ -28,6 +28,8 @@ Source0: https://sourceforge.net/projects/peazip/files/%{version}/peazip-
Source1: altconf.txt Source1: altconf.txt
Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf
Patch0: peazip-desktop.patch 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 # PATCH-FIX-OPENSUSE peazip-build_PIE.patch -- aloisio@gmx.com
Patch2: peazip-build_PIE.patch Patch2: peazip-build_PIE.patch
# PATCH-FIX-OPENSUSE peazip-help_path.patch set correct path for the pdf guide -- aloisio@gmx.com # 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 %prep
%setup -q -n %{name}-%{version}.src %setup -q -n %{name}-%{version}.src
%patch0 %patch0
%patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1