mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
dolphin_kf6, bump to 24.12.3 (#11991)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -23,11 +23,11 @@ At first look, this is a simple file manager, but it has many talents. Some feat
|
||||
* Add a terminal in the directory you are currently browsing
|
||||
* Many functions controlled by keyboard shortcuts"
|
||||
HOMEPAGE="https://userbase.kde.org/Dolphin"
|
||||
COPYRIGHT="2000-2024 KDE"
|
||||
COPYRIGHT="2000-2025 KDE"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/dolphin-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="421f02f9699b609d7e66e0aae9fa1fd735ba0a92a56febe75880ecbeb8dfc513"
|
||||
CHECKSUM_SHA256="0bcefb5c6eadddb867924e9052d5431c5b7c98aa4022c3fa2ca16d5b6515b0f0"
|
||||
SOURCE_DIR="dolphin-$portVersion"
|
||||
PATCHES="dolphin-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="dolphin.rdef.in"
|
||||
@@ -46,7 +46,7 @@ libVersion="$portVersion"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
dolphin24$secondaryArchSuffix = $portVersion
|
||||
dolphin_kf6$secondaryArchSuffix = $portVersion
|
||||
app:Dolphin$secondaryArchSuffix = $portVersion
|
||||
cmd:dolphin$commandSuffix = $portVersion
|
||||
cmd:servicemenuinstaller$commandSuffix = $portVersion
|
||||
@@ -114,6 +114,18 @@ REQUIRES="
|
||||
CONFLICTS="
|
||||
dolphin$secondaryArchSuffix
|
||||
"
|
||||
REPLACES="
|
||||
dolphin24$scondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
dolphin_kf6${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libdolphinprivate$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libdolphinvcs$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
dolphin_kf6$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
@@ -150,22 +162,13 @@ BUILD_REQUIRES="
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Qml$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
dolphin24${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libdolphinprivate$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libdolphinvcs$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
dolphin24$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:msgmerge
|
||||
cmd:msgfmt$secondaryArchSuffix
|
||||
cmd:msgmerge$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
|
||||
@@ -178,8 +181,8 @@ PATCH()
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||
$cmakeDirArgs \
|
||||
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
|
||||
-DKDE_INSTALL_DATAROOTDIR=$dataDir \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
|
||||
@@ -187,6 +190,7 @@ BUILD()
|
||||
-DHAVE_PACKAGEKIT=FALSE \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-Wno-dev
|
||||
|
||||
make -Cbuild $jobArgs
|
||||
}
|
||||
|
||||
@@ -1,139 +0,0 @@
|
||||
From 8dab0b2645b5ac6e4f027fd1b987c2ff9b0eff93 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Tue, 16 Jul 2024 17:19:06 +0200
|
||||
Subject: Build fix
|
||||
|
||||
|
||||
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
|
||||
index 02fe3e3..63303a2 100644
|
||||
--- a/src/panels/information/informationpanel.cpp
|
||||
+++ b/src/panels/information/informationpanel.cpp
|
||||
@@ -8,7 +8,9 @@
|
||||
|
||||
#include "informationpanelcontent.h"
|
||||
|
||||
-#include <KDirNotify>
|
||||
+#ifndef __HAIKU__
|
||||
+ #include <KDirNotify>
|
||||
+#endif
|
||||
#include <KIO/StatJob>
|
||||
#include <KJobWidgets>
|
||||
#include <KLocalizedString>
|
||||
@@ -406,6 +408,7 @@ void InformationPanel::init()
|
||||
Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
|
||||
Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
|
||||
|
||||
+#ifndef __HAIKU__
|
||||
org::kde::KDirNotify *dirNotify = new org::kde::KDirNotify(QString(), QString(), QDBusConnection::sessionBus(), this);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FileRenamed, this, &InformationPanel::slotFileRenamed);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesAdded, this, &InformationPanel::slotFilesAdded);
|
||||
@@ -413,6 +416,7 @@ void InformationPanel::init()
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesRemoved, this, &InformationPanel::slotFilesRemoved);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::enteredDirectory, this, &InformationPanel::slotEnteredDirectory);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::leftDirectory, this, &InformationPanel::slotLeftDirectory);
|
||||
+#endif
|
||||
|
||||
m_content = new InformationPanelContent(this);
|
||||
connect(m_content, &InformationPanelContent::urlActivated, this, &InformationPanel::urlActivated);
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 6fe61f571be2c365c9a49d61122e293360a07e36 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 3 Mar 2024 20:23:08 +1000
|
||||
Subject: Fix for Haiku
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index ef50cf7..debd9c2 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -608,7 +608,7 @@ endif()
|
||||
|
||||
if(NOT WIN32)
|
||||
add_subdirectory(settings/contextmenu/servicemenuinstaller)
|
||||
- install( FILES settings/contextmenu/servicemenu.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} )
|
||||
+ install( FILES settings/contextmenu/servicemenu.knsrc DESTINATION ${KDE_INSTALL_DATADIR}/knsrcfiles )
|
||||
endif()
|
||||
|
||||
########### install files ###############
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index f811c4f..eb55767 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -45,6 +45,11 @@
|
||||
#ifndef Q_OS_WIN
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+#include <QProcess>
|
||||
+#include <QString>
|
||||
+#include <QStringList>
|
||||
+#endif
|
||||
#include <iostream>
|
||||
|
||||
constexpr auto dolphinTranslationDomain{"dolphin"};
|
||||
@@ -222,6 +227,21 @@ int main(int argc, char **argv)
|
||||
|
||||
mainWindow->show();
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ if (getenv("DBUS_SESSION_BUS_PID") == NULL) {
|
||||
+ QProcess dbusProcess;
|
||||
+ QString exec = "/bin/dbus-launch";
|
||||
+ QStringList params;
|
||||
+ dbusProcess.start(exec, params);
|
||||
+ dbusProcess.waitForFinished();
|
||||
+ QString output(dbusProcess.readAllStandardOutput());
|
||||
+
|
||||
+ QStringList list = output.split("\n", Qt::SkipEmptyParts);
|
||||
+ for (int i = 0; i < list.count(); i++)
|
||||
+ putenv(list.at(i).toLatin1().data());
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
// Allow starting Dolphin on a system that is not running DBus:
|
||||
KDBusService::StartupOptions serviceOptions = KDBusService::Multiple;
|
||||
if (!QDBusConnection::sessionBus().isConnected()) {
|
||||
@@ -272,5 +292,12 @@ int main(int argc, char **argv)
|
||||
Q_UNUSED(feedbackProvider)
|
||||
#endif
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ int status=app.exec();
|
||||
+// kwalletProcess.kill();
|
||||
+ system("kill -3 $DBUS_SESSION_BUS_PID");
|
||||
+ return status;
|
||||
+#else
|
||||
return app.exec(); // krazy:exclude=crash;
|
||||
+#endif
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From cc45644e6eb8d820ad142c9e236ffbc8d55257f6 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Thu, 26 Dec 2024 19:42:25 +0100
|
||||
Subject: Use Haiku icons
|
||||
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index eb55767..41253ef 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -74,8 +74,10 @@ int main(int argc, char **argv)
|
||||
/**
|
||||
* trigger initialisation of proper icon theme
|
||||
*/
|
||||
+#ifndef Q_OS_HAIKU
|
||||
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
|
||||
KIconTheme::initTheme();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
QApplication app(argc, argv);
|
||||
--
|
||||
2.45.2
|
||||
|
||||
65
kde-apps/dolphin/patches/dolphin-24.12.3.patchset
Normal file
65
kde-apps/dolphin/patches/dolphin-24.12.3.patchset
Normal file
@@ -0,0 +1,65 @@
|
||||
From 61b9e99a641fe2e33010d1d5e5ad67cf6606ffdb Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Tue, 16 Jul 2024 17:19:06 +0200
|
||||
Subject: Build fix
|
||||
|
||||
|
||||
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
|
||||
index 02fe3e3..63303a2 100644
|
||||
--- a/src/panels/information/informationpanel.cpp
|
||||
+++ b/src/panels/information/informationpanel.cpp
|
||||
@@ -8,7 +8,9 @@
|
||||
|
||||
#include "informationpanelcontent.h"
|
||||
|
||||
-#include <KDirNotify>
|
||||
+#ifndef __HAIKU__
|
||||
+ #include <KDirNotify>
|
||||
+#endif
|
||||
#include <KIO/StatJob>
|
||||
#include <KJobWidgets>
|
||||
#include <KLocalizedString>
|
||||
@@ -406,6 +408,7 @@ void InformationPanel::init()
|
||||
Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
|
||||
Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
|
||||
|
||||
+#ifndef __HAIKU__
|
||||
org::kde::KDirNotify *dirNotify = new org::kde::KDirNotify(QString(), QString(), QDBusConnection::sessionBus(), this);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FileRenamed, this, &InformationPanel::slotFileRenamed);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesAdded, this, &InformationPanel::slotFilesAdded);
|
||||
@@ -413,6 +416,7 @@ void InformationPanel::init()
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesRemoved, this, &InformationPanel::slotFilesRemoved);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::enteredDirectory, this, &InformationPanel::slotEnteredDirectory);
|
||||
connect(dirNotify, &OrgKdeKDirNotifyInterface::leftDirectory, this, &InformationPanel::slotLeftDirectory);
|
||||
+#endif
|
||||
|
||||
m_content = new InformationPanelContent(this);
|
||||
connect(m_content, &InformationPanelContent::urlActivated, this, &InformationPanel::urlActivated);
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From 7181b5f1bac949f36e06597300fd24a88ec152d5 Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Thu, 26 Dec 2024 19:42:25 +0100
|
||||
Subject: Use Haiku icons
|
||||
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index f811c4f..c6826e8 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -69,8 +69,10 @@ int main(int argc, char **argv)
|
||||
/**
|
||||
* trigger initialisation of proper icon theme
|
||||
*/
|
||||
+#ifndef Q_OS_HAIKU
|
||||
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
|
||||
KIconTheme::initTheme();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
QApplication app(argc, argv);
|
||||
--
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user