mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
107 lines
2.6 KiB
Plaintext
107 lines
2.6 KiB
Plaintext
From 9b836fa41f439d5039d26b4bef5d5c705c4722a5 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 4 Mar 2024 20:14:38 +1000
|
|
Subject: Remove dbus
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a68b5d0..32d6c8b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -32,7 +32,7 @@ else()
|
|
endif()
|
|
|
|
|
|
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Widgets)
|
|
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Core Gui Widgets)
|
|
|
|
find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED
|
|
Archive
|
|
@@ -43,7 +43,6 @@ find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED
|
|
I18n
|
|
Config
|
|
KIO
|
|
- DBusAddons
|
|
)
|
|
|
|
add_definitions(
|
|
diff --git a/kcachegrind/CMakeLists.txt b/kcachegrind/CMakeLists.txt
|
|
index 2020634..a807fc2 100644
|
|
--- a/kcachegrind/CMakeLists.txt
|
|
+++ b/kcachegrind/CMakeLists.txt
|
|
@@ -34,7 +34,6 @@ set(kcachegrind_LIBS
|
|
KF${KF_MAJOR_VERSION}::ConfigGui
|
|
KF${KF_MAJOR_VERSION}::KIOCore
|
|
KF${KF_MAJOR_VERSION}::KIOWidgets
|
|
- KF${KF_MAJOR_VERSION}::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.43.2
|
|
|
|
|
|
From e914af111fecbf8af211d60008568b68c55c228c Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 4 Mar 2024 20:14:51 +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.43.2
|
|
|