'/pidgin/main: 2e94b6fa06a0: Merged in CMaiku/pidgin (pull reques...'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    /pidgin/main: 2e94b6fa06a0: Merged in CMaiku/pidgin (pull reques...
From:       Gary Kramlich <grim () reaperworld ! com>
Date:       2016-09-28 14:32:40
Message-ID: hg.2e94b6fa06a0.1475073160.-874508059 () rock ! pidgin ! im
[Download RAW message or body]

Changeset: 2e94b6fa06a0d949e0655b4db2b07e3eca29f496
Author:	 Gary Kramlich <grim@reaperworld.com>
Date:	 2016-09-28 09:32 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/2e94b6fa06a0

Description:

Merged in CMaiku/pidgin (pull request #136)

Windows build fixes

diffstat:

 configure.ac                             |   8 ++++----
 libpurple/protocols/bonjour/Makefile.am  |   3 ++-
 libpurple/protocols/facebook/Makefile.am |   2 +-
 libpurple/protocols/gg/Makefile.am       |   2 +-
 pidgin/libpidgin.c                       |  27 ++++++++++++++++++++++++++-
 5 files changed, 34 insertions(+), 8 deletions(-)

diffs (223 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -155,9 +155,9 @@ AM_CONDITIONAL(IS_WIN32, test "x$is_win3
 AC_SUBST([PLUGIN_LDFLAGS])
 
 dnl Define *_LIBS
-PURPLE_LIBS="\$(top_builddir)/libpurple/libpurple.la \$(GLIB_LIBS)"
-PIDGIN_LIBS="\$(top_builddir)/pidgin/libpidgin.la \$(GTK_LIBS)"
-FINCH_LIBS="\$(top_builddir)/finch/libfinch.la \$(top_builddir)/finch/libgnt/libgnt.la \$(GLIB_LIBS)"
+PURPLE_LIBS="\$(top_builddir)/libpurple/libpurple.la \$(GLIB_LIBS) \$(GPLUGIN_LIBS)"
+PIDGIN_LIBS="\$(top_builddir)/pidgin/libpidgin.la \$(GTK_LIBS) \$(PURPLE_LIBS) \$(WEBKIT_LIBS)"
+FINCH_LIBS="\$(top_builddir)/finch/libfinch.la \$(top_builddir)/finch/libgnt/libgnt.la \$(PURPLE_LIBS)"
 AC_SUBST(PURPLE_LIBS)
 AC_SUBST(PIDGIN_LIBS)
 AC_SUBST(FINCH_LIBS)
@@ -1198,7 +1198,7 @@ Then rerun this ./configure
 
 Falling back to using our own copy of libgadu.
 		])
-	])
+	], [$LIBGADU_LIBS])
 fi
 
 AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")
diff --git a/libpurple/protocols/bonjour/Makefile.am b/libpurple/protocols/bonjour/Makefile.am
--- a/libpurple/protocols/bonjour/Makefile.am
+++ b/libpurple/protocols/bonjour/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	mdns_avahi.c \
+	mdns_dns_sd.c \
 	dns_sd_proxy.c \
 	dns_sd_proxy.h \
 	Makefile.mingw
@@ -23,7 +24,7 @@ BONJOURSOURCES = \
 	bonjour_ft.h 
 
 if IS_WIN32
-BONJOURSOURCES += dns_sd_proxy.c
+BONJOURSOURCES += dns_sd_proxy.c mdns_dns_sd.c
 else
 BONJOURSOURCES += mdns_avahi.c
 endif
diff --git a/libpurple/protocols/facebook/Makefile.am b/libpurple/protocols/facebook/Makefile.am
--- a/libpurple/protocols/facebook/Makefile.am
+++ b/libpurple/protocols/facebook/Makefile.am
@@ -52,7 +52,7 @@ else
 st =
 pkg_LTLIBRARIES        = libfacebook.la
 libfacebook_la_SOURCES = $(FACEBOOKSOURCES)
-libfacebook_la_LIBADD  = @PURPLE_LIBS@
+libfacebook_la_LIBADD  = @PURPLE_LIBS@ $(JSON_LIBS)
 
 endif
 
diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -131,7 +131,7 @@ libgg_la_SOURCES = $(GGSOURCES)
 
 endif
 
-libgg_la_LIBADD  = @PURPLE_LIBS@ $(LIBGADU_LIBS) $(JSON_LIBS)
+libgg_la_LIBADD  = @PURPLE_LIBS@ $(LIBGADU_LIBS) $(INTGG_LIBS) $(JSON_LIBS)
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
diff --git a/pidgin/libpidgin.c b/pidgin/libpidgin.c
--- a/pidgin/libpidgin.c
+++ b/pidgin/libpidgin.c
@@ -70,10 +70,13 @@
 #include "pidginstock.h"
 #include "gtkwhiteboard.h"
 
