From b5548ca0468dfc7b6b0836f155ac200ad9ff2b86 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 16 Mar 2025 14:58:21 +0000 Subject: [PATCH] bovo, bump to version 24.12.3, switch to KF6 (#12003) --- kde-apps/bovo/bovo-23.08.5.recipe | 137 ------------------ kde-apps/bovo/bovo-24.12.3.recipe | 152 ++++++++++++++++++++ kde-apps/bovo/patches/bovo-23.08.5.patchset | 23 --- 3 files changed, 152 insertions(+), 160 deletions(-) delete mode 100644 kde-apps/bovo/bovo-23.08.5.recipe create mode 100644 kde-apps/bovo/bovo-24.12.3.recipe delete mode 100644 kde-apps/bovo/patches/bovo-23.08.5.patchset diff --git a/kde-apps/bovo/bovo-23.08.5.recipe b/kde-apps/bovo/bovo-23.08.5.recipe deleted file mode 100644 index 458e17e7c..000000000 --- a/kde-apps/bovo/bovo-23.08.5.recipe +++ /dev/null @@ -1,137 +0,0 @@ -SUMMARY="Gomoku like game for two players" -DESCRIPTION="Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five points\") like \ -game for two players, where the opponents alternate in placing their respective \ -pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, \ -Naughts and Crosses)." -HOMEPAGE="https://apps.kde.org/bovo" -COPYRIGHT="2010-2024 KDE Organisation" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/bovo-$portVersion.tar.xz" -CHECKSUM_SHA256="db79b3cc909f1348b2fdf57705085ff9684c35f377c0cb962854e284a51f1e4b" -PATCHES="bovo-$portVersion.patchset" -ADDITIONAL_FILES="bovo.rdef.in" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - bovo$secondaryArchSuffix = $portVersion - app:Bovo$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libKF5Archive$secondaryArchSuffix - lib:libKF5Auth$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:libKF5DBusAddons$secondaryArchSuffix - lib:libKF5GuiAddons$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5IconThemes$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5JobWidgets$secondaryArchSuffix - lib:libKF5KDEGames$secondaryArchSuffix - lib:libKF5KIOCore$secondaryArchSuffix - lib:libKF5Service$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5TextEditor$secondaryArchSuffix - lib:libKF5TextWidgets$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - " - -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:libKF5DBusAddons$secondaryArchSuffix - devel:libKF5DocTools$secondaryArchSuffix - devel:libKF5GuiAddons$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5IconThemes$secondaryArchSuffix - devel:libKF5ItemModels$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5JobWidgets$secondaryArchSuffix - devel:libKF5KDEGames$secondaryArchSuffix - devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5Service$secondaryArchSuffix - devel:libKF5Solid$secondaryArchSuffix - devel:libKF5TextEditor$secondaryArchSuffix - devel:libKF5TextWidgets$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix >= 5 - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - # disable docs generation - sed -e '/add_subdirectory (doc)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt - - mkdir -p build - cd build - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir \ - -DCMAKE_INSTALL_DATADIR=$dataDir \ - -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ - -DSHARE_INSTALL_PREFIX=$dataDir \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make $jobArgs -} - -INSTALL() -{ - cd build - make install - - mv $appsDir/bin/bovo $appsDir/Bovo - rm -rf $appsDir/bin - - local APP_SIGNATURE="application/x-vnd.kde-bovo" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local LONG_INFO="$SUMMARY" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ - $portDir/additional-files/bovo.rdef.in > bovo.rdef - - addResourcesToBinaries bovo.rdef $appsDir/Bovo - addAppDeskbarSymlink $appsDir/Bovo -} diff --git a/kde-apps/bovo/bovo-24.12.3.recipe b/kde-apps/bovo/bovo-24.12.3.recipe new file mode 100644 index 000000000..feef52049 --- /dev/null +++ b/kde-apps/bovo/bovo-24.12.3.recipe @@ -0,0 +1,152 @@ +SUMMARY="Gomoku like game for two players" +DESCRIPTION="Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five points\") like \ +game for two players, where the opponents alternate in placing their respective \ +pictogram on the game board. (Also known as: Connect Five, Five in a row, X and O, \ +Naughts and Crosses)." +HOMEPAGE="https://apps.kde.org/bovo" +COPYRIGHT="2010-2025 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/bovo-$portVersion.tar.xz" +CHECKSUM_SHA256="95b422c700db53d07985ce6044ad2d0aea388f95a6a2e8bdc679d2cfd595c4bb" +SOURCE_DIR="bovo-$portVersion" +ADDITIONAL_FILES="bovo.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + bovo$secondaryArchSuffix = $portVersion + app:Bovo$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKDEGames6$secondaryArchSuffix + # KF6 + lib:libKF6Archive$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:libKF6DBusAddons$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6JobWidgets$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6Service$secondaryArchSuffix + lib:libKF6Solid$secondaryArchSuffix + lib:libKF6TextEditor$secondaryArchSuffix + lib:libKF6TextWidgets$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6DBus$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libKDEGames6$secondaryArchSuffix + devel:libmarkdown$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6AuthCore$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:libKF6GuiAddons$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix + devel:libKF6ItemModels$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6TextEditor$secondaryArchSuffix + devel:libKF6TextWidgets$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/gui/main.cc +} + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -Wno-dev + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + mv $appsDir/bovo $appsDir/Bovo + + local APP_SIGNATURE="application/x-vnd.kde-bovo" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/bovo.rdef.in > bovo.rdef + + addResourcesToBinaries bovo.rdef $appsDir/Bovo + addAppDeskbarSymlink $appsDir/Bovo +} diff --git a/kde-apps/bovo/patches/bovo-23.08.5.patchset b/kde-apps/bovo/patches/bovo-23.08.5.patchset deleted file mode 100644 index b98fda262..000000000 --- a/kde-apps/bovo/patches/bovo-23.08.5.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From ae5398f3f01d778d7a11ead766ea81d8350adbba Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 2 Jan 2021 19:43:20 +1000 -Subject: Disable dbus - - -diff --git a/gui/main.cc b/gui/main.cc -index 359fc32..49abd72 100644 ---- a/gui/main.cc -+++ b/gui/main.cc -@@ -64,7 +64,9 @@ int main(int argc, char **argv) { - aboutData.setupCommandLine(&parser); - parser.process(app); - aboutData.processCommandLine(&parser); -+#ifndef __HAIKU__ - KDBusService service; -+#endif - if( app.isSessionRestored() ) { - kRestoreMainWindows(); - } else { --- -2.28.0 -