Skip to content

Commit

Permalink
putty: try to use wincon.h instead of consoleapi.h
Browse files Browse the repository at this point in the history
the later one is not in mingw-w64
  • Loading branch information
lazka committed Nov 28, 2024
1 parent f480ed4 commit 3e35b7b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
11 changes: 11 additions & 0 deletions mingw-w64-putty/0001-consoleapi-missing.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- putty-0.82/windows/conpty.c.orig 2024-11-28 23:51:05.108139900 +0100
+++ putty-0.82/windows/conpty.c 2024-11-28 23:51:14.570904300 +0100
@@ -9,7 +9,7 @@
#include "putty.h"

#include <windows.h>
-#include <consoleapi.h>
+#include <wincon.h>

typedef struct ConPTY ConPTY;
struct ConPTY {
15 changes: 12 additions & 3 deletions mingw-w64-putty/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ _realname=putty
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.82
pkgrel=1
pkgrel=2
pkgdesc="A free telnet/SSH client (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
url="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
msys2_repository_url="https://git.tartarus.org/?p=simon/putty.git"
msys2_references=(
"cpe: cpe:/a:putty:putty"
"cpe: cpe:/a:simon_tatham:putty"
Expand All @@ -24,12 +25,20 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-putty-ssh: ssh wrapper for plink")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git"
"${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
source=("https://the.earth.li/~sgtatham/putty/latest/${_realname}-${pkgver}.tar.gz"
"putty-${pkgver}.tar.gz.sig::https://the.earth.li/~sgtatham/putty/${pkgver}/putty-${pkgver}.tar.gz.gpg")
"putty-${pkgver}.tar.gz.sig::https://the.earth.li/~sgtatham/putty/${pkgver}/putty-${pkgver}.tar.gz.gpg"
"0001-consoleapi-missing.patch")
sha256sums=('195621638bb6b33784b4e96cdc296f332991b5244968dc623521c3703097b5d9'
'SKIP')
'SKIP'
'741e90fe6920233ef527163b05a060ef5e1073cf194d537a4460882c38a0a41b')
validpgpkeys=('F412BA3AA30FDC0E77B4E3871993D21BCAD1AA77') # PuTTY Releases <[email protected]>

prepare() {
cd "${_realname}-${pkgver}"

# https://github.com/mingw-w64/mingw-w64/issues/71
patch -Np1 -i "${srcdir}/0001-consoleapi-missing.patch"

cd "${srcdir}"
mkdir -p "${srcdir}"/${_realname}-build-${MSYSTEM}
}

Expand Down

0 comments on commit 3e35b7b

Please sign in to comment.