Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pidgin

Browse Source
This commit is contained in:
Rmys
2020-04-07 10:21:44 +03:00
parent 33252647a1
commit a612c0b1dd
3 changed files with 69 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/chat/pidgin/files/pidgin-nm-1.0.patch
+52
View File
@@ -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;
network/chat/pidgin/files/pidgin-python-3.8.patch
+13
View File
@@ -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
network/chat/pidgin/pspec.xml
+4 -1
View File
@@ -15,8 +15,9 @@
<Archive sha1sum="122f0a48ba63cd7f2bc2962c497df045ce29ef71" type="tarbz2">mirrors://sourceforge/pidgin/pidgin-2.13.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>intltool</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>gconf-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libXScrnSaver-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>gtkspell-devel</Dependency>
@@ -46,6 +47,8 @@
<Patches>
<!-- <Patch level="1">suse/pidgin-ncurses-6.0-accessors.patch</Patch> -->
<Patch level="1">pidgin-py3-fixes.patch</Patch>
<Patch level="1">pidgin-nm-1.0.patch</Patch>
<Patch level="1">pidgin-python-3.8.patch</Patch>
</Patches>
</Source>