KPty: bump version to 5.86.0

This commit is contained in:
Gerasim Troeglazov
2021-11-01 09:35:44 +10:00
parent e8114e1416
commit 005ca5c248
2 changed files with 14 additions and 24 deletions

View File

@@ -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

View File

@@ -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 ###############