mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
103 lines
3.6 KiB
Plaintext
103 lines
3.6 KiB
Plaintext
From 0fd57d499ce574e2a13388a1c218ebcfb4086145 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Tue, 12 Feb 2019 15:57:57 +0300
|
|
Subject: Haiku patch
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 70f1479..3ad57f2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -170,11 +170,13 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|
add_gcc_compiler_flags("-Werror")
|
|
endif()
|
|
|
|
+if (NOT HAIKU)
|
|
if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
|
|
add_gcc_compiler_flags("-fstack-protector-strong")
|
|
else()
|
|
add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
|
|
endif()
|
|
+endif()
|
|
|
|
add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
|
|
add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
|
|
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
|
|
index 81bb269..686af27 100644
|
|
--- a/share/CMakeLists.txt
|
|
+++ b/share/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ file(GLOB DATABASE_ICONS icons/database/*.png)
|
|
|
|
install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
|
|
|
|
-if(UNIX AND NOT APPLE)
|
|
+if(UNIX AND NOT APPLE AND NOT HAIKU)
|
|
install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
|
|
FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz"
|
|
PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE)
|
|
@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE)
|
|
install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
|
|
install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
|
|
install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
|
|
-endif(UNIX AND NOT APPLE)
|
|
+endif(UNIX AND NOT APPLE AND NOT HAIKU)
|
|
|
|
if(APPLE)
|
|
install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 28a0753..8c5465d 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -272,6 +272,9 @@ if(APPLE)
|
|
target_link_libraries(keepassx_core Qt5::MacExtras)
|
|
endif()
|
|
endif()
|
|
+if(HAIKU)
|
|
+ target_link_libraries(keepassx_core network)
|
|
+endif()
|
|
if (UNIX AND NOT APPLE)
|
|
target_link_libraries(keepassx_core Qt5::DBus)
|
|
endif()
|
|
diff --git a/src/autotype/CMakeLists.txt b/src/autotype/CMakeLists.txt
|
|
index 4b36105..df21c01 100644
|
|
--- a/src/autotype/CMakeLists.txt
|
|
+++ b/src/autotype/CMakeLists.txt
|
|
@@ -1,5 +1,5 @@
|
|
if(WITH_XC_AUTOTYPE)
|
|
- if(UNIX AND NOT APPLE)
|
|
+ if(UNIX AND NOT APPLE AND NOT HAIKU)
|
|
find_package(X11)
|
|
find_package(Qt5X11Extras 5.2)
|
|
if(PRINT_SUMMARY)
|
|
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
|
|
index f6cc2e4..cad479c 100644
|
|
--- a/src/gui/MainWindow.cpp
|
|
+++ b/src/gui/MainWindow.cpp
|
|
@@ -413,8 +413,10 @@ MainWindow::MainWindow()
|
|
connect(m_ui->tabWidget, SIGNAL(messageTab(QString,MessageWidget::MessageType)), this, SLOT(displayTabMessage(QString, MessageWidget::MessageType)));
|
|
connect(m_ui->tabWidget, SIGNAL(messageDismissTab()), this, SLOT(hideTabMessage()));
|
|
|
|
+#ifndef Q_OS_HAIKU
|
|
m_screenLockListener = new ScreenLockListener(this);
|
|
connect(m_screenLockListener, SIGNAL(screenLocked()), SLOT(handleScreenLock()));
|
|
+#endif
|
|
|
|
updateTrayIcon();
|
|
|
|
diff --git a/src/sshagent/includes.h b/src/sshagent/includes.h
|
|
index c6bb4d3..efcdbe5 100644
|
|
--- a/src/sshagent/includes.h
|
|
+++ b/src/sshagent/includes.h
|
|
@@ -9,7 +9,7 @@
|
|
#include <sys/types.h>
|
|
|
|
|
|
-#ifdef _WIN32
|
|
+#if defined(_WIN32) || defined(__HAIKU__)
|
|
#include <stdint.h>
|
|
|
|
typedef uint32_t u_int32_t;
|
|
--
|
|
2.19.1
|
|
|