Update to upstream release 2.0.0

f39
Artur Iwicki 6 years ago
parent e3d9ea63c9
commit c0fef87fbc

1
.gitignore vendored

@ -15,3 +15,4 @@ lazarus-0.9.28-src.tar.bz2
/lazarus-1.8.0.tar.gz
/lazarus-1.8.2.tar.gz
/lazarus-1.8.4.tar.gz
/lazarus-2.0.0.tar.gz

@ -1,17 +0,0 @@
--- lazarus/install/lazarus.desktop 2007-11-26 15:34:42.000000000 +0100
+++ lazarus/install/lazarus.desktop.n 2008-10-18 11:52:33.000000000 +0200
@@ -4,13 +4,9 @@
Exec=startlazarus %f
Terminal=false
Type=Application
-Icon=lazarus.png
-Categories=Application;IDE;Development;GTK;GUIDesigner;
+Icon=lazarus
+Categories=IDE;Development;GTK;GUIDesigner;
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

@ -1,7 +1,5 @@
Index: lazarus/Makefile.fpc
===================================================================
--- lazarus/Makefile.fpc (version 0.9.26)
+++ lazarus/Makefile.fpc (working copy)
--- lazarus/Makefile.fpc 2017-10-18 09:51:34.000000000 +0200
+++ lazarus/Makefile.fpc.patched 2019-02-08 19:55:55.499867322 +0100
@@ -20,7 +20,7 @@
[install]
@ -20,7 +18,7 @@ Index: lazarus/Makefile.fpc
INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
ifneq ($(findstring $(OS_TARGET),win32 win64),)
LAZARUS_INSTALL_DIR=C:\lazarus
@@ -256,8 +256,9 @@
@@ -263,8 +263,9 @@
ifneq ($(findstring $(OS_TARGET),win32 win64),)
else

@ -1,51 +0,0 @@
diff --git lazarus/components/Makefile.fpc lazarus/components/Makefile.fpc
index f7578d9..e88fda9 100644
--- lazarus/components/Makefile.fpc
+++ lazarus/components/Makefile.fpc
@@ -70,8 +70,10 @@ bigide:
$(MAKE) -C externhelp
$(MAKE) -C tdbf
$(MAKE) -C sqldb
+ifneq ($(CPU_TARGET),powerpc64)
$(MAKE) -C PascalScript/Source
$(MAKE) -C macroscript
+endif
all: base bigide
@@ -108,8 +110,10 @@ clean:
$(MAKE) -C externhelp clean
$(MAKE) -C tdbf clean
$(MAKE) -C sqldb clean
+ifneq ($(CPU_TARGET),powerpc64)
$(MAKE) -C PascalScript/Source clean
$(MAKE) -C macroscript clean
+endif
cleanall: clean
@@ -146,6 +150,8 @@ distclean:
$(MAKE) -C externhelp distclean
$(MAKE) -C tdbf distclean
$(MAKE) -C sqldb distclean
+ifneq ($(CPU_TARGET),powerpc64)
$(MAKE) -C PascalScript/Source distclean
$(MAKE) -C macroscript distclean
+endif
diff --git lazarus/ide/lazarus.pp lazarus/ide/lazarus.pp
index b6ea8c7..54ddb1a 100644
--- lazarus/ide/lazarus.pp
+++ lazarus/ide/lazarus.pp
@@ -73,7 +73,10 @@ uses
TurboPowerIPro, TurboPowerIProDsgn,
jcfidelazarus, chmhelppkg,
FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg,
- TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, pascalscript, EditorMacroScript,
+ TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz,
+ {$IFNDEF CPUPOWERPC64}
+ pascalscript, EditorMacroScript,
+ {$ENDIF}
{$ENDIF}
MainBase;

@ -1,15 +1,14 @@
Name: lazarus
Version: 1.8.4
Release: 3%{?dist}
Version: 2.0.0
Release: 1%{?dist}
Summary: Lazarus Component Library and IDE for Freepascal
# 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
patch0: Makefile_patch.diff
patch1: Desktop_patch.diff
patch2: disable_pascalscript_powerpc64.diff
Patch0: Makefile_patch.diff
BuildRequires: binutils
BuildRequires: desktop-file-utils
@ -52,11 +51,11 @@ The qt5pas-devel package contains libraries and header files for
developing applications that use qt5pas.
# Qt5pas end
%prep
%setup -c -q
%patch0 -p0
%patch1 -p0
%patch2 -p0
%build
cd lazarus
@ -127,6 +126,11 @@ popd
%changelog
* Fri Feb 08 2019 Artur Iwicki <fedora@svgames.pl> - 2.0.0-1
- Update to upstream version 2.0.0
- Drop the .desktop file patch (issues fixed upstream)
- Drop the "Disable PascalScript on PowerPC64" patch (we no longer ship ppc64 fpc/lazarus)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

@ -1 +1 @@
SHA512 (lazarus-1.8.4.tar.gz) = 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
SHA512 (lazarus-2.0.0.tar.gz) = bd590a345aac831f00813e0ce306549ad66b78e0c60678f181b6b1dcab2e39a489835a0b05f9fa9040ab97fe685baf23384468b67cc6c3956e8e0b8753764b9b

Loading…
Cancel
Save