From dd070808f0b87646b2119d075ffc6fc90fa30fb1 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 14 Dec 2016 16:11:05 +0100
Subject: [PATCH] hexchat: update to 2.12.4

---
 srcpkgs/hexchat/patches/libressl.patch  | 50 +++++++++++++++++++++++++
 srcpkgs/hexchat/patches/no-werror.patch | 20 ++++++++++
 srcpkgs/hexchat/template                | 14 ++++---
 3 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/hexchat/patches/libressl.patch
 create mode 100644 srcpkgs/hexchat/patches/no-werror.patch

diff --git a/srcpkgs/hexchat/patches/libressl.patch b/srcpkgs/hexchat/patches/libressl.patch
new file mode 100644
index 00000000000..8f3056fdf82
--- /dev/null
+++ b/srcpkgs/hexchat/patches/libressl.patch
@@ -0,0 +1,50 @@
+From d583ca7d922e5ac6ff466df2e4411b1303a3a2a3 Mon Sep 17 00:00:00 2001
+From: Florian Stinglmayr <florian@n0la.org>
+Date: Tue, 13 Dec 2016 18:41:43 +0100
+Subject: [PATCH] Use AC_CHECK_FUNCS to find functions not in LibreSSL
+
+LibreSSL might not have all functions of OpenSSL 1.1.0 so use
+AC_CHECK_FUNCS to find them first before using them.
+
+Closes #1899
+Fixes #1898
+---
+ configure.ac     | 2 ++
+ src/common/ssl.c | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git configure.ac.orig configure.ac
+index 34e6def..1f442c5 100644
+--- configure.ac.orig
++++ configure.ac
+@@ -374,6 +374,8 @@ AS_IF([test "$openssl" != no], [
+ 		openssl=yes
+ 		COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
+ 		COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
++		dnl Test for various functions that are not available in LibreSSL
++		AC_CHECK_FUNCS([SSL_CTX_get_ssl_method X509_get_signature_nid])
+ 	], [
+ 		unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h
+ 		AS_IF([test "$openssl" != yes], [
+diff --git src/common/ssl.c.orig src/common/ssl.c
+index cb58ce2..76fea7b 100644
+--- src/common/ssl.c.orig
++++ src/common/ssl.c
+@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *cert_info, SSL * ssl)
+ 		return 1;
+ 
+ 	alg = OBJ_obj2nid (algor->algorithm);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#ifndef HAVE_X509_GET_SIGNATURE_NID
+ 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
+ #else
+ 	sign_alg = X509_get_signature_nid (peer_cert);
+@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
+ 
+ 	SSL_set_fd (ssl, sd);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#ifndef HAVE_SSL_CTX_GET_SSL_METHOD
+ 	method = ctx->method;
+ #else
+ 	method = SSL_CTX_get_ssl_method (ctx);
diff --git a/srcpkgs/hexchat/patches/no-werror.patch b/srcpkgs/hexchat/patches/no-werror.patch
new file mode 100644
index 00000000000..508dd34a3e1
--- /dev/null
+++ b/srcpkgs/hexchat/patches/no-werror.patch
@@ -0,0 +1,20 @@
+--- configure.ac.old
++++ configure.ac
+@@ -634,17 +634,10 @@ AX_APPEND_COMPILE_FLAGS([\
+ 	-Wno-unused-parameter \
+ 	-Wno-sign-compare \
+ 	-Wno-pointer-sign \
+ 	-Wno-missing-field-initializers \
+ 	-Wno-unused-result \
+-	-Werror=format-security \
+-	-Werror=init-self \
+-	-Werror=declaration-after-statement \
+-	-Werror=missing-include-dirs \
+-	-Werror=date-time \
+-	-Werror=implicit-function-declaration \
+-	-Werror=pointer-arith \
+ ])
+ 
+ AS_IF([test "$stack_protector" = "yes"], [
+ 	AX_APPEND_COMPILE_FLAGS([ \
+ 		-fstack-protector-strong \
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index bb622023f69..c703dcff101 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,24 +1,28 @@
 # Template file for 'hexchat'
 pkgname=hexchat
-version=2.12.3
-revision=2
+version=2.12.4
+revision=1
 lib32disabled=yes
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool glib-devel gdk-pixbuf-devel perl-XML-Parser"
+hostmakedepends="automake libtool gettext-devel pkg-config intltool glib-devel
+ gdk-pixbuf-devel perl-XML-Parser autoconf-archive"
 makedepends="gtk+-devel libressl-devel dbus-glib-devel perl python-devel
  libnotify-devel libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
  lua-devel"
 depends="desktop-file-utils enchant iso-codes"
-configure_args="--enable-openssl --enable-dbus --disable-textfe --enable-ipv6
+configure_args="--enable-openssl --enable-dbus --disable-textfe
  --enable-perl --enable-python"
 short_desc="A GTK+ based IRC client successor of Xchat"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://hexchat.github.io/"
 license="GPL-2"
 distfiles="http://dl.hexchat.net/hexchat/${pkgname}-${version}.tar.xz"
-checksum=6f2b22372c7a9ed8ffab817079638e8f4178f5f8ba63c89cb3baa01be614f2ba
+checksum=fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a
 nocross=yes
 
+pre_configure() {
+	autoreconf -fi
+}
 post_install() {
 	# Remove useless files.
 	rm -rf ${DESTDIR}/usr/include