SHA256
1
0
forked from pool/lazarus

Accepting request 959927 from devel:languages:pascal

OBS-URL: https://build.opensuse.org/request/show/959927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lazarus?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2022-03-07 16:47:51 +00:00 committed by Git OBS Bridge
commit 84f286c961
5 changed files with 16 additions and 39 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba6cef7f823a2d28166229982efc926039d42313c40e22fe0c6776c13d0015b2
size 69560778

3
lazarus-2.2.0-0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160
size 76777421

View File

@ -1,26 +0,0 @@
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,11 @@
-------------------------------------------------------------------
Wed Jan 5 11:56:21 UTC 2022 - Luigi Baldoni <aloisio@gmx.com>
- Update to version 2.2.0
* For a complete list of changes see:
https://wiki.freepascal.org/Lazarus_2.2.0_release_notes
- Drop lazarus-PascalScript_PPC.patch (merged upstream)
-------------------------------------------------------------------
Sun Oct 10 06:22:11 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package lazarus
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,16 +16,17 @@
#
%define dlver 2.2.0-0
%define sover 1
Name: lazarus
Version: 2.0.12
Version: 2.2.0
Release: 0
# Please note that the LGPL is modified and this is not multi-licensed, but each component has a separate license chosen.
Summary: FreePascal RAD IDE and Component Library
License: GPL-2.0-only AND LGPL-2.0-only AND MPL-1.1
Group: Development/Languages/Other
URL: http://www.lazarus.freepascal.org/
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{dlver}.tar.gz
# PATCH-FEATURE-UPSTREAM http://mantis.freepascal.org/view.php?id=31364
Source1: https://raw.githubusercontent.com/hughsie/fedora-appstream/developerapps/appdata-extra/desktop/lazarus.appdata.xml
Source90: %{name}-rpmlintrc
@ -33,8 +34,6 @@ 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
@ -99,10 +98,7 @@ Requires: libQt5Pas%{sover} = %{version}
Development files for Free Pascal interface to Qt5.
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%autosetup -p1 -n %{name}
# remove unneeded files
rm -rf debian
@ -201,7 +197,6 @@ mv %{buildroot}%{_libdir}/%{name}/examples %{buildroot}%{_defaultdocdir}/%{name}
ln -s %{_defaultdocdir}/%{name}/examples %{buildroot}%{_libdir}/%{name}/examples
mv %{buildroot}%{_libdir}/%{name}/docs %{buildroot}%{_defaultdocdir}/%{name}
ln -s %{_defaultdocdir}/%{name}/docs %{buildroot}%{_libdir}/%{name}/docs
mv %{buildroot}%{_libdir}/%{name}/COPYING* %{buildroot}%{_libdir}/%{name}/README* %{buildroot}%{_defaultdocdir}/%{name}
# icons
for f in 16 32 48 64 128 256; do