[rpms/lazarus] multiple-IDE-widgetsets: Drop workaround for building Qt on non-x86

[rpms/lazarus] multiple-IDE-widgetsets: Drop workaround for building Qt on non-x86

[Artur Frenszek-Iwicki]

A new commit has been pushed.

Repo   : rpms/lazarus
Branch : multiple-IDE-widgetsets
Commit : e62f336d9f5b4bc5ed80a8eeef88f243ff20bb47
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2024-02-08T14:32:24+01:00
Stats  : +2/-62 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/lazarus/c/e62f336d9f5b4bc5ed80a8eeef88f243ff20bb47?branch=multiple-IDE-widgetsets

Log:
Drop workaround for building Qt on non-x86

---
diff --git a/9999-qt-disable-broken-components.patch b/9999-qt-disable-broken-components.patch
deleted file mode 100644
index 9b7c3c9..0000000
--- a/9999-qt-disable-broken-components.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lazarus/components/Makefile	2023-04-21 11:01:56.498437134 +0200
-+++ lazarus/components/Makefile.patched	2023-04-23 10:42:38.023110927 +0200
-@@ -1684,10 +1684,10 @@
- 	$(MAKE) -C sqldb
- 	$(MAKE) -C PascalScript/Source
- 	$(MAKE) -C macroscript
- 	$(MAKE) -C lclextensions
--	$(MAKE) -C virtualtreeview
--	$(MAKE) -C onlinepackagemanager
-+#	$(MAKE) -C virtualtreeview
-+#	$(MAKE) -C onlinepackagemanager
- 	$(MAKE) -C pas2js
- all: base
- clean:
- 	$(MAKE) -C lazutils clean
-@@ -1729,10 +1729,10 @@
- 	$(MAKE) -C sqldb clean
- 	$(MAKE) -C PascalScript/Source clean
- 	$(MAKE) -C macroscript clean
- 	$(MAKE) -C lclextensions clean
--	$(MAKE) -C virtualtreeview clean
--	$(MAKE) -C onlinepackagemanager clean
-+#	$(MAKE) -C virtualtreeview clean
-+#	$(MAKE) -C onlinepackagemanager clean
- 	$(MAKE) -C pas2js clean
- cleanall: clean
- distclean:
- 	$(MAKE) -C lazutils distclean
-@@ -1774,7 +1774,7 @@
- 	$(MAKE) -C sqldb distclean
- 	$(MAKE) -C PascalScript/Source distclean
- 	$(MAKE) -C macroscript distclean
- 	$(MAKE) -C lclextensions distclean
--	$(MAKE) -C virtualtreeview distclean
--	$(MAKE) -C onlinepackagemanager distclean
-+#	$(MAKE) -C virtualtreeview distclean
-+#	$(MAKE) -C onlinepackagemanager distclean
- 	$(MAKE) -C pas2js distclean

diff --git a/lazarus.spec b/lazarus.spec
index 7f524fe..668c00a 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -29,10 +29,6 @@ Source0:        https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%
 
 Source100:      lazarus.appdata.xml
 
-# Some components fail to build with the "qt" widget set.
-# This file is listed as Source, not Patch, as we will manually apply and revert it during the build process.
-Source9999:     9999-qt-disable-broken-components.patch
-
 # Lazarus wants to put arch-specific stuff in /usr/share - make it go in /usr/lib istead
 Patch0:         0000-Makefile_patch.diff
 
@@ -312,29 +308,10 @@ make lcl %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM=nogui
 make tools %{fpmakeopt} OPT='%{fpcopt}'
 
 # Compile the LCL base + extra components for GUI widgetsets
-for WIDGETSET in gtk2 gtk3 qt5 qt6; do
+for WIDGETSET in gtk2 gtk3 qt qt5 qt6; do
 	make lcl basecomponents bigidecomponents %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM="${WIDGETSET}"
 done
 
-# The qt widgetset is, unfortunately, a special case.
-for WIDGETSET in qt; do
-	make lcl basecomponents %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM="${WIDGETSET}"
-
-	# bigidecomponents: the "virtualtreeview" component contains some in-line assembly.
-	# Each widgetset has its own bit of assembly. Unfortunately, for the "qt" widgetset,
-	# only x86 assembly is provided. We use this patch to disable the offending components.
-	%ifnarch %{ix86} x86_64
-		patch -p1 < %{SOURCE9999}
-	%endif
-
-	make bigidecomponents %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM="${WIDGETSET}"
-
-	# Revert the patch before proceeding.
-	%ifnarch %{ix86} x86_64
-		patch -R -p1 < %{SOURCE9999}
-	%endif
-done
-
 # Compile the IDE itself
 # TODO: Could try building the IDE with multiple widgetsets, as well!
 make bigide %{fpmakeopt} OPT='%{fpcopt}' LCL_PLATFORM=gtk2
@@ -570,6 +547,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 - Update to v3.0.0
 - Add qt6pas, qt6pas-devel and lazarus-lcl-qt6 packages
 - Drop Patch2 (GTK3 fixes - fixed upstream)
+- Drop workaround for building Qt on non-x86 platforms (fixed upstream)
 
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild