diff --git a/kde-apps/cantor/cantor-25.08.0.recipe b/kde-apps/cantor/cantor-25.12.0.recipe similarity index 93% rename from kde-apps/cantor/cantor-25.08.0.recipe rename to kde-apps/cantor/cantor-25.12.0.recipe index f09489fc6..6bc080a3c 100644 --- a/kde-apps/cantor/cantor-25.08.0.recipe +++ b/kde-apps/cantor/cantor-25.12.0.recipe @@ -22,7 +22,7 @@ COPYRIGHT="2010-2025 KDE Organisation LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/cantor-$portVersion.tar.xz" -CHECKSUM_SHA256="5c98fa36bac3500a57d07813a101be709c58aa0ab755d4c9c9fa2b3f8836238d" +CHECKSUM_SHA256="072a3bbe238654404f17fef51c4e0aadb1b7862eed8eb8f9fed7d42628802d89" SOURCE_DIR="cantor-$portVersion" PATCHES="cantor-$portVersion.patchset" ADDITIONAL_FILES="cantor.rdef.in" @@ -35,6 +35,7 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" cantor$secondaryArchSuffix = $portVersion + app:Cantor = $portVersion cmd:cantor$secondaryArchSuffix = $portVersion cmd:cantor_pythonserver$secondaryArchSuffix = $portVersion cmd:cantor_rserver$secondaryArchSuffix = $portVersion @@ -47,13 +48,14 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libAnalitza$secondaryArchSuffix + lib:libgfortran$secondaryArchSuffix lib:libluajit_5.1$secondaryArchSuffix lib:libmarkdown$secondaryArchSuffix lib:libpoppler$secondaryArchSuffix lib:libpoppler_qt6$secondaryArchSuffix lib:libpython3.10$secondaryArchSuffix lib:libqalculate$secondaryArchSuffix -# lib:libRmath$secondaryArchSuffix + lib:libRmath$secondaryArchSuffix lib:libspectre$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix @@ -107,7 +109,7 @@ BUILD_REQUIRES=" devel:libpoppler$secondaryArchSuffix >= 148 devel:libpoppler_Qt6$secondaryArchSuffix >= 3.10 devel:libqalculate$secondaryArchSuffix -# devel:libRmath$secondaryArchSuffix + devel:libRmath$secondaryArchSuffix devel:libspectre$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix @@ -144,7 +146,8 @@ BUILD_PREREQUIRES=" cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix cmd:python3.10 -# cmd:r + cmd:r + cmd:which " TEST_REQUIRES=" @@ -155,8 +158,7 @@ BUILD() { cmake -B build -S . -G Ninja -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_INSTALL_BINDIR=$prefix/bin \ -DENABLE_EMBEDDED_DOCUMENTATION=OFF \ -DBUILD_DOC=OFF \ -DCMAKE_SKIP_RPATH=YES \ @@ -176,6 +178,10 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,config.kcfg,knsrcfiles,metainfo} + mkdir -p $appsDir + mv $prefix/bin/cantor $appsDir/Cantor + ln -s $appsDir/Cantor $prefix/bin/cantor + local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" @@ -191,7 +197,8 @@ INSTALL() -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/cantor.rdef.in > cantor.rdef - addResourcesToBinaries cantor.rdef $binDir/cantor + addResourcesToBinaries cantor.rdef $appsDir/Cantor + addAppDeskbarSymlink $appsDir/Cantor prepareInstalledDevelLib \ libcantorlibs @@ -199,8 +206,6 @@ INSTALL() packageEntries devel \ $developDir \ $libDir/cmake - - addAppDeskbarSymlink $binDir/cantor Cantor } TEST() diff --git a/kde-apps/cantor/patches/cantor-25.08.0.patchset b/kde-apps/cantor/patches/cantor-25.08.0.patchset deleted file mode 100644 index 593ca3639..000000000 --- a/kde-apps/cantor/patches/cantor-25.08.0.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From df9e098c1ad0ff39736d8f3c5a3013e4306e17fc Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Sun, 31 Mar 2024 16:02:09 +0200 -Subject: Disable POSITION_INDEPENDENT_CODE - - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index bf676e7..b4be872 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -11,7 +11,7 @@ ExternalProject_Add( - URL ${CMAKE_CURRENT_SOURCE_DIR}/discount-2.2.6-patched - SOURCE_SUBDIR cmake - CMAKE_ARGS -DDISCOUNT_ONLY_LIBRARY:BOOL=ON -DDISCOUNT_MAKE_INSTALL:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -- CMAKE_CACHE_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true" -+ CMAKE_CACHE_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=false" - PREFIX ${CMAKE_CURRENT_BINARY_DIR} - INSTALL_COMMAND "" - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/discount_project-build -@@ -25,7 +25,7 @@ add_library(Discount::Lib STATIC IMPORTED GLOBAL) - set_target_properties(Discount::Lib PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${source_dir} - IMPORTED_LOCATION ${binary_dir}/libmarkdown${CMAKE_STATIC_LIBRARY_SUFFIX} -- POSITION_INDEPENDENT_CODE ON -+ POSITION_INDEPENDENT_CODE OFF - ) - add_dependencies(Discount::Lib discount_project-build) - --- -2.48.1 - diff --git a/kde-apps/cantor/patches/cantor-25.12.0.patchset b/kde-apps/cantor/patches/cantor-25.12.0.patchset new file mode 100644 index 000000000..eecf2f96f --- /dev/null +++ b/kde-apps/cantor/patches/cantor-25.12.0.patchset @@ -0,0 +1,69 @@ +From 8e8169223af355e02b1b814c0a02e9ddc201f2be Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Sun, 31 Mar 2024 16:02:09 +0200 +Subject: Disable POSITION_INDEPENDENT_CODE + + +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index bf676e7..b4be872 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -11,7 +11,7 @@ ExternalProject_Add( + URL ${CMAKE_CURRENT_SOURCE_DIR}/discount-2.2.6-patched + SOURCE_SUBDIR cmake + CMAKE_ARGS -DDISCOUNT_ONLY_LIBRARY:BOOL=ON -DDISCOUNT_MAKE_INSTALL:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} +- CMAKE_CACHE_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true" ++ CMAKE_CACHE_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=false" + PREFIX ${CMAKE_CURRENT_BINARY_DIR} + INSTALL_COMMAND "" + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/discount_project-build +@@ -25,7 +25,7 @@ add_library(Discount::Lib STATIC IMPORTED GLOBAL) + set_target_properties(Discount::Lib PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${source_dir} + IMPORTED_LOCATION ${binary_dir}/libmarkdown${CMAKE_STATIC_LIBRARY_SUFFIX} +- POSITION_INDEPENDENT_CODE ON ++ POSITION_INDEPENDENT_CODE OFF + ) + add_dependencies(Discount::Lib discount_project-build) + +-- +2.51.0 + + +From f1bff3b8cec1ef5119a1a5f05a69a3299d7dd889 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Sun, 16 Nov 2025 15:33:25 +0100 +Subject: Fix building R backend + + +diff --git a/src/backends/R/rserver/CMakeLists.txt b/src/backends/R/rserver/CMakeLists.txt +index 630c090..8cdfe59 100644 +--- a/src/backends/R/rserver/CMakeLists.txt ++++ b/src/backends/R/rserver/CMakeLists.txt +@@ -20,7 +20,7 @@ add_custom_target(rautoloads DEPENDS rautoloads.h) + + add_executable( cantor_rserver ${RServer_SRCS} ) + set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH false) +-target_link_libraries( cantor_rserver cantorlibs ${R_LIBRARIES} KF6::KIOCore) ++target_link_libraries( cantor_rserver cantorlibs ${R_LIBRARIES} Qt6::DBus KF6::KIOCore) + add_dependencies(cantor_rserver renvvars rautoloads) + + install(TARGETS cantor_rserver ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) +diff --git a/src/backends/R/rserver/main.cpp b/src/backends/R/rserver/main.cpp +index 9ad1b8f..b9a1087 100644 +--- a/src/backends/R/rserver/main.cpp ++++ b/src/backends/R/rserver/main.cpp +@@ -7,8 +7,8 @@ + #include "rserver.h" + + #include +-#include +-#include ++#include ++#include + #include + #include + +-- +2.51.0 + diff --git a/kde-apps/kbruch/kbruch-25.12.0.recipe b/kde-apps/kbruch/kbruch-25.12.0.recipe new file mode 100644 index 000000000..46bafc849 --- /dev/null +++ b/kde-apps/kbruch/kbruch-25.12.0.recipe @@ -0,0 +1,116 @@ +SUMMARY="A Practice Fractions" +DESCRIPTION="KBruch is a small program to practice calculating with fractions and percentages. \ +Different exercises are provided for this purpose and you can use the learning mode to practice \ +with fractions. The program checks the user's input and gives feedback. + +Features: +* Arithmetic exercise - in this exercise you have to solve a given fraction task. You have to \ +enter the numerator and the denominator. This is the main exercise. +* Comparison exercise - in this exercise you have to compare the size of 2 given fractions, using \ +the symbols >, < or =. +* Conversion exercise - in this exercise you have to convert a given number into a fraction. +* Factorization exercise - in this exercise you have to factorize a given number into its prime \ +factors. +* Percentage exercise - in this exercise you have to calculate percentages." +HOMEPAGE="https://invent.kde.org/education/kbruch" +COPYRIGHT="2002-2011 Sebastian Stein + 2010-2025 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kbruch-$portVersion.tar.xz" +CHECKSUM_SHA256="034ab74980f9ec5897eb96db4f6d3e4a53c3d4de773609426330f2c6670436be" +SOURCE_DIR="kbruch-$portVersion" +ADDITIONAL_FILES="kbruch.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + kbruch$secondaryArchSuffix = $portVersion + app:KBruch = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + # KF6 + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6Codecs$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + extra_cmake_modules$secondaryArchSuffix + # KF6 + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6GuiAddons$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DCMAKE_SKIP_RPATH=YES + + make -Cbuild $jobArgs +} + +INSTALL() +{ + make -Cbuild install + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + mv $appsDir/kbruch $appsDir/KBruch + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="KBruch" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.kde-kbruch" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/kbruch.rdef.in > kbruch.rdef + + addResourcesToBinaries kbruch.rdef $appsDir/KBruch + addAppDeskbarSymlink $appsDir/KBruch +} diff --git a/kde-apps/kgeography/kgeography-25.08.0.recipe b/kde-apps/kgeography/kgeography-25.12.0.recipe similarity index 95% rename from kde-apps/kgeography/kgeography-25.08.0.recipe rename to kde-apps/kgeography/kgeography-25.12.0.recipe index bb73386ad..162bdbb9b 100644 --- a/kde-apps/kgeography/kgeography-25.08.0.recipe +++ b/kde-apps/kgeography/kgeography-25.12.0.recipe @@ -16,7 +16,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kgeography-$portVersion.tar.xz" -CHECKSUM_SHA256="4aed07a1c6e69fa3986038f1d2186aed402b792cc024417c0c195871ec02c3ed" +CHECKSUM_SHA256="8c941545cdeed947f223a0c2fc5e222e57480559e5986d728fe2635c09c2d79f" SOURCE_DIR="kgeography-$portVersion" ADDITIONAL_FILES="kgeography.rdef.in" @@ -64,7 +64,6 @@ BUILD_REQUIRES=" devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6IconThemes$secondaryArchSuffix @@ -87,6 +86,7 @@ BUILD_PREREQUIRES=" PATCH() { # disable docs generation + sed -e 's|DocTools||' -i CMakeLists.txt sed -e '/add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt } @@ -96,7 +96,8 @@ BUILD() cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF make -Cbuild $jobArgs } diff --git a/kde-apps/kig/kig-25.08.0.recipe b/kde-apps/kig/kig-25.12.0.recipe similarity index 97% rename from kde-apps/kig/kig-25.08.0.recipe rename to kde-apps/kig/kig-25.12.0.recipe index 88ddd4f44..339fe5e1c 100644 --- a/kde-apps/kig/kig-25.08.0.recipe +++ b/kde-apps/kig/kig-25.12.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kig-$portVersion.tar.xz" -CHECKSUM_SHA256="10f5c931723a34ea6e075df052711148c2912bcab2cc70d307f60e40311a3d97" +CHECKSUM_SHA256="d0a4a206d069dde7fad8f1cd383e698524ea05bd50238a673f29427691d0a8bb" ADDITIONAL_FILES="kig.rdef.in" ARCHITECTURES="all !x86_gcc2" diff --git a/kde-apps/kiten/additional-files/kiten.rdef.in b/kde-apps/kiten/additional-files/kiten.rdef.in index 3d815178c..3802e537d 100644 --- a/kde-apps/kiten/additional-files/kiten.rdef.in +++ b/kde-apps/kiten/additional-files/kiten.rdef.in @@ -15,71 +15,358 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; resource vector_icon { - $"6E63696605011A171B660554020016020000003CC4CCBCC4CC0000004E24C24A" - $"2E8F00FFFFE503003F80020006020000003D063DBD063D0000004E372349B68F" - $"00ABD5FFFF006CD906022BB91BBB92B91BBB92B911BB92B8FFBB9BB906BB972E" - $"BC03B7BBBCD5B827BC6CB7AEBCE2B7B2BD09B7A8BCF9B831BDCFB92EBF5BB8AF" - $"BE95B8E9BFC6B890C0B7B8B7C03CB7A6C0E5B5D2C143B6BCC114B5BEC148B5AD" - $"C166B5ADC152B5ADC1F8B5ADC31AB5ADC288B5ADC32DB5D2C345B5BFC341B6B6" - $"C37AB87EC3E2B79AC3AEB8A2C471B924C574B8D9C4F9B8A0C631B797C7ABB81B" - $"C6EFB78BC7BCB7A0C7DFB791C7D2B80CC845B8E3C911B878C8ABB8F1C91EB91B" - $"C91AB90AC924B9E9C8A3BB85C7B4BAB7C82CBC00C7F7BD0AC852BC7FC82EBD3B" - $"C92CBD9DCADFBD6CCA06BDA2CAF3BDC3CB03BDAECB03BE5DCB03BF90CB03BEF7" - $"CB03BFA4CB03BFBECADFBFB9CAF2BFF6CA06C065C852C02DC92CC0F4C82DC1FB" - $"C7ABC17EC7F1C2C6C82CC45DC92CC392C8ABC46DC936C494C923C485C931C500" - $"C8BDC5D7C7F1C56BC857C5E5C7E3C5E0C7BDC5EAC7CDC597C748C503C660C54C" - $"C6D4C4EAC669C4B8C67AC4D2C671C4AEC67FC49DC671C4A3C67AC49DC671C35A" - $"C4ABC411C5A9C27EC641BEBBC754C0C0C754BBDFC754B989C274B989C528B989" - $"C077BC9BBDFDBACDBEC2BC9BBD92BC9BBCBABC9BBD25BC47BCD6BBAABD1ABBF8" - $"BCF2BBAABD1ABBA1BD1ABBA2BD1ABAD3BC9AB937BB9ABA05BC1AB92EBB95B91A" - $"BB92B924BB91B91ABB92B91BBB92B91ABB92B91BBB92B91BBB92B91BBB92B91B" - $"BB92B91BBB92B91BBB92B91BBB92022BB8B5BAC6B8B5BAC6B8ABBAC6B899BACF" - $"B8A0BACB2DBB37B755BC09B7C1BBA0B748BC16B74CBC3DB742BC2DB7CBBD03B8" - $"C8BE8FB849BDC9B883BEFAB82ABFEBB851BF70B740C019B56CC077B656C048B5" - $"58C07CB547C09AB547C086B547C12CB547C24EB547C1BCB547C261B56CC279B5" - $"59C275B650C2AEB818C316B734C2E2B83CC3A5B8BEC4A8B873C42DB83AC565B7" - $"31C6DFB7B5C623B725C6F0B73AC713B72BC706B7A6C779B87DC845B812C7DFB8" - $"8BC852B8B5C84EB8A4C858B983C7D7BB1FC6E8BA51C760BB9AC72BBCA4C786BC" - $"19C762BCD5C860BD37CA13BD06C93ABD3CCA27BD5DCA37BD48CA37BDF7CA37BF" - $"2ACA37BE91CA37BF3ECA37BF58CA13BF53CA26BF90C93ABFFFC786BFC7C860C0" - $"8EC761C195C6DFC118C725C260C760C3F7C860C32CC7DFC407C86AC42EC857C4" - $"1FC865C49AC7F1C571C725C505C78BC57FC717C57AC6F1C584C701C531C67CC4" - $"9DC594C4E6C608C484C59DC452C5AEC46CC5A5C448C5B3C437C5A5C43DC5AEC4" - $"37C5A5C2F4C3DFC3ABC4DDC218C575BE55C688C05AC688BB79C688B923C1A8B9" - $"23C45CB923BFABBC35BD31BA67BDF6BC35BCC6BC35BBEEBC35BC59BBE1BC0ABB" - $"44BC4EBB92BC26BB44BC4EBB3BBC4EBB3CBC4EBA6DBBCEB8D1BACEB99FBB4EB8" - $"C8BAC9B8B4BAC6B8BEBAC5B8B4BAC6B8B5BAC6B8B4BAC6B8B5BAC6B8B5BAC6B8" - $"B5BAC6B8B5BAC6B8B5BAC6B8B5BAC6B8B5BAC6022BB8B5BAC6B8B5BAC6B8ABBA" - $"C6B899BACFB8A0BACB2DBB37B755BC09B7C1BBA0B748BC16B74CBC3DB742BC2D" - $"B7CBBD03B8C8BE8FB849BDC9B883BEFAB82ABFEBB851BF70B740C019B56CC077" - $"B656C048B558C07CB547C09AB547C086B547C12CB547C24EB547C1BCB547C261" - $"B56CC279B559C275B650C2AEB818C316B734C2E2B83CC3A5B8BEC4A8B873C42D" - $"B83AC565B731C6DFB7B5C623B725C6F0B73AC713B72BC706B7A6C779B87DC845" - $"B812C7DFB88BC852B8B5C84EB8A4C858B983C7D7BB1FC6E8BA51C760BB9AC72B" - $"BCA4C786BC19C762BCD5C860BD37CA13BD06C93ABD3CCA27BD5DCA37BD48CA37" - $"BDF7CA37BF2ACA37BE91CA37BF3ECA37BF58CA13BF53CA26BF90C93ABFFFC786" - $"BFC7C860C08EC761C195C6DFC118C725C260C760C3F7C860C32CC7DFC407C86A" - $"C42EC857C41FC865C49AC7F1C571C725C505C78BC57FC717C57AC6F1C584C701" - $"C531C67CC49DC594C4E6C608C484C59DC452C5AEC46CC5A5C448C5B3C437C5A5" - $"C43DC5AEC437C5A5C2F4C3DFC3ABC4DDC218C575BE55C688C05AC688BB79C688" - $"B923C1A8B923C45CB923BFABBC35BD31BA67BDF6BC35BCC6BC35BBEEBC35BC59" - $"BBE1BC0ABB44BC4EBB92BC26BB44BC4EBB3BBC4EBB3CBC4EBA6DBBCEB8D1BACE" - $"B99FBB4EB8C8BAC9B8B4BAC6B8BEBAC5B8B4BAC6B8B5BAC6B8B4BAC6B8B5BAC6" - $"B8B5BAC6B8B5BAC6B8B5BAC6B8B5BAC6B8B5BAC6B8B5BAC6060FFFFFFF15C27E" - $"B679C27EB679C166B693BF36B6C7C04EB6AEBF36BB02BF36C376BF36BF3CC04B" - $"C350C275C305C160C32BC275C136C275BD99C275BF68C3E6BF99C6C9C399C558" - $"C199C7EBC341CA2EC293C90CC2EAC8B2C0A7C5BEBCD1C738BEBBC73BBAFFCA37" - $"B75CC8B9B92EC90FB71CC6C0B69CC7E7B6DCC551B86EC275BC10C3E3BA3FC278" - $"BA34C27EB679C27BB856C27EB679B679B679B679060FFFFFFF15C1B2B5ADC1B2" - $"B5ADC09AB5C7BE6AB5FBBF82B5E2BE6ABA36BE6AC2AABE6ABE70BF7FC284C1A9" - $"C239C094C25FC1A9C06AC1A9BCCDC1A9BE9CC31ABECDC5FDC2CDC48CC0CDC71F" - $"C275C962C1C7C840C21EC7E6BFDBC4F2BC05C66CBDEFC66FBA33C96BB690C7ED" - $"B862C843B650C5F4B5D0C71BB610C485B7A2C1A9BB44C317B973C1ACB968C1B2" - $"B5ADC1AFB78AC1B2B5ADB5ADB5ADB5AD060FFFFFFF15C1B2B5ADC1B2B5ADC09A" - $"B5C7BE6AB5FBBF82B5E2BE6ABA36BE6AC2AABE6ABE70BF7FC284C1A9C239C094" - $"C25FC1A9C06AC1A9BCCDC1A9BE9CC31ABECDC5FDC2CDC48CC0CDC71FC275C962" - $"C1C7C840C21EC7E6BFDBC4F2BC05C66CBDEFC66FBA33C96BB690C7EDB862C843" - $"B650C5F4B5D0C71BB610C485B7A2C1A9BB44C317B973C1ACB968C1B2B5ADC1AF" - $"B78AC1B2B5ADB5ADB5ADB5AD060A0001001001178322040A0101011001178422" - $"040A020102000A0001031001178422040A0301041001178422040A04010500" + $"6E63696605020112030000003DB084BFCC310000004962BD4AE1F70000FF7F00" + $"FFFF000002011605BF879340ABD2BF879CC0546146A72D47BCD100A77FFF89AD" + $"BAF0FFDC04153202000602BA39BCB8367D3733C3BB136B4A146548508D00F700" + $"00FF7C000001430000B5600606FF07B4C4B60EB4C4B60EBC18B662CAC1B708C3" + $"6DB6B5CB3BBE09CC2ECC0B5EC50A5156B328CD45BB8FCED7B3B1C588B4C4B60E" + $"B43BBDCBB4C4B60EB60E0606FF07B46FB2C6B46FB2C6BBF9B6A1CB0CB3D6C382" + $"AFDBCB88BB7A60CAC2CC04C31EC400C71D20CC19BB80CF9AB37AC3A8B46FB2C6" + $"B3F4BB37B46FB2C6B2C60228BF50BD18BF50BD18BEDEBEECBD1EC1B2BE53C0AF" + $"BD0DBF2CBEC4BC38BEDEBE76BEAFBBE1BE59BB7ABE36BC28BDF836BD11BC28BD" + $"73BBE2BCA2BCDBBC9BBE6FBCADBD9BBC88BF4CBC41C133BBFFC03EBAA6C1D7B9" + $"9EBDF6B994C02FB9A1BD28B9C0BB8FB9FEBC0EB906BAF5B88FB928B88BBA9AB8" + $"96B791BACCB3FEBA71B500B8ADB41DB46FB2C9B68EB3DFB46DB2DFB414B912B4" + $"16B8E5B538B950B5A1B63CB588B7E4B6ABB6F6B752B95AB6F8B7EEB6E4B9DFB6" + $"F1BBA2B6E0BA9AB71DBE48B893C199B813BFE0B74BC103B66FBF10B733C0B7B5" + $"D8BDC0B4B7BAF5B5A4BBFEB461BAEFB401BB74B441BB53B44BBC61B3D6BE6CB4" + $"72BE03B3D1BE6AB3C6BE6522BE67B3C3BEA0B3BCBF17B3C0BEDCB3BEBF17B3C2" + $"BF15B3C0BF16B3A4BF5EB37DC0E5B389C00EB371C1ACB387C2C6B376C261B37E" + $"C359B36EC481B376C3EDB373C483B37E4CB379C486B393C45FB3B7C400B389C3" + $"F9B412C462B507C4CDB48FC4D8B5F6C59FB815C6C2B691C768B7E5C598B673C4" + $"7BB69EC5BCB765C496B912C5B3B87CC509B9D6C5D2BB2CC55EBA60C57EBB4EC5" + $"85BB29C5E0BB22C59DBC71C4B1BE5EC168BD18C35DBEBFC0D3BFBEBF92BF2CC0" + $"58C018BF1AC0F9BD8AC100BDF5C0EFBCC6BF50BD18BFDEBCABBF50BD18BF50BD" + $"18BF50BD18BF50BD1806047FB9CBB7F6B9CBB7F6B85FB663B9F7BA5AB825BBCE" + $"BA35B94CB9CBB7F6B9F9B8CBB9CBB7F6B7F6002DB99FB405B99FB405BA79B408" + $"BC2FB3DDBB54B3F8BC21B581BC86B820BCDDB692BC91B89CBD1CB8DFBD13B85F" + $"BCEDB96ABC13B9E2BC69B98ABBEDBA13BC01BA7CBC2BBA45BB4334BA94BC46BB" + $"02BB61BA6EBC93BA12BD15BA29BCDCB95ABEC9BBA3C0E3BA8EC0EFBBF3BFDDBB" + $"F2BDB5BBB4BEBDBC05BD64BC84BC58BC57BCABBD47BAF0C029B86BBEFCB9C3C0" + $"A1B7E2C178B73DC0E4B707C18FB814C0C3B89FC0FEB826C0C4B9DCBFBE37BFEA" + $"BAD3C065BC7CC1A6BD39C0EBBD02C009C103BB81C7C3BDBCC462BC63C76DBE16" + $"C5A8BD66C682BE73C536BECBC424BE7EC494BEFBC3DEBFBFC350BF7AC395C0A3" + $"C268C271C101C165C0ECC290C13BC2C5C1C1C2AAC17FC2DBC1A1C314C187C2EC" + $"C159C30CC22BC34CC2F6C32AC292C32BC433C273C61AC2B6C525C1FBC7CCC0FF" + $"CB04C1B1C97CC0D2CB11C079CB2AC0A5CB1DC144C9FCC220C5EEC1A5C79CC24B" + $"C555C29DC42CC29FC493C299C388C206C2BEC21EC33AC18BC2D6C166C3E245C3" + $"A5C0BCC3D5BF5DC3E9BFF1C3BDBEA0C421BE89C560BED2C4BFBE60C5B9BDE4C6" + $"0BBE1EC5E1BD06C6ADBAEAC84BBC11C821BD45C4F6C139BD91BF61C13FC0E8BC" + $"C1BF60BC94C024BCAABF40BB58BF90B9CBBFF3BAA2BE0ABAAABC30BDD6BCC2BB" + $"CEBC5ABF01BC01C129BBCCBFDEBA2EC1A6BA28BC23B933BE7ABA3BBBADB9FFBB" + $"4BB9F2BBB9BA39BB04BAD9BB24BAA6BBA3B9BFBAD0B871B924B879BB03B86DB8" + $"0FB99FB405B922B4C4B99FB40506047FC8E2C43CC8E2C43CC8FFC3EEC93949C9" + $"58C3F2C8C1C29FC8E2C43CC888C3E0C8E2C43CC43C0610FFFFFF6FCC15C433CC" + $"15C433CBE3C3D3CB84C409CBC7C41DCB76C475CB34C515CB61C4D6CB0EC50FCA" + $"C2C505CAF8C521CA6BC52ACA41C637CAAFC62DC9FFC5F5C984C56FC998C5DFC9" + $"43C552C911C572C944C5B4C909C509C8D4C463C8D4C4D6C881C446C866C4BEC8" + $"CFC4F6C818C45DC7B4C359C7FEC3BBC814C2D8C893C195C879C267C8BFC181C9" + $"24C1AAC8F5C189C947C19BC92BC0F5C924C12BC9CFBF96CBB3BE1ECA7EBE515E" + $"BE32CC15C433C433020DCBB6BE5BCBB6BE5BCBB8BE76CC0FC3CECC0DC3B3CBDC" + $"C383CB6CC38ACBB2C3B6CB41C3D5CB0DC4A5CB3AC459CAD6C4B7CA3CC4A4CA66" + $"C47ACA3B4DCA37C580CA54C55CC9E9C577C99FC510C9AFC55BC9E1C3E3C89BC2" + $"4DC95BC2C6C89BC213C8B5C1C2C887C1BFC908C1C3C96AC21BC90AC225C92DC0" + $"3BCB1FBE7ACA35BF18CB49BE5DCBB6BE5BCB76BE38CBB6BE5BCBB6BE5BCBB6BE" + $"5BCBB6BE5B0211B3C6BE65B3C6BE65B3CABE22B406BA08B3FCBAABB438BA39B5" + $"02BA65B4CFBA84B62CBD70B858C13EB66BBF49B7EEBF50B6E1BB7AB703BDF9B6" + $"D3BA8CB742B929B6EAB99DB6E1B81BB60DB6F9B6C4B7B0B5FAB8F7B408B9DFB5" + $"2CBA0AB40AB9C1B414B912B412B930B538B950B5A1B63CB588B7E5B6ABB6F9B7" + $"A7B96AB74DB803B739B9F2B732BBB3B720BAACB75DBE5DB96AC2C4B8E6C11CB8" + $"C4C289B65AC077B781C18FB532BF69B3D6BE6CB424BE3BB3D1BE6AB3C6BE6522" + $"BE67B3C6BE65B3C6BE65B3C6BE65B3C6BE65020BBFBDB345BFBDB345BFE0B33E" + $"41B331C003B338C01FB37EC07FB32042B37CC09DB31BC0D9B310C0BBB315C0C6" + $"B3D2C0A0B557C096B471C037B634BEADB6A5BF5EB6C9BEAEB6DBBF07B6BDBEDF" + $"B6C5BF02B722BE9CB77EBED3B755BDF7B70CBE8FB5EABE47B698BEF7B4F0BFBD" + $"B345BF4EB3E2BFBDB345BFBDB345BFBDB345BFBDB34506047F41B33141B331C0" + $"44B32CC07FB320C061B326C08DB37C41B331C01FB37E41B331B3310605FF01C7" + $"C9B414C7C9B414C830B42FC866B391C859B3F6C862B379C847B362C854B36DC8" + $"0AB37FC7C9B414C7CDB3A0C7C9B414B4140217C6BCB298C6BCB298C6C6B29BC8" + $"87B2E4C7A8B2A9C967B318CA44B379CA44B378CA87B39FCB0EB3F5CACAB3C8CB" + $"0EB3F5CB31B624CB2FB602CA92B5F2C9A4B642CA15B60DC996B7C0C8D1B9B8C9" + $"A3B931C83FB96BC71AB8EEC7DEB8E7C755B970C86CBA47C7E3B9C3C8D9BAADC9" + $"D2BBC6C995BB51CA5DBCCBC8D4BF02C932BE49C864BFD9C6C3C1FAC819C2BAC6" + $"6AC1C9C5C2C02CC5D9C082C599BF99C5B4BE7AC59CBEEDC5E5BD92C6BCBC1EC6" + $"C8BD06C6B7BBC0C613BAACC64DBB26C59DB9B4C4BCB87BC53DB91FC4BCB7EEC5" + $"81B807C526B7EFC62FB79CC6EEB620C6D1B736C741B5FBC7EBB5C3C773B5ABC6" + $"A5B51DC4ADB41BC4DCB60AC511B327C6BCB298C653B367C6BCB298C6BCB298C6" + $"BCB298C6BCB298020ACB0CB3D9CB0CB3D9CB0FB408CB2BB5BECB28B58FCA25B5" + $"91C77BB525C8C7B628C7D7B46FC89DB339C8ADB47CC7AAB2E8C709B44CC7A3B4" + $"03C6FAB4A8C71FB506C74CB4C4C63AB510C4E9B403C4F4B59DC5FEB3FFC6F8B2" + $"9EC69BB379C854B2C3CB0CB3D9C9B0B321CB0CB3D9CB0CB3D9CB0CB3D9CB0CB3" + $"D90605FF01C76FB2ADC76FB2ADC7BAB2B8C84FB2D6C804B2C5C7CCB2F1C701B3" + $"94C77EB361C715B32EC76FB2ADC74DB2FDC76FB2ADB2AD020CCB0DB3EDCB0DB3" + $"EDCAEDB3E7CAA4B3A5CAB0B3EDCA6DB38AC9FFB35CCA36B372CA0BB3ADC9BAB3" + $"A5C9CEB387C9BFB3B5C994B3E9C9AAB3CEC994B3D0C98EB395C992B3B5C967B3" + $"70C92FB312C948B344C907B306C8B7B2F0C8DFB2FAC939B44DC813B551C838B4" + $"6CC96CB5D9CB22B531CA39B532CB21B51DCB0DB3EDCB0FB402CB0DB3EDCB0DB3" + $"EDCB0DB3EDCB0DB3ED020DC92FB312C92FB312C974B328C9FFB35CC9BAB340CA" + $"0BB3ADC9BAB3A5C9CEB387C9C4B3C6C9DDB401C9D3B3E0CA5DB430CB11B42ACA" + $"AFB41CCB13B445CB16B47BCB15B460CAC2B485CA22B4BBCA6AB491CA66B4E4CB" + $"1AB4B8CAC9B4AACB1BB4CCCB1EB4F4CB1DB4E0CA63B4F0C8B4B50EC9B2B57AC8" + $"F6B47DC98EB395C9B9B4C2C967B370C92FB312C948B344C92FB312C92FB312C9" + $"2FB312C92FB31206047FC5A0B451C5A0B451C5ADB4ABC529B47DC53EB4C2C537" + $"B44CC5A0B451C56DB450C5A0B451B4510605FF01C654B5EFC654B5EFC657B65E" + $"C569B6E7C5D0B6BAC55CB6B9C546B657C546B697C581B609C654B5EFC5F8B60B" + $"C654B5EFB5EF020CC8BEB978C8BEB978C81AB913C68CB8AAC762B866C71AB9E5" + $"C99ABD5BCA3ABB06C96BBE01C87ABF6EC8CDBE93C822C052C783C1D2C821C160" + $"C6ABC1C3C5E8BF08C5E2C011C5F1BD91C6B5BB51C765BCD2C63CBA43C537B872" + $"C572B9B5C626B834C732B6DDC67DB745C72FB5D1C8D5B66BC84EB63BC9C8B771" + $"C8BEB978C976B904C8BEB978C8BEB978C8BEB978C8BEB9780605FF01CB6BB9B2" + $"CB6BB9B2CB74BA3FCB86BB5ACB7DBACDCB01BB3ACA67BA69CA7BBB62CAE3BA61" + $"CB6BB9B2CB07B9D2CB6BB9B2B9B206047FC7BABAFAC7BABAFAC788BAFAC769BA" + $"A1C76EBADBC786BA7DC7BABAFAC7B2BAC1C7BABAFABAFA0607FF1FCBBCBEACCB" + $"BCBEACCBC3BF1ECC0AC37DCC02C304CAFCC2F3CA57C447CB2FC45FC9EAC3F2C9" + $"74C2E7C9AFC36CC9CDC257C97CC105C977C1ABC985BFABCBBCBEACCAFABE9BCB" + $"BCBEACBEAC06047FCBD1C003CBD1C003CBDCC0B3CBF3C211CBE7C162CB32C150" + $"CBD1C003CAFBC00CCBD1C003C0030605FF01C81ABF63C81ABF63C81AC022C737" + $"C09DC7E3C12EC728C029C7A1BFFDC75AC005C79CBF8FC81ABF63C7BFBF54C81A" + $"BF63BF63023BB99FB405B99FB405BA6BB408BC02B3E3BB36B3FABBFFB534BC3B" + $"B7D5BCD0B6B5BBF4B7ECBBB2B7E7BBE0B7C4BBA8B8BBBC44B959BC32B8AFBBE8" + $"B9C3BA94B9E3BB15BA43BAABB9A1BAE5B92EBAE1B98ABA53B840B961B614BA28" + $"B6C0B8E2B6D2B871B924B86DB80FB879BB03BAD9BB24B9BFBAD0BAA6BBA3B9FF" + $"BB4ABA39BB04B9F2BBB9BA28BC23BA3BBBACB933BE7ABC01C129BA2EC1A6BBCC" + $"BFDEBC30BDD6BC5ABF00BCC2BBCEBF90B9CBBE0ABAAABFF3BAA2BF60BC94BF40" + $"BB57C024BCAAC139BD91C0E8BCC1BF61C13FBAEAC84BBD45C4F6BC11C821BDE4" + $"C60BBD06C6ADBE1EC5E0BE89C560BE60C5B9BED2C4BFBF5DC3E9BEA0C421BFF1" + $"C3BDC166C3E2C0BCC3D545C3A5C206C2BEC18BC2D6C21EC33AC29DC42CC299C3" + $"87C29FC493C220C5EEC24BC555C1A5C79CC079CB2AC144C9FCBFF8CB4FBEF6CB" + $"9ABF77CB75BEF5CB51BBA5CBC43ACB88B9EDCC09B79CCCF7B819CC51B71BCCF9" + $"B4EDCCB2B5F4CCEEB3E7CC7D20CC1920CC1820CC19B323C9A7B320C9D4B38DC9" + $"84B46BC938B424C9A8B445C8AFB459C6B9B408C791B40CC617B354C640B3BBC6" + $"08B35DC5ABB36EC481B365C516B373C483B37E4CB378C486B393C45FB3B7C400" + $"B389C3F9B412C462B507C4CDB48FC4D8B5F6C59FB815C6C2B691C768B7E5C598" + $"B673C47BB69EC5BCB765C496B912C5B3B87CC509B9D6C5D2BB2CC55EBA60C57E" + $"BB4EC585BB29C5E0BB22C59DBC71C4B1BE5EC168BD18C35DBEBFC0D3BFBEBF92" + $"BF2CC058C018BF1AC0F9BD8AC100BDF5C0EFBCC6BF50BD18BFDEBCABBEDEBEEC" + $"BD1EC1B2BE53C0AFBD0DBF2CBEC4BC38BEDEBE76BEAFBBE1BE59BB7ABE36BC28" + $"BDF836BD11BC28BD73BBE2BCA2BCDBBC9BBE6FBCADBD9BBC88BF4CBC41C133BB" + $"FFC03EBAA6C1D7B99EBDF6B994C02FB9A1BD28B9C0BB8FB9FEBC0EB906BAF6B8" + $"53B922B84EBA96B858B785B99FB405B941B4FCB99FB405B99FB405B99FB405B9" + $"9FB4050605FF01CC35C62DCC35C62DCC37C64ECC3CC692CC39C670CC09C66FCB" + $"E2C5F5CBE5C641CC07C5FECC35C62DCC21C613CC35C62DC62D06047FC673C7CA" + $"C673C7CAC662C839C548C815C590C819C4C0C67DC673C7CAC65CC6D3C673C7CA" + $"C7CA020EC8BAB926C8BAB926C802B8A3C603B8D2C690B7E2C649B941C6E7BA0A" + $"C656B9FDC71DB9EDC6D2B97AC684B974C7C0BA27C978BD17C980BB18C974BDE2" + $"C886BF1FC8C7BE89C856BF8CC7AFC159C80FC13AC6BEC1AAC651BE35C616BF89" + $"C66EBD8DC70CBC35C708BC9DC71BBAA4C5B5B8BFC588BA29C5CDB7F6C78FB6FB" + $"C70AB797C7B2B6D1C7F2B667C7C8B671C965B676C8BAB926C999B8AFC8BAB926" + $"C8BAB926C8BAB926C8BAB92606047FC733BB7EC733BB7EC7DEBBC2C713BD02C7" + $"AD39C727BC8CC733BB7EC71FBBF3C733BB7EBB7E0002BA04B472BA04B472B9F6" + $"B4D3BA3BB50BBA32B4CBBA3BB50B0609FFFF01BC10B743BC10B743BBA82BBB4D" + $"B6EEBB94B703BB35B744BB54B874BB6FB7D4BA6FB850BA09B5D1BA76B6D7B9E5" + $"B57AB9B6B4E1B9B0B541B9C5B3EEBB11B466BA98B3F835B4ADBB81B5B8BB4EB5" + $"13BBACB644BC10B743BC4FB69DBC10B743B7430605FF01BB19B581BB19B581BA" + $"DEB593BA3BB50BBAB5B4E5BA32B4CBBA04B472B9F6B4D3BA89B405BB19B581BA" + $"FCB4D8BB19B581B58106047FB3EABBF3B3EABBF3B42FBC5FB3D2BD9CB42BBD7F" + $"B3DABD0EB3EABBF3B3E2BC81B3EABBF3BBF30607FF1FB58DBB83B58DBB83B5CB" + $"BC79B694BEA7B63BBDE22ABF90B80CC0B8B786C076B790BE87B720B913B603BB" + $"B0B6C3B885B61FB745B689B7CCB5F7B8F0B58DBB83B529B9F6B58DBB83BB8306" + $"09FFFF01B406BA08B406BA08B409B9D3B40EB96BB40BB99FB531B995B5E9B698" + $"B5D6B896B6A0B754B769B962B708B856B712B9D7B6F6BB7DB6E9BA8FB717BE01" + $"B8FDC25CB88EC07CB6DEC0EDB4EEBA6BB616BD7FB4BBBA88B406BA08B438BA39" + $"B406BA08BA080605FF01C132C25DC132C25DC130C283C143C2AEC146C285C0F8" + $"C2DDC0A2C340C0EEC2F9C066C2CFC132C25DC0B6C250C132C25DC25D0606FF07" + $"BCE5C45ABCE5C45ABCF5C457BCF5C481BCF1C471BCEAC4F1BC60C54EBC94C50C" + $"BC0EC642BADEC789BBAEC72ABB3BC61CBCE5C45ABC35C568BCE5C45AC45A0608" + $"FF7FC188C46EC188C46EC176C50AC149C5E5C197C573C0D9C5F7C064C68BC0A0" + $"C642C064C6CBC064C74AC064C70BBFA9C77DBED9C6E1BF78C6DABE9AC650BECB" + $"C48FBECBC55BBF9BC3C6C188C46EC0EBC414C188C46EC46E0605FF01BF8EC646" + $"BF8EC646BF27C65FBF1CC47ABEBCC4FABF7CC3FAC0B3C479C035C479C102C578" + $"BF8EC646BFEBC5AFBF8EC646C6460607FF1FB9B2C613B9B2C613B989C6ACB9F7" + $"C7ECB9C9C757B942C923B693C78BB6D4C934B718C72BB89652B82DC78BB898C6" + $"B8B89BC652B899C685B8F1C635B9B2C613B93FC60EB9B2C613C61306047FBB28" + $"C5F6BB28C5F6BB1CC648BAB3C68BBAEEC672BAB7C62FBB28C5F6BADDC5FCBB28" + $"C5F6C5F60606FF07B323C9A7B323C9A7B333C885B354C640B344C762B3BBC608" + $"B459C6B9B40CC617B408C791B46BC938B445C8AFB424C9A8B323C9A7B38DC984" + $"B323C9A7C9A70210BD1CC794BD1CC794BD1AC7DBBD09C85ABCFFC806BDB7C93B" + $"C034C8EBBF49C8A3C02CC983C088CA27C099C9C7C02CCA2BBFD0CA71C029CA63" + $"BF58CA84BE71CA54BEE9CA46BD5BCA76BAFCCAFEBC09CACFB973CB44B61BCC74" + $"B7BFCC6DB56BCC76B404CBD7B4BECC23B450CB8BB54BCB75B4E3CB50B560CBCD" + $"B524CBDDB51BCB96B648CBD5B908CB2EB7D7CBDCB923CAC0B984CA1BB94FCA68" + $"B9ABCA10B9D7CA27B9C4CA17BA6AC8C6BD1CC794BBB5C7CDBD1CC794BD1CC794" + $"BD1CC794BD1CC7940607FF1FBD7FC766BD7FC766BDCFC746BE02C7B0BDCBC7A8" + $"BE43C7A5BE76C73CBE35C747BEEEC757BF4BC897BFACC7AFBE62C8D2BD4CC81F" + $"BDBCC8A2BD49C7CCBD7FC766BD70C7A6BD7FC766C7660607FF1FBF29C94BBF29" + $"C94BBE5BC9F0BB21CA5FBBEBCB34BAE2CA1FBAB3C959BAE0C9AEBB13C886BC95" + $"C88BBBEDC86CBCCFC897BD39C8FABCF7C8E5BDDFC92FBF29C94BBED0C8C4BF29" + $"C94BC94B06047FB7F6CA34B7F6CA342DCA62B925C98BB906CA15B8B4C9B9B7F6" + $"CA34B808C98EB7F6CA34CA3406047FB9ABC952B9ABC952B8F2CAA5B660CABEB7" + $"A3CB86B745CA22B9ABC952B869C956B9ABC952C9520606FF07B386CC4DB386CC" + $"4DB359CC3D20CC19B32CCC2BB304CBCFB30CCB3AB308CB84B340CB5AB383CB51" + $"B34ACB29B372CB9FB386CC4DB354CC09B386CC4DCC4D020BB310CAF6B310CAF6" + $"B314CAB3B31BCA2DB318CA70B3C7CA22B509C9FFB48DCA8AB54EC9B1B5ADC8E6" + $"B52FC8F9B5E2C8DDB62DC953B602C946B64FC95EB737C954B6EEC959B837C94B" + $"BA45C87AB966C8DDB9BAC92EB84FC96CB8F9C932B6F3C9E3B474CB16B5AFCAD8" + $"B3EACAF2B310CAF6B379CAEFB310CAF6B310CAF6B310CAF6B310CAF606047FB9" + $"ACB431B9ACB431B9AFB499B937B5BBB94FB52FB925B53BB9ACB431B989B4ABB9" + $"ACB431B43106057F01B4FFB5A4B4FFB5A4B500B5A4B500B5A4B500B5A4B500B5" + $"A4B4FFB5A4B500B5A4B4FFB5A4B5A4B5A4020DB46FB2C9B46FB2C9B464B383B4" + $"4FB4F7B45AB43DB46DB4DFB4C6B547B4BDB50FB48AB623B4C3B7C5B4EDB6BFB5" + $"2CB79EB50AB603B4D1B675B5EEB5BBB726B712B63AB70BB738B802B837B8C7B7" + $"D2B849B87AB7D4B8DCB5B7B8BDB6E2B832B53CB687B4EBB70DB5C1B74FB4F9B9" + $"0FB51FB847B53EB939B4C8B981B404B95FB469B7D0B3FBB46FB2C9B61FB3A6B4" + $"6FB2C9B46FB2C9B46FB2C9B46FB2C90606FF07B41BB88CB41BB88CB42BB771B4" + $"4BB53BB43BB656B45EB53124B549B475B531B469B5E2B49BB86BB470B770B494" + $"B8BDB41BB88CB446B8D4B41BB88CB88C0212B389C295B389C295B39AC16BB3BC" + $"BF18B3ABC041B480BECBB44C36B481BD16B489BBCBB4EDBBA9B4B8BBB429BEC6" + $"BAA7C33DB752C35CBA99C29CB99DC253B9EEC2ABB929C1D6B865BFB2B8BEC0B8" + $"B7CFBE05B791BA03B715BC47B934BAE3B9DBC06DB8CCBE99BA6EC166BCAFC173" + $"BB64C1C2BCE4C1B2BCABC28CBCBEC22ABD3AC231BE1FC137BD8AC18DBD4AC313" + $"BA494EBC0EC516B9A1C56AB7D7C499B8BAC4F5B684C410B45047B570C365B40D" + $"C288B39AC29DB3D9C29DB394C29AB389C295B38FC298B389C295B389C295B389" + $"C295B389C29506047FB4ADCA9DB4ADCA9DB487CADFB3E0CABCB417CA9DB3C7CA" + $"6DB4ADCA9DB45FCA8BB4ADCA9DCA9D06047FBAB0C1B4BAB0C1B4BAD8C1ACBAFF" + $"C1D5BAE1C1D034C21FBAB0C1B4BAAAC1F9BAB0C1B4C1B404020E20CC19B30CCB" + $"3AB309CB7BB30CCB3A06047FBA66B954BA66B954B93DB80ABA8ABB47B90DBC77" + $"BABDBA6BBA66B954BA8CBA01BA66B954B95406047FC6B9C359C6B9C359C6D0C3" + $"19C6FFC29DC719C31CC69DC208C6B9C359C66FC30EC6B9C359C35906047FBF96" + $"B56EBF96B56EBFAFB56ABFDFB561BFC7B565BFEAB5ABBF96B56EBF91B5ADBF96" + $"B56EB56E0605FF01C5D3B628C5D3B628C627B63EC653B5BCC649B60FC650B5A9" + $"C639B596C645B5A0C608B5AEC5D3B628C5D6B5C9C5D3B628B6280605FF01C589" + $"B502C589B502C5C6B50BC640B524C603B516C5D6B53AC530B5BFC596B595C540" + $"B56CC589B502C56EB543C589B502B502020DC6F7B555C6F7B555C730B567C7A1" + $"B592C769B57BC7ABB5D3C769B5CDC779B5B4C771B5E8C785B618C77DB5FDC7EE" + $"B63FC881B63AC831B62EC882B650C885B67C56B666C840B684C7BEB6B0C7F9B6" + $"8DC7F5B6D2C888B6ADC846B6A2C889B6BEC88BB6DFC88AB6CEC7F2B6DCC693B6" + $"F3C762B74CC6C9B67EC744B5C0C767B6B6C725B5A2C6F7B555C70CB57EC6F7B5" + $"55C6F7B555C6F7B555C6F7B55506047FC40FB659C40FB659C41AB6A3C3AEB67D" + $"C3BFB6B6C3B9B655C40FB659C3E5B658C40FB659B6590605FF01C4A3B7ABC4A3" + $"B7ABC4A5B806C3E2B876C437B851C3D7B850C3C6B801C3C6B835C3F6B7C1C4A3" + $"B7ABC457B7C2C4A3B7ABB7AB06047FC5C7BBCAC5C7BBCAC59DBBCAC584BB81C5" + $"89BBB0C59DBB63C5C7BBCAC5C0BB9BC5C7BBCABBCA06047FC91EBFE6C91EBFE6" + $"C927C076C939C194C930C105C89BC0F6C91EBFE6C86EBFEDC91EBFE6BFE60605" + $"FF01C615BF64C615BF64C615BFFFC55CC064C5E8C0DAC54FC005C5B2BFE1C578" + $"BFE8C5AEBF88C615BF64C5CBBF58C615BF64BF640605FF01C96F4DC96F4DC971" + $"C50AC975C541C973C525C94BC524C92BC4C1C92EC4FFC94AC4C9C96F4DC95FC4" + $"DAC96F4D4D06047FC4BBC640C4BBC640C4ADC69AC3C7C67DC402C681C359C530" + $"C4BBC640C4A9C576C4BBC640C6400605FF01C621C7EBC621C7EBC60AC7EAC5DD" + $"C7EAC5F4C7EAC5D7C7AEC61EC797C5EDC792C61FC7B3C621C7EB50C7CFC621C7" + $"EBC7EB06047FC559BC36C559BC36C5E4BC6DC53FBD72C5BCBD68C54EBD12C559" + $"BC36C548BC95C559BC36BC360002BA94B675BA94B675BA89B6C4BAC2B6F1BABA" + $"B6BDBAC2B6F10605FF01BB77B751BB77B751BB47B760BAC2B6F1BB25B6D2BABA" + $"B6BDBA94B675BA89B6C4BB01B61BBB77B751BB5FB6C7BB77B751B75106047FB5" + $"99BC95B599BC95B5D1BCEDB585BDF0B5CEBDD8B58CBD7CB599BC95B592BD09B5" + $"99BC95BC950607FF1FB6EFBC3AB6EFBC3AB721BD02B7C6BECAB77DBE2AB81BBF" + $"88B8F9C07AB88BC0442EBEB0B838BA3CB74FBC5EB7EDB9C8B766B8C3B7BDB931" + $"B746BA1FB6EFBC3AB69EBAF6B6EFBC3ABC3A0609FFFF01B5AFBB04B5AFBB04B5" + $"B2BAD9B5B7BA84B5B4BAAEB6A4BAA6B73BB835B72BB9D6B7CFB8CFB874BA7CB8" + $"25B9A2B82DBADCB816BC35B80BBB72B831BE42B9BDC1D1B963C049B802C0A5B6" + $"6DBB55B75FBDD8B643BB6DB5AFBB04B5D8BB2CB5AFBB04BB040606FF07BCEEC3" + $"71BCEEC371BCFBC36FBCFBC391BCF8C384BCF2C3EDBC82C439BCACC403BC3FC5" + $"00BB47C60BBBF0C5BDBB93C4E1BCEEC371BC5FC44EBCEEC371C3710607FF1FBA" + $"51C4DABA51C4DABA30C556BA89C65CBA64C5E2B9F6C75AB7C5C60DB7FBC768B8" + $"32C5BEB96AC58BB914C60DB96BC561B96EC50DB96CC537B9B4C4F5BA51C4DAB9" + $"F4C4D6BA51C4DAC4DA06047FBB83C4C2BB83C4C2BB79C505BB23C53CBB54C527" + $"BB26C4F0BB83C4C2BB46C4C7BB83C4C2C4C20606FF07B4F6C7C6B4F6C7C6B504" + $"C6D8B51FC4FEB511C5EBB573C4D1B5F4C561B5B4C4DDB5B1C612B602C76BB5E4" + $"C6FBB5C8C7C7B4F6C7C6B54DC7A9B4F6C7C6C7C60607FF1FBD6CC5EEBD6CC5EE" + $"BDADC5D4BDD7C62BBDAAC624BE0CC621BE35C5CCBE00C5D5BE98C5E2BEE4C6E8" + $"BF33C62ABE25C717BD42C685BD9EC6F0BD40C641BD6CC5EEBD60C623BD6CC5EE" + $"C5EE0607FF1FBEC8C77ABEC8C77ABE20C801BB7DC85CBC22C909BB4AC828BB23" + $"C785BB48C7CBBB71C6DABCADC6DEBC24C6C4BCDDC6E7BD32C738BCFDC727BDBA" + $"C764BEC8C77ABE7FC70CBEC8C77AC77A06047FB8E7C839B8E7C839B914C85EB9" + $"DFC7AFB9C5C820B982C7D4B8E7C839B8F6C7B1B8E7C839C83906047FBA4CC780" + $"BA4CC780B9B5C895B79CC8A9B8A3C94DB857C82ABA4CC780B945C784BA4CC780" + $"C780020BBE9EC95DBE9EC95DBE67C96DBDF9C98CBE30C97CBDC5C947BC5FC98D" + $"BD07C96CBBEFC9A3BAFAC9D6BB66C9C3BA98C9E8B9F5CA0CBA04CA01B9DCCA1F" + $"B9D7CA68B9C1CA30B925CA7BB7BFCA72B872CA7FB983C9ACBE9EC917BCD8C875" + $"BE9EC923BE9EC93ABE9EC92EBE9EC946BE9EC95DBE9EC951BE9EC95DBE9EC95D" + $"BE9EC95DBE9EC95D0606FF07B547C9EFB547C9EFB523C9E2B4DAC9C525C9D4B4" + $"DDC988B4E4C90EB4E0C94BB50FC929B545C921B516C901B537C961B547C9EFB5" + $"1FC9B8B547C9EFC9EF020BB4E7C8D7B4E7C8D7B4EAC8A1B4F0C833B4EDC86AB5" + $"7CC82AB683C80DB61EC87FB6BCC7CEB709C728B6A2C738B734C721B772C781B7" + $"4EC776B78EC78AB84BC782B80FC785B91CC77ABAC9C6D0BA14C721BA58C763B9" + $"30C795B9BAC766B813C7F7B60AC8F1B70BC8BEB599C8D4B4E7C8D7B53DC8D1B4" + $"E7C8D7B4E7C8D7B4E7C8D7B4E7C8D706047FBA4DB63FBA4DB63FBA4FB695B9ED" + $"B781BA00B70EB9DFB718BA4DB63FBA30B6A2BA4DB63FB63F06057F01B67BB76E" + $"B67BB76EB67CB76EB67CB76EB67CB76EB67CB76EB67BB76EB67CB76EB67BB76E" + $"B76EB76E0606FF07B5C1B9CDB5C1B9CDB5CEB8E6B5E8B718B5DBB7FFB5F8B710" + $"B627B724B60BB710B601B7A1B629B9B2B606B8E6B624B9F5B5C1B9CDB5E4BA08" + $"B5C1B9CDB9CD06047FB638C88FB638C88FB619C8C4B591C8A7B5BEC88EB57CC8" + $"67B638C88FB5F8C880B638C88FC88F06047FBB21C148BB21C148BB42C141BB62" + $"C163BB49C15FBB5BC19FBB21C148BB1CC180BB21C148C1480606FF07C3CEBDFE" + $"C3CEBDFEC3CEC218BE92C542C128C542BC59C542BAC5BF8BBAC5C303BAC5BC78" + $"BFCCB808BCD5B808C261B808C3CEBDFEC3CEBAEAC3CEBDFEBDFE04020EB4DAC9" + $"C5B4E4C90EB4E1C943B4E4C90E710A000100024000000000000000003FC39A00" + $"00003FBA2E0A010101024000000000000000003FC39A0000003FBA2E0A020102" + $"024000000000000000003FC39A0000003FBA2E0A020203040240000000000000" + $"00003FC39A0000003FBA2E0A02020506024000000000000000003FC39A000000" + $"3FBA2E0A020107024000000000000000003FC39A0000003FBA2E0A0201080240" + $"00000000000000003FC39A0000003FBA2E0A020109024000000000000000003F" + $"C39A0000003FBA2E0A02010A024000000000000000003FC39A0000003FBA2E0A" + $"02020B0C024000000000000000003FC39A0000003FBA2E0A02010D0240000000" + $"00000000003FC39A0000003FBA2E0A02010E024000000000000000003FC39A00" + $"00003FBA2E0A02010F024000000000000000003FC39A0000003FBA2E0A020110" + $"024000000000000000003FC39A0000003FBA2E0A020111024000000000000000" + $"003FC39A0000003FBA2E0A020112024000000000000000003FC39A0000003FBA" + $"2E0A020113024000000000000000003FC39A0000003FBA2E0A02011402400000" + $"0000000000003FC39A0000003FBA2E0A0200024000000000000000003FC39A00" + $"00003FBA2E0A020115024000000000000000003FC39A0000003FBA2E0A020116" + $"024000000000000000003FC39A0000003FBA2E0A020117024000000000000000" + $"003FC39A0000003FBA2E0A020118024000000000000000003FC39A0000003FBA" + $"2E0A020119024000000000000000003FC39A0000003FBA2E0A02011A02400000" + $"0000000000003FC39A0000003FBA2E0A02011B024000000000000000003FC39A" + $"0000003FBA2E0A0200024000000000000000003FC39A0000003FBA2E0A02011C" + $"024000000000000000003FC39A0000003FBA2E0A02011D024000000000000000" + $"003FC39A0000003FBA2E0A02021E1F024000000000000000003FC39A0000003F" + $"BA2E0A020120024000000000000000003FC39A0000003FBA2E0A020121024000" + $"000000000000003FC39A0000003FBA2E0A0200024000000000000000003FC39A" + $"0000003FBA2E0A02022223024000000000000000003FC39A0000003FBA2E0A02" + $"0124024000000000000000003FC39A0000003FBA2E0A02012502400000000000" + $"0000003FC39A0000003FBA2E0A020126024000000000000000003FC39A000000" + $"3FBA2E0A020127024000000000000000003FC39A0000003FBA2E0A0201280240" + $"00000000000000003FC39A0000003FBA2E0A020129024000000000000000003F" + $"C39A0000003FBA2E0A02012A024000000000000000003FC39A0000003FBA2E0A" + $"02012B024000000000000000003FC39A0000003FBA2E0A02012C024000000000" + $"000000003FC39A0000003FBA2E0A02012D024000000000000000003FC39A0000" + $"003FBA2E0A02022E2F024000000000000000003FC39A0000003FBA2E0A020002" + $"4000000000000000003FC39A0000003FBA2E0A02013002400000000000000000" + $"3FC39A0000003FBA2E0A020131024000000000000000003FC39A0000003FBA2E" + $"0A020132024000000000000000003FC39A0000003FBA2E0A0202333402400000" + $"0000000000003FC39A0000003FBA2E0A020135024000000000000000003FC39A" + $"0000003FBA2E0A020136024000000000000000003FC39A0000003FBA2E0A0201" + $"37024000000000000000003FC39A0000003FBA2E0A0200024000000000000000" + $"003FC39A0000003FBA2E0A0200024000000000000000003FC39A0000003FBA2E" + $"0A020138024000000000000000003FC39A0000003FBA2E0A0201390240000000" + $"00000000003FC39A0000003FBA2E0A03015E024000000000000000003FC39A00" + $"00003FBA2E0A0400024000000000000000003FC39A0000003FBA2E0A04013A02" + $"4000000000000000003FC39A0000003FBA2E0A04013B02400000000000000000" + $"3FC39A0000003FBA2E0A0400024000000000000000003FC39A0000003FBA2E0A" + $"0400024000000000000000003FC39A0000003FBA2E0A04000240000000000000" + $"00003FC39A0000003FBA2E0A04013C024000000000000000003FC39A0000003F" + $"BA2E0A04013D024000000000000000003FC39A0000003FBA2E0A040002400000" + $"0000000000003FC39A0000003FBA2E0A04013E024000000000000000003FC39A" + $"0000003FBA2E0A0400024000000000000000003FC39A0000003FBA2E0A04013F" + $"024000000000000000003FC39A0000003FBA2E0A040140024000000000000000" + $"003FC39A0000003FBA2E0A040141024000000000000000003FC39A0000003FBA" + $"2E0A0400024000000000000000003FC39A0000003FBA2E0A0400024000000000" + $"000000003FC39A0000003FBA2E0A0400024000000000000000003FC39A000000" + $"3FBA2E0A040142024000000000000000003FC39A0000003FBA2E0A0400024000" + $"000000000000003FC39A0000003FBA2E0A040143024000000000000000003FC3" + $"9A0000003FBA2E0A040144024000000000000000003FC39A0000003FBA2E0A04" + $"00024000000000000000003FC39A0000003FBA2E0A0401450240000000000000" + $"00003FC39A0000003FBA2E0A040146024000000000000000003FC39A0000003F" + $"BA2E0A040147024000000000000000003FC39A0000003FBA2E0A040002400000" + $"0000000000003FC39A0000003FBA2E0A040148024000000000000000003FC39A" + $"0000003FBA2E0A040149024000000000000000003FC39A0000003FBA2E0A0401" + $"4A024000000000000000003FC39A0000003FBA2E0A04014B0240000000000000" + $"00003FC39A0000003FBA2E0A0400024000000000000000003FC39A0000003FBA" + $"2E0A04024C4D024000000000000000003FC39A0000003FBA2E0A040002400000" + $"0000000000003FC39A0000003FBA2E0A04014E024000000000000000003FC39A" + $"0000003FBA2E0A0400024000000000000000003FC39A0000003FBA2E0A040002" + $"4000000000000000003FC39A0000003FBA2E0A04014F02400000000000000000" + $"3FC39A0000003FBA2E0A040150024000000000000000003FC39A0000003FBA2E" + $"0A040151024000000000000000003FC39A0000003FBA2E0A0400024000000000" + $"000000003FC39A0000003FBA2E0A040152024000000000000000003FC39A0000" + $"003FBA2E0A040153024000000000000000003FC39A0000003FBA2E0A04025455" + $"024000000000000000003FC39A0000003FBA2E0A040156024000000000000000" + $"003FC39A0000003FBA2E0A040157024000000000000000003FC39A0000003FBA" + $"2E0A040158024000000000000000003FC39A0000003FBA2E0A04015902400000" + $"0000000000003FC39A0000003FBA2E0A04015A024000000000000000003FC39A" + $"0000003FBA2E0A04015B024000000000000000003FC39A0000003FBA2E0A0400" + $"024000000000000000003FC39A0000003FBA2E0A04015C024000000000000000" + $"003FC39A0000003FBA2E0A0400024000000000000000003FC39A0000003FBA2E" + $"0A0400024000000000000000003FC39A0000003FBA2E0A04015D024000000000" + $"000000003FC39A0000003FBA2E0A04015F024000000000000000003FC39A0000" + $"003FBA2E" }; diff --git a/kde-apps/kiten/kiten-25.08.0.recipe b/kde-apps/kiten/kiten-25.12.0.recipe similarity index 82% rename from kde-apps/kiten/kiten-25.08.0.recipe rename to kde-apps/kiten/kiten-25.12.0.recipe index 4692c7a65..f4baf8d0d 100644 --- a/kde-apps/kiten/kiten-25.08.0.recipe +++ b/kde-apps/kiten/kiten-25.12.0.recipe @@ -7,21 +7,21 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kiten-$portVersion.tar.xz" -CHECKSUM_SHA256="a7961268808e303edc412cf1cd6e853511fd1e5724d717c3f92e8605f5b9dfb4" +CHECKSUM_SHA256="98563b39feae0be033a0f33bb426379dd89ff2b3d37209eebdb5594990ba9982" SOURCE_DIR="kiten-$portVersion" ADDITIONAL_FILES="kiten.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="6.0.0" +libVersion="6.6.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" kiten$secondaryArchSuffix = $portVersion - cmd:Kiten$secondaryArchSuffix = $portVersion - cmd:kitenkanjibrowser$secondaryArchSuffix = $portVersion - cmd:kitenradselect$secondaryArchSuffix = $portVersion + app:Kiten = $portVersion + cmd:kitenkanjibrowser = $portVersion + cmd:kitenradselect = $portVersion lib:libkiten$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -65,7 +65,6 @@ BUILD_REQUIRES=" devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6ItemViews$secondaryArchSuffix @@ -92,6 +91,7 @@ BUILD_PREREQUIRES=" PATCH() { # disable docs generation + sed -e 's|DocTools||' -i CMakeLists.txt sed -e '/add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt } @@ -100,7 +100,8 @@ BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_TESTING=OFF \ -Wno-dev @@ -114,6 +115,13 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,icons,metainfo} + mkdir -p $prefix/bin + mv $appsDir/kiten $appsDir/Kiten + mv $appsDir/kitenkanjibrowser $appsDir/"Kanji Browser" + mv $appsDir/kitenradselect $appsDir/"Radical Selector" + ln -s $appsDir/"Kanji Browser" $prefix/bin/kitenkanjibrowser + ln -s $appsDir/"Radical Selector" $prefix/bin/kitenradselect + local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" @@ -129,10 +137,10 @@ INSTALL() -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/kiten.rdef.in > kiten.rdef - addResourcesToBinaries kiten.rdef $binDir/kiten - addResourcesToBinaries kiten.rdef $binDir/kitenkanjibrowser - addResourcesToBinaries kiten.rdef $binDir/kitenradselect - addAppDeskbarSymlink $binDir/kiten Kiten + addResourcesToBinaries kiten.rdef $appsDir/Kiten + addResourcesToBinaries kiten.rdef $appsDir/"Kanji Browser" + addResourcesToBinaries kiten.rdef $appsDir/"Radical Selector" + addAppDeskbarSymlink $appsDir/Kiten prepareInstalledDevelLib \ libkiten diff --git a/kde-apps/klettres/klettres-25.08.0.recipe b/kde-apps/klettres/klettres-25.12.0.recipe similarity index 93% rename from kde-apps/klettres/klettres-25.08.0.recipe rename to kde-apps/klettres/klettres-25.12.0.recipe index db2486040..efae2b727 100644 --- a/kde-apps/klettres/klettres-25.08.0.recipe +++ b/kde-apps/klettres/klettres-25.12.0.recipe @@ -13,7 +13,7 @@ COPYRIGHT="2001-2011 Anne-Marie Mahfouf LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/klettres-$portVersion.tar.xz" -CHECKSUM_SHA256="cae11be755b3f6e5fd1b30d830e61e303ddaeedaaecc888980c610424bf832c7" +CHECKSUM_SHA256="3118dcd5fbe434581510a44c15a8d5e3d9f6efe819581ec35e7a178225044e97" ADDITIONAL_FILES="klettres.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -62,7 +62,6 @@ BUILD_REQUIRES=" devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6NewStuffCore$secondaryArchSuffix @@ -86,6 +85,7 @@ BUILD_PREREQUIRES=" PATCH() { # disable docs generation + sed -e 's|DocTools||' -i CMakeLists.txt sed -e '/ecm_optional_add_subdirectory( doc )/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt } @@ -95,10 +95,9 @@ BUILD() cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=OFF + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs } diff --git a/kde-apps/kmplot/kmplot-25.08.0.recipe b/kde-apps/kmplot/kmplot-25.12.0.recipe similarity index 98% rename from kde-apps/kmplot/kmplot-25.08.0.recipe rename to kde-apps/kmplot/kmplot-25.12.0.recipe index 79e94ab5d..37e2dab5b 100644 --- a/kde-apps/kmplot/kmplot-25.08.0.recipe +++ b/kde-apps/kmplot/kmplot-25.12.0.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kmplot-$portVersion.tar.xz" -CHECKSUM_SHA256="b629366abffc691f8d6c20baf25b8cab311adbfff3365519c947e9f234b3f2a6" +CHECKSUM_SHA256="8af8b6213df6a9db028e1489c4a07bfb0fb34f288c6b1e9d1bb6e15c2ebc466e" SOURCE_DIR="kmplot-$portVersion" ADDITIONAL_FILES="kmplot.rdef.in" diff --git a/kde-apps/ktouch/ktouch-25.08.0.recipe b/kde-apps/ktouch/ktouch-25.12.0.recipe similarity index 97% rename from kde-apps/ktouch/ktouch-25.08.0.recipe rename to kde-apps/ktouch/ktouch-25.12.0.recipe index 7ae94bf9d..2aa717cdd 100644 --- a/kde-apps/ktouch/ktouch-25.08.0.recipe +++ b/kde-apps/ktouch/ktouch-25.12.0.recipe @@ -13,9 +13,9 @@ teacher to analyze your progress." HOMEPAGE="https://apps.kde.org/ktouch/" COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/ktouch-$portVersion.tar.xz" -CHECKSUM_SHA256="d1ca5bf8760d19bfa0412875bcda5cdb9b4c0db9bbb39c43f1d7a4042b2d91d3" +CHECKSUM_SHA256="c33fcd880e70b503f7d5a4a0cb6ba01c3218d9b3cf8c0231505602f272a6f4ad" SOURCE_DIR="ktouch-$portVersion" ADDITIONAL_FILES="ktouch.rdef.in" diff --git a/kde-apps/minuet/minuet-25.08.0.recipe b/kde-apps/minuet/minuet-25.12.0.recipe similarity index 95% rename from kde-apps/minuet/minuet-25.08.0.recipe rename to kde-apps/minuet/minuet-25.12.0.recipe index 307761703..03fc23167 100644 --- a/kde-apps/minuet/minuet-25.08.0.recipe +++ b/kde-apps/minuet/minuet-25.12.0.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/minuet-$portVersion.tar.xz" -CHECKSUM_SHA256="838ad92f54058ac84b8cb3411922f3a848910e3b87f3b0faebeee2591ba97744" +CHECKSUM_SHA256="9f2c13ab47d881938e24ef14bafc715e82121ac1644728f9107963d0eb578b3c" SOURCE_DIR="minuet-$portVersion" PATCHES="minuet-$portVersion.patchset" ADDITIONAL_FILES="minuet.rdef.in" @@ -98,7 +98,6 @@ BUILD_REQUIRES=" devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix devel:libKF6DBusAddons$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6IconThemes$secondaryArchSuffix @@ -131,6 +130,7 @@ BUILD_PREREQUIRES=" PATCH() { # disable docs generation + sed -e 's|DocTools||' -i CMakeLists.txt sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt } @@ -139,10 +139,10 @@ BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DBUILD_WITH_QT6=ON \ -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs } diff --git a/kde-apps/minuet/patches/minuet-25.08.0.patchset b/kde-apps/minuet/patches/minuet-25.12.0.patchset similarity index 100% rename from kde-apps/minuet/patches/minuet-25.08.0.patchset rename to kde-apps/minuet/patches/minuet-25.12.0.patchset diff --git a/kde-apps/rocs/rocs-25.08.0.recipe b/kde-apps/rocs/rocs-25.08.0.recipe deleted file mode 100644 index 2909370d5..000000000 --- a/kde-apps/rocs/rocs-25.08.0.recipe +++ /dev/null @@ -1,166 +0,0 @@ -SUMMARY="A graph theory IDE" -DESCRIPTION="Rocs is a Graph Theory IDE for designing and analyzing graph algorithms. It provides \ -an easy to use visual editor for creating graphs, a scripting engine to execute algorithms, and \ -several helper tools for simulations and experiments. Algorithms are specified in JavaScript." -HOMEPAGE="https://apps.kde.org/rocs/" -COPYRIGHT="2010-2025 KDE Organisation" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/rocs-$portVersion.tar.xz" -CHECKSUM_SHA256="b4e8e702303767269463473707cf4b24a3d99f5f9433cc7c2ce2e5e40df31c89" -ADDITIONAL_FILES="rocs.rdef.in" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - rocs$secondaryArchSuffix = $portVersion - app:Rocks = $portVersion - lib:librocsgraphtheory$secondaryArchSuffix = 0 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libGrantlee_Templates$secondaryArchSuffix - # KF5 - lib:libKF5Archive$secondaryArchSuffix - lib:libKF5AuthCore$secondaryArchSuffix - lib:libKF5Codecs$secondaryArchSuffix - lib:libKF5Completion$secondaryArchSuffix - lib:libKF5ConfigCore$secondaryArchSuffix - lib:libKF5ConfigGui$secondaryArchSuffix - lib:libKF5ConfigWidgets$secondaryArchSuffix - lib:libKF5CoreAddons$secondaryArchSuffix - lib:libKF5Crash$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5KIOCore$secondaryArchSuffix - lib:libKF5JobWidgets$secondaryArchSuffix - lib:libKF5Parts$secondaryArchSuffix - lib:libKF5Service$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5SonnetCore$secondaryArchSuffix - lib:libKF5SyntaxHighlighting$secondaryArchSuffix - lib:libKF5TextEditor$secondaryArchSuffix - lib:libKF5TextWidgets$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - # Qt5 - lib:libQt5Core$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5Script$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - " - -PROVIDES_devel=" - rocs${secondaryArchSuffix}_devel = $portVersion - devel:librocsgraphtheory$secondaryArchSuffix = 0 - " -REQUIRES_devel=" - rocs$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix >= 1.85.0 - devel:libGrantlee_Templates$secondaryArchSuffix - # KF5 - extra_cmake_modules$secondaryArchSuffix - devel:libKF5Archive$secondaryArchSuffix - devel:libKF5Auth$secondaryArchSuffix - devel:libKF5Bookmarks$secondaryArchSuffix - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5Completion$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5Crash$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5JobWidgets$secondaryArchSuffix - devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5Parts$secondaryArchSuffix - devel:libKF5Service$secondaryArchSuffix - devel:libKF5Solid$secondaryArchSuffix - devel:libKF5SonnetCore$secondaryArchSuffix - devel:libKF5SyntaxHighlighting$secondaryArchSuffix - devel:libKF5TextEditor$secondaryArchSuffix - devel:libKF5TextWidgets$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - # Qt5 - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:make - cmd:msgfmt - cmd:msgmerge - cmd:pkg_config$secondaryArchSuffix - cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 - " - -TEST_REQUIRES=" - qthaikuplugins$secondaryArchSuffix - " - -BUILD() -{ - cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ - $cmakeDirArgs \ - -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=ON \ - -Wno-dev - - make -C build $jobArgs -} - -INSTALL() -{ - make -C build install - - # cleanup - rm -rf $dataDir/{applications,icons,metainfo} - - mv $appsDir/rocs $appsDir/Rocks - - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local APP_NAME="Rocks" - local LONG_INFO="$SUMMARY" - local APP_SIGNATURE="application/x-vnd.kde-rocs" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ - -e "s|@APP_NAME@|$APP_NAME|" \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - $portDir/additional-files/rocs.rdef.in > rocs.rdef - - addResourcesToBinaries rocs.rdef $appsDir/Rocks - addAppDeskbarSymlink $appsDir/Rocks - - prepareInstalledDevelLib \ - librocsgraphtheory - - packageEntries devel \ - $developDir -} - -TEST() -{ - export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" - make -C build test -} diff --git a/kde-apps/rocs/rocs-25.12.0.recipe b/kde-apps/rocs/rocs-25.12.0.recipe new file mode 100644 index 000000000..dfadb4229 --- /dev/null +++ b/kde-apps/rocs/rocs-25.12.0.recipe @@ -0,0 +1,149 @@ +SUMMARY="A graph theory IDE" +DESCRIPTION="Rocs is a Graph Theory IDE for designing and analyzing graph algorithms. It provides \ +an easy to use visual editor for creating graphs, a scripting engine to execute algorithms, and \ +several helper tools for simulations and experiments. Algorithms are specified in JavaScript." +HOMEPAGE="https://apps.kde.org/rocs/" +COPYRIGHT="2010-2025 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/rocs-$portVersion.tar.xz" +CHECKSUM_SHA256="626d616a88abdc49fd120d31b38916780a7ab9bd50dfa0cab90adb7b14cc7f87" +ADDITIONAL_FILES="rocs.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + rocs$secondaryArchSuffix = $portVersion + app:Rocs = $portVersion + cmd:rocs = $portVersion + lib:librocsgraphtheory$secondaryArchSuffix = 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + # KF6 + lib:libKF6Archive$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6Completion$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6guiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6Parts$secondaryArchSuffix + lib:libKF6SonnetCore$secondaryArchSuffix + lib:libKF6SyntaxHighlighting$secondaryArchSuffix + lib:libKF6TextEditor$secondaryArchSuffix + lib:libKF6TextTemplate$secondaryArchSuffix + lib:libKF6TextWidgets$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + " + +PROVIDES_devel=" + rocs${secondaryArchSuffix}_devel = $portVersion + devel:librocsgraphtheory$secondaryArchSuffix = 0 + " +REQUIRES_devel=" + rocs$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libboost_system$secondaryArchSuffix >= 1.88.0 + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6TextEditor$secondaryArchSuffix + devel:libKF6TextTemplate$secondaryArchSuffix + devel:libKF6TextWidgets$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + " + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=ON \ + -Wno-dev + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + mkdir -p $prefix/bin + mv $appsDir/rocs $appsDir/Rocs + ln -s $appsDir/Rocs $prefix/bin/rocs + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="Rocs" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.kde-rocs" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + -e "s|@APP_NAME@|$APP_NAME|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + $portDir/additional-files/rocs.rdef.in > rocs.rdef + + addResourcesToBinaries rocs.rdef $appsDir/Rocs + addAppDeskbarSymlink $appsDir/Rocs + + prepareInstalledDevelLib \ + librocsgraphtheory + + packageEntries devel \ + $developDir +} + +TEST() +{ + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -C build test +} diff --git a/kde-apps/step/step-25.08.0.recipe b/kde-apps/step/step-25.12.0.recipe similarity index 95% rename from kde-apps/step/step-25.08.0.recipe rename to kde-apps/step/step-25.12.0.recipe index 332d69dee..e231e670c 100644 --- a/kde-apps/step/step-25.08.0.recipe +++ b/kde-apps/step/step-25.12.0.recipe @@ -34,7 +34,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/step-$portVersion.tar.xz" -CHECKSUM_SHA256="994bab4d0750cfdeb3af1f92d6453ee173cd483e392ad170bf5250b23b4ddf3a" +CHECKSUM_SHA256="c80c54d8b6d61e1a70b631241cc40aca69368d0c95e40408fc3342a39ccb0b23" SOURCE_DIR="step-$portVersion" ADDITIONAL_FILES="step.rdef.in" @@ -110,7 +110,6 @@ BUILD_REQUIRES=" devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix devel:libKF6DBusAddons$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6IconThemes$secondaryArchSuffix @@ -147,21 +146,14 @@ BUILD_PREREQUIRES=" cmd:update_mime_database$secondaryArchSuffix " -PATCH() -{ - # disable docs generation - sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt -} - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DBUILD_WITH_QT6=ON \ -DSTEP_WITH_QALCULATE=TRUE \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF \ -Wno-dev make -C build $jobArgs diff --git a/kde-base/marble/marble-25.08.0.recipe b/kde-base/marble/marble-25.12.0.recipe similarity index 88% rename from kde-base/marble/marble-25.08.0.recipe rename to kde-base/marble/marble-25.12.0.recipe index f437bb5e9..832c84d6e 100644 --- a/kde-base/marble/marble-25.08.0.recipe +++ b/kde-base/marble/marble-25.12.0.recipe @@ -12,21 +12,29 @@ COPYRIGHT="2007-2025 Marble Virtual Globe authors" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/marble-$portVersion.tar.xz" -CHECKSUM_SHA256="6f5bf1cebc3311ce2439c4243f90ad249722edf12a96fb927ca60b83e98c7c9a" +CHECKSUM_SHA256="ae29bd99b09eef35079ff6c58f5f34c1bebf8b7708bcb78eb67040950caadc7b" PATCHES="marble-$portVersion.patchset" ADDITIONAL_FILES="marble.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" marble$secondaryArchSuffix = $portVersion - cmd:marble$secondaryArchSuffix = $portVersion - cmd:marble_behaim$secondaryArchSuffix = $portVersion - cmd:marble_maps$secondaryArchSuffix = $portVersion + app:Marble + cmd:marble$commandSuffix = $portVersion + cmd:marble_behaim$commandSuffix = $portVersion + cmd:marble_maps$commandSuffix = $portVersion lib:libastro$secondaryArchSuffix = $libVersionCompat lib:libmarblewidget_qt6$secondaryArchSuffix = $libVersionCompat " @@ -90,7 +98,6 @@ BUILD_REQUIRES=" devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix - devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKF6IconThemes$secondaryArchSuffix @@ -159,17 +166,13 @@ BUILD() cmake -Bbuild -S. \ -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DCMAKE_AUTOGEN_PARALLEL=4 \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DICON_INSTALL_DIR=$dataDir/icons \ -DINCLUDE_INSTALL_DIR=$includeDir \ - -DKDE_INSTALL_BINDIR=$binDir \ - -DKDE_INSTALL_LIBDIR=$libDir \ - -DKDE_INSTALL_INCLUDEDIR=$includeDir \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ - -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DMARBLE_PRI_INSTALL_DIR=$dataDir/Qt6/mkspecs \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=ON \ + -DQT_PLUGINS_DIR=$addOnsDir/Qt6 \ + -DCMAKE_SKIP_RPATH=YES \ + -DBUILD_TESTING=OFF \ -Wno-dev make -Cbuild $jobArgs @@ -183,10 +186,13 @@ INSTALL() rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} # cleanup - rm -rf $dataDir/{applications,metainfo} - rm -rf $prefix/share + rm -rf $dataDir/{applications,icons,metainfo} + + mkdir -p $appsDir + mv $commandBinDir/marble $appsDir/Marble + ln -s $appsDir/Marble $commandBinDir/marble # only keep marble-kde - rm -rf $binDir/marble-qt + rm -rf $commandBinDir/marble-qt local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" @@ -198,9 +204,9 @@ INSTALL() -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/marble.rdef.in > marble.rdef - addResourcesToBinaries marble.rdef $binDir/marble + addResourcesToBinaries marble.rdef $appsDir/Marble - addAppDeskbarSymlink $binDir/marble Marble + addAppDeskbarSymlink $appsDir/Marble prepareInstalledDevelLibs \ libastro \ diff --git a/kde-base/marble/patches/marble-25.08.0.patchset b/kde-base/marble/patches/marble-25.12.0.patchset similarity index 100% rename from kde-base/marble/patches/marble-25.08.0.patchset rename to kde-base/marble/patches/marble-25.12.0.patchset