mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-20 02:30:05 +02:00
107 lines
2.5 KiB
Plaintext
107 lines
2.5 KiB
Plaintext
From b715b0be8eaa99829f3fbc3962f7328b19e69bea Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 19 Jul 2022 20:05:18 +1000
|
|
Subject: Remove dbus
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c8cf82a..defb990 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ include(FeatureSummary)
|
|
include(ECMAddAppIcon)
|
|
include(ECMPoQmTools)
|
|
|
|
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Widgets)
|
|
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Gui Widgets)
|
|
|
|
find_package(KF5 ${KF_MIN_VERSION} REQUIRED
|
|
Archive
|
|
@@ -34,7 +34,6 @@ find_package(KF5 ${KF_MIN_VERSION} REQUIRED
|
|
I18n
|
|
Config
|
|
KIO
|
|
- DBusAddons
|
|
)
|
|
|
|
add_definitions(
|
|
diff --git a/kcachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt
|
|
index cb28103..534cf65 100644
|
|
--- a/kcachegrind/CMakeLists.txt
|
|
+++ b/kcachegrind/CMakeLists.txt
|
|
@@ -34,7 +34,6 @@ set(kcachegrind_LIBS
|
|
KF5::ConfigGui
|
|
KF5::KIOCore
|
|
KF5::KIOWidgets
|
|
- KF5::DBusAddons
|
|
)
|
|
|
|
target_link_libraries(kcachegrind core views ${kcachegrind_LIBS})
|
|
diff --git a/kcachegrind/main.cpp b/kcachegrind/main.cpp
|
|
index 536a175..814995e 100644
|
|
--- a/kcachegrind/main.cpp
|
|
+++ b/kcachegrind/main.cpp
|
|
@@ -19,7 +19,6 @@
|
|
#include <KAboutData>
|
|
#include <KLocalizedString>
|
|
#include <KSharedConfig>
|
|
-#include <KDBusService>
|
|
|
|
#include "kdeconfig.h"
|
|
#include "toplevel.h"
|
|
@@ -46,8 +45,6 @@ int main( int argc, char ** argv )
|
|
KAboutData::setApplicationData(aboutData);
|
|
QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kcachegrind")));
|
|
|
|
- KDBusService service(KDBusService::Multiple);
|
|
-
|
|
// KGlobal::locale()->insertCatalog("kcachegrind_qt");
|
|
Loader::initLoaders();
|
|
|
|
--
|
|
2.36.1
|
|
|
|
|
|
From 0bf94381a4f9c8022d2697c20074e9bac5716d5d Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 19 Jul 2022 20:06:10 +1000
|
|
Subject: Use system int64, uint64 defs
|
|
|
|
|
|
diff --git a/libcore/subcost.h b/libcore/subcost.h
|
|
index c1df65e..4bc004b 100644
|
|
--- a/libcore/subcost.h
|
|
+++ b/libcore/subcost.h
|
|
@@ -14,7 +14,11 @@
|
|
|
|
#include "utils.h"
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <SupportDefs.h>
|
|
+#else
|
|
typedef unsigned long long uint64;
|
|
+#endif
|
|
|
|
/**
|
|
* Cost event counter, simple wrapper around a 64bit entity
|
|
diff --git a/libcore/utils.h b/libcore/utils.h
|
|
index 2eb267b..e827a4b 100644
|
|
--- a/libcore/utils.h
|
|
+++ b/libcore/utils.h
|
|
@@ -17,8 +17,12 @@
|
|
|
|
class QIODevice;
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <SupportDefs.h>
|
|
+#else
|
|
typedef unsigned long long uint64;
|
|
typedef long long int64;
|
|
+#endif
|
|
|
|
/**
|
|
* A simple, constant string class
|
|
--
|
|
2.36.1
|
|
|