haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Krusader: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-08-22 12:59:11 +10:00
parent 20a0a2d293
commit 651ca9d5fa
2 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kde-misc/krusader/krusader-2.7.1.recipe → kde-misc/krusader/krusader-2.7.2.recipe
View File

@@ -18,11 +18,11 @@ It supports a wide variety of archive formats and can handle other KIO \
slaves such as smb or fish. It is (almost) completely customizable, very \
user friendly, fast and looks great on your desktop! You should give it a try."
HOMEPAGE="https://krusader.org/"
COPYRIGHT="2000-2018 Krusader Krew"
COPYRIGHT="2000-2020 Krusader Krew"
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="1"
SOURCE_URI="https://github.com/KDE/krusader/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="1ce50427db5256c46985374b267b378d69591c4093386dbd692655772826fc37"
CHECKSUM_SHA256="08e429e9f5139db8af06d1cdcc86d696e04cd6aff92535d32391568c349b72ab"
ADDITIONAL_FILES="krusader.rdef.in"
PATCHES="krusader-$portVersion.patchset"

79
kde-misc/krusader/patches/krusader-2.7.1.patchset → kde-misc/krusader/patches/krusader-2.7.2.patchset
View File

@@ -1,11 +1,11 @@
From 40f199bd4f20d2a5095052f2bb3684af7bcc1111 Mon Sep 17 00:00:00 2001
From 747d8ba294b07f422b1831ff94affd72aa228d1a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 28 Mar 2019 22:28:54 +1000
Subject: Add haiku file icons support
diff --git a/krusader/Panel/PanelView/krview.cpp b/krusader/Panel/PanelView/krview.cpp
index a7f0437..f07b62e 100644
index 6ee6227..b28f939 100644
--- a/krusader/Panel/PanelView/krview.cpp
+++ b/krusader/Panel/PanelView/krview.cpp
@@ -316,6 +316,59 @@ QPixmap KrView::processIcon(const QPixmap &icon, bool dim, const QColor & dimCol
@@ -77,7 +77,7 @@ index a7f0437..f07b62e 100644
QPixmap KrView::getIcon(FileItem *fileitem)
{
diff --git a/krusader/Panel/PanelView/krview.h b/krusader/Panel/PanelView/krview.h
index 6371cdb..d973e83 100644
index 8d23700..2da1c33 100644
--- a/krusader/Panel/PanelView/krview.h
+++ b/krusader/Panel/PanelView/krview.h
@@ -33,6 +33,13 @@
@@ -95,10 +95,10 @@ index 6371cdb..d973e83 100644
class KrView;
--
2.19.1
2.28.0
From 6f5844e31bb1d4e022444a9130d8c35f1bdbff85 Mon Sep 17 00:00:00 2001
From 6c89e79b465cf8b46739975a202faa9e7f317437 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 28 Mar 2019 22:41:58 +1000
Subject: Link with be and tracker libraries
@@ -118,5 +118,72 @@ index 0ade19c..dcd2cf3 100644
if(SYNCHRONIZER_ENABLED)
--
2.19.1
2.28.0
From 242769e318710873433949a8fa775d8b374bc5ea 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
diff --git a/krusader/main.cpp b/krusader/main.cpp
index e731ce9..1ed59e6 100644
--- a/krusader/main.cpp
+++ b/krusader/main.cpp
@@ -116,7 +116,11 @@ int main(int argc, char *argv[])
#endif
KAboutData aboutData(QStringLiteral("krusader"),
+#ifndef Q_OS_HAIKU
(geteuid() ? i18n("Krusader") : i18n("Krusader - ROOT PRIVILEGES")), versionName,
+#else
+ i18n("Krusader"), versionName,
+#endif
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[])
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
+
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[])
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();
+#endif
}
--
2.28.0