[packages/lazarus] - up to 2.2.6
baggins
baggins at pld-linux.org
Sun Aug 20 19:22:28 CEST 2023
commit 8cfc5e1812bc96a9e5b6d61b759e9663bd480e9e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Aug 20 18:58:15 2023 +0200
- up to 2.2.6
deprecated-unit.patch | 376 ++++++++++++++++++++++++++++++++++++++++++++++++++
lazarus-desktop.patch | 13 +-
lazarus.appdata.xml | 39 ++++++
lazarus.spec | 137 +++++++++++++-----
libdir.patch | 36 +++++
5 files changed, 559 insertions(+), 42 deletions(-)
---
diff --git a/lazarus.spec b/lazarus.spec
index 0278f9c..46acab7 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,26 +1,23 @@
-# TODO: optflags (where possible)
Summary: Lazarus Component Library and IDE
Summary(pl.UTF-8): Lazarus - biblioteka komponentów i IDE
Name: lazarus
-Version: 1.6.0
-Release: 2
+Version: 2.2.6
+Release: 1
License: GPL v2, modified LGPL, MPL (see COPYING.txt)
Group: Development/Tools
Source0: http://downloads.sourceforge.net/lazarus/%{name}-%{version}-0.tar.gz
-# Source0-md5: 1857ee87efa9cb0fdecf8e414f4794ca
+# Source0-md5: 51ca9d8351c368d8c3f7e89734fc17f1
+Source1: lazarus.appdata.xml
Patch0: %{name}-desktop.patch
+Patch1: deprecated-unit.patch
+Patch2: libdir.patch
URL: http://www.lazarus.freepascal.org/
-BuildRequires: fpc >= 3.0.0
-BuildRequires: gdk-pixbuf-devel
-BuildRequires: gtk+2-devel
+BuildRequires: fpc >= 3.2.0
+BuildRequires: gtk+3-devel
%requires_eq fpc
-Requires: fpc-src >= 3.0.0
-Requires: gdk-pixbuf >= 0.18.0
+Requires: fpc-src >= 3.2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# Stabs debuginfo not supported
-%define _enable_debug_packages 0
-
%define lazdir %{_libdir}/lazarus
%description
@@ -36,33 +33,78 @@ Component Library), która jest także zawarta w tym pakiecie.
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
+ docs/xml/multi_makeskel.pl \
+ tools/delete_non_svn_files.pl \
+ tools/install/replace_in_files.pl
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+ components/lazreport/tools/localize.sh \
+ components/lazsvnpkg/lazsvnpkg_images.sh \
+ components/projectgroups/images/pg_images.sh \
+ docs/html/build_lcl_chm.sh \
+ images/bookmark.sh \
+ images/components_images.sh \
+ images/laz_images.sh \
+ tools/compile_all.sh \
+ tools/copy_po_files_to_lazarus_sources.sh \
+ tools/create_lazarus_deb.sh \
+ tools/find_missing_lpl_files.sh \
+ tools/getallpofiles.sh \
+ tools/install/build_fpc_snaphot_rpm.sh \
+ tools/install/check_fpc_dependencies.sh \
+ tools/install/create_clean_fpcsrc_directory.sh \
+ tools/install/create_clean_lazarus_directory.sh \
+ tools/install/create_lazarus_deb.sh \
+ tools/install/create_lazarus_snapshot_rpm.sh \
+ tools/install/cross_unix/create_linux_cross_win32_deb.sh \
+ tools/install/cross_unix/create_linux_cross_win32_rpm.sh \
+ tools/install/cross_unix/update_cross_fpc.sh \
+ tools/install/do_nothing.sh \
+ tools/install/file_filter.sh \
+ tools/install/get_fpc_full_version.sh \
+ tools/install/get_lazarus_version.sh \
+ tools/install/get_svn_revision_number.sh \
+ tools/install/macosx/create_fpc-src_dmg.sh \
+ tools/install/macosx/create_lazarus_dmg.sh \
+ tools/install/macosx/makefpcsnapshot.sh \
+ tools/install/macosx/makefpcsrcsnapshot.sh \
+ tools/install/macosx/makelazsnapshot.sh \
+ tools/install/macosx/uninstall.sh \
+ tools/install/rpm/create_gtk1_links.sh \
+ tools/install/rpm/create_lazarus_rpm.sh \
+ tools/install/rpm/create_nonroot_rpmmacros.sh \
+ tools/install/rpm/get_rpm_source_dir.sh \
+ tools/install/smart_strip.sh \
+ tools/lfm_to_lrs.sh
%build
-%{__make} -j1
+# Re-create the Makefiles
+export FPCDIR=%{_datadir}/fpcsrc/
+fpcmake -Tall
+cd components
+fpcmake -Tall
+cd ../
+
+# Enable GDB debuginfo in DWARF format, plus some optimisations
+%{__make} -j1 LCL_PLATFORM=gtk3 OPT="-g -gl -gw -O3"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_libdir}/lazarus/docs,%{_pixmapsdir},%{_desktopdir},%{_bindir}} \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT{%{_metainfodir},%{_examplesdir}}
+
+%{__make} install INSTALL_PREFIX=$RPM_BUILD_ROOT%{_prefix} _LIB=%{_lib}
-cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/lazarus/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-for i in components doceditor ide lcl units converter debugger languages startlazarus \
- designer images lazarus lazbuild packager tools ; do
- cp -a $i $RPM_BUILD_ROOT%{_libdir}/lazarus
-done
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.appdata.xml
-cp -a docs/*.html $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
-cp -a docs/html $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
-cp -a docs/images $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
-cp -a docs/xml $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
-install docs/Contributors.txt $RPM_BUILD_ROOT%{_libdir}/lazarus/docs
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/lazarus/{lazarus.app,test}
-install images/ide_icon48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/lazarus.png
-install install/lazarus.desktop $RPM_BUILD_ROOT%{_desktopdir}/lazarus.desktop
-ln -sf %{lazdir}/lazarus $RPM_BUILD_ROOT%{_bindir}/lazarus
-ln -sf %{lazdir}/lazarus $RPM_BUILD_ROOT%{_bindir}/lazbuild
-ln -sf %{lazdir}/startlazarus $RPM_BUILD_ROOT%{_bindir}/startlazarus
+find $RPM_BUILD_ROOT%{_libdir}/lazarus \( -name 'Makefile*' -o -name .gitignore \) -exec %{__rm} {} \;
%clean
rm -rf $RPM_BUILD_ROOT
@@ -70,9 +112,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc COPYING.txt COPYING.modifiedLGPL.txt docs/*.txt docs/*.pdf
-%attr(755,root,root) %{_bindir}/lazarus
+%attr(755,root,root) %{_bindir}/lazarus-ide
%attr(755,root,root) %{_bindir}/lazbuild
%attr(755,root,root) %{_bindir}/startlazarus
+%attr(755,root,root) %{_bindir}/lazres
+%attr(755,root,root) %{_bindir}/lrstolfm
+%attr(755,root,root) %{_bindir}/updatepofiles
%dir %{_libdir}/lazarus
%{_libdir}/lazarus/components
%{_libdir}/lazarus/converter
@@ -85,7 +130,24 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lazarus/languages
%{_libdir}/lazarus/lcl
%{_libdir}/lazarus/packager
-%{_libdir}/lazarus/tools
+%dir %{_libdir}/lazarus/tools
+%{_libdir}/lazarus/tools/apiwizz
+%{_libdir}/lazarus/tools/chmmaker
+%{_libdir}/lazarus/tools/debugserver
+%{_libdir}/lazarus/tools/glazres
+%{_libdir}/lazarus/tools/install
+%{_libdir}/lazarus/tools/jsonviewer
+%{_libdir}/lazarus/tools/lazdatadesktop
+%{_libdir}/lazarus/tools/snapshots
+%{_libdir}/lazarus/tools/xpm_to_png
+%attr(755,root,root) %{_libdir}/lazarus/tools/*.sh
+%attr(755,root,root) %{_libdir}/lazarus/tools/lazres
+%attr(755,root,root) %{_libdir}/lazarus/tools/lrstolfm
+%attr(755,root,root) %{_libdir}/lazarus/tools/svn2revisioninc
+%attr(755,root,root) %{_libdir}/lazarus/tools/updatepofiles
+%{_libdir}/lazarus/tools/*.lp*
+%{_libdir}/lazarus/tools/*.o
+%{_libdir}/lazarus/tools/*.p*
%{_libdir}/lazarus/units
%attr(755,root,root) %{_libdir}/lazarus/lazarus
%attr(755,root,root) %{_libdir}/lazarus/lazbuild
@@ -93,3 +155,14 @@ rm -rf $RPM_BUILD_ROOT
%{_pixmapsdir}/lazarus.png
%{_desktopdir}/lazarus.desktop
%{_examplesdir}/%{name}-%{version}
+%{_iconsdir}/hicolor/*x*/mimetypes/text-lazarus-*.png
+%{_iconsdir}/hicolor/*x*/mimetypes/text-x-pascal.png
+%{_metainfodir}/lazarus.appdata.xml
+%{_datadir}/mime/packages/lazarus.xml
+%{_mandir}/man1/lazarus-ide.1*
+%{_mandir}/man1/lazbuild.1*
+%{_mandir}/man1/lazres.1*
+%{_mandir}/man1/lrstolfm.1*
+%{_mandir}/man1/startlazarus.1*
+%{_mandir}/man1/svn2revisioninc.1*
+%{_mandir}/man1/updatepofiles.1*
diff --git a/deprecated-unit.patch b/deprecated-unit.patch
new file mode 100644
index 0000000..cae5b45
--- /dev/null
+++ b/deprecated-unit.patch
@@ -0,0 +1,376 @@
+--- lazarus/lcl/interfaces/gtk3/gtk3boxes.pas~ 2022-09-25 12:37:18.000000000 +0200
++++ lazarus/lcl/interfaces/gtk3/gtk3boxes.pas 2022-12-21 18:46:07.163316917 +0100
+@@ -1,11 +1,13 @@
+ unit gtk3boxes;
+
++{$MODE OBJFPC} {$LONGSTRINGS ON}
++
+ interface
+
+ uses
+ // LazUtils
+- UITypes,
++ System.UITypes,
+ // LCL
+ LCLType, LCLStrConsts,LCLProc, InterfaceBase,
+ LazGtk3, LazGLib2, LazGObject2, LazGdk3, gtk3objects;
+
+--- lazarus/components/lazutils/lazutils.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/lazutils/lazutils.pas 2023-08-20 14:35:52.118267306 +0200
+@@ -20,7 +20,7 @@
+ LazUTF16, LazUTF8, LazUTF8Classes, LazUTF8SysUtils, LazUtilities,
+ LazUtilsStrConsts, LazVersion, LConvEncoding, lcsvutils, LookupStringList,
+ Maps, Masks, ObjectLists, StringHashList, TextStrings, Translations,
+- UITypes, UTF8Process, LazarusPackageIntf;
++ System.UITypes, UTF8Process, LazarusPackageIntf;
+
+ implementation
+
+--- lazarus/lcl/controls.pp~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/lcl/controls.pp 2023-08-20 14:39:15.438847651 +0200
+@@ -42,7 +42,7 @@
+ LCLStrConsts, LCLType, LCLProc, Graphics, LMessages, LCLIntf, InterfaceBase,
+ ImgList, PropertyStorage, Menus, ActnList, LCLClasses, LResources, LCLPlatformDef,
+ // LazUtils
+- GraphType, UITypes, LazMethodList, LazLoggerBase, LazTracer, LazUtilities;
++ GraphType, System.UITypes, LazMethodList, LazLoggerBase, LazTracer, LazUtilities;
+
+ {$I controlconsts.inc}
+
+@@ -48,22 +48,22 @@
+
+ const
+ // Used for ModalResult
+- mrNone = UITypes.mrNone;
+- mrOK = UITypes.mrOK;
+- mrCancel = UITypes.mrCancel;
+- mrAbort = UITypes.mrAbort;
+- mrRetry = UITypes.mrRetry;
+- mrIgnore = UITypes.mrIgnore;
+- mrYes = UITypes.mrYes;
+- mrNo = UITypes.mrNo;
+- mrAll = UITypes.mrAll;
+- mrNoToAll = UITypes.mrNoToAll;
+- mrYesToAll= UITypes.mrYesToAll;
+- mrClose = UITypes.mrClose;
+- mrLast = UITypes.mrLast;
++ mrNone = System.UITypes.mrNone;
++ mrOK = System.UITypes.mrOK;
++ mrCancel = System.UITypes.mrCancel;
++ mrAbort = System.UITypes.mrAbort;
++ mrRetry = System.UITypes.mrRetry;
++ mrIgnore = System.UITypes.mrIgnore;
++ mrYes = System.UITypes.mrYes;
++ mrNo = System.UITypes.mrNo;
++ mrAll = System.UITypes.mrAll;
++ mrNoToAll = System.UITypes.mrNoToAll;
++ mrYesToAll= System.UITypes.mrYesToAll;
++ mrClose = System.UITypes.mrClose;
++ mrLast = System.UITypes.mrLast;
+
+ function GetModalResultStr(ModalResult: TModalResult): ShortString;
+- deprecated 'Use the ModalResultStr array from unit UITypes directly.';
++ deprecated 'Use the ModalResultStr array from unit System.UITypes directly.';
+ property ModalResultStr[ModalResult: TModalResult]: shortstring read GetModalResultStr;
+
+ const
+@@ -3047,7 +3047,7 @@
+
+ function GetModalResultStr(ModalResult: TModalResult): ShortString;
+ begin
+- Result := UITypes.ModalResultStr[ModalResult];
++ Result := System.UITypes.ModalResultStr[ModalResult];
+ end;
+
+ {------------------------------------------------------------------------------
+--- lazarus/lcl/forms.pp~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/lcl/forms.pp 2023-08-20 14:40:56.355815258 +0200
+@@ -40,7 +40,7 @@
+ ClipBrd, HelpIntfs, Controls, ImgList, Themes,
+ // LazUtils
+ LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList, LazLoggerBase,
+- LazUtilities, GraphType, UITypes
++ LazUtilities, GraphType, System.UITypes
+ {$ifndef wince},gettext{$endif}// remove ifdefs when gettext is fixed and a new fpc is released
+ ;
+
+@@ -421,8 +421,8 @@
+ );
+ TFormState = set of TFormStateType;
+
+- TModalResult = UITypes.TModalResult;
+- PModalResult = ^UITypes.TModalResult;
++ TModalResult = System.UITypes.TModalResult;
++ PModalResult = ^System.UITypes.TModalResult;
+
+ TFormHandlerType = (
+ fhtFirstShow,
+--- lazarus/lcl/dialogs.pp~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/lcl/dialogs.pp 2023-08-20 14:41:48.209305836 +0200
+@@ -28,34 +28,34 @@
+ Forms, Controls, Themes, Graphics, Buttons, ButtonPanel, StdCtrls,
+ ExtCtrls, LCLClasses, ClipBrd, Menus, LCLTaskDialog,
+ // LazUtils
+- GraphType, UITypes, FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase;
++ GraphType, System.UITypes, FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase;
+
+ type
+- // Aliases for types in UITypes.
+- TMsgDlgType = UITypes.TMsgDlgType;
+- TMsgDlgBtn = UITypes.TMsgDlgBtn;
+- TMsgDlgButtons = UITypes.TMsgDlgButtons;
++ // Aliases for types in System.UITypes.
++ TMsgDlgType = System.UITypes.TMsgDlgType;
++ TMsgDlgBtn = System.UITypes.TMsgDlgBtn;
++ TMsgDlgButtons = System.UITypes.TMsgDlgButtons;
+
+ const
+- // Aliases for enum values in UITypes.
+- mtWarning = UITypes.TMsgDlgType.mtWarning;
+- mtError = UITypes.TMsgDlgType.mtError;
+- mtInformation = UITypes.TMsgDlgType.mtInformation;
+- mtConfirmation = UITypes.TMsgDlgType.mtConfirmation;
+- mtCustom = UITypes.TMsgDlgType.mtCustom;
++ // Aliases for enum values in System.UITypes.
++ mtWarning = System.UITypes.TMsgDlgType.mtWarning;
++ mtError = System.UITypes.TMsgDlgType.mtError;
++ mtInformation = System.UITypes.TMsgDlgType.mtInformation;
++ mtConfirmation = System.UITypes.TMsgDlgType.mtConfirmation;
++ mtCustom = System.UITypes.TMsgDlgType.mtCustom;
+
+- mbYes = UITypes.TMsgDlgBtn.mbYes;
+- mbNo = UITypes.TMsgDlgBtn.mbNo;
+- mbOK = UITypes.TMsgDlgBtn.mbOK;
+- mbCancel = UITypes.TMsgDlgBtn.mbCancel;
+- mbAbort = UITypes.TMsgDlgBtn.mbAbort;
+- mbRetry = UITypes.TMsgDlgBtn.mbRetry;
+- mbIgnore = UITypes.TMsgDlgBtn.mbIgnore;
+- mbAll = UITypes.TMsgDlgBtn.mbAll;
+- mbNoToAll = UITypes.TMsgDlgBtn.mbNoToAll;
+- mbYesToAll = UITypes.TMsgDlgBtn.mbYesToAll;
+- mbHelp = UITypes.TMsgDlgBtn.mbHelp;
+- mbClose = UITypes.TMsgDlgBtn.mbClose;
++ mbYes = System.UITypes.TMsgDlgBtn.mbYes;
++ mbNo = System.UITypes.TMsgDlgBtn.mbNo;
++ mbOK = System.UITypes.TMsgDlgBtn.mbOK;
++ mbCancel = System.UITypes.TMsgDlgBtn.mbCancel;
++ mbAbort = System.UITypes.TMsgDlgBtn.mbAbort;
++ mbRetry = System.UITypes.TMsgDlgBtn.mbRetry;
++ mbIgnore = System.UITypes.TMsgDlgBtn.mbIgnore;
++ mbAll = System.UITypes.TMsgDlgBtn.mbAll;
++ mbNoToAll = System.UITypes.TMsgDlgBtn.mbNoToAll;
++ mbYesToAll = System.UITypes.TMsgDlgBtn.mbYesToAll;
++ mbHelp = System.UITypes.TMsgDlgBtn.mbHelp;
++ mbClose = System.UITypes.TMsgDlgBtn.mbClose;
+
+ // Combinations of buttons.
+ mbYesNoCancel = [mbYes, mbNo, mbCancel];
+--- lazarus/components/buildintf/packageintf.pas~ 2023-03-04 14:24:23.000000000 +0100
++++ lazarus/components/buildintf/packageintf.pas 2023-08-20 14:42:44.599478598 +0200
+@@ -18,7 +18,7 @@
+ uses
+ Classes, SysUtils, contnrs,
+ // LazUtils
+- LazConfigStorage, LazMethodList, LazLoggerBase, UITypes,
++ LazConfigStorage, LazMethodList, LazLoggerBase, System.UITypes,
+ // BuildIntf
+ NewItemIntf, ProjPackIntf, PackageDependencyIntf, IDEOptionsIntf;
+
+--- lazarus/components/buildintf/lazmsgworker.pas~ 2023-03-04 14:24:23.000000000 +0100
++++ lazarus/components/buildintf/lazmsgworker.pas 2023-08-20 14:43:18.346249440 +0200
+@@ -6,7 +6,7 @@
+
+ uses
+ // LazUtils
+- UITypes;
++ System.UITypes;
+
+ type
+ TLazMessageWorker = function(const aCaption, aMsg: string;
+--- lazarus/components/buildintf/packagelinkintf.pas~ 2023-03-04 14:24:23.000000000 +0100
++++ lazarus/components/buildintf/packagelinkintf.pas 2023-08-20 14:44:04.903060679 +0200
+@@ -7,7 +7,7 @@
+ uses
+ SysUtils, Classes,
+ // LazUtils
+- LazFileUtils, UITypes,
++ LazFileUtils, System.UITypes,
+ // BuildIntf
+ PackageDependencyIntf, PackageIntf;
+
+--- lazarus/components/buildintf/projectintf.pas~ 2023-03-04 14:24:23.000000000 +0100
++++ lazarus/components/buildintf/projectintf.pas 2023-08-20 14:44:33.739817399 +0200
+@@ -18,7 +18,7 @@
+ uses
+ Classes, SysUtils, Contnrs,
+ // LazUtils
+- FileUtil, LazFileUtils, LazFileCache, LazMethodList, UITypes, AvgLvlTree,
++ FileUtil, LazFileUtils, LazFileCache, LazMethodList, System.UITypes, AvgLvlTree,
+ // BuildIntf
+ IDEOptionsIntf, NewItemIntf, ProjPackIntf, CompOptsIntf, BuildStrConsts;
+
+--- lazarus/components/ideintf/lazideintf.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/lazideintf.pas 2023-08-20 14:45:03.926578664 +0200
+@@ -20,7 +20,7 @@
+ // LCL
+ Forms, Controls, LazHelpHTML,
+ // LazUtils
+- UITypes, LazMethodList,
++ System.UITypes, LazMethodList,
+ // BuildIntf
+ BaseIDEIntf, IDEOptionsIntf, CompOptsIntf, ProjectIntf, IDEExternToolIntf,
+ // IdeIntf
+--- lazarus/components/ideintf/propedits.pp~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/propedits.pp 2023-08-20 14:45:33.133337177 +0200
+@@ -32,7 +32,7 @@
+ {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
+ // LazUtils
+ FileUtil, StringHashList, LazMethodList, LazLoggerBase, LazUtilities, LazStringUtils,
+- GraphType, UITypes, FPCAdds, // for StrToQWord in older fpc versions
++ GraphType, System.UITypes, FPCAdds, // for StrToQWord in older fpc versions
+ // IdeIntf
+ ObjInspStrConsts, PropEditUtils,
+ // Forms with .lfm files
+--- lazarus/components/ideintf/texttools.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/texttools.pas 2023-08-20 14:45:56.766745083 +0200
+@@ -18,7 +18,7 @@
+ uses
+ Classes, SysUtils,
+ // LazUtils
+- UITypes;
++ System.UITypes;
+
+ { Sorting }
+ type
+--- lazarus/components/ideintf/idedialogs.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/idedialogs.pas 2023-08-20 14:46:29.640182417 +0200
+@@ -21,7 +21,7 @@
+ // LCL
+ Dialogs,
+ // LazUtils
+- UITypes, LazFileCache,
++ System.UITypes, LazFileCache,
+ // BuildIntf
+ LazMsgWorker;
+
+--- lazarus/components/ideintf/unitresources.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/unitresources.pas 2023-08-20 14:46:53.290257490 +0200
+@@ -23,7 +23,7 @@
+ // LCL
+ LCLMemManager, Forms, LResources,
+ // LazUtils
+- UITypes;
++ System.UITypes;
+
+ type
+
+--- lazarus/components/ideintf/dbgridcolumnspropeditform.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/dbgridcolumnspropeditform.pas 2023-08-20 14:47:20.813678406 +0200
+@@ -9,7 +9,7 @@
+ // LCL
+ LCLType, Dialogs, Forms, ComCtrls, StdCtrls, ActnList, DBGrids,
+ // LazUtils
+- UITypes, LazLoggerBase,
++ System.UITypes, LazLoggerBase,
+ // IdeIntf
+ ObjInspStrConsts, IDEImagesIntf, PropEdits, PropEditUtils;
+
+--- lazarus/components/ideintf/graphpropedits.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/graphpropedits.pas 2023-08-20 14:47:50.880440984 +0200
+@@ -20,7 +20,7 @@
+ // LCL
+ LCLIntf, LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn,
+ // LazUtils
+- GraphType, UITypes, LazFileUtils,
++ GraphType, System.UITypes, LazFileUtils,
+ // IdeIntf
+ PropEdits, GraphicPropEdit; // defines TGraphicPropertyEditorForm
+
+--- lazarus/components/ideintf/idetextconverter.pas~ 2023-03-04 14:24:24.000000000 +0100
++++ lazarus/components/ideintf/idetextconverter.pas 2023-08-20 15:02:06.476570331 +0200
+@@ -25,7 +25,7 @@
+ // LCL
+ LCLProc,
+ // LazUtils
+- UITypes, FileUtil, LazFileUtils, LazUTF8, LazLoggerBase,
++ System.UITypes, FileUtil, LazFileUtils, LazUTF8, LazLoggerBase,
+ // IdeIntf
+ SrcEditorIntf, PropEdits, ObjInspStrConsts;
+
+--- lazarus/ide/lazbuild.lpr~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/ide/lazbuild.lpr 2023-08-20 18:08:54.531207411 +0200
+@@ -32,7 +32,7 @@
+ Interfaces, // this includes the NoGUI widgetset
+ // LazUtils
+ Masks, LConvEncoding, FileUtil, LazFileUtils, LazLoggerBase, LazUtilities,
+- LazUTF8, Laz2_XMLCfg, UITypes, LazStringUtils,
++ LazUTF8, Laz2_XMLCfg, System.UITypes, LazStringUtils,
+ // LCL
+ LCLPlatformDef, Forms,
+ // Codetools
+--- lazarus/ide/exttools.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/ide/exttools.pas 2023-08-20 18:09:30.484662629 +0200
+@@ -38,7 +38,7 @@
+ Classes, SysUtils, math, process, Pipes, Laz_AVL_Tree,
+ // LazUtils
+ FileUtil, LazFileUtils, LazUtilities, LazLoggerBase, UTF8Process, LazUTF8,
+- UITypes, AvgLvlTree,
++ System.UITypes, AvgLvlTree,
+ // BuildIntf
+ IDEExternToolIntf, BaseIDEIntf, MacroIntf, LazMsgWorker,
+ // IDE
+--- lazarus/packager/packagedefs.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/packager/packagedefs.pas 2023-08-20 18:10:00.878222128 +0200
+@@ -46,7 +46,7 @@
+ CodeCache, CodeToolsCfgScript, CodeToolsStructs,
+ // LazUtils
+ FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8, FileReferenceList,
+- LazTracer, LazLoggerBase, UITypes, Laz2_XMLCfg, AvgLvlTree,
++ LazTracer, LazLoggerBase, System.UITypes, Laz2_XMLCfg, AvgLvlTree,
+ // BuildIntf
+ MacroIntf, MacroDefIntf, IDEOptionsIntf, PublishModuleIntf,
+ PackageDependencyIntf, PackageIntf, FppkgIntf,
+--- lazarus/ide/buildmodesmanager.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/ide/buildmodesmanager.pas 2023-08-20 18:12:01.309201711 +0200
+@@ -35,7 +35,7 @@
+ // LCL
+ Forms, Controls, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel, LCLProc,
+ // LazUtils
+- LazFileUtils, LazLoggerBase, UITypes,
++ LazFileUtils, LazLoggerBase, System.UITypes,
+ // IdeIntf
+ IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf,
+ // IDE
+--- lazarus/ide/publishmoduledlg.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/ide/publishmoduledlg.pas 2023-08-20 18:12:41.982840412 +0200
+@@ -36,7 +36,7 @@
+ // LCL
+ LCLType, Forms, StdCtrls, Dialogs, Buttons, ButtonPanel, LCLIntf,
+ // LazUtils
+- FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase, UITypes, LazUTF8,
++ FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase, System.UITypes, LazUTF8,
+ // BuildIntf
+ ProjPackIntf, CompOptsIntf, PublishModuleIntf,
+ // IdeIntf
+--- lazarus/packager/projpackchecks.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/packager/projpackchecks.pas 2023-08-20 18:13:32.746539176 +0200
+@@ -9,7 +9,7 @@
+ // LCL
+ LCLProc, Forms, Dialogs,
+ // LazUtils
+- FileUtil, LazFileUtils, UITypes,
++ FileUtil, LazFileUtils, System.UITypes,
+ // Codetools
+ CodeToolManager, CodeCache,
+ // BuildIntf
+--- lazarus/ide/diskdiffsdialog.pas~ 2023-03-04 14:24:25.000000000 +0100
++++ lazarus/ide/diskdiffsdialog.pas 2023-08-20 18:14:29.530262496 +0200
+@@ -35,7 +35,7 @@
+ // CodeTools
+ FileProcs, CodeCache,
+ // LazUtils
+- LazFileUtils, UITypes,
++ LazFileUtils, System.UITypes,
+ // IdeIntf
+ IDEImagesIntf,
+ // SynEdit
diff --git a/lazarus-desktop.patch b/lazarus-desktop.patch
index 4cd33e3..87e5b4e 100644
--- a/lazarus-desktop.patch
+++ b/lazarus-desktop.patch
@@ -1,18 +1,11 @@
--- lazarus/install/lazarus.desktop~ 2008-11-23 22:33:35.000000000 +0100
+++ lazarus/install/lazarus.desktop 2010-01-14 22:08:47.235416252 +0100
-@@ -6,12 +6,13 @@
+@@ -6,7 +6,7 @@
Terminal=false
Type=Application
- Icon=lazarus.png
--Categories=Application;IDE;Development;GTK;GUIDesigner;
+ Icon=lazarus
+-Categories=IDE;Development;GTK;GUIDesigner;
+Categories=Development;IDE;
StartupWMClass=Lazarus
MimeType=text/x-pascal;text/lazarus-project-source;text/lazarus-project-information;text/lazarus-form;text/lazarus-resource;text/lazarus-package;text/lazarus-package-link;text/lazarus-code-inlay;
Keywords=editor;Pascal;IDE;FreePascal;fpc;Design;Designer;
- [Property::X-KDE-NativeExtension]
- Type=QString
- Value=.pas
- X-Ubuntu-Gettext-Domain=desktop_kdelibs
--
-+Encoding=UTF-8
-+# vi: encoding=utf-8
diff --git a/lazarus.appdata.xml b/lazarus.appdata.xml
new file mode 100644
index 0000000..6af1525
--- /dev/null
+++ b/lazarus.appdata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2021 Artur Frenszek-Iwicki <fedora at svgames.pl> -->
+<component type="desktop">
+<id>lazarus.desktop</id>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+ <project_license>GPL-2.0-or-later and LGPL-2.1-or-later and MPL-1.1</project_license>
+ <name>Lazarus</name>
+ <summary>RAD IDE for Free Pascal</summary>
+ <description>
+ <p>
+ Lazarus is a Delphi-compatible cross-platform IDE for Rapid Application Development.
+ It has variety of components ready for use and a graphical form designer to easily create complex graphical user interfaces.
+ With Lazarus you can create file browsers, image viewers, database applications, graphics editing software,
+ games, 3D software, medical analysis software or any other type of software.
+ </p>
+ <p>
+ Lazarus is developed to be totally and completely API independent. Once you write your code, you just link it against the API widget set of your choice.
+ If you want to use GTK+, great! If you want it to be Gnome compliant, great! As long as the interface code for the widget set you want to use is available, you can link to it.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://suve.fedorapeople.org/lazarus-dark-0.png</image>
+ </screenshot>
+ <screenshot>
+ <image>https://suve.fedorapeople.org/lazarus-light-0.png</image>
+ </screenshot>
+ <screenshot>
+ <image>https://suve.fedorapeople.org/lazarus-dark-1.png</image>
+ </screenshot>
+ <screenshot>
+ <image>https://suve.fedorapeople.org/lazarus-light-1.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">https://lazarus-ide.org</url>
+ <url type="bugtracker">https://bugs.freepascal.org</url>
+ <url type="faq">https://wiki.lazarus.freepascal.org/Lazarus_Faq</url>
+ <update_contact>fedora at svgames.pl</update_contact>
+</component>
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 0000000..1e2e96e
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,36 @@
+--- lazarus/Makefile.fpc~ 2023-03-04 14:24:23.000000000 +0100
++++ lazarus/Makefile.fpc 2023-03-07 19:25:14.938976319 +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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lazarus.git/commitdiff/8cfc5e1812bc96a9e5b6d61b759e9663bd480e9e
More information about the pld-cvs-commit
mailing list