From f19c2f429880358b29e88050b9902baf62ba799d6164c2dba2371e18621e65a8 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Sun, 10 Oct 2021 07:02:35 +0000 Subject: [PATCH] Accepting request 924514 from home:alois:branches:devel:languages:pascal - Add lazarus-PascalScript_PPC.patch (fixes PPC build) - Add _constraints file OBS-URL: https://build.opensuse.org/request/show/924514 OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/lazarus?expand=0&rev=70 --- _constraints | 15 +++++++++++++++ lazarus-PascalScript_PPC.patch | 26 ++++++++++++++++++++++++++ lazarus.changes | 6 ++++++ lazarus.spec | 7 +++++-- 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 _constraints create mode 100644 lazarus-PascalScript_PPC.patch diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..51be272 --- /dev/null +++ b/_constraints @@ -0,0 +1,15 @@ + + + + + ppc + ppc64 + ppc64le + + + + 4 + + + + diff --git a/lazarus-PascalScript_PPC.patch b/lazarus-PascalScript_PPC.patch new file mode 100644 index 0000000..184eee6 --- /dev/null +++ b/lazarus-PascalScript_PPC.patch @@ -0,0 +1,26 @@ +From 832180699b3591d64d2121cf60f6d64b83edf904 Mon Sep 17 00:00:00 2001 +From: Martin +Date: Sat, 9 Oct 2021 20:02:38 +0200 +Subject: [PATCH] PascalScript: Compile on PPC, using "not supported" + InnerfuseCall. Issue #39404 + +--- + components/PascalScript/Source/uPSRuntime.pas | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/components/PascalScript/Source/uPSRuntime.pas b/components/PascalScript/Source/uPSRuntime.pas +index 95099a71e0..8a925e2e1a 100644 +--- a/components/PascalScript/Source/uPSRuntime.pas ++++ b/components/PascalScript/Source/uPSRuntime.pas +@@ -9834,7 +9834,7 @@ end; + {$IFDEF Delphi6UP} + {$if defined(cpu86)} + {$include x86.inc} +- {$elseif defined(cpupowerpc)} ++ {$elseif defined(cpupowerpc) and defined(cpu32) and defined(darwin)} + {$include powerpc.inc} + {$elseif defined(cpuarm)} + {$include arm.inc} +-- +GitLab + diff --git a/lazarus.changes b/lazarus.changes index 4e6ec0f..c82bae3 100644 --- a/lazarus.changes +++ b/lazarus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 10 06:22:11 UTC 2021 - Luigi Baldoni + +- Add lazarus-PascalScript_PPC.patch (fixes PPC build) +- Add _constraints file + ------------------------------------------------------------------- Wed Feb 24 11:57:37 UTC 2021 - Luigi Baldoni diff --git a/lazarus.spec b/lazarus.spec index a5c352e..fd0c96a 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -33,6 +33,8 @@ Source90: %{name}-rpmlintrc Patch0: %{name}-Makefile_patch.diff # PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file Patch1: lazarus.desktop.patch +# PATCH-FIX-UPSTREAM lazarus-PascalScript_PPC.patch +Patch2: lazarus-PascalScript_PPC.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fpc >= 3.0.0 @@ -42,8 +44,8 @@ Requires: fpc-src Requires: gdb Requires(post): desktop-file-utils Requires(post): shared-mime-info -Requires(postun): desktop-file-utils -Requires(postun): shared-mime-info +Requires(postun):desktop-file-utils +Requires(postun):shared-mime-info %if 0%{?suse_version} > 1210 BuildRequires: desktop-file-utils %else @@ -100,6 +102,7 @@ Development files for Free Pascal interface to Qt5. %setup -q -n %{name} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # remove unneeded files rm -rf debian