public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/lazarus] multiple-IDE-widgetsets: Update to v2.2.0
@ 2026-07-23 8:18 Artur Frenszek-Iwicki
0 siblings, 0 replies; only message in thread
From: Artur Frenszek-Iwicki @ 2026-07-23 8:18 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/lazarus
Branch : multiple-IDE-widgetsets
Commit : 71fe63c874f616f262c73204e5f727bc00cf7341
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date : 2022-02-07T22:11:00+01:00
Stats : +81/-78 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/lazarus/c/71fe63c874f616f262c73204e5f727bc00cf7341?branch=multiple-IDE-widgetsets
Log:
Update to v2.2.0
---
diff --git a/0000-Makefile_patch.diff b/0000-Makefile_patch.diff
new file mode 100644
index 0000000..f8be476
--- /dev/null
+++ b/0000-Makefile_patch.diff
@@ -0,0 +1,36 @@
+--- lazarus-2.2.0--orig/lazarus/Makefile.fpc 2022-01-02 11:01:23.000000000 +0100
++++ lazarus-2.2.0--patched/lazarus/Makefile.fpc 2022-01-06 12:38:15.415350306 +0100
+@@ -19,18 +19,18 @@
+ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+
+ [install]
+ fpcpackage=n
+-basedir=share/lazarus
++basedir=$(_LIB)/lazarus
+
+ [dist]
+ destdir=$(BASEDIR)/dist
+
+ [prerules]
+ RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
+ #
+ ifndef LAZARUS_INSTALL_DIR
+-LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/share/lazarus
++LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/$(_LIB)/lazarus
+ INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
+ ifneq ($(findstring $(OS_TARGET),win32 win64),)
+ LAZARUS_INSTALL_DIR=C:\lazarus
+ endif
+@@ -286,10 +286,11 @@
+ installbase:
+ ifneq ($(findstring $(OS_TARGET),win32 win64),)
+
+ else
++ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)
++ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)/lazarus
+ $(MKDIR) $(INSTALL_PREFIX)/share
+- $(MKDIR) $(INSTALL_PREFIX)/share/lazarus
+ $(MKDIR) $(INSTALL_PREFIX)/share/applications
+ $(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
+ $(MKDIR) $(INSTALL_PREFIX)/share/mime/packages
+ $(MKDIR) $(INSTALL_PREFIX)/share/icons/hicolor/48x48/mimetypes
diff --git a/0001-DWARF-debuginfo-everywhere.patch b/0001-DWARF-debuginfo-everywhere.patch
new file mode 100644
index 0000000..d6ed856
--- /dev/null
+++ b/0001-DWARF-debuginfo-everywhere.patch
@@ -0,0 +1,32 @@
+--- lazarus-2.2.0--orig/lazarus/components/chmhelp/lhelp/Makefile.fpc 2022-01-02 11:01:23.000000000 +0100
++++ lazarus-2.2.0--patched/lazarus/components/chmhelp/lhelp/Makefile.fpc 2022-01-16 14:38:13.725920651 +0100
+@@ -14,9 +14,9 @@
+ libc=y
+ packages=rtl
+
+ [compiler]
+-options=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++options=-gw -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+ unitdir=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) \
+ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) \
+ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
+--- lazarus-2.2.0--orig/lazarus/lcl/interfaces/nogui/Makefile.fpc 2022-01-02 11:01:25.000000000 +0100
++++ lazarus-2.2.0--patched/lazarus/lcl/interfaces/nogui/Makefile.fpc 2022-01-16 15:00:53.421077087 +0100
+@@ -7,15 +7,12 @@
+ [target]
+ units=lcl.pas
+
+ [prerules]
+-DBG_OPTIONS=
+-ifeq ($(OS_TARGET),darwin)
+ DBG_OPTIONS=-gw
+-endif
+
+ [compiler]
+-options=-gl -dnogui $(DBG_OPTIONS)
++options=-gw -gl -dnogui $(DBG_OPTIONS)
+ unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) \
+ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) \
+ ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) \
+ .. .
diff --git a/Makefile_patch.diff b/Makefile_patch.diff
deleted file mode 100644
index 17fe416..0000000
--- a/Makefile_patch.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- lazarus-2.0.12--orig/lazarus/Makefile.fpc 2020-07-24 18:14:39.000000000 +0200
-+++ lazarus-2.0.12--patched/lazarus/Makefile.fpc 2021-04-30 16:51:44.926870797 +0200
-@@ -19,18 +19,18 @@
- files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
-
- [install]
- fpcpackage=n
--basedir=share/lazarus
-+basedir=$(_LIB)/lazarus
-
- [dist]
- destdir=$(BASEDIR)/dist
-
- [prerules]
- RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
- #
- ifndef LAZARUS_INSTALL_DIR
--LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/share/lazarus
-+LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/$(_LIB)/lazarus
- INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
- ifneq ($(findstring $(OS_TARGET),win32 win64),)
- LAZARUS_INSTALL_DIR=C:\lazarus
- endif
-@@ -270,10 +270,11 @@
- installbase:
- ifneq ($(findstring $(OS_TARGET),win32 win64),)
-
- else
-+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)
-+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)/lazarus
- $(MKDIR) $(INSTALL_PREFIX)/share
-- $(MKDIR) $(INSTALL_PREFIX)/share/lazarus
- $(MKDIR) $(INSTALL_PREFIX)/share/applications
- $(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
- $(MKDIR) $(INSTALL_PREFIX)/share/mime/packages
- $(MKDIR) $(INSTALL_PREFIX)/share/icons/hicolor/48x48/mimetypes
diff --git a/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch b/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
deleted file mode 100644
index df566ec..0000000
--- a/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Only in lazarus-2.0.6/lazarus/components/chmhelp/lhelp/lhelp.app/Contents/MacOS: lhelp
-diff -U4 -r lazarus-2.0.6/lazarus/components/Makefile.fpc lazarus-2.0.6--patched/lazarus/components/Makefile.fpc
---- lazarus-2.0.6/lazarus/components/Makefile.fpc 2018-11-11 22:09:04.000000000 +0100
-+++ lazarus-2.0.6--patched/lazarus/components/Makefile.fpc 2020-01-29 12:37:09.583868745 +0100
-@@ -71,10 +71,12 @@
- $(MAKE) -C instantfpc
- $(MAKE) -C externhelp
- $(MAKE) -C tdbf
- $(MAKE) -C sqldb
-+ifneq ($(CPU_TARGET),powerpc64)
- $(MAKE) -C PascalScript/Source
- $(MAKE) -C macroscript
-+endif
- $(MAKE) -C lclextensions
- $(MAKE) -C virtualtreeview
- $(MAKE) -C onlinepackagemanager
-
-diff -U4 -r lazarus-2.0.6/lazarus/ide/lazarus.pp lazarus-2.0.6--patched/lazarus/ide/lazarus.pp
---- lazarus-2.0.6/lazarus/ide/lazarus.pp 2018-11-11 23:48:56.000000000 +0100
-+++ lazarus-2.0.6--patched/lazarus/ide/lazarus.pp 2020-01-29 12:35:44.192723725 +0100
-@@ -72,10 +72,13 @@
- LeakView, MemDSLaz, SDFLaz, InstantFPCLaz, ExternHelp,
- TurboPowerIPro, TurboPowerIProDsgn,
- jcfidelazarus, chmhelppkg,
- FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg,
-- TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, pascalscript,
-- EditorMacroScript, RegisterVirtualTreeView, OnlinePackageManager,
-+ TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz,
-+ {$IFNDEF CPUPOWERPC64}
-+ pascalscript, EditorMacroScript,
-+ {$ENDIF}
-+ RegisterVirtualTreeView, OnlinePackageManager,
- LazDebuggerFpLldb,
- {$ENDIF}
- MainBase;
-
diff --git a/lazarus.spec b/lazarus.spec
index 49e834c..67f1ccb 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,9 +1,9 @@
Name: lazarus
Summary: Lazarus Component Library and IDE for Freepascal
-Version: 2.0.12
+Version: 2.2.0
-%global baserelease 4
+%global baserelease 1
Release: %{baserelease}%{?dist}
# The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
@@ -13,12 +13,14 @@ Release: %{baserelease}%{?dist}
# GNU Classpath style exception, see COPYING.modifiedLGPL
License: GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
URL: http://www.lazarus-ide.org/
-Source0: https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}.tar.gz
+Source0: https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-0.tar.gz
Source100: lazarus.appdata.xml
-Patch0: Makefile_patch.diff
-Patch1: lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
+# Lazarus wants to put arch-specific stuff in /usr/share - make it go in /usr/lib istead
+Patch0: 0000-Makefile_patch.diff
+# Some config files explicitly use STABS debuginfo - change to DWARF
+Patch1: 0001-DWARF-debuginfo-everywhere.patch
BuildRequires: binutils
BuildRequires: desktop-file-utils
@@ -150,7 +152,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%{_datadir}/icons/hicolor/48x48/mimetypes/*
%{_metainfodir}/%{name}.appdata.xml
%license lazarus/COPYING*
-%doc lazarus/README.txt
+%doc lazarus/README.md
%dir %{_sysconfdir}/lazarus
%config(noreplace) %{_sysconfdir}/lazarus/environmentoptions.xml
%{_mandir}/*/*
@@ -165,6 +167,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%changelog
+* Mon Feb 07 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 2.2.0-1
+- Update to v2.2.0
+- Drop Patch1 - disable PascalScript on ppc64le (compiles successfully now)
+- Add Patch1 - use DWARF debuginfo instead of stabs
+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-23 8:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-23 8:18 [rpms/lazarus] multiple-IDE-widgetsets: Update to v2.2.0 Artur Frenszek-Iwicki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox