From f130b192072c7b730146152aff16efafc94c708d84fbb0eeda2aff2f5968698f Mon Sep 17 00:00:00 2001
From: Luigi Baldoni <aloisio@gmx.com>
Date: Fri, 10 Jul 2020 20:36:21 +0000
Subject: [PATCH] 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
---
 lazarus-2.0.10-fpc304.patch | 27 +++++++++++++++++++++++++++
 lazarus-2.0.10.tar.gz       |  3 +++
 lazarus-2.0.8.tar.gz        |  3 ---
 lazarus.changes             |  8 ++++++++
 lazarus.spec                |  5 ++++-
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 lazarus-2.0.10-fpc304.patch
 create mode 100644 lazarus-2.0.10.tar.gz
 delete mode 100644 lazarus-2.0.8.tar.gz

diff --git a/lazarus-2.0.10-fpc304.patch b/lazarus-2.0.10-fpc304.patch
new file mode 100644
index 0000000..4405cf5
--- /dev/null
+++ b/lazarus-2.0.10-fpc304.patch
@@ -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
diff --git a/lazarus-2.0.10.tar.gz b/lazarus-2.0.10.tar.gz
new file mode 100644
index 0000000..83b2c67
--- /dev/null
+++ b/lazarus-2.0.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c767cc2836bb28fe3d3b8afb2a2f0ef94ea96c7132154e678dff448eb49fcd3b
+size 69625081
diff --git a/lazarus-2.0.8.tar.gz b/lazarus-2.0.8.tar.gz
deleted file mode 100644
index 2d3da03..0000000
--- a/lazarus-2.0.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:90b037280e5c63265bc25a63e6e78c9cb979fc4b45aa84606e3856b09ac791c5
-size 65602475
diff --git a/lazarus.changes b/lazarus.changes
index c9b19e8..7ae08f3 100644
--- a/lazarus.changes
+++ b/lazarus.changes
@@ -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>
 
diff --git a/lazarus.spec b/lazarus.spec
index c5c8f05..51f87fc 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -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