breeze_icons, fix build for 32bit (#10941)

kde-frameworks/breeze-icons/breeze_icons-6.2.0.recipe

@@ -1,77 +0,0 @@
-SUMMARY="Breeze SVG icon theme"
-DESCRIPTION="Breeze-icons is a freedesktop.org compatible icon theme. \
-It's developed by the KDE Community as part of KDE Frameworks 5 and it's \
-used by default in KDE Plasma 5 and KDE Applications."
-HOMEPAGE="https://invent.kde.org/frameworks/breeze-icons"
-COPYRIGHT="2010-2024 KDE Organisation"
-LICENSE="GNU LGPL v2"
-REVISION="1"
-SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/breeze-icons-${portVersion}.tar.xz"
-CHECKSUM_SHA256="df5a3b150768dd5c781a6c3d1848d79f4b0eb2f327e248c5426a1234aa4c135b"
-SOURCE_DIR="breeze-icons-$portVersion"
-PATCHES="breeze_icons-$portVersion.patchset"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	breeze_icons$secondaryArchSuffix = $portVersion
-	"
-if [ -n "$secondaryArchSuffix" ]; then
-	PROVIDES+="
-		breeze_icons = $portVersion
-		"
-fi
-
-PROVIDES_devel="
-	breeze_icons${secondaryArchSuffix}_devel = $portVersion
-	"
-REQUIRES_devel="
-	breeze_icons$secondaryArchSuffix == $portVersion base
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
-	devel:libQt6Core$secondaryArchSuffix
-	lxml_python310
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:python3
-	"
-
-TEST_REQUIRES="
-	cmd:fdupes
-	"
-
-BUILD()
-{
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		$cmakeDirArgs \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-		-DBINARY_ICONS_RESOURCE=ON \
-		-DBUILD_TESTING=OFF \
-		-Wno-dev
-	make -Cbuild $jobArgs
-}
-
-INSTALL()
-{
-	make -Cbuild install
-
-	packageEntries devel \
-		$libDir
-}
-
-TEST()
-{
-	make -Cbuild test
-}

kde-frameworks/breeze-icons/breeze_icons-6.5.0.recipe

@@ -9,6 +9,9 @@ REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/breeze-icons-${portVersion}.tar.xz"
 CHECKSUM_SHA256="ca6e8faef84891750ebc240d0b99f42414e5f643678d5b1ae94bcbad551ab0c4"
 SOURCE_DIR="breeze-icons-$portVersion"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	PATCHES="breeze_icons_x86-$portVersion.patchset"
+fi
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -20,6 +23,11 @@ PROVIDES="
 	breeze_icons$secondaryArchSuffix = $portVersion
 	lib:libKF6BreezeIcons$secondaryArchSuffix = $libVersionCompat
 	"
+if [ -n "$secondaryArchSuffix" ]; then
+	PROVIDES+="
+		breeze_icons = $portVersion
+		"
+fi
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix

kde-frameworks/breeze-icons/patches/breeze_icons-6.2.0.patchset

@@ -1,22 +0,0 @@
-From a3a4fc08e6270e6fd46601353699a664ac0e2654 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 1 Nov 2021 09:59:51 +1000
-Subject: Don't run validate_svg.sh on Haiku
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d0dbca1..bdf3a16 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,7 +119,7 @@ function(generate_binary_resource target outfile)
- endfunction()
- endif()
- 
--if(NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
-+if(NOT WIN32 AND NOT HAIKU  AND NOT CMAKE_CROSSCOMPILING)
-     # validate
-     find_program(SH_EXE sh)
-     find_program(XMLLINT_EXE xmllint)
--- 
-2.43.2
-

kde-frameworks/breeze-icons/patches/breeze_icons_x86-6.5.0.patchset

@@ -0,0 +1,34 @@
+From bd496d5e202fb6b583f8676c3acf982f4d5a3040 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Tue, 27 Aug 2024 21:12:48 +0200
+Subject: Revert:
+ https://invent.kde.org/frameworks/breeze-icons/-/merge_requests/379/diffs
+
+
+diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+index e8c9e0a..e485840 100644
+--- a/src/lib/CMakeLists.txt
++++ b/src/lib/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ # helper functions to ensure we load the icon theme
+ set(kbreezeicons_SRCS breezeicons.cpp)
+ 
+-# avoid dependency cycle with add resource
+-set(CMAKE_AUTOMOC OFF)
+-
+ # generate resource file for all breeze icons
+ set(RESOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/breeze-icons.qrc)
+ set(RESOURCE_FILE_BINARY ${CMAKE_CURRENT_BINARY_DIR}/breeze-icons.rcc)
+@@ -24,8 +21,7 @@ if(BINARY_ICONS_RESOURCE)
+     install(FILES ${RESOURCE_FILE_BINARY} DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/breeze)
+ endif()
+ 
+-# use normal resource adding, big resource variant has issue with LTO
+-qt_add_resources(kbreezeicons_resource_SRCS
++qt_add_big_resources(kbreezeicons_resource_SRCS
+     ${RESOURCE_FILE}
+     OPTIONS --root /icons/breeze
+ )
+-- 
+2.45.2
+