From 9477bfe09458fa26bb510f71b7b5f94ae0bd4b4c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 28 Mar 2020 10:47:54 +0100
Subject: [PATCH] gloox: update.

---
 ...loox-1.0.22.recipe => gloox-1.0.23.recipe} |  4 +--
 net-libs/gloox/patches/gloox-1.0.22.patchset  | 21 -------------
 net-libs/gloox/patches/gloox-1.0.23.patchset  | 30 +++++++++++++++++++
 3 files changed, 32 insertions(+), 23 deletions(-)
 rename net-libs/gloox/{gloox-1.0.22.recipe => gloox-1.0.23.recipe} (94%)
 delete mode 100644 net-libs/gloox/patches/gloox-1.0.22.patchset
 create mode 100644 net-libs/gloox/patches/gloox-1.0.23.patchset

diff --git a/net-libs/gloox/gloox-1.0.22.recipe b/net-libs/gloox/gloox-1.0.23.recipe
similarity index 94%
rename from net-libs/gloox/gloox-1.0.22.recipe
rename to net-libs/gloox/gloox-1.0.23.recipe
index a879eed90..009358920 100644
--- a/net-libs/gloox/gloox-1.0.22.recipe
+++ b/net-libs/gloox/gloox-1.0.23.recipe
@@ -3,9 +3,9 @@ DESCRIPTION="Rock-solid, full-featured Jabber/XMPP client library, written in cl
 HOMEPAGE="https://camaya.net/gloox/"
 COPYRIGHT="2002-2019 Jakob Schröter"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2"
-CHECKSUM_SHA256="4ade1b14848ccfcd89a505a4fff05116c24f13cef8d02fab0ade2717117ec964"
+CHECKSUM_SHA256="97cb6a0c07e320ffa4a7c66e8ab06b2361086271dc87ed2398befef4e8435f8a"
 PATCHES="gloox-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/net-libs/gloox/patches/gloox-1.0.22.patchset b/net-libs/gloox/patches/gloox-1.0.22.patchset
deleted file mode 100644
index 2b31b2c6e..000000000
--- a/net-libs/gloox/patches/gloox-1.0.22.patchset
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1053a4f7eb3d9a73854a3c08c9b6f5b46e163e20 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Mon, 3 Jun 2019 22:33:34 +0200
-Subject: Fix linking on Haiku.
-
-
-diff --git a/configure.ac b/configure.ac
-index 8269d4e..9b87f82 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,6 +327,7 @@ dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(unistd.h strings.h errno.h arpa/nameser.h)
- AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
-+AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(network,setsockopt)])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
--- 
-2.21.0
-
diff --git a/net-libs/gloox/patches/gloox-1.0.23.patchset b/net-libs/gloox/patches/gloox-1.0.23.patchset
new file mode 100644
index 000000000..b64b6c815
--- /dev/null
+++ b/net-libs/gloox/patches/gloox-1.0.23.patchset
@@ -0,0 +1,30 @@
+From 3adb58f29cf83ff50df3ca70da417928768b16fb Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 28 Mar 2020 10:17:16 +0100
+Subject: Search for network functions in libnetwork
+
+
+diff --git a/configure.ac b/configure.ac
+index 3fa8d04..c97b431 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -318,7 +282,7 @@ AC_ARG_ENABLE( getaddrinfo,
+                   [do not use getaddrinfo for dns lookups [default use getaddrinfo]])],
+                [getaddrinfo="no"])
+ if test "x$getaddrinfo" = "xyes"; then
+-    AC_CHECK_FUNCS(getaddrinfo,,getaddrinfo="no")
++    AC_SEARCH_LIBS(getaddrinfo,network,,getaddrinfo="no")
+ fi
+ AC_MSG_CHECKING([whether to use getaddrinfo])
+ AC_MSG_RESULT($getaddrinfo)
+@@ -327,6 +291,7 @@ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(unistd.h strings.h errno.h arpa/nameser.h)
+ AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
++AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(network,setsockopt)])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-- 
+2.24.1
+