mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
113 lines
4.1 KiB
Plaintext
113 lines
4.1 KiB
Plaintext
From 514b2d1787bf2bd1d4b6a0c8ee0013ae32effaf6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
|
|
Date: Thu, 12 Apr 2018 15:16:42 +0300
|
|
Subject: Remove deprecated attribute for now. Not available on current Neon.
|
|
|
|
|
|
diff --git a/src/core/partition.h b/src/core/partition.h
|
|
index 63f604d..c675c10 100644
|
|
--- a/src/core/partition.h
|
|
+++ b/src/core/partition.h
|
|
@@ -80,10 +80,10 @@ public:
|
|
New, /**< from a NewOperation */
|
|
Copy, /**< from a CopyOperation */
|
|
Restore, /**< from a RestoreOperation */
|
|
- StateNone __attribute__((deprecated("Use Partition::State::None"))) = None,
|
|
- StateNew __attribute__((deprecated("Use Partition::State::New"))) = New,
|
|
- StateCopy __attribute__((deprecated("Use Partition::State::Copy"))) = Copy,
|
|
- StateRestore __attribute__((deprecated("Use Partition::State::Restore"))) = Restore
|
|
+ StateNone = None,
|
|
+ StateNew = New,
|
|
+ StateCopy = Copy,
|
|
+ StateRestore = Restore
|
|
};
|
|
|
|
Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::FlagNone, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::FlagNone, State state = State::None);
|
|
--
|
|
2.16.2
|
|
|
|
|
|
From cff2110c47897d98316e68231eb55fe78f3c547b Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Fri, 11 May 2018 17:49:10 +0300
|
|
Subject: Disable BLKPBSZGET
|
|
|
|
|
|
diff --git a/src/core/diskdevice.cpp b/src/core/diskdevice.cpp
|
|
index 38c8175..481c3cf 100644
|
|
--- a/src/core/diskdevice.cpp
|
|
+++ b/src/core/diskdevice.cpp
|
|
@@ -37,7 +37,7 @@
|
|
#endif
|
|
|
|
#if !defined(BLKPBSZGET)
|
|
-#define BLKPBSZGET _IO(0x12,123)/* get block physical sector size */
|
|
+//#define BLKPBSZGET _IO(0x12,123)/* get block physical sector size */
|
|
#endif
|
|
|
|
#define d_ptr std::static_pointer_cast<DiskDevicePrivate>(d)
|
|
--
|
|
2.16.2
|
|
|
|
|
|
From a105024ee4f7fa38a992bf8d324e8a62cfe6c46d Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Fri, 11 May 2018 19:00:27 +0300
|
|
Subject: Fix headers search path
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index caff811..a29a01f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -89,8 +89,8 @@ include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE
|
|
add_subdirectory(src)
|
|
|
|
# create a Config.cmake and a ConfigVersion.cmake file and install them
|
|
-set(INCLUDE_INSTALL_DIR "include/kpmcore/")
|
|
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KPMcore")
|
|
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/kpmcore" )
|
|
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/kpmcore")
|
|
|
|
ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KPMcoreConfig.cmake.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfig.cmake"
|
|
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
|
|
index 6e3abb2..a149448 100644
|
|
--- a/src/util/CMakeLists.txt
|
|
+++ b/src/util/CMakeLists.txt
|
|
@@ -32,7 +32,7 @@ target_link_libraries(kpmcore_externalcommand
|
|
KF5::I18n
|
|
)
|
|
|
|
-install(TARGETS kpmcore_externalcommand DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
|
|
+#install(TARGETS kpmcore_externalcommand DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
|
|
install( FILES util/org.kde.kpmcore.helperinterface.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
|
|
|
|
kauth_install_helper_files(kpmcore_externalcommand org.kde.kpmcore.externalcommand root)
|
|
--
|
|
2.16.2
|
|
|
|
|
|
From 53b182ffb0ae5d8e6607bd09effeeee96d35d108 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Sun, 13 May 2018 13:28:40 +0300
|
|
Subject: Enable sfdisk backend on Haiku
|
|
|
|
|
|
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
|
|
index 098738c..1df787c 100644
|
|
--- a/src/plugins/CMakeLists.txt
|
|
+++ b/src/plugins/CMakeLists.txt
|
|
@@ -15,7 +15,7 @@
|
|
|
|
############################################
|
|
|
|
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
+if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|Haiku)")
|
|
option(PARTMAN_SFDISKBACKEND "Build the sfdisk backend plugin." ON)
|
|
|
|
if (PARTMAN_SFDISKBACKEND)
|
|
--
|
|
2.16.2
|
|
|