+#ifndef _WIN32
 #include <signal.h>
+#endif
 
 #include <getopt.h>
 
+#ifndef _WIN32
 
 /*
  * Lists of signals we wish to catch and those we wish to ignore.
@@ -92,6 +95,7 @@ static const int ignore_sig_list[] = {
 	SIGPIPE,
 	-1
 };
+#endif /* !_WIN32 */
 
 static void
 dologin_named(const char *name)
@@ -121,6 +125,7 @@ dologin_named(const char *name)
 	}
 }
 
+#ifndef _WIN32
 static char *segfault_message;
 
 static int signal_sockets[2];
@@ -189,6 +194,7 @@ mainloop_sighandler(GIOChannel *source, 
 
 	return TRUE;
 }
+#endif /* !_WIN32 */
 
 static int
 ui_main(void)
@@ -427,21 +433,23 @@ int pidgin_start(int argc, char *argv[])
 	GtkCssProvider *provider;
 	GdkScreen *screen;
 	GList *accounts;
+#ifndef _WIN32
 	int sig_indx;	/* for setting up signal catching */
 	sigset_t sigset;
 	char errmsg[BUFSIZ];
 	GIOChannel *signal_channel;
 	GIOStatus signal_status;
 	guint signal_channel_watcher;
-	GError *error;
 #ifndef DEBUG
 	char *segfault_message_tmp;
 #endif /* DEBUG */
+#endif /* !_WIN32 */
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled, debug_colored;
 	GList *active_accounts;
 	GStatBuf st;
+	GError *error;
 
 	struct option long_options[] = {
 		{"config",       required_argument, NULL, 'c'},
@@ -474,6 +482,8 @@ int pidgin_start(int argc, char *argv[])
 	/* Locale initialization is not complete here.  See gtk_init_check() */
 	setlocale(LC_ALL, "");
 
+#ifndef _WIN32
+
 #ifndef DEBUG
 		/* We translate this here in case the crash breaks gettext. */
 		segfault_message_tmp = g_strdup_printf(_(
@@ -574,6 +584,7 @@ int pidgin_start(int argc, char *argv[])
 		snprintf(errmsg, sizeof(errmsg), "Warning: couldn't unblock signals");
 		perror(errmsg);
 	}
+#endif /* !_WIN32 */
 
 	/* scan command-line options */
 	opterr = 1;
@@ -626,7 +637,9 @@ int pidgin_start(int argc, char *argv[])
 		case '?':	/* show terse help */
 		default:
 			show_usage(argv[0], TRUE);
+#ifndef _WIN32
 			g_free(segfault_message);
+#endif
 			return 0;
 			break;
 		}
@@ -635,14 +648,18 @@ int pidgin_start(int argc, char *argv[])
 	/* show help message */
 	if (opt_help) {
 		show_usage(argv[0], FALSE);
+#ifndef _WIN32
 		g_free(segfault_message);
+#endif
 		return 0;
 	}
 	/* show version message */
 	if (opt_version) {
 		printf("%s %s (libpurple %s)\n", PIDGIN_NAME, DISPLAY_VERSION,
 		                                 purple_core_get_version());
+#ifndef _WIN32
 		g_free(segfault_message);
+#endif
 		return 0;
 	}
 
@@ -677,7 +694,9 @@ int pidgin_start(int argc, char *argv[])
 		printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION);
 
 		g_warning("cannot open display: %s", display ? display : "unset");
+#ifndef _WIN32
 		g_free(segfault_message);
+#endif
 
 		return 1;
 	}
@@ -711,7 +730,9 @@ int pidgin_start(int argc, char *argv[])
 		fprintf(stderr,
 				"Initialization of the libpurple core failed. Dumping core.\n"
 				"Please report this!\n");
+#ifndef _WIN32
 		g_free(segfault_message);
+#endif
 		abort();
 	}
 
@@ -737,7 +758,9 @@ int pidgin_start(int argc, char *argv[])
 		gdk_notify_startup_complete();
 		purple_core_quit();
 		g_printerr(_("Exiting because another libpurple client is already running.\n"));
+#ifndef _WIN32
 		g_free(segfault_message);
+#endif
 		return 0;
 	}
 
@@ -822,10 +845,12 @@ int pidgin_start(int argc, char *argv[])
 
 	gtk_main();
 
+#ifndef _WIN32
 	g_free(segfault_message);
 	g_source_remove(signal_channel_watcher);
 	close(signal_sockets[0]);
 	close(signal_sockets[1]);
+#endif
 
 #ifdef _WIN32
 	winpidgin_cleanup();

_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits
[prev in list] [next in list] [prev in thread] [next in thread] 
