From 45b95d2045d4df26991423c3b27ebecd6e9d7bad Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 25 Mar 2025 14:03:41 +0000 Subject: [PATCH] palapeli, bump to version 24.12.3, switch to KF6 (#12077) --- kde-apps/palapeli/palapeli-23.08.5.recipe | 148 --------------- kde-apps/palapeli/palapeli-24.12.3.recipe | 168 ++++++++++++++++++ .../patches/palapeli-23.08.5.patchset | 33 ---- 3 files changed, 168 insertions(+), 181 deletions(-) delete mode 100644 kde-apps/palapeli/palapeli-23.08.5.recipe create mode 100644 kde-apps/palapeli/palapeli-24.12.3.recipe delete mode 100644 kde-apps/palapeli/patches/palapeli-23.08.5.patchset diff --git a/kde-apps/palapeli/palapeli-23.08.5.recipe b/kde-apps/palapeli/palapeli-23.08.5.recipe deleted file mode 100644 index 1c32e7cd2..000000000 --- a/kde-apps/palapeli/palapeli-23.08.5.recipe +++ /dev/null @@ -1,148 +0,0 @@ -SUMMARY="A jigsaw puzzle game" -DESCRIPTION="Palapeli is a single-player jigsaw puzzle game" -HOMEPAGE="https://invent.kde.org/games/palapeli" -COPYRIGHT="2009-2024 Stefan Majewsky" -LICENSE="MIT - GNU GPL v2" -REVISION="1" -SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/palapeli-$portVersion.tar.xz" -CHECKSUM_SHA256="faea7b9a18a4fc8fa4af2cca7994609bdb79039a9bd319cdc74fad55046b89d1" -PATCHES="palapeli-$portVersion.patchset" -ADDITIONAL_FILES="palapeli.rdef.in" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -libVersion="0.2.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -GLOBAL_WRITABLE_FILES=" - settings/xdg/palapeli-collectionrc keep-old - " - -PROVIDES=" - palapeli$secondaryArchSuffix = $portVersion - app:palapeli$secondaryArchSuffix = $portVersion - lib:libpala$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libKF5Archive$secondaryArchSuffix - lib:libKF5Auth$secondaryArchSuffix - lib:libKF5Codecs$secondaryArchSuffix - lib:libKF5Completion$secondaryArchSuffix - lib:libKF5ConfigCore$secondaryArchSuffix - lib:libKF5ConfigGui$secondaryArchSuffix - lib:libKF5ConfigWidgets$secondaryArchSuffix - lib:libKF5CoreAddons$secondaryArchSuffix - lib:libKF5Crash$secondaryArchSuffix - lib:libKF5KDEGames$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5KIOCore$secondaryArchSuffix - lib:libKF5JobWidgets$secondaryArchSuffix - lib:libKF5Notifications$secondaryArchSuffix - lib:libKF5Service$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - " - -PROVIDES_devel=" - palapeli${secondaryArchSuffix}_devel = $portVersion - devel:libpala$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - palapeli$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - 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:libKF5KDEGames$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5JobWidgets$secondaryArchSuffix - devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5Notifications$secondaryArchSuffix - devel:libKF5Service$secondaryArchSuffix - devel:libKF5Solid$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:make - cmd:msgfmt - cmd:msgmerge - cmd:pkg_config$secondaryArchSuffix - cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 - " - -BUILD() -{ - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make -C build $jobArgs -} - -INSTALL() -{ - make -C build install - - rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} - rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} - - prepareInstalledDevelLib \ - libpala - - packageEntries devel \ - $developDir \ - $libDir/cmake - - mv $appsDir/palapeli $appsDir/Palapeli - - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local APP_NAME="Palapeli" - local LONG_INFO="$SUMMARY" - local APP_SIGNATURE="application/x-vnd.palapeli" - 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/palapeli.rdef.in > palapeli.rdef - - addResourcesToBinaries palapeli.rdef $appsDir/Palapeli - - addAppDeskbarSymlink $appsDir/Palapeli -} diff --git a/kde-apps/palapeli/palapeli-24.12.3.recipe b/kde-apps/palapeli/palapeli-24.12.3.recipe new file mode 100644 index 000000000..a77764247 --- /dev/null +++ b/kde-apps/palapeli/palapeli-24.12.3.recipe @@ -0,0 +1,168 @@ +SUMMARY="A jigsaw puzzle game" +DESCRIPTION="Palapeli is a single-player jigsaw puzzle game" +HOMEPAGE="https://invent.kde.org/games/palapeli" +COPYRIGHT="2009-2024 Stefan Majewsky" +LICENSE="MIT + GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/palapeli-$portVersion.tar.xz" +CHECKSUM_SHA256="10913895c626a31db5b5ddfbec09bf05170f1699caa97ee6a98548ad7063e820" +SOURCE_DIR="palapeli-$portVersion" +ADDITIONAL_FILES="palapeli.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +libVersion="0.2.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +GLOBAL_WRITABLE_FILES=" + settings/xdg/palapeli-collectionrc keep-old + " + +PROVIDES=" + palapeli$secondaryArchSuffix = $portVersion + app:Palapeli$secondaryArchSuffix = $portVersion + lib:libpala$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKDEGames6$secondaryArchSuffix + # KF6 + lib:libKF6Archive$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6Completion$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigGui$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6DBusAddons$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6JobWidgets$secondaryArchSuffix + lib:libKF6Notifications$secondaryArchSuffix + lib:libKF6Service$secondaryArchSuffix + lib:libKF6Solid$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6DBus$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + " + +PROVIDES_devel=" + palapeli${secondaryArchSuffix}_devel = $portVersion + devel:libpala$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + palapeli$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libKDEGames6$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6DBusAddons$secondaryArchSuffix + devel:libKF6DocTools$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6Notifications$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +PATCH() +{ + # disable docs generation + sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt + sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt + # remove dbus service + sed -e '/KDBusService service;/d' -i src/main.cpp +} + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + + # cleanup + rm -rf $dataDir/{applications,metainfo} + # 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} + + mv $appsDir/palapeli $appsDir/Palapeli + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="Palapeli" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.palapeli" + 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/palapeli.rdef.in > palapeli.rdef + + addResourcesToBinaries palapeli.rdef $appsDir/Palapeli + addAppDeskbarSymlink $appsDir/Palapeli + + prepareInstalledDevelLib \ + libpala + + packageEntries devel \ + $developDir \ + $libDir/cmake +} diff --git a/kde-apps/palapeli/patches/palapeli-23.08.5.patchset b/kde-apps/palapeli/patches/palapeli-23.08.5.patchset deleted file mode 100644 index f71d46570..000000000 --- a/kde-apps/palapeli/patches/palapeli-23.08.5.patchset +++ /dev/null @@ -1,33 +0,0 @@ -From 215c303f470255ed05dc7bba05f69e3cee947632 Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Fri, 22 Dec 2023 18:51:58 +0100 -Subject: Disable DocTools - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f95882c..0702640 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,7 +33,6 @@ find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS - ConfigWidgets - CoreAddons - Crash -- DocTools - I18n - ItemViews - KIO -@@ -57,11 +56,9 @@ add_subdirectory(pics) - add_subdirectory(src) - add_subdirectory(mime) - add_subdirectory(puzzles) --add_subdirectory(doc) - - ecm_qt_install_logging_categories(EXPORT PALAPELI FILE palapeli.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - ki18n_install(po) --kdoctools_install(po) - - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.42.1 -