[rpms/lazarus] multiple-IDE-widgetsets: Disable PascalScript on ppc64le

[rpms/lazarus] multiple-IDE-widgetsets: Disable PascalScript on ppc64le

[Artur Iwicki]

            A new commit has been pushed.

            Repo   : rpms/lazarus
            Branch : multiple-IDE-widgetsets
            Commit : eb03132047e922c58b8b0cf00f91f655f7e59a3e
            Author : Artur Iwicki <fedora@svgames.pl>
            Date   : 2020-01-29T12:44:26+01:00
            Stats  : +44/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/lazarus/c/eb03132047e922c58b8b0cf00f91f655f7e59a3e?branch=multiple-IDE-widgetsets

            Log:
            Disable PascalScript on ppc64le

The package previously contained a patch to disable PascalScript on ppc64,
but since Fedora dropped support for this arch in favour of ppc64le, it was removed.
Now that FPC supports ppc64le, the patch had to be reintroduced.

---
diff --git a/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch b/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
new file mode 100644
index 0000000..df566ec
--- /dev/null
+++ b/lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
@@ -0,0 +1,36 @@
+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 3544beb..5b1dca7 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -2,7 +2,7 @@ Name:           lazarus
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 Version:        2.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 # The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
 %global qt5pas_version 2.6
@@ -14,6 +14,7 @@ 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:         lazarus-2.0.6--disable-PascalScript-on-ppc64le.patch
 
 BuildRequires:  binutils
 BuildRequires:  desktop-file-utils
@@ -43,7 +44,7 @@ Component Library - LCL, which is also included in this package.
 # Qt5pas start
 %package -n     qt5pas
 Version:        %{qt5pas_version}
-Release:        %{qt5pas_release}.1
+Release:        %{qt5pas_release}
 Summary:        Qt5 bindings for Pascal
 
 %description -n qt5pas
@@ -51,7 +52,7 @@ Qt5 bindings for Pascal from Lazarus.
 
 %package -n     qt5pas-devel
 Version:        %{qt5pas_version}
-Release:        %{qt5pas_release}.1
+Release:        %{qt5pas_release}
 Summary:        Development files for qt5pas
 Requires:       qt5pas%{?_isa} = %{qt5pas_version}-%{qt5pas_release}
 
@@ -64,6 +65,7 @@ developing applications that use qt5pas.
 %prep
 %setup -c -q
 %patch0 -p0
+%patch1 -p1
 
 
 %build
@@ -147,6 +149,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings/tmp/
 
 
 %changelog
+* Wed Jan 29 2020 Artur Iwicki <fedora@svgames.pl> - 2.0.6-3
+- Disable PascalScript on ppc64le
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild