From 835ccadd9e4b1f88f49340464df0a913ced1c6e0 Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Sat, 8 Feb 2020 13:25:35 +0100 Subject: [PATCH] Add a patch to address build failures in Rawhide --- lazarus-2.0.6--illegal-qualifier.patch | 33 ++++++++++++++++++++++++++ lazarus.spec | 3 +++ 2 files changed, 36 insertions(+) create mode 100644 lazarus-2.0.6--illegal-qualifier.patch diff --git a/lazarus-2.0.6--illegal-qualifier.patch b/lazarus-2.0.6--illegal-qualifier.patch new file mode 100644 index 0000000..026e1a6 --- /dev/null +++ b/lazarus-2.0.6--illegal-qualifier.patch @@ -0,0 +1,33 @@ +--- lazarus-2.0.6/lazarus/ide/frames/compiler_compilation_options.pas 2019-03-07 00:02:00.000000000 +0100 ++++ lazarus-2.0.6--patched/lazarus/ide/frames/compiler_compilation_options.pas 2020-02-08 12:26:26.678811589 +0100 +@@ -389,12 +389,10 @@ + Options.CreateMakefileOnBuild := chkCreateMakefile.Checked; + + // execute before + Options.ExecuteBefore.Command := ExecuteBeforeCommandComboBox.Text; +- with InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive) do begin +- Assign(ExecuteBeforeCommandComboBox.Items); +- Push(Options.ExecuteBefore.Command); +- end; ++ InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive).Assign(ExecuteBeforeCommandComboBox.Items); ++ InputHistories.HistoryLists.GetList('BuildExecBefore',true,rltCaseSensitive).Push(Options.ExecuteBefore.Command); + + WriteSettingsParsers(Options.ExecuteBefore,ExecBeforeParsersCheckListBox); + + if Options.ExecuteBefore is TProjectCompilationToolOptions then +@@ -415,12 +413,11 @@ + TPkgCompilerOptions(Options).SkipCompiler := chkCompilerCompile.Checked; + + // execute after + Options.ExecuteAfter.Command := ExecuteAfterCommandComboBox.Text; +- with InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive) do begin +- Assign(ExecuteAfterCommandComboBox.Items); +- Push(Options.ExecuteAfter.Command); +- end; ++ InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive).Assign(ExecuteAfterCommandComboBox.Items); ++ InputHistories.HistoryLists.GetList('BuildExecAfter',true,rltCaseSensitive).Push(Options.ExecuteAfter.Command); ++ + WriteSettingsParsers(Options.ExecuteAfter,ExecAfterParsersCheckListBox); + if Options.ExecuteAfter is TProjectCompilationToolOptions then + Options.ExecuteAfter.CompileReasons := + MakeCompileReasons(chkExecAfterCompile, chkExecAfterBuild, chkExecAfterRun); diff --git a/lazarus.spec b/lazarus.spec index a22717f..4e462c7 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -15,6 +15,7 @@ Source0: https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip% Patch0: Makefile_patch.diff Patch1: lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch +Patch2: lazarus-2.0.6--illegal-qualifier.patch BuildRequires: binutils BuildRequires: desktop-file-utils @@ -66,6 +67,7 @@ developing applications that use qt5pas. %setup -c -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build @@ -150,6 +152,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings/tmp/ %changelog * Sat Feb 08 2020 Artur Iwicki - 2.0.6-4 +- Fix build failures in Rawhide - Rebuilt for FPC 3.2.0-beta-r44109 * Wed Jan 29 2020 Artur Iwicki - 2.0.6-3