kpty: bump version

This commit is contained in:
Gerasim Troeglazov
2022-05-09 21:27:43 +10:00
parent 980d5c23da
commit c9436a0c3e
2 changed files with 20 additions and 14 deletions

View File

@@ -3,11 +3,11 @@ DESCRIPTION="This library provides primitives to interface with pseudo terminal
devices as well as a KProcess derived class for running child processes and \
communicating with them using a pty.."
HOMEPAGE="https://github.com/KDE/kpty/"
COPYRIGHT="2010-2021 KDE Organisation"
COPYRIGHT="2010-2022 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/kpty/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="f352e381b7ac41700e77797c9307f0dd7bdc1651fa91dddfd49e5da9b00238da"
CHECKSUM_SHA256="db9293931f328dea6a34f4015c1a70196c666d7e4a1b291deeb16dc3532aeca1"
PATCHES="kpty-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -43,7 +43,7 @@ BUILD_REQUIRES="
devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
devel:libQt5Core$secondaryArchSuffix >= 5.15
devel:libQt5Core$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -52,6 +52,11 @@ BUILD_PREREQUIRES="
cmd:make
"
PATCH()
{
sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml
}
BUILD()
{
mkdir -p build
@@ -62,6 +67,7 @@ BUILD()
-DCMAKE_CXX_FLAGS=-D_BSD_SOURCE \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
make $jobArgs
}

View File

@@ -1,23 +1,23 @@
From ee5472d2a9dd38215d4d2349e95c07e92be9b063 Mon Sep 17 00:00:00 2001
From 69f5727e734677a2a663300e30d2a5162bc74a9d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
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 d18c70f..2bfa926 100644
index 644c00b..2693d1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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
)
@@ -26,7 +26,8 @@ target_link_libraries(KF5Pty PUBLIC Qt5::Core
- kpty.cpp
+ kpty_haiku.cpp
kptydevice.cpp
kptydevice.h
kpty.h
@@ -30,7 +30,8 @@ target_link_libraries(KF5Pty PUBLIC Qt${QT_MAJOR_VERSION}::Core
KF5::CoreAddons # KProcess
PRIVATE
${UTIL_LIBRARY}
@@ -26,8 +26,8 @@ index d18c70f..2bfa926 100644
+ bsd)
target_include_directories(KF5Pty PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..)
@@ -80,7 +81,7 @@ endif()
if(UTEMPTER_FOUND)
@@ -87,7 +88,7 @@ endif()
########### next target ###############
@@ -35,7 +35,7 @@ index d18c70f..2bfa926 100644
+if (NOT HAVE_OPENPTY AND NOT HAIKU)
add_executable(kgrantpty kgrantpty.c)
ecm_mark_nongui_executable(kgrantpty)
install(TARGETS kgrantpty DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5})
install(TARGETS kgrantpty DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF})
diff --git a/src/kpty_haiku.cpp b/src/kpty_haiku.cpp
new file mode 100644
index 0000000..7acd36d