Mercurial > pidgin3 / changeset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.doxygen	Mon Jun 03 01:20:33 2019 -0400
@@ -0,0 +1,15 @@
+FROM pidgin/release-builder:release-2.x.y AS build
+
+COPY . /pidgin
+
+RUN set -ex && \
+	cd /pidgin && \
+	./autogen.sh --enable-debug && \
+	make -s -j$(nproc) docs
+
+FROM rwgrim/goserve
+
+EXPOSE 3000
+
+COPY --from=build /pidgin/doc/html html
+

--- a/Doxyfile.in	Fri May 17 00:46:48 2019 -0400
+++ b/Doxyfile.in	Mon Jun 03 01:20:33 2019 -0400
@@ -807,13 +807,15 @@
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-HTML_HEADER            = @top_srcdir@/doc/TracHeader.html
+# HTML_HEADER            = @top_srcdir@/doc/TracHeader.html
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = @top_srcdir@/doc/TracFooter.html
+# HTML_FOOTER            = @top_srcdir@/doc/TracFooter.html
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to

--- a/bitbucket-pipelines.yml	Fri May 17 00:46:48 2019 -0400
+++ b/bitbucket-pipelines.yml	Mon Jun 03 01:20:33 2019 -0400
@@ -11,7 +11,7 @@
   branches:
     release-2.x.y:
       - step:
-          image: pidgin/release-builder:release-2.x.y
+          image: pidgin/builders-2:debian-buster-amd64
           script:
             - set -ex
             - hg clone https://bitbucket.org/pidgin/libgnt -b release-2.x.y

--- a/configure.ac	Fri May 17 00:46:48 2019 -0400
+++ b/configure.ac	Mon Jun 03 01:20:33 2019 -0400
@@ -1396,18 +1396,24 @@
 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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/convey.yml	Mon Jun 03 01:20:33 2019 -0400
@@ -0,0 +1,43 @@
+environment:
+  - REPO=pidgin/pidgin2-docs
+  - TAG=latest
+  - REGISTRY=docker.io
+  - REGISTRY_USERNAME
+  - REGISTRY_PASSWORD
+
+tasks:
+  import:
+    type: docker/import
+    files: .:.
+
+  build:
+    type: docker/build
+    dockerfile: Dockerfile.doxygen
+    tag: ${REGISTRY}/${REPO}:${TAG}
+    files: .:.
+
+  login:
+    type: docker/login
+    username: ${REGISTRY_USERNAME}
+    password: ${REGISTRY_PASSWORD}
+    server: ${REGISTRY}
+
+  logout:
+    type: docker/logout
+    server: ${REGISTRY}
+
+  push:
+    type: docker/push
+    images: ${REGISTRY}/${REPO}:${TAG}
+
+plans:
+  default:
+    stages:
+      - tasks: [import, build]
+
+  ci:
+    stages:
+      - tasks: [import, build, login, push]
+      - tasks: [logout]
+        run: always
+

--- a/libpurple/network.c	Fri May 17 00:46:48 2019 -0400
+++ b/libpurple/network.c	Mon Jun 03 01:20:33 2019 -0400
@@ -939,8 +939,13 @@
 #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;