public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
To: git-commits@fedoraproject.org
Subject: [rpms/lazarus] multiple-IDE-widgetsets: Update to v3.4
Date: Thu, 23 Jul 2026 08:18:20 GMT [thread overview]
Message-ID: <178479470011.1.16777919683455053086.rpms-lazarus-0f14c0226021@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/lazarus
Branch : multiple-IDE-widgetsets
Commit : 0f14c0226021662cf1cbdd8d5c9d13bd1fa90bf1
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date : 2024-07-28T13:50:00+02:00
Stats : +30/-134 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/lazarus/c/0f14c0226021662cf1cbdd8d5c9d13bd1fa90bf1?branch=multiple-IDE-widgetsets
Log:
Update to v3.4
---
diff --git a/.gitignore b/.gitignore
index a99ef2b..9e45a1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/lazarus-2.2.6-0.tar.gz
/lazarus-3.0-0.tar.gz
/lazarus-3.2-0.tar.gz
+/lazarus-3.4-0.tar.gz
diff --git a/0002-Qt6-removed-function.patch b/0002-Qt6-removed-function.patch
deleted file mode 100644
index 93a4cc2..0000000
--- a/0002-Qt6-removed-function.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b71e3074a333b1573c6d662930b4689d92f5962e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=BDeljan=20Rikalo?= <zeljko@lazarus-ide.org>
-Date: Sun, 14 Apr 2024 13:19:52 +0200
-Subject: [PATCH] Qt6: removed deprecated QString::IsSimpleText() from
- cbindings. issue #40901
-
----
- lazarus/lcl/interfaces/qt6/cbindings/Qt6Pas.pro | 8 ++++----
- lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.cpp | 5 -----
- lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.h | 1 -
- lazarus/lcl/interfaces/qt6/qt62.pas | 1 -
- 4 files changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/lazarus/lcl/interfaces/qt6/cbindings/Qt6Pas.pro b/lazarus/lcl/interfaces/qt6/cbindings/Qt6Pas.pro
-index bb4dd573cfd..c6e7419f18e 100644
---- a/lazarus/lcl/interfaces/qt6/cbindings/Qt6Pas.pro
-+++ b/lazarus/lcl/interfaces/qt6/cbindings/Qt6Pas.pro
-@@ -10,13 +10,13 @@
-
-
-
--# Binding Release Version 6.2.7 against Qt6 6.2 LTS release.
-+# Binding Release Version 6.2.8 against Qt6 6.2 LTS release.
-
--win32:VERSION = 6.2.7.0
--else:VERSION = 6.2.7
-+win32:VERSION = 6.2.8.0
-+else:VERSION = 6.2.8
- VER_MAJ = 6
- VER_MIN = 2
--VER_PAT = 7
-+VER_PAT = 8
- win32:VERSION_PE_HEADER = 6.2
-
- QT += gui printsupport
-diff --git a/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.cpp b/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.cpp
-index 9cb602ebc08..d3d5058480f 100644
---- a/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.cpp
-+++ b/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.cpp
-@@ -1073,11 +1073,6 @@ bool QString_isNull(QStringH handle)
- return (bool) ((QString *)handle)->isNull();
- }
-
--bool QString_isSimpleText(QStringH handle)
--{
-- return (bool) ((QString *)handle)->isSimpleText();
--}
--
- bool QString_isRightToLeft(QStringH handle)
- {
- return (bool) ((QString *)handle)->isRightToLeft();
-diff --git a/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.h b/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.h
-index 6f0b6715207..377ef5a133a 100644
---- a/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.h
-+++ b/lazarus/lcl/interfaces/qt6/cbindings/src/qstring_c.h
-@@ -166,7 +166,6 @@ C_EXPORT void QString_push_back2(QStringH handle, PWideString s);
- C_EXPORT void QString_push_front(QStringH handle, PWideChar c);
- C_EXPORT void QString_push_front2(QStringH handle, PWideString s);
- C_EXPORT bool QString_isNull(QStringH handle);
--C_EXPORT bool QString_isSimpleText(QStringH handle);
- C_EXPORT bool QString_isRightToLeft(QStringH handle);
- C_EXPORT void QString_chopped(QStringH handle, int len, PWideString retval);
- C_EXPORT void QString_first(QStringH handle, int n, PWideString retval);
-diff --git a/lazarus/lcl/interfaces/qt6/qt62.pas b/lazarus/lcl/interfaces/qt6/qt62.pas
-index 9def6242a2a..bef59bfc9bc 100644
---- a/lazarus/lcl/interfaces/qt6/qt62.pas
-+++ b/lazarus/lcl/interfaces/qt6/qt62.pas
-@@ -3214,7 +3214,6 @@ procedure QString_push_back(handle: QStringH; s: PWideString); cdecl; external Q
- procedure QString_push_front(handle: QStringH; c: PWideChar); cdecl; external Qt6PasLib name 'QString_push_front';
- procedure QString_push_front(handle: QStringH; s: PWideString); cdecl; external Qt6PasLib name 'QString_push_front2';
- function QString_isNull(handle: QStringH): Boolean; cdecl; external Qt6PasLib name 'QString_isNull';
--function QString_isSimpleText(handle: QStringH): Boolean; cdecl; external Qt6PasLib name 'QString_isSimpleText';
- function QString_isRightToLeft(handle: QStringH): Boolean; cdecl; external Qt6PasLib name 'QString_isRightToLeft';
- function QString_Create(size: Integer; AnonParam2: QtInitialization): QStringH; cdecl; external Qt6PasLib name 'QString_Create8';
- procedure QString_chopped(handle: QStringH; len: integer; retval: PWideString); cdecl; external Qt6PasLib name 'QString_chopped';
---
-GitLab
-
diff --git a/0003-gtk2-SIGSEGV.patch b/0003-gtk2-SIGSEGV.patch
deleted file mode 100644
index bbd700f..0000000
--- a/0003-gtk2-SIGSEGV.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dcaf7e6bbeee9312a1c9f342a5ee97ee9757fc58 Mon Sep 17 00:00:00 2001
-From: Juha <juha@lazarus-ide.org>
-Date: Tue, 5 Mar 2024 09:18:41 +0200
-Subject: [PATCH] LCL-GTK2: Prevent a SIGSEGV in function
- DeliverMouseUpMessage(). Issue #40793, patch by Iluha Companets.
-
----
- lazarus/lcl/interfaces/gtk2/gtk2callback.inc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lazarus/lcl/interfaces/gtk2/gtk2callback.inc b/lazarus/lcl/interfaces/gtk2/gtk2callback.inc
-index 5cfcca52a8d..813493ee4c2 100644
---- a/lazarus/lcl/interfaces/gtk2/gtk2callback.inc
-+++ b/lazarus/lcl/interfaces/gtk2/gtk2callback.inc
-@@ -2274,7 +2274,7 @@ begin
- else if MessI.Result <> 0 then
- begin
- // issue #19914
-- if GTK_IS_NOTEBOOK(Widget) then
-+ if GTK_IS_NOTEBOOK(PGTKObject(AWinControl.Handle)) then
- begin
- if g_object_get_data({%H-}PGObject(AWinControl.Handle),'lclnotebookdragging') <> nil then
- begin
-@@ -2284,7 +2284,7 @@ begin
- end;
- // handled by the LCL
- //DebugLn(['DeliverMouseUpMessage msg was handled by the LCL, Stopping signal ...']);
-- g_signal_stop_emission_by_name(PGTKObject(Widget), 'button-release-event');
-+ //g_signal_stop_emission_by_name(PGTKObject(AWinControl.Handle), 'button-release-event');
- Result := True;
- end;
- end;
---
-GitLab
-
diff --git a/lazarus.spec b/lazarus.spec
index 729ae59..54e9f44 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,9 +1,9 @@
Name: lazarus
Summary: Lazarus Component Library and IDE for Free Pascal
-Version: 3.2
+Version: 3.4
-%global baserelease 3
+%global baserelease 1
Release: %{baserelease}%{?dist}
# The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
@@ -39,23 +39,6 @@ Patch0: 0000-Makefile_patch.diff
# 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
-# Qt 6.7 removed a deprecated function.
-# This causes Qt6Pas to fail to build due to a linking error.
-#
-# RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=2277326
-# Upstream bug: https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40901
-#
-# Patch backported from upstream:
-# https://gitlab.com/freepascal.org/lazarus/lazarus/-/commit/b71e3074a333b1573c6d662930b4689d92f5962e
-Patch2: 0002-Qt6-removed-function.patch
-
-# Fix segmentation fault when recreating Gtk2 widgets
-# Upstream bug: https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40793
-#
-# Patch backported from upstream:
-# https://gitlab.com/freepascal.org/lazarus/lazarus/-/commit/dcaf7e6bbeee9312a1c9f342a5ee97ee9757fc58
-Patch3: 0003-gtk2-SIGSEGV.patch
-
# -- Build-time dependencies
BuildRequires: binutils
@@ -175,6 +158,19 @@ This package contains LCL components for developing non-graphical applications
and command-line tools.
+%package lcl-gtk
+Summary: Lazarus Component Library - GTK+ widgetset support
+Requires: %{name}-lcl%{?_isa} = %{version}-%{release}
+
+Requires: gtk+-devel%{?_isa}
+
+%description lcl-gtk
+Lazarus is a cross-platform IDE and component library for Free Pascal.
+
+This package contains LCL components for developing applications
+using the GTK+ widgetset.
+
+
%package lcl-gtk2
Summary: Lazarus Component Library - GTK2 widgetset support
Requires: %{name}-lcl%{?_isa} = %{version}-%{release}
@@ -326,7 +322,7 @@ make lcl %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM=nogui
make tools %{fpmakeopt} OPT='%{fpcopt}'
# Compile the LCL base + extra components for GUI widgetsets
-for WIDGETSET in gtk2 gtk3 qt qt5 qt6; do
+for WIDGETSET in gtk gtk2 gtk3 qt qt5 qt6; do
make lcl basecomponents bigidecomponents %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM="${WIDGETSET}"
done
@@ -503,6 +499,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_libdir}/%{name}/components/
%{_libdir}/%{name}/lcl/
%lcl_base_files -n nogui %exclude
+%lcl_extra_files -n gtk %exclude
+%lcl_extra_files -n gtk %exclude
%lcl_base_files -n gtk2 %exclude
%lcl_extra_files -n gtk2 %exclude
%lcl_base_files -n gtk3 %exclude
@@ -519,6 +517,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%files lcl-nogui
%lcl_base_files -n nogui
+%files lcl-gtk
+%lcl_base_files -n gtk
+%lcl_extra_files -n gtk
+
%files lcl-gtk2
%lcl_base_files -n gtk2
%lcl_extra_files -n gtk2
@@ -561,6 +563,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%changelog
+* Sun Jul 28 2024 Artur Frenszek-Iwicki <fedora@svgames.pl> - 3.4-1
+- Update to v3.4
+- Drop Patch2 (qt6pas build failure - backport from this release)
+- Drop Patch3 (segfault in GTK2 widgetset - backport from this release)
+- Move GTK+ widgetset support to separate subpackage
+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index b6093f2..c91079c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lazarus-3.2-0.tar.gz) = 58a235b1754f3d75b438c5c09ab9f1a8ac24da4f3a1b8682150744774827b97d910b2ec8e0a5d4593cac14246f3c9c71c736c3f85464bdc0289ba0700a44b6c0
+SHA512 (lazarus-3.4-0.tar.gz) = ab4096345d72028e89da4a284479bbe5d4ed89a6bd0463f62b7d04a23c0491dc3f7934c75b4a4a916f81db8c0b252bf382e5ab41a16ef42efc1c08efcce68aef
reply other threads:[~2026-07-23 8:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178479470011.1.16777919683455053086.rpms-lazarus-0f14c0226021@fedoraproject.org \
--to=fedora@svgames.pl \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox