Accepting request 820052 from home:alois:branches:devel:languages:pascal

- Update to version 2.0.10
  This is a bugfix release. For a complete list of changes see:
  https://wiki.freepascal.org/Lazarus_2.0_fixes_branch#Fixes_for_2.0.10_.28merged.29
- Add lazarus-2.0.10-fpc304.patch (fix build with fpc 3.0.4)

OBS-URL: https://build.opensuse.org/request/show/820052
OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/lazarus?expand=0&rev=64
This commit is contained in:
Luigi Baldoni 2020-07-10 20:36:21 +00:00 committed by Git OBS Bridge
parent 4e50e30873
commit f130b19207
5 changed files with 42 additions and 4 deletions

View File

@ -0,0 +1,27 @@
From: Mattias Gaertner <mattias@freepascal.org>
Date: 2020-07-07 09:25:48 UTC
Subject: fixed compile fpc 3.0.4
References: r63523
chmhelp: fixed compile fpc 3.0.4
--- trunk/components/chmhelp/lhelp/chmspecialparser.pas 2020/07/07 03:59:57 63522
+++ trunk/components/chmhelp/lhelp/chmspecialparser.pas 2020/07/07 09:25:48 63523
@@ -136,6 +136,7 @@
// Add new child node
fLastNode := AParentNode;
NewNode := TContentTreeNode(fTreeView.Items.AddChild(AParentNode, txt));
+ {$IF FPC_FULLVERSION>=30200}
URL:='';
for x:=0 to AItem.SubItemcount-1 do
begin
@@ -146,6 +147,9 @@
if URL<>'' then
break;
end;
+ {$ELSE}
+ URL:=AItem.URL;
+ {$ENDIF}
NewNode.Url := FixURL('/'+URL);
NewNode.Data := fChm;
if fTreeView.Images <> nil then

3
lazarus-2.0.10.tar.gz Normal file
View File

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

View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jul 8 17:15:55 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
- Update to version 2.0.10
This is a bugfix release. For a complete list of changes see:
https://wiki.freepascal.org/Lazarus_2.0_fixes_branch#Fixes_for_2.0.10_.28merged.29
- Add lazarus-2.0.10-fpc304.patch (fix build with fpc 3.0.4)
-------------------------------------------------------------------
Wed Apr 15 20:15:11 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

View File

@ -18,7 +18,7 @@
%define sover 1
Name: lazarus
Version: 2.0.8
Version: 2.0.10
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
@ -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-2.0.10-fpc304.patch
Patch2: lazarus-2.0.10-fpc304.patch
%if 0%{?suse_version} > 1210
BuildRequires: desktop-file-utils
%else
@ -101,6 +103,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