Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

1 files changed, 0 insertions, 27 deletions

diff --git a/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch b/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch
deleted file mode 100644
index 31b5cfed7d..0000000000
--- a/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d6919c0be7f531b20cbfcb9929d697ac3c132c40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <github@kempniu.pl>
-Date: Wed, 12 Oct 2016 15:17:51 +0200
-Subject: [PATCH] Fix compiler detection when using
- --without-{crypt,crypto,ssl}
-
-(cherry picked from commit d6919c0be7f531b20cbfcb9929d697ac3c132c40)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 55724bc..bdfff94 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,6 +5,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_CONFIG_HEADER(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- 
-+AC_PROG_CC
- AC_PROG_SED
- 
- # some OS's need both -lssl and -lcrypto on link line:
--- 
-2.9.3
-