From 61c79851a1271ff65b198ee80714ff6bda93e0dd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Nov 2015 08:48:52 +0100 Subject: [PATCH] putty: unbreak musl with Alpine patches and -Wno-error. --- srcpkgs/putty/patches/fix-big-int-type.patch | 12 ++++++++++++ srcpkgs/putty/patches/fix-include.patch | 10 ++++++++++ srcpkgs/putty/template | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/putty/patches/fix-big-int-type.patch create mode 100644 srcpkgs/putty/patches/fix-include.patch diff --git a/srcpkgs/putty/patches/fix-big-int-type.patch b/srcpkgs/putty/patches/fix-big-int-type.patch new file mode 100644 index 00000000000..1caa679bbe8 --- /dev/null +++ b/srcpkgs/putty/patches/fix-big-int-type.patch @@ -0,0 +1,12 @@ +--- sshbn.h.orig ++++ sshbn.h +@@ -26,7 +26,8 @@ + * using the same 'two machine registers' kind of code generation that + * 32-bit targets use for 64-bit ints. If we have one of these, we can + * use a 64-bit BignumInt and a 128-bit BignumDblInt. */ +-typedef __uint64_t BignumInt; ++#include ++typedef uint64_t BignumInt; + typedef __uint128_t BignumDblInt; + #define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL + #define BIGNUM_TOP_BIT 0x8000000000000000ULL diff --git a/srcpkgs/putty/patches/fix-include.patch b/srcpkgs/putty/patches/fix-include.patch new file mode 100644 index 00000000000..1a51996d87e --- /dev/null +++ b/srcpkgs/putty/patches/fix-include.patch @@ -0,0 +1,10 @@ +--- unix/uxcons.c ++++ unix/uxcons.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template index ca64828a8f2..58b55d968b9 100644 --- a/srcpkgs/putty/template +++ b/srcpkgs/putty/template @@ -1,7 +1,8 @@ # Template file for 'putty' pkgname=putty version=0.66 -revision=1 +revision=2 +build_pie=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel" @@ -11,3 +12,5 @@ license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/" distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz" checksum=fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 + +CFLAGS="-Wno-error"