[rpms/lazarus] multiple-IDE-widgetsets: Update to v4.0

[rpms/lazarus] multiple-IDE-widgetsets: Update to v4.0

[Artur Frenszek-Iwicki]

A new commit has been pushed.

Repo   : rpms/lazarus
Branch : multiple-IDE-widgetsets
Commit : df451b25ba34c3b197c5898e881749fd4a7efce3
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2025-05-10T16:43:54+02:00
Stats  : +14/-91 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/lazarus/c/df451b25ba34c3b197c5898e881749fd4a7efce3?branch=multiple-IDE-widgetsets

Log:
Update to v4.0

---
diff --git a/.gitignore b/.gitignore
index f52ad63..87b78e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /lazarus-3.4-0.tar.gz
 /lazarus-3.6-0.tar.gz
 /lazarus-3.8-0.tar.gz
+/lazarus-4.0-0.tar.gz

diff --git a/0001-crash-when-trying-to-recompile-packages.patch b/0001-crash-when-trying-to-recompile-packages.patch
deleted file mode 100644
index 92fb7bf..0000000
--- a/0001-crash-when-trying-to-recompile-packages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fixed crash when trying to recompile packages.
- Some packages do not need to be recompiled. There was a bug in lazbuild
- when trying to guess package output directory in this special case.
- Now, we just skip recompilation if it is not needed.
-Author: Abou Al Montacir <abou.almontacir@sfr.fr>
-Last-Update: Mon, 25 Dec 2023 16:02:09 +0100
-
----
- lazarus/packager/packagesystem.pas | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lazarus/packager/packagesystem.pas b/lazarus/packager/packagesystem.pas
-index e2c6c080..e36eefff 100644
---- a/lazarus/packager/packagesystem.pas
-+++ b/lazarus/packager/packagesystem.pas
-@@ -4221,6 +4221,10 @@ begin
-                           pcfSkipDesignTimePackages in Flags,
-                           pcfGroupCompile in Flags,
-                           NeedBuildAllFlag,Note);
-+    if Result = mrNo then begin
-+      DebugLn(['Info: (lazarus) [CompilePackage]: CheckIfPackageNeedsCompilation returned mrNo for package ', APackage.IDAsString]);
-+      Exit(mrOk);
-+    end;
-     if Note<>'' then
-       Note:='Compile reason: '+Note;
-     if (pcfOnlyIfNeeded in Flags) then begin
--- 
-2.39.2
-

diff --git a/0002-qt5-segfault.patch b/0002-qt5-segfault.patch
deleted file mode 100644
index 9a3976f..0000000
--- a/0002-qt5-segfault.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -U4 -r lazarus-3.6--orig/lazarus/lcl/interfaces/qt5/qtwsforms.pp lazarus-3.6--patched/lazarus/lcl/interfaces/qt5/qtwsforms.pp
---- lazarus-3.6--orig/lazarus/lcl/interfaces/qt5/qtwsforms.pp	2024-09-29 11:39:45.000000000 +0200
-+++ lazarus-3.6--patched/lazarus/lcl/interfaces/qt5/qtwsforms.pp	2024-12-09 16:58:22.751428297 +0100
-@@ -1034,20 +1034,23 @@
-     begin
-       if Assigned(TCustomForm(AWinControl).Menu) then
-       begin
-         AWin := TQtMainWindow(AWinControl.Handle);
--        AWin.MenuBar.sizeHint(@ASize);
--        // geometry isn't updated yet
--        if ASize.cy < 10 then
--          ASize.cy := 0;
--        // we must use real geometry, and then exclude menubar height.
--        aClientRect := AWin.getGeometry;
--        Types.OffsetRect(aClientRect, -aClientRect.Left, -aClientRect.Top);
--        dec(AClientRect.Bottom, ASize.cy);
--        {$IFDEF VerboseQtResize}
--        DebugLn('TQtWSCustomForm.getDefaultClientRect ',dbgsName(AWinControl),' ',dbgs(AWin.getClientBounds),' mnuBarHeight ',dbgs(AWin.MenuBar.getHeight),' ASize=',dbgs(ASize),' FINAL=',dbgs(AClientRect));
--        {$ENDIF}
--        Result := True;
-+        if Assigned(AWin.MenuBar) then
-+        begin
-+          AWin.MenuBar.sizeHint(@ASize);
-+          // geometry isn't updated yet
-+          if ASize.cy < 10 then
-+            ASize.cy := 0;
-+          // we must use real geometry, and then exclude menubar height.
-+          aClientRect := AWin.getGeometry;
-+          Types.OffsetRect(aClientRect, -aClientRect.Left, -aClientRect.Top);
-+          dec(AClientRect.Bottom, ASize.cy);
-+          {$IFDEF VerboseQtResize}
-+          DebugLn('TQtWSCustomForm.getDefaultClientRect ',dbgsName(AWinControl),' ',dbgs(AWin.getClientBounds),' mnuBarHeight ',dbgs(AWin.MenuBar.getHeight),' ASize=',dbgs(ASize),' FINAL=',dbgs(AClientRect));
-+          {$ENDIF}
-+          Result := True;
-+        end;
-       end;
-     end;
-   end;
- end;

