diff --git a/kde-misc/krusader/krusader-2.7.2.recipe b/kde-misc/krusader/krusader-2.7.2.recipe index 69ce45c17..6fc1d11ea 100644 --- a/kde-misc/krusader/krusader-2.7.2.recipe +++ b/kde-misc/krusader/krusader-2.7.2.recipe @@ -20,9 +20,9 @@ user friendly, fast and looks great on your desktop! You should give it a try." HOMEPAGE="https://krusader.org/" COPYRIGHT="2000-2020 Krusader Krew" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://github.com/KDE/krusader/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="08e429e9f5139db8af06d1cdcc86d696e04cd6aff92535d32391568c349b72ab" +REVISION="3" +SOURCE_URI="https://download.kde.org/stable/krusader/$portVersion/krusader-$portVersion.tar.xz" +CHECKSUM_SHA256="41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109" ADDITIONAL_FILES="krusader.rdef.in" PATCHES="krusader-$portVersion.patchset" @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - dbus$secondaryArchSuffix + cmd:dbus_launch lib:libKF5Archive$secondaryArchSuffix lib:libKF5Auth$secondaryArchSuffix lib:libKF5Bookmarks$secondaryArchSuffix @@ -74,7 +74,7 @@ SUPPLEMENTS=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.55 + extra_cmake_modules$secondaryArchSuffix >= 5.77 devel:libKF5Archive$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix @@ -119,6 +119,8 @@ defineDebugInfoPackage krusader$secondaryArchSuffix \ 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 .. \ diff --git a/kde-misc/krusader/patches/krusader-2.7.2.patchset b/kde-misc/krusader/patches/krusader-2.7.2.patchset index 5f07d58b1..2bda1dc66 100644 --- a/kde-misc/krusader/patches/krusader-2.7.2.patchset +++ b/kde-misc/krusader/patches/krusader-2.7.2.patchset @@ -1,6 +1,6 @@ -From 747d8ba294b07f422b1831ff94affd72aa228d1a Mon Sep 17 00:00:00 2001 +From d15ffeefe04c66b6b7e22cb9cd39b9576423f630 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 28 Mar 2019 22:28:54 +1000 +Date: Wed, 16 Dec 2020 09:17:44 +1000 Subject: Add haiku file icons support @@ -98,9 +98,9 @@ index 8d23700..2da1c33 100644 2.28.0 -From 6c89e79b465cf8b46739975a202faa9e7f317437 Mon Sep 17 00:00:00 2001 +From 508680fa7fcd6dd194547b2c10f0ece299a5cc7e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 28 Mar 2019 22:41:58 +1000 +Date: Wed, 16 Dec 2020 09:18:03 +1000 Subject: Link with be and tracker libraries @@ -121,14 +121,14 @@ index 0ade19c..dcd2cf3 100644 2.28.0 -From 242769e318710873433949a8fa775d8b374bc5ea Mon Sep 17 00:00:00 2001 +From bff5210a21181b8b60489c84abf1dbfa0afba0d2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 22 Aug 2020 12:56:50 +1000 -Subject: Dbus and kwalletd autostart +Date: Wed, 16 Dec 2020 09:18:24 +1000 +Subject: kwalletd autostart diff --git a/krusader/main.cpp b/krusader/main.cpp -index e731ce9..1ed59e6 100644 +index e731ce9..867792b 100644 --- a/krusader/main.cpp +++ b/krusader/main.cpp @@ -116,7 +116,11 @@ int main(int argc, char *argv[]) @@ -143,27 +143,12 @@ index e731ce9..1ed59e6 100644 i18n(description), KAboutLicense::GPL_V2, i18n("© 2000-2003 Shie Erlich, Rafi Yanai\n© 2004-2019 Krusader Krew"), i18n("Feedback:\nhttps://forum.kde.org/viewforum.php?f=225\n\nIRC\nserver: " -@@ -234,6 +238,27 @@ int main(int argc, char *argv[]) +@@ -234,6 +238,12 @@ int main(int argc, char *argv[]) if (!singleInstanceMode) appName += QString("%1").arg(getpid()); +#ifdef Q_OS_HAIKU + int status=0; -+ QProcess dbusProcess; -+ QString exec = "/bin/dbus-launch"; -+ QStringList params; -+ dbusProcess.start(exec, params); -+ dbusProcess.waitForFinished(); -+ QString output(dbusProcess.readAllStandardOutput()); -+ QFile file ("/tmp/krusader_session"); -+ if (file.open(QFile::WriteOnly | QFile::Truncate)) { -+ QTextStream outstream(&file); -+ outstream << output; -+ file.close(); -+ } -+ QStringList list = output.split("\n", QString::SkipEmptyParts); -+ foreach (const QString &str, list) -+ putenv(str.toLatin1().data()); + QProcess kwalletProcess; + kwalletProcess.start("/bin/kwalletd5", QStringList()); +#endif @@ -171,14 +156,13 @@ index e731ce9..1ed59e6 100644 if (!QDBusConnection::sessionBus().isConnected()) { fprintf(stderr, "Cannot connect to the D-BUS session bus.\n" "To start it, run:\n" -@@ -313,5 +338,12 @@ int main(int argc, char *argv[]) +@@ -313,5 +323,11 @@ int main(int argc, char *argv[]) delete splash; } // let's go. +#ifdef Q_OS_HAIKU + status = app.exec(); + kwalletProcess.kill(); -+ system("kill -3 $DBUS_SESSION_BUS_PID"); + return status; +#else return app.exec();