Accepting request 924515 from devel:languages:pascal

OBS-URL: https://build.opensuse.org/request/show/924515
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lazarus?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2021-10-11 13:31:39 +00:00 committed by Git OBS Bridge
commit c44299ccec
4 changed files with 52 additions and 2 deletions

15
_constraints Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0"?>
<constraints>
<overwrite>
<conditions>
<arch>ppc</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
</conditions>
<hardware>
<disk>
<size unit="G">4</size>
</disk>
</hardware>
</overwrite>
</constraints>

View File

@ -0,0 +1,26 @@
From 832180699b3591d64d2121cf60f6d64b83edf904 Mon Sep 17 00:00:00 2001
From: Martin <laz.git@mfriebe.de>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Oct 10 06:22:11 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
- Add lazarus-PascalScript_PPC.patch (fixes PPC build)
- Add _constraints file
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 24 11:57:37 UTC 2021 - Luigi Baldoni <aloisio@gmx.com> Wed Feb 24 11:57:37 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

View File

@ -33,6 +33,8 @@ Source90: %{name}-rpmlintrc
Patch0: %{name}-Makefile_patch.diff Patch0: %{name}-Makefile_patch.diff
# PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file # PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file
Patch1: lazarus.desktop.patch Patch1: lazarus.desktop.patch
# PATCH-FIX-UPSTREAM lazarus-PascalScript_PPC.patch
Patch2: lazarus-PascalScript_PPC.patch
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: fpc >= 3.0.0 BuildRequires: fpc >= 3.0.0
@ -42,8 +44,8 @@ Requires: fpc-src
Requires: gdb Requires: gdb
Requires(post): desktop-file-utils Requires(post): desktop-file-utils
Requires(post): shared-mime-info Requires(post): shared-mime-info
Requires(postun): desktop-file-utils Requires(postun):desktop-file-utils
Requires(postun): shared-mime-info Requires(postun):shared-mime-info
%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1210
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%else %else
@ -100,6 +102,7 @@ Development files for Free Pascal interface to Qt5.
%setup -q -n %{name} %setup -q -n %{name}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# remove unneeded files # remove unneeded files
rm -rf debian rm -rf debian