diff --git a/fix-object-inspector-visible.patch b/fix-object-inspector-visible.patch deleted file mode 100644 index aafe855..0000000 --- a/fix-object-inspector-visible.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: PragmaticLinux -Date: 2022-04-30 22:41:34 +0200 -Subject: Makes sure the Object Inspector is visible after the first install -References: boo#1197651 -Upstream: merged https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/39328 - -With a properly configured system (make, gdb, fpc, fppkg, etc.) Lazarus skips showing -the setup dialog, when you first start Lazarus after installation. This is correct. -However, in this case the Object Inspector window does not show. This patch fixes -this problem. - ---- - ide/main.pp | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - -Index: lazarus/ide/main.pp -=================================================================== ---- lazarus.orig/ide/main.pp -+++ lazarus/ide/main.pp -@@ -649,6 +649,7 @@ type - FFixingGlobalComponentLock: integer; - OldCompilerFilename, OldLanguage: String; - OIChangedTimer: TIdleTimer; -+ FEnvOptsCfgExisted: boolean; // tracks if a local or user specific environment options configuration file existed - - FIdentifierWordCompletion: TSourceEditorWordCompletion; - FIdentifierWordCompletionWordList: TStringList; -@@ -1199,7 +1200,6 @@ procedure TMainIDE.LoadGlobalOptions; - end; - - var -- EnvOptsCfgExisted: boolean; - s, LastCalled: String; - OldVer: String; - NowVer: String; -@@ -1212,7 +1212,6 @@ begin - - with EnvironmentOptions do - begin -- EnvOptsCfgExisted := FileExistsCached(GetDefaultConfigFilename); - OnBeforeRead := @EnvironmentOptionsBeforeRead; - OnBeforeWrite := @EnvironmentOptionsBeforeWrite; - OnAfterWrite := @EnvironmentOptionsAfterWrite; -@@ -1300,8 +1299,8 @@ begin - - OldVer:=EnvironmentOptions.OldLazarusVersion; - NowVer:=GetLazarusVersionString; -- //debugln(['TMainIDE.LoadGlobalOptions ',EnvOptsCfgExisted,' diff=',OldVer<>NowVer,' Now=',NowVer,' Old=',OldVer,' Comp=',CompareLazarusVersion(NowVer,OldVer)]); -- if EnvOptsCfgExisted and (OldVer<>NowVer) then -+ //debugln(['TMainIDE.LoadGlobalOptions ',FEnvOptsCfgExisted,' diff=',OldVer<>NowVer,' Now=',NowVer,' Old=',OldVer,' Comp=',CompareLazarusVersion(NowVer,OldVer)]); -+ if FEnvOptsCfgExisted and (OldVer<>NowVer) then - begin - IsUpgrade:=CompareLazarusVersion(NowVer,OldVer)>0; - if OldVer='' then -@@ -1387,7 +1386,6 @@ var - CfgCache: TPCTargetConfigCache; - OldLazDir: String; - Note: string; -- OI: TSimpleWindowLayout; - ConfigFile: string; - begin - {$IFDEF DebugSearchFPCSrcThread} -@@ -1466,10 +1464,6 @@ begin - Application.Terminate; - exit; - end; -- // show OI with empty configuration -- OI := IDEWindowIntf.IDEWindowCreators.SimpleLayoutStorage.ItemByFormID(DefaultObjectInspectorName); -- if OI<>nil then -- OI.Visible := True; - EnvironmentOptions.Save(true); - if OldLazDir<>EnvironmentOptions.LazarusDirectory then begin - // fetch new translations -@@ -1510,6 +1504,9 @@ begin - // setup macros before loading options - MainBuildBoss.SetupTransferMacros; - -+ // set flag to track if a local or user specific environment options configuration file existed -+ FEnvOptsCfgExisted := FileExistsCached(EnvironmentOptions.GetDefaultConfigFilename); -+ - // load options - CreatePrimaryConfigPath; - StartProtocol; -@@ -2127,6 +2124,8 @@ begin - end; - - procedure TMainIDE.SetupObjectInspector; -+var -+ OIWindowLayout: TSimpleWindowLayout; - begin - IDECmdScopeObjectInspectorOnly.AddWindowClass(TObjectInspectorDlg); - -@@ -2135,6 +2134,15 @@ begin - - ShowAnchorDesigner:=@mnuViewAnchorEditorClicked; - ShowTabOrderEditor:=@mnuViewTabOrderClicked; -+ -+ // always show the object inspector in case no local or user specific environment -+ // options configuration file existed -+ if not FEnvOptsCfgExisted then -+ begin -+ OIWindowLayout := IDEWindowCreators.SimpleLayoutStorage.ItemByFormID(DefaultObjectInspectorName); -+ if OIWindowLayout <> nil then -+ OIWindowLayout.Visible := True; -+ end; - end; - - procedure TMainIDE.SetupFormEditor; diff --git a/lazarus-2.2.0-0.tar.gz b/lazarus-2.2.0-0.tar.gz deleted file mode 100644 index b2b8c87..0000000 --- a/lazarus-2.2.0-0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160 -size 76777421 diff --git a/lazarus-2.2.2-0.tar.gz b/lazarus-2.2.2-0.tar.gz new file mode 100644 index 0000000..ca9fdd9 --- /dev/null +++ b/lazarus-2.2.2-0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9832004cffec8aca69de87290441d54772bf95d5d04372249d5a5491fb674c4 +size 76906715 diff --git a/lazarus-Makefile_patch.diff b/lazarus-Makefile_patch.diff index d98e815..81c7767 100644 --- a/lazarus-Makefile_patch.diff +++ b/lazarus-Makefile_patch.diff @@ -31,11 +31,3 @@ Index: lazarus/Makefile.fpc $(MKDIR) $(INSTALL_PREFIX)/share/applications $(MKDIR) $(INSTALL_PREFIX)/share/pixmaps $(MKDIR) $(INSTALL_PREFIX)/share/mime/packages -@@ -334,6 +334,7 @@ else - $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/gtk - $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/gtk2 - $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/qt -+ $(MKDIR) $(LAZARUS_INSTALL_DIR)/units/$(FULL_TARGET)/qt5 - $(MKDIR) $(LAZARUS_INSTALL_DIR)/components/synedit/design/languages - endif - diff --git a/lazarus.changes b/lazarus.changes index f775563..c5b906f 100644 --- a/lazarus.changes +++ b/lazarus.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri May 20 06:27:18 UTC 2022 - ecsos + +- Update to 2.2.2 + * For a complete list of changes see: + https://wiki.freepascal.org/Lazarus_2.2_fixes_branch#Fixes_for_2.2.2_.28merged.29 +- Rebase lazarus-Makefile_patch.diff, because some things in + upstream now. +- Drop fix-object-inspector-visible.patch because now in upstream. + ------------------------------------------------------------------- Sat Apr 30 20:57:54 UTC 2022 - PragmaticLinux diff --git a/lazarus.spec b/lazarus.spec index f9f6b20..3b51fea 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -16,10 +16,10 @@ # -%define dlver 2.2.0-0 +%define dlver 2.2.2-0 %define sover 1 Name: lazarus -Version: 2.2.0 +Version: 2.2.2 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 @@ -34,8 +34,6 @@ Source90: %{name}-rpmlintrc Patch0: %{name}-Makefile_patch.diff # PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file Patch1: lazarus.desktop.patch -# PATCH-FIX-UPSTREAM fix-object-inspector-visible.patch boo#1197651 -Patch2: fix-object-inspector-visible.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fpc >= 3.0.0