From 005ca5c248422386b08c9d703b9e68d01edd7589 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 1 Nov 2021 09:35:44 +1000 Subject: [PATCH] KPty: bump version to 5.86.0 --- ...{kpty-5.80.0.recipe => kpty-5.86.0.recipe} | 5 +-- ...y-5.80.0.patchset => kpty-5.86.0.patchset} | 33 +++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) rename kde-frameworks/kpty/{kpty-5.80.0.recipe => kpty-5.86.0.recipe} (94%) rename kde-frameworks/kpty/patches/{kpty-5.80.0.patchset => kpty-5.86.0.patchset} (90%) diff --git a/kde-frameworks/kpty/kpty-5.80.0.recipe b/kde-frameworks/kpty/kpty-5.86.0.recipe similarity index 94% rename from kde-frameworks/kpty/kpty-5.80.0.recipe rename to kde-frameworks/kpty/kpty-5.86.0.recipe index 7e3c1605b..ab446243c 100644 --- a/kde-frameworks/kpty/kpty-5.80.0.recipe +++ b/kde-frameworks/kpty/kpty-5.86.0.recipe @@ -5,9 +5,9 @@ communicating with them using a pty.." HOMEPAGE="https://github.com/KDE/kpty/" COPYRIGHT="2010-2021 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/KDE/kpty/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="8eb480b3be456c392d619e000e27cbd946468f92d0bce73dfd8ab702a33c1741" +CHECKSUM_SHA256="f352e381b7ac41700e77797c9307f0dd7bdc1651fa91dddfd49e5da9b00238da" PATCHES="kpty-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -58,6 +58,7 @@ BUILD() cd build cmake .. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS=-D_BSD_SOURCE \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake diff --git a/kde-frameworks/kpty/patches/kpty-5.80.0.patchset b/kde-frameworks/kpty/patches/kpty-5.86.0.patchset similarity index 90% rename from kde-frameworks/kpty/patches/kpty-5.80.0.patchset rename to kde-frameworks/kpty/patches/kpty-5.86.0.patchset index a0df9756c..71f0b3d14 100644 --- a/kde-frameworks/kpty/patches/kpty-5.80.0.patchset +++ b/kde-frameworks/kpty/patches/kpty-5.86.0.patchset @@ -1,44 +1,33 @@ -From 340c93f0606445d84fd99d08dc2435154dc3f443 Mon Sep 17 00:00:00 2001 +From ee5472d2a9dd38215d4d2349e95c07e92be9b063 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 5 Jan 2021 17:37:56 +1000 +Date: Mon, 1 Nov 2021 09:20:04 +1000 Subject: Use bsd openpty for haiku diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 523ac94..e60fed6 100644 +index d18c70f..2bfa926 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1,9 +1,18 @@ - set(kpty_LIB_SRCS +@@ -2,7 +2,7 @@ add_library(KF5Pty) + add_library(KF5::Pty ALIAS KF5Pty) + + target_sources(KF5Pty PRIVATE - kpty.cpp ++ kpty_haiku.cpp kptydevice.cpp kptyprocess.cpp ) - -+if (HAIKU) -+ set(kpty_LIB_SRCS -+ ${kpty_LIB_SRCS} -+ kpty_haiku.cpp) -+else() -+ set(kpty_LIB_SRCS -+ ${kpty_LIB_SRCS} -+ kpty.cpp) -+endif() -+ - ecm_qt_declare_logging_category(kpty_LIB_SRCS - HEADER kpty_debug.h - IDENTIFIER KPTY_LOG -@@ -26,7 +35,8 @@ target_link_libraries(KF5Pty PUBLIC Qt5::Core +@@ -26,7 +26,8 @@ target_link_libraries(KF5Pty PUBLIC Qt5::Core + KF5::CoreAddons # KProcess PRIVATE ${UTIL_LIBRARY} - ${kpty_OPTIONAL_LIBS} - KF5::I18n) + KF5::I18n + bsd) target_include_directories(KF5Pty PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) -@@ -80,7 +90,7 @@ endif() +@@ -80,7 +81,7 @@ endif() ########### next target ###############