From 203103d9ae3a0792d77c01ef88c87ecef036ab28 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 5 Dec 2019 23:52:40 +0100
Subject: [PATCH] - added networkmanager 1.0 and python 3.8 fixes from fedora -
 rel 7

---
 nm-1.0.patch     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 pidgin.spec      |  6 +++++-
 python-3.8.patch | 13 ++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 nm-1.0.patch
 create mode 100644 python-3.8.patch

diff --git a/nm-1.0.patch b/nm-1.0.patch
new file mode 100644
index 0000000..781612f
--- /dev/null
+++ b/nm-1.0.patch
@@ -0,0 +1,52 @@
+diff --git a/configure.ac b/configure.ac
+index 04836fa..0a2d451 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1423,18 +1423,24 @@ fi
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
+ 		], [
+-			enable_nm=no
+-			if test "x$force_deps" = "xyes" ; then
+-				AC_MSG_ERROR([
++			PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++				AC_SUBST(NETWORKMANAGER_CFLAGS)
++				AC_SUBST(NETWORKMANAGER_LIBS)
++				AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
++			], [
++				enable_nm=no
++				if test "x$force_deps" = "xyes" ; then
++					AC_MSG_ERROR([
+ NetworkManager development headers not found.
+ Use --disable-nm if you do not need NetworkManager support.
+ ])
+-			fi])
++				fi])
++		])
+ 	fi
+ else
+ 	enable_nm=no
+diff --git a/libpurple/network.c b/libpurple/network.c
+index c43e3c7..b17e439 100644
+--- a/libpurple/network.c
++++ b/libpurple/network.c
+@@ -939,8 +939,13 @@ nm_update_state(NMState state)
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(1,0,0)
++			if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/pidgin.spec b/pidgin.spec
index fdf1eb6..0961989 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -49,7 +49,7 @@ Summary(pl.UTF-8):	Oparty na GTK+ klient komunikatorów obsługujący wiele prot
 Summary(pt_BR.UTF-8):	Um cliente para o AOL Instant Messenger (AIM)
 Name:		pidgin
 Version:	2.13.0
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
@@ -59,6 +59,8 @@ Patch1:		%{name}-dbus-dir.patch
 # Patch2:		%{name}-libgadu.patch
 # http://developer.pidgin.im/ticket/14936
 Patch3:		%{name}-port-to-farstream.patch
+Patch4:		nm-1.0.patch
+Patch5:		python-3.8.patch
 URL:		http://www.pidgin.im/
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel >= 2.16.0
@@ -562,6 +564,8 @@ Dokumentacja Pidgina dla programistów (format HTML).
 %patch1 -p1
 #%%patch2 -p1
 #%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %if %{with dotnet}
diff --git a/python-3.8.patch b/python-3.8.patch
new file mode 100644
index 0000000..06063ad
--- /dev/null
+++ b/python-3.8.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d916891..d8c39a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1565,7 +1565,7 @@ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ;
+ 	AC_MSG_CHECKING(for Python compile flags)
+ 	if test -f ${PYTHON}-config; then
+ 		PY_CFLAGS=`${PYTHON}-config --includes`
+-		PY_LIBS=`${PYTHON}-config --libs`
++		PY_LIBS=`${PYTHON}-config --libs --embed` || PY_LIBS=`${PYTHON}-config --libs`
+ 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
+ 		AC_MSG_RESULT(ok)
+ 	else
-- 
2.44.0