From eaece05da6d29cb326ecd2342aa02829ee6edf4c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 27 Aug 2024 13:31:30 +0200 Subject: [PATCH] breeze_icons, bump version (#10937) --- ...6.2.0.recipe => breeze_icons-6.5.0.recipe} | 27 ++++++++++++------- .../patches/breeze_icons-6.2.0.patchset | 22 --------------- 2 files changed, 18 insertions(+), 31 deletions(-) rename kde-frameworks/breeze-icons/{breeze_icons-6.2.0.recipe => breeze_icons-6.5.0.recipe} (71%) delete mode 100644 kde-frameworks/breeze-icons/patches/breeze_icons-6.2.0.patchset diff --git a/kde-frameworks/breeze-icons/breeze_icons-6.2.0.recipe b/kde-frameworks/breeze-icons/breeze_icons-6.5.0.recipe similarity index 71% rename from kde-frameworks/breeze-icons/breeze_icons-6.2.0.recipe rename to kde-frameworks/breeze-icons/breeze_icons-6.5.0.recipe index fe8213d58..6821be7dd 100644 --- a/kde-frameworks/breeze-icons/breeze_icons-6.2.0.recipe +++ b/kde-frameworks/breeze-icons/breeze_icons-6.5.0.recipe @@ -7,24 +7,29 @@ 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" +CHECKSUM_SHA256="ca6e8faef84891750ebc240d0b99f42414e5f643678d5b1ae94bcbad551ab0c4" SOURCE_DIR="breeze-icons-$portVersion" -PATCHES="breeze_icons-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" breeze_icons$secondaryArchSuffix = $portVersion + lib:libKF6BreezeIcons$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" ]; then - PROVIDES+=" - breeze_icons = $portVersion - " -fi PROVIDES_devel=" breeze_icons${secondaryArchSuffix}_devel = $portVersion + devel:libKF6BreezeIcons$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" breeze_icons$secondaryArchSuffix == $portVersion base @@ -67,11 +72,15 @@ INSTALL() { make -Cbuild install + prepareInstalledDevelLib \ + libKF6BreezeIcons + packageEntries devel \ - $libDir + $developDir \ + $libDir/cmake } TEST() { - make -Cbuild test + ctest --test-dir build --output-on-failure } diff --git a/kde-frameworks/breeze-icons/patches/breeze_icons-6.2.0.patchset b/kde-frameworks/breeze-icons/patches/breeze_icons-6.2.0.patchset deleted file mode 100644 index b9f94023e..000000000 --- a/kde-frameworks/breeze-icons/patches/breeze_icons-6.2.0.patchset +++ /dev/null @@ -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 -