Control: tag -1 + patch
On Thu, 19 Apr 2018 18:08:40 +, Ari Pollak wrote:
> Sorry, I haven't had time to do anything about it yet and I won't be able
> to look at it for the next month or so.
As this is the last blocker for the perl 5.28 transition, I looked
into this bug now, and I converted Michael's recipe into a debdiff
(attached).
Michael: can you take a look if you spot anything?
Ari: Do you have time to upload and fix this bug in the near future?
If not I'm happy to help with an NMU.
Cheers,
gregor
--
.''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org
: :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06
`. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
`- NP: Willi Resetarits + Stubnblues: sag ma nix
diff -Nru pidgin-2.13.0/debian/changelog pidgin-2.13.0/debian/changelog
--- pidgin-2.13.0/debian/changelog 2018-03-11 20:54:57.0 +0100
+++ pidgin-2.13.0/debian/changelog 2018-07-21 01:54:18.0 +0200
@@ -1,3 +1,14 @@
+pidgin (2.13.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "Switch from network-manager-dev to libnm-dev":
+- update build dependency
+- add patch for configure.ac and a constant in libpurple/network.c
+Thanks to Michael Biebl for the recipe to fix this bug.
+(Closes: #862678)
+
+ -- gregor herrmann Sat, 21 Jul 2018 01:54:18 +0200
+
pidgin (2.13.0-1) unstable; urgency=medium
* New upstream version 2.13.0
diff -Nru pidgin-2.13.0/debian/control pidgin-2.13.0/debian/control
--- pidgin-2.13.0/debian/control 2018-03-11 20:54:57.0 +0100
+++ pidgin-2.13.0/debian/control 2018-07-21 01:39:49.0 +0200
@@ -12,7 +12,7 @@
libgadu-dev (>= 1:1.12.0-5),
xsltproc, doxygen, libfarstream-0.2-dev,
libgstreamer-plugins-base1.0-dev,
- network-manager-dev (>= 0.9.0) [linux-any],
+ libnm-dev [linux-any],
libsqlite3-dev (>= 3.3), libidn11-dev, ca-certificates,
dh-autoreconf
Standards-Version: 3.9.8
diff -Nru pidgin-2.13.0/debian/patches/libnm.patch pidgin-2.13.0/debian/patches/libnm.patch
--- pidgin-2.13.0/debian/patches/libnm.patch 1970-01-01 01:00:00.0 +0100
+++ pidgin-2.13.0/debian/patches/libnm.patch 2018-07-21 01:54:01.0 +0200
@@ -0,0 +1,29 @@
+Description: adjust to the change from network-manager-dev to libnm-dev
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/862678
+Forwarded: no
+Author: gregor herrmann
+Last-Update: 2018-07-21
+
+--- a/configure.ac
b/configure.ac
+@@ -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], [
+ AC_SUBST(NETWORKMANAGER_CFLAGS)
+ AC_SUBST(NETWORKMANAGER_LIBS)
+ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
+--- a/libpurple/network.c
b/libpurple/network.c
+@@ -939,7 +939,7 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ case NM_STATE_DISCONNECTING:
+ #endif
+- if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
++ if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
+ break;
+ if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ ui_ops->network_disconnected();
diff -Nru pidgin-2.13.0/debian/patches/series pidgin-2.13.0/debian/patches/series
--- pidgin-2.13.0/debian/patches/series 2017-03-10 03:02:18.0 +0100
+++ pidgin-2.13.0/debian/patches/series 2018-07-21 01:40:18.0 +0200
@@ -0,0 +1 @@
+libnm.patch
signature.asc
Description: Digital Signature
