putty: add icon and settings workaround (#11665)

Fixes #11585 but could probably use improvement.
2026-03-19 01:46:00 +01:00 · 2025-01-18 21:15:15 -07:00
parent eedbf8f2c0
commit e316baac9a
3 changed files with 125 additions and 4 deletions
--- a/net-misc/putty/additional-files/putty.rdef.in
+++ b/net-misc/putty/additional-files/putty.rdef.in
@@ -14,3 +14,88 @@ resource app_version {
 };

 resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon array {
+	$"6E6369660705BF058005FF0500030000FF0300008003FFFF001D0207BD9DBF7C"
+	$"BD9DBF7CC200BF7CCAC6BF7CC663BF7C5D3ECC5EBDE4CBD5BE6BCC5EBCEFCC5E"
+	$"BB05CC5EBBFAC7FBBB05BF35BB05C398BB05BEADBB8DBD9DBC9DBE25BC15BD9D"
+	$"BD92BD9DBF7CBD9DBE87BD9DBF7C0208BE69BF7CBE69BF7CBE69BF37BE69BEB0"
+	$"BE693EC244BEB0C9FABEB0C61FBEB0C9FABE43C9FABD69C9FABDD6CAC6BC9DCC"
+	$"5EBB05CB92BBD1CC5EBBFACC5EBDE4CC5EBCEFCBD5BE6BCAC6BF7C5D3EC6A7BF"
+	$"7CBE69BF7CC288BF7CBE69BF7C0209BD9DBEB0BD9DBEB0BDE1BEB0BE69BEB0BE"
+	$"25BEB0BE69BE43BE69BD69BE69BDD6C244BD69C9FABD69C61FBD69CAC6BC9DCC"
+	$"5EBB05CB92BBD15FBB05CB92BB05CBD5BB05CB09BB8DC9FABC9D5BBC15C5DBBC"
+	$"9DBD9DBC9DC1BCBC9DBD9DBD4EBD9DBEB0BD9DBDFFBD9DBEB00205C52FBE21C5"
+	$"2FBE21C683BE21C92BBE21C7D7BE21C92BBE50C92BBEB0C92BBE80C7D7BEB0C5"
+	$"2FBEB0C683BEB0C52FBE80C52FBE21C52FBE50C52FBE210207BD9DBF7CBD9DBF"
+	$"7CC200BF7CCAC6BF7CC663BF7C5D3ECC5EBDE4CBD5BE6BCC5EBCEFCC5EBB05CC"
+	$"5EBBFAC7FBBB05BF35BB05C398BB05BEADBB8DBD9DBC9DBE25BC15BD9DBD92BD"
+	$"9DBF7CBD9DBE87BD9DBF7C0207BFB0BC4CBFB0BC4CC2BEBC4CC8DABC4CC5CCBC"
+	$"4CC96236CA72BAB4C9EABB3BCA722DCA72B322CA72B5A7C764B322C148B322C4"
+	$"56B322C0C0B3A9BFB0B4BAC03823BFB0B740BFB0BC4CBFB031BFB0BC4C0208BF"
+	$"B0BC4CBFB0BC4CBFD237C016BBE6BFF4BC07C2E0BBE6C874BBE6C5AABBE6C874"
+	$"B9A3C874B520C8742BC91EB476CA72B322C9C822CA72B5A7CA72BAB4CA722DC9"
+	$"EABB3BC8DABC4CC96236C5CCBC4CBFB0BC4CC2BEBC4CBFB0BC4C0207BFB0BC4C"
+	$"BFB0BC4CBFD237C016BBE6BFF4BC07C016B9A3C016B520C0162BC2E0B520C874"
+	$"B520C5AAB520C89625C8DAB4BAC8B8B4DBC5CCB4BABFB0B4BAC2BEB4BABFB0B7"
+	$"40BFB0BC4CBFB031BFB0BC4C0207C016BB1AC016BB1AC03834C07CBAB4C05ABA"
+	$"D5C07C2FC07CB586C07CB740C302B586C80EB586C588B586C83026C874B520C8"
+	$"52B541C5AAB520C016B520C2E0B520C016B71DC016BB1AC016B91BC016BB1A02"
+	$"07C016BB1AC016BB1AC03834C07CBAB4C05ABAD5C302BAB4C80EBAB4C588BAB4"
+	$"C80E2FC80EB586C80EB740C83026C874B520C852B541C874B71DC874BB1AC874"
+	$"B91BC5AABB1AC016BB1AC2E0BB1AC016BB1A0205C07CB586C07CB586C302B586"
+	$"C80EB586C588B586C80EB740C80EBAB4C80E2FC588BAB4C07CBAB4C302BAB4C0"
+	$"7C2FC07CB586C07CB740C07CB5860207C07CBAB4C07CBAB4C09EBAB4C0E2BAB4"
+	$"C0C0BAB4C0E2B91BC0E2B5ECC0E2B783C346B5ECC80EB5ECC5AAB5ECC80E27C8"
+	$"0EB586C80EB5A7C588B586C07CB586C302B586C07CB740C07CBAB4C07C2FC07C"
+	$"BAB40207BFB0BC4CBFB0BC4CC2BEBC4CC8DABC4CC5CCBC4CC96236CA72BAB4C9"
+	$"EABB3BCA722DCA72B322CA72B5A7C764B322C148B322C456B322C0C0B3A9BFB0"
+	$"B4BAC03823BFB0B740BFB0BC4CBFB031BFB0BC4C0207B322CC5EB322CC5EB784"
+	$"CC5EC04ACC5EBBE7CC5EC0D2CBD5C1E2CAC6C15A5DC1E2C9D1C1E2C7E7C1E2C8"
+	$"DCBD7FC7E7B4BAC7E7B91CC7E723C86FB322C97FB3A9C8F7B322CA74B322CC5E"
+	$"B322CB69B322CC5E0208B3EDCC5EB3EDCC5EB3ED5FB3EDCB92B3EDCBD52CCB92"
+	$"BF7ECB92BBA3CB92BF7ECB25BF7ECA4BBF7ECAB8C04AC97FC1E2C7E7C116C8B3"
+	$"C1E2C8DCC1E2CAC6C1E2C9D1C15A5DC04ACC5EC0D2CBD5BC2BCC5EB3EDCC5EB8"
+	$"0CCC5EB3EDCC5E0209B322CB92B322CB9221CB92B3EDCB92B3A9CB92B3EDCB25"
+	$"B3EDCA4BB3EDCAB82CCA4BBF7ECA4BBBA3CA4BC04AC97FC1E2C7E7C116C8B3C1"
+	$"9EC7E7C116C7E7C15AC7E7C08EC86FBF7EC97FC006C8F7BB5FC97FB322C97FB7"
+	$"40C97FB322CA30B322CB92B322CAE1B322CB920205BAB4CB03BAB4CB03BC07CB"
+	$"03BEB0CB033ACB03BEB0CB32BEB0CB92BEB0CB623ACB92BAB4CB92BC07CB92BA"
+	$"B4CB62BAB4CB03BAB4CB32BAB4CB030207B322CC5EB322CC5EB784CC5EC04ACC"
+	$"5EBBE7CC5EC0D2CBD5C1E2CAC6C15A5DC1E2C9D1C1E2C7E7C1E2C8DCBD7FC7E7"
+	$"B4BAC7E7B91CC7E723C86FB322C97FB3A9C8F7B322CA74B322CC5EB322CB69B3"
+	$"22CC5E0207B534C92EB534C92EB842C92EBE5EC92EBB50C92EBEE6C8A5BFF6C7"
+	$"96BF6E55BFF6C50FBFF6C004BFF647BCE8C004B6CCC004B9DAC004B64442B534"
+	$"C19CB5BCC113B5344BB534C92EB534C6A7B534C92E0208B534C92EB534C92EB5"
+	$"56C90BB59AC8C8B57857B864C8C8BDF8C8C8BB2EC8C8BDF851BDF8C202BDF8C4"
+	$"43BEA244BFF6C004BF4CC0ADBFF647BFF6C796BFF6C50FBF6E55BE5EC92EBEE6"
+	$"C8A5BB50C92EB534C92EB842C92EB534C92E0207B534C92EB534C92EB556C90B"
+	$"B59AC8C8B57857B59A51B59AC202B59AC443B864C202BDF8C202BB2EC202BE1A"
+	$"C1DFBE5EC19CBE3C45BB50C19CB534C19CB842C19CB5344BB534C92EB534C6A7"
+	$"B534C92E0207B59AC7FCB59AC7FCB5BCC7D9B600C796B5DE54B600C5DBB600C2"
+	$"68B6004BB886C268BD92C268BB0CC268BDB4C245BDF8C202BDD646BB2EC202B5"
+	$"9AC202B864C202B59AC400B59AC7FCB59AC5FEB59AC7FC0207B59AC7FCB59AC7"
+	$"FCB5BCC7D9B600C796B5DE54B886C796BD92C796BB0CC796BD92C5DBBD92C268"
+	$"BD924BBDB4C245BDF8C202BDD646BDF8C400BDF8C7FCBDF8C5FEBB2EC7FCB59A"
+	$"C7FCB864C7FCB59AC7FC0205B600C268B600C268B886C268BD92C268BB0CC268"
+	$"BD924BBD92C796BD92C5DBBB0CC796B600C796B886C796B600C5DBB600C268B6"
+	$"004BB600C2680207B600C796B600C796B622C796B666C796B644C796B666C5FE"
+	$"B666C2CEB666C466B8CAC2CEBD92C2CEBB2EC2CEBD92C2ABBD92C268BD9247BB"
+	$"0CC268B600C268B886C268B6004BB600C796B600C5DBB600C7960207B534C92E"
+	$"B534C92EB842C92EBE5EC92EBB50C92EBEE6C8A5BFF6C796BF6E55BFF6C50FBF"
+	$"F6C004BFF647BCE8C004B6CCC004B9DAC004B64442B534C19CB5BCC113B5344B"
+	$"B534C92EB534C6A7B534C92E0207BF6FBF8DBF6FBF8DBD9EC16EB9FCC532BBCD"
+	$"C350BCF7C2C8C2ECBDF5BFF1C05EC19FBDF5BF04BDF5C052BDF5C0D6BC13C478"
+	$"B84FC2A7BA31C17DBAB9BB88BF8DBE82BD23BCD5BF8DBF6FBF8DBE22BF8DBF6F"
+	$"BF8D0207BF6FBF8DBF6FBF8DBD9EC16EB9FCC532BBCDC350BCF7C2C8C2ECBDF5"
+	$"BFF1C05EC19FBDF5BF04BDF5C052BDF5C0D6BC13C478B84FC2A7BA31C17DBAB9"
+	$"BB88BF8DBE82BD23BCD5BF8DBF6FBF8DBE22BF8DBF6FBF8D0207BF6FBF8DBF6F"
+	$"BF8DBD9EC16EB9FCC532BBCDC350BCF7C2C8C2ECBDF5BFF1C05EC19FBDF5BF04"
+	$"BDF5C052BDF5C0D6BC13C478B84FC2A7BA31C17DBAB9BB88BF8DBE82BD23BCD5"
+	$"BF8DBF6FBF8DBE22BF8DBF6FBF8D1D0A000100000A010101000A020102000A03"
+	$"0103000A0301041001178022040A000105000A010106000A020107000A010108"
+	$"000A020109000A04010A000A05010B000A03010C1001178022040A00010D000A"
+	$"01010E000A02010F000A030110000A0301111001178022040A000112000A0101"
+	$"13000A020114000A010115000A020116000A040117000A050118000A03011910"
+	$"01178022040A03011A000A03011B1001178122040A06011C00"
+};
--- a/net-misc/putty/patches/putty-0.80.patchset
+++ b/net-misc/putty/patches/putty-0.80.patchset
@@ -1,4 +1,4 @@
-From 738b3b33c59f39f506793d1a2bca0eaae4e8ae7d Mon Sep 17 00:00:00 2001
+From 190f5335afd53bc243e07220fd606f673ef0126f Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Thu, 15 Dec 2022 17:36:32 +0100
 Subject: adjust folders for Haiku
@@ -52,5 +52,41 @@ index 4d212fe..87b8ead 100644
         pos += strcspn(path + pos, "/");
 
 -- 
-2.37.3
+2.45.2
+
+
+From b5dffa983d18c611bc8a4a015a703d8c2dbd0881 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sat, 18 Jan 2025 21:05:35 -0700
+Subject: if mkdir returns EROFS then make sure it doesn't already exist
+
+
+diff --git a/unix/utils/make_dir_path.c b/unix/utils/make_dir_path.c
+index 87b8ead..9fb44fb 100644
+--- a/unix/utils/make_dir_path.c
+++ b/unix/utils/make_dir_path.c
+@@ -26,11 +26,20 @@ char *make_dir_path(const char *path, mode_t mode)
+         if (pos > 0) {
+             prefix = dupprintf("%.*s", pos, path);
+ 
+-            if (mkdir(prefix, mode) < 0 && errno != EEXIST) {
+            if (mkdir(prefix, mode) < 0 && errno != EEXIST && errno != EROFS) {
+                 char *ret = dupprintf("%s: mkdir: %s",
+                                       prefix, strerror(errno));
+                 sfree(prefix);
+                 return ret;
+            } else if (errno == EROFS) {
+                int original_errno = errno;
+                struct stat sb;
+                if (stat(prefix, &sb) == 0 && !S_ISDIR(sb.st_mode)) {
+                    char *ret = dupprintf("%s: mkdir: %s",
+                                      prefix, strerror(original_errno));
+                    sfree(prefix);
+                    return ret;
+                }
+             }
+ 
+             sfree(prefix);
+-- 
+2.45.2

--- a/net-misc/putty/putty-0.80.recipe
+++ b/net-misc/putty/putty-0.80.recipe
@@ -8,7 +8,7 @@ The Telnet-only binary (PuTTYtel) is unrestricted by any cryptography laws."
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 COPYRIGHT="1997-2023 Simon Tatham et al."
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://the.earth.li/~sgtatham/putty/$portVersion/putty-$portVersion.tar.gz"
 CHECKSUM_SHA256="2013c83a721b1753529e9090f7c3830e8fe4c80a070ccce764539badb3f67081"
 PATCHES="putty-$portVersion.patchset"
@@ -68,7 +68,7 @@ BUILD()
 		$cmakeDirArgs \
 		-DCMAKE_C_FLAGS="-DXDG_DEFAULT" \
 		-DCMAKE_EXE_LINKER_FLAGS="-lnetwork" \
-		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo
 	cmake --build build $jobArgs
 }