diff --git a/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe new file mode 100644 index 000000000..0081cdee2 --- /dev/null +++ b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe @@ -0,0 +1,90 @@ +SUMMARY="Library for managing partitions" +DESCRIPTION="https://www.kde.org/applications/system/kdepartitionmanager." +HOMEPAGE="https://github.com/KDE/kpmcore/" +COPYRIGHT="2010-2018 KDE Organisation" +LICENSE="GNU LGPL v2" +REVISION="1" +COMMIT="9e6cf4063a29dd13fafed939e2ee4ae3061a37d6" +SOURCE_URI="https://github.com/KDE/kpmcore/archive/$COMMIT.zip" +SOURCE_DIR="kpmcore-$COMMIT" +CHECKSUM_SHA256="0b641ca970c6f109fdf40d3693fb7eddeb8cb1f6e0e807310ce9f1d41dbe87cd" +PATCHES="kpmcore-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + kpmcore$secondaryArchSuffix = $portVersion + lib:libkpmcore$secondaryArchSuffix = $portVersion compat >= 9 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libKF5Auth$secondaryArchSuffix + lib:libKF5CoreAddons$secondaryArchSuffix + lib:libKF5I18n$secondaryArchSuffix + lib:libKF5WidgetsAddons$secondaryArchSuffix + lib:libqca$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix >= 5.7 + " + +PROVIDES_devel=" + kpmcore${secondaryArchSuffix}_devel = $portVersion + devel:libkpmcore$secondaryArchSuffix = $portVersion compat >= 9 + " +REQUIRES_devel=" + kpmcore$secondaryArchSuffix == $portVersion + " + +BUILD_REQUIRES=" + extra_cmake_modules >= 5.45 + haiku${secondaryArchSuffix}_devel + devel:libKF5Auth$secondaryArchSuffix + devel:libKF5CoreAddons$secondaryArchSuffix + devel:libKF5I18n$secondaryArchSuffix + devel:libKF5WidgetsAddons$secondaryArchSuffix + devel:libqca$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix >= 5.7 + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + " + +GLOBAL_WRITABLE_FILES=" + settings/dbus-1/system.d/org.kde.kpmcore.externalcommand.conf keep-old + settings/dbus-1/system.d/org.kde.kpmcore.helperinterface.conf keep-old + " + +BUILD() +{ + mkdir -p build + cd build + + cmake .. $cmakeDirArgs \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DINCLUDE_INSTALL_DIR=$includeDir \ + -DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt5/kauth/helper + + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + prepareInstalledDevelLibs \ + libkpmcore + + packageEntries devel \ + $libDir/cmake \ + $developDir +} + +TEST() +{ + cd build + make test +} diff --git a/sys-libs/kpmcore/patches/kpmcore-3.3.0~git.patchset b/sys-libs/kpmcore/patches/kpmcore-3.3.0~git.patchset new file mode 100644 index 000000000..128211718 --- /dev/null +++ b/sys-libs/kpmcore/patches/kpmcore-3.3.0~git.patchset @@ -0,0 +1,88 @@ +From 6d89629552d7e09b5ad053208e62d4a26c8a7e61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= +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 a00f757cd306aa3b0a58ead2d24f21971ae0b328 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +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(d) + + +From 711e73f744808a27f232c3d052a6cd9803af21e4 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +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 +