diff --git a/lazarus.spec b/lazarus.spec
index 2ebafbc..0603fe5 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,27 +1,25 @@
 Name:           lazarus
 Summary:        Lazarus Component Library and IDE for Free Pascal
 
-Version:        3.8
+Version:        4.0
 
 %global baserelease 1
 Release:        %{baserelease}%{?dist}
 
 # The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
-%global qt5pas_version 2.15
+%global qt5pas_version 2.16
 %global qt5pas_release %(relstr="%{version}.%{baserelease}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*10000 + ${relstr[1]}*100 + ${relstr[2]})); echo "${relno}%{?dist}";)
 
 # The qt6pas version is taken from lcl/interfaces/qt6/cbindings/Qt6Pas.pro
-%global qt6pas_version 6.2.8
+%global qt6pas_version 6.2.10
 %global qt6pas_release %{qt5pas_release}
 
-# The IDE itself is licensed under GPLv2+, with minor parts under the modified LGPL.
+# The IDE itself is licensed under GPLv2+, with minor parts under a modified LGPL.
 # The Lazarus Component Library has parts licensed under all the licenses mentioned in the tag.
-#
-# GNU Classpath style exception, see COPYING.modifiedLGPL
 %global license_doc   GPL-2.0-or-later
 %global license_tools GPL-2.0-or-later
-%global license_ide   GPL-2.0-or-later AND LGPL-2.0 WITH Classpath-exception-2.0
-%global license_lcl   GPL-2.0-or-later AND LGPL-2.0 WITH Classpath-exception-2.0 AND MPL-1.1 AND Apache-2.0
+%global license_ide   GPL-2.0-or-later AND LGPL-2.0-only WITH Independent-modules-exception
+%global license_lcl   GPL-2.0-or-later AND LGPL-2.0-only WITH Independent-modules-exception AND MPL-1.1 AND Apache-2.0
 License:        %{license_lcl}
 
 URL:            http://www.lazarus-ide.org/
@@ -32,20 +30,6 @@ Source100:      lazarus.appdata.xml
 # Lazarus wants to put arch-specific stuff in /usr/share - make it go in /usr/lib istead
 Patch0:         0000-Makefile_patch.diff
 
-# lazbuild can be too eager to rebuild some Lazarus packages.
-# This causes build failures on other Fedora packages, as it tries to overwrite files in /usr/lib.
-#
-# Taken from Debian:
-# https://sources.debian.org/data/main/l/lazarus/3.0%2Bdfsg1-6/debian/patches/Fixed-crash-when-trying-to-recompile-packages.patch
-Patch1:         0001-crash-when-trying-to-recompile-packages.patch
-
-# Fix SIGSEGV on startup in programs built using the Qt5 widgetset
-# rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=2323227
-#
-# Backport of upstream commit:
-# https://gitlab.com/freepascal.org/lazarus/lazarus/-/commit/7ae720285564f69e85216a0889b3ae4308661860
-Patch2:         0002-qt5-segfault.patch
-
 # -- Build-time dependencies
 
 BuildRequires:  binutils
@@ -564,6 +548,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Sat May 10 2025 Artur Frenszek-Iwicki <fedora@svgames.pl> - 4.0-1
+- Update to v4.0
+- Drop Patch1 (crash in lazbuild) - issue fixed upstream
+- Drop Patch2 (Qt5 segfault) - backport from this release
+- Fix license tag ("LGPL-2.0 WITH Classpath-exception-2.0" -> "LGPL-2.0-only WITH Independent-modules-exception")
+
 * Wed Jan 22 2025 Artur Frenszek-Iwicki <fedora@svgames.pl> - 3.8-1
 - Update to v3.8
 

diff --git a/sources b/sources
index d812173..a69e51e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lazarus-3.8-0.tar.gz) = f33308cf130854b63fbcf6eee8824b454276dd71f8ce5c3cffbac5d42ded396ee3859a59ebfa3385c21a27553b0997ae2d334e6c8f6ce6edaf5474047eef79e4
+SHA512 (lazarus-4.0-0.tar.gz) = ef68febf91d00387df198d15130e5217dc6bc33a9eccc98ff24514241e79da36ca8d45f51593e4513a4674a613b9ec48d336db45e7bc4562b2d3cc5bdb811e18