From e77cc205053ca32fb6f3ec61326c14d791f20d00 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 14 Apr 2025 15:07:02 +0200 Subject: [PATCH] labplot, revbump for poppler changes (#12160) Keep inline with poppler version used for Cantor --- .../labplot/labplot-2.11.1.recipe | 176 +++++++++--------- 1 file changed, 90 insertions(+), 86 deletions(-) diff --git a/sci-visualization/labplot/labplot-2.11.1.recipe b/sci-visualization/labplot/labplot-2.11.1.recipe index a049b7c66..5b3f51144 100644 --- a/sci-visualization/labplot/labplot-2.11.1.recipe +++ b/sci-visualization/labplot/labplot-2.11.1.recipe @@ -12,7 +12,7 @@ Feature highlights: HOMEPAGE="https://invent.kde.org/education/labplot" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://download.kde.org/stable/labplot/labplot-$portVersion.tar.xz" CHECKSUM_SHA256="53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d" SOURCE_DIR="labplot-$portVersion" @@ -28,9 +28,11 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libcantorlibs$secondaryArchSuffix lib:libcerf$secondaryArchSuffix lib:libcfitsio$secondaryArchSuffix lib:libfftw3f$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libgsl$secondaryArchSuffix lib:libgslcblas$secondaryArchSuffix lib:libhdf5$secondaryArchSuffix @@ -40,55 +42,57 @@ REQUIRES=" lib:libnetcdf$secondaryArchSuffix lib:liborigin$secondaryArchSuffix lib:libpoppler$secondaryArchSuffix - lib:libpoppler_qt5$secondaryArchSuffix + lib:libpoppler_qt6$secondaryArchSuffix lib:libspectre$secondaryArchSuffix lib:libxcb$secondaryArchSuffix lib:libz$secondaryArchSuffix - # KF5 - lib:libcantorlibs$secondaryArchSuffix - lib:libKF5Archive$secondaryArchSuffix - lib:libKF5Attica$secondaryArchSuffix - lib:libKF5AuthCore$secondaryArchSuffix - lib:libKF5Bookmarks$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:libKF5IconThemes$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5KIOCore$secondaryArchSuffix - lib:libKF5JobWidgets$secondaryArchSuffix - lib:libKF5NewStuffCore$secondaryArchSuffix - lib:libKF5Parts$secondaryArchSuffix - lib:libKF5Purpose$secondaryArchSuffix - lib:libKF5Service$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5SonnetCore$secondaryArchSuffix - lib:libKF5SyntaxHighlighting$secondaryArchSuffix - lib:libKF5TextWidgets$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libKUserFeedbackCore$secondaryArchSuffix - # Qt5 - lib:libQt5Core$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix + # KF6 + lib:libKF6Archive$secondaryArchSuffix + lib:libKF6Attica$secondaryArchSuffix + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6Bookmarks$secondaryArchSuffix + lib:libKF6Codecs$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6Completion$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigGui$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6JobWidgets$secondaryArchSuffix + lib:libKF6NewStuffCore$secondaryArchSuffix + lib:libKF6Parts$secondaryArchSuffix + lib:libKF6Purpose$secondaryArchSuffix + lib:libKF6Service$secondaryArchSuffix + lib:libKF6Solid$secondaryArchSuffix + lib:libKF6SonnetCore$secondaryArchSuffix + lib:libKF6SyntaxHighlighting$secondaryArchSuffix + lib:libKF6TextWidgets$secondaryArchSuffix + lib:libKF6UserFeedbackCore$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6DBus$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6PrintSupport$secondaryArchSuffix + lib:libQt6SerialPort$secondaryArchSuffix + lib:libQt6Sql$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:eigen$secondaryArchSuffix + devel:libcantorlibs$secondaryArchSuffix devel:libcerf$secondaryArchSuffix devel:libcfitsio$secondaryArchSuffix >= 10.4 devel:libexecinfo$secondaryArchSuffix @@ -101,45 +105,45 @@ BUILD_REQUIRES=" devel:libmatio$secondaryArchSuffix devel:libnetcdf$secondaryArchSuffix devel:liborigin$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 131.0.0 - devel:libpoppler_qt5$secondaryArchSuffix >= 1.33.0 + devel:libpoppler$secondaryArchSuffix >= 144 + devel:libpoppler_qt6$secondaryArchSuffix >= 3.9.0 devel:libspectre$secondaryArchSuffix devel:libssp_nonshared$secondaryArchSuffix devel:libxcb$secondaryArchSuffix devel:libz$secondaryArchSuffix - # KF5 + # KF6 extra_cmake_modules$secondaryArchSuffix - devel:libcantorlibs$secondaryArchSuffix - devel:libKF5Archive$secondaryArchSuffix - devel:libKF5Auth$secondaryArchSuffix - devel:libKF5Attica$secondaryArchSuffix - devel:libKF5Bookmarks$secondaryArchSuffix - devel:libKF5Completion$secondaryArchSuffix - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5Crash$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5IconThemes$secondaryArchSuffix - devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5JobWidgets$secondaryArchSuffix - devel:libKF5NewStuffCore$secondaryArchSuffix - devel:libKF5Parts$secondaryArchSuffix - devel:libKF5Purpose$secondaryArchSuffix - devel:libKF5Service$secondaryArchSuffix - devel:libKF5Solid$secondaryArchSuffix - devel:libKF5SonnetUi$secondaryArchSuffix - devel:libKF5SyntaxHighlighting$secondaryArchSuffix - devel:libKF5TextWidgets$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libKUserFeedbackCore$secondaryArchSuffix - # Qt5 - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Xml$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6Attica$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6NewStuffCore$secondaryArchSuffix + devel:libKF6Parts$secondaryArchSuffix + devel:libKF6Purpose$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6SonnetUi$secondaryArchSuffix + devel:libKF6SyntaxHighlighting$secondaryArchSuffix + devel:libKF6TextWidgets$secondaryArchSuffix + devel:libKF6UserFeedbackCore$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6SerialPort$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + devel:libQt6Xml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:awk @@ -147,10 +151,9 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " TEST_REQUIRES=" @@ -166,15 +169,14 @@ PATCH() BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_WITH_QT6=OFF \ -DENABLE_READSTAT=OFF \ -DBUILD_TESTING=OFF \ - -DENABLE_TESTS=OFF -Wno-dev + -DENABLE_TESTS=OFF \ + -Wno-dev + make -C build $jobArgs } @@ -185,13 +187,15 @@ INSTALL() # don't mess with shared_mime_info files 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,icons,metainfo} local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" local APP_NAME="LabPlot2" local LONG_INFO="$SUMMARY" - local APP_SIGNATURE="application/x-vnd.labplot2" + local APP_SIGNATURE="application/x-vnd.kde-labplot2" sed \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \