Rebuild [nonprism/pidgin] against new python.

3 files changed, 79 insertions, 5 deletions

diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD
index 277f8420d..3baaaae49 100644
--- a/nonprism/pidgin/PKGBUILD
+++ b/nonprism/pidgin/PKGBUILD
@@ -9,19 +9,24 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.13.0
-pkgrel=2.nonprism2
+pkgrel=9.nonprism1
 arch=('i686' 'x86_64' 'armv7h')
-url="http://pidgin.im/"
+url="https://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python' 'hicolor-icon-theme' 'farstream' 'tk'
-             'libnsl' 'avahi' 'ca-certificates' 'intltool' 'networkmanager')
+             'libnsl' 'avahi' 'ca-certificates' 'intltool' 'libnm' 'dbus-glib')
 source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
-        purple-remote-python3.patch
-        nonprism.patch)
+        purple-remote-python3.patch 
+	pidgin-python-3.8.patch 
+	pidgin-nm-1.0.patch
+	nonprism.patch)
+
 sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
             'SKIP'
             '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1'
+            'afc824771b7409859f06b18f88ed9db97e90e3a5b10e5bab60f880c19f058c4f'
+            'ca00ab0f502690f7a1551020dfc9a0119edf1eabaae9127658313d6635acda33'
             '7024ead994efd4fe0fb404db92ff4358ba2dfa83d31a1871818faf2894744f97')
 validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <grim@reaperworld.com>
 
@@ -29,6 +34,10 @@ prepare() {
   cd $pkgbase-$pkgver
   # https://developer.pidgin.im/ticket/17065
   patch -Np1 -i ../purple-remote-python3.patch
+  # Fix networkmanager 1.0 detection (Fedora)
+  patch -p1 -i ../pidgin-nm-1.0.patch
+  # Fix build with python 3.8
+  patch -p1 -i ../pidgin-python-3.8.patch
 
   msg "Remove Google Talk and Facebook protocols"
   patch -Np1 -i "$srcdir/nonprism.patch"
diff --git a/nonprism/pidgin/pidgin-nm-1.0.patch b/nonprism/pidgin/pidgin-nm-1.0.patch
new file mode 100644
index 000000000..781612f24
--- /dev/null
+++ b/nonprism/pidgin/pidgin-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/nonprism/pidgin/pidgin-python-3.8.patch b/nonprism/pidgin/pidgin-python-3.8.patch
new file mode 100644
index 000000000..06063ad56
--- /dev/null
+++ b/nonprism/pidgin/pidgin-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