diff --git a/net-misc/qputty/patches/qputty-506.patchset b/net-misc/qputty/patches/qputty-506.patchset index 05e99db0a..1fef2e6e1 100644 --- a/net-misc/qputty/patches/qputty-506.patchset +++ b/net-misc/qputty/patches/qputty-506.patchset @@ -1,4 +1,4 @@ -From d41c4e88e7b14d99a9b1089e8fcff9be1b6aca29 Mon Sep 17 00:00:00 2001 +From ab8d4abc3344afec1fe51b662ba22109c70c4740 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 22 Aug 2018 19:35:17 +1000 Subject: Fix build for Haiku @@ -95,10 +95,10 @@ index aa2a09d..10c87d0 100644 aa=QFont::NoAntialias; break; -- -2.16.4 +2.37.3 -From cadbfedfdd5cb6b22441aedd04965c332dccda3f Mon Sep 17 00:00:00 2001 +From 3058eea29a8ef00e2311d0f20bceefacb62556d8 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 22 Aug 2018 22:07:01 +1000 Subject: Disable window icon @@ -120,5 +120,28 @@ index 771e0d5..11822fc 100644 int ret=p.run(app.arguments()); if(ret<1) exit(ret); -- -2.16.4 +2.37.3 + + +From 9b64595f0101edac134e630ed1e0687d89d16388 Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Sun, 13 Nov 2022 11:33:04 +0100 +Subject: qtwin: fix double variable definition pty_argv + + +diff --git a/qtwin.cpp b/qtwin.cpp +index 10c87d0..7e726f5 100644 +--- a/qtwin.cpp ++++ b/qtwin.cpp +@@ -101,7 +101,7 @@ int pt_main(int argc, char **argv); + + + +-char **pty_argv; /* declared in pty.c */ ++extern char **pty_argv; /* declared in pty.c */ + + + /* +-- +2.37.3 diff --git a/net-misc/qputty/qputty-506.recipe b/net-misc/qputty/qputty-506.recipe index 04a00a398..eb4a6d710 100644 --- a/net-misc/qputty/qputty-506.recipe +++ b/net-misc/qputty/qputty-506.recipe @@ -13,13 +13,13 @@ HOMEPAGE="https://github.com/dsmorozov/qputty-qt5/" COPYRIGHT="2015-2018 Dmitry Morozov, 1999-2018 PuTTY Team" LICENSE="MIT GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/dsmorozov/qputty-qt5/archive/$portVersion.tar.gz" CHECKSUM_SHA256="e79e356eb7d04f8ec133ce1094cfb54c7c4b540d6cc05e5f224111909c261973" SOURCE_FILENAME="qputty-qt5-$portVersion.tar.gz" SOURCE_DIR="qputty-qt5-$portVersion" puttyVersion="0.70" -SOURCE_URI_2="http://the.earth.li/~sgtatham/putty/latest/putty-$puttyVersion.tar.gz" +SOURCE_URI_2="https://the.earth.li/~sgtatham/putty/$puttyVersion/putty-$puttyVersion.tar.gz" CHECKSUM_SHA256_2="bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be" SOURCE_DIR_2="putty-$puttyVersion" PATCHES="qputty-$portVersion.patchset" @@ -58,11 +58,14 @@ BUILD_PREREQUIRES=" cmd:qmake$secondaryArchSuffix >= 5 " +defineDebugInfoPackage qputty$secondaryArchSuffix \ + $appsDir/QPuTTY + BUILD() { rm -rf $sourceDir/putty ln -s $sourceDir2 $sourceDir/putty - qmake KERBEROS=no GSSGLUE=no VERSION=$portVersion + qmake KERBEROS=no GSSGLUE=no VERSION=$portVersion PUTTY_SRC_VERSION=$puttyVersion make $jobArgs }