From 766282442bc5ae8fc6b60287d91085aa04286477 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 15 May 2024 14:16:03 +0200 Subject: [PATCH] konversation, bump version (#10444) --- ...4.0.recipe => konversation-23.08.5.recipe} | 39 +++++++++---------- ...patchset => konversation-23.08.5.patchset} | 32 +++++++++++++-- 2 files changed, 47 insertions(+), 24 deletions(-) rename net-irc/konversation/{konversation-22.04.0.recipe => konversation-23.08.5.recipe} (88%) rename net-irc/konversation/patches/{konversation-22.04.0.patchset => konversation-23.08.5.patchset} (58%) diff --git a/net-irc/konversation/konversation-22.04.0.recipe b/net-irc/konversation/konversation-23.08.5.recipe similarity index 88% rename from net-irc/konversation/konversation-22.04.0.recipe rename to net-irc/konversation/konversation-23.08.5.recipe index 577b4ddcb..1615a8b26 100644 --- a/net-irc/konversation/konversation-22.04.0.recipe +++ b/net-irc/konversation/konversation-23.08.5.recipe @@ -2,11 +2,11 @@ SUMMARY="User friendly IRC Client" DESCRIPTION="Konversation is a user-friendly Internet Relay Chat (IRC) client which provides \ easy access to standard IRC networks such as Libera, where the KDE IRC channels can be found." HOMEPAGE="https://konversation.kde.org/" -COPYRIGHT="2010-2022 KDE Organisation" +COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/konversation-$portVersion.tar.xz" -CHECKSUM_SHA256="f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a" +CHECKSUM_SHA256="60576f16773789596b612969bbbf3a2762ef1cbab21bc19565483310e63d25be" SOURCE_DIR="konversation-$portVersion" PATCHES="konversation-$portVersion.patchset" ADDITIONAL_FILES="konversation.rdef.in" @@ -14,9 +14,16 @@ ADDITIONAL_FILES="konversation.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + PROVIDES=" konversation$secondaryArchSuffix = $portVersion - app:Konversation$secondaryArchSuffix = $portVersion + cmd:konversation$secondaryArchSuffix = $portVersion " REQUIRES=" haiku${secondaryArchSuffix} @@ -67,7 +74,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix @@ -125,27 +132,19 @@ BUILD() sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt - mkdir -p build - cd build - - cmake .. \ + cmake -Bbuild -S. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir \ - -DCMAKE_INSTALL_DATADIR=$dataDir \ - -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ - -DSHARE_INSTALL_PREFIX=$dataDir \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - - make $jobArgs + make -Cbuild $jobArgs } INSTALL() { - cd build - make install + make -Cbuild install - mv $appsDir/bin/konversation $appsDir/Konversation - rm -rf $appsDir/bin $dataDir/{applications,dbus-1} + rm -rf $dataDir/{applications,dbus-1,icons,metainfo} local APP_SIGNATURE="application/x-vnd.kde-konversation" local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -158,6 +157,6 @@ INSTALL() -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/konversation.rdef.in > konversation.rdef - addResourcesToBinaries konversation.rdef $appsDir/Konversation - addAppDeskbarSymlink $appsDir/Konversation + addResourcesToBinaries konversation.rdef $commandBinDir/konversation + addAppDeskbarSymlink $commandBinDir/konversation Konversation } diff --git a/net-irc/konversation/patches/konversation-22.04.0.patchset b/net-irc/konversation/patches/konversation-23.08.5.patchset similarity index 58% rename from net-irc/konversation/patches/konversation-22.04.0.patchset rename to net-irc/konversation/patches/konversation-23.08.5.patchset index 24db4b8f9..ea9e76275 100644 --- a/net-irc/konversation/patches/konversation-22.04.0.patchset +++ b/net-irc/konversation/patches/konversation-23.08.5.patchset @@ -1,11 +1,11 @@ -From db57bec17fbc8d98fe4faa731ff452c311b5ecf0 Mon Sep 17 00:00:00 2001 +From 0d42673c80d5f762ce09c6f1f251921052590a5d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 19 May 2022 23:20:42 +1000 Subject: Fix build for haiku diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1d3d143..c7f7146 100644 +index 61413e1..919d019 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -25,4 +25,4 @@ install(PROGRAMS updaters/konversation-0.19-colors.pl @@ -15,7 +15,7 @@ index 1d3d143..c7f7146 100644 -install(FILES konversation_nicklist_theme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +install(FILES konversation_nicklist_theme.knsrc DESTINATION ${CMAKE_INSTALL_DATADIR}/knsrcfiles) diff --git a/src/dcc/dcccommon.cpp b/src/dcc/dcccommon.cpp -index 75a9483..3104ad8 100644 +index 5d93c74..f419caf 100644 --- a/src/dcc/dcccommon.cpp +++ b/src/dcc/dcccommon.cpp @@ -107,7 +107,7 @@ namespace Konversation @@ -28,5 +28,29 @@ index 75a9483..3104ad8 100644 struct ifreq ifr; const QByteArray addressBa = Preferences::self()->dccIPv4FallbackIface().toLatin1(); -- -2.30.2 +2.43.2 + + +From a26ae300680826892ff6a47dfb71151cf656a2f4 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Wed, 15 May 2024 13:46:43 +0200 +Subject: Link with libnetwork + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 76b3888..69afd93 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -361,6 +361,9 @@ endif () + if (WIN32) + target_link_libraries(konversation ws2_32) # for symbols from winsock2.h: ntohl, etc. + endif() ++if (HAIKU) ++ target_link_libraries(konversation network) # for symbol from setsockopt ++endif() + + set_target_properties(konversation PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in) + install(TARGETS konversation ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +-- +2.43.2