diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch new file mode 100644 index 00000000000..0bc02926559 --- /dev/null +++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch @@ -0,0 +1,11 @@ +--- configure.ac 2018-03-08 07:22:25.000000000 +0100 ++++ configure.ac 2020-02-11 04:14:37.777681920 +0100 +@@ -1428,7 +1428,7 @@ + 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 >= 0.5.0], [ + AC_SUBST(NETWORKMANAGER_CFLAGS) + AC_SUBST(NETWORKMANAGER_LIBS) + AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch new file mode 100644 index 00000000000..802d64b89f2 --- /dev/null +++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch @@ -0,0 +1,19 @@ +--- libpurple/network.c 2018-03-06 07:00:49.000000000 +0100 ++++ libpurple/network.c 2020-02-11 04:30:20.163644344 +0100 +@@ -939,8 +939,16 @@ + #if NM_CHECK_VERSION(0,8,992) + case NM_STATE_DISCONNECTING: + #endif ++#if NM_CHECK_VERSION(0,8,992) ++ if (prev != NM_STATE_CONNECTED_LOCAL && ++ prev != NM_STATE_CONNECTED_SITE && ++ 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/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index 0fa8e0e026c..e98936ae0ed 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -18,7 +18,7 @@ distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f lib32disabled=yes -hostmakedepends="pkg-config intltool automake libtool gettext-devel glib-devel" +hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel" makedepends="libglib-devel gtk+-devel libXext-devel libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel libxml2-devel gst-plugins-base1-devel libidn-devel python-devel @@ -26,6 +26,8 @@ makedepends="libglib-devel gtk+-devel libXext-devel libsasl-devel libSM-devel farstream-devel" depends="cyrus-sasl-modules gst-plugins-good1" +CFLAGS="-Wno-deprecated-declarations" + pre_configure() { autoreconf -fi }