/cpw/tomkiewicz/gg11: 637fc4614dcc: Merge with main
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Thu May 30 05:24:15 EDT 2013
Changeset: 637fc4614dcc2883e3c642eddf17a864275b11f0
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-05-30 11:23 +0200
Branch: default
URL: https://hg.pidgin.im/cpw/tomkiewicz/gg11/rev/637fc4614dcc
Description:
Merge with main
diffstat:
.hgignore | 2 +
COPYRIGHT | 1 +
ChangeLog | 7 +
ChangeLog.API | 1 +
Makefile.mingw | 75 +--
config.h.mingw | 19 +-
configure.ac | 26 +-
finch/finch.c | 8 +-
finch/gntblist.c | 2 +-
finch/gntnotify.c | 6 +-
finch/gntplugin.c | 2 +-
finch/gntprefs.c | 2 +-
finch/libgnt/gntfilesel.c | 10 +-
finch/libgnt/gntmain.c | 3 +
finch/libgnt/gntwm.c | 16 +-
libpurple/Makefile.am | 2 +
libpurple/Makefile.mingw | 28 +-
libpurple/blist.h | 5 +-
libpurple/cipher.c | 198 +++++----
libpurple/cipher.h | 145 ++++---
libpurple/ciphers/Makefile.am | 9 +-
libpurple/ciphers/ciphers.h | 38 ++
libpurple/ciphers/des.c | 219 +++++++----
libpurple/ciphers/gchecksum.c | 34 +-
libpurple/ciphers/hmac.c | 79 ++-
libpurple/ciphers/md4.c | 19 +-
libpurple/ciphers/rc4.c | 69 +--
libpurple/core.c | 4 +
libpurple/dbus-analyze-functions.py | 83 ++--
libpurple/dbus-analyze-signals.py | 14 +-
libpurple/dbus-analyze-types.py | 28 +-
libpurple/dnsquery.c | 6 +-
libpurple/dnssrv.c | 57 +--
libpurple/example/nullclient.c | 2 +-
libpurple/ft.c | 4 +-
libpurple/glibcompat.h | 15 +-
libpurple/http.c | 5 +-
libpurple/internal.h | 1 -
libpurple/log.c | 8 +-
libpurple/media.c | 2 +-
libpurple/media/backend-fs2.c | 89 +++-
libpurple/network.c | 98 +++-
libpurple/network.h | 14 -
libpurple/ntlm.c | 12 +-
libpurple/plugin.c | 2 +-
libpurple/plugin.h | 14 +-
libpurple/plugins/Makefile.mingw | 18 +-
libpurple/plugins/ciphertest.c | 6 +-
libpurple/plugins/dbus-buddyicons-example.py | 3 +-
libpurple/plugins/filectl.c | 6 +-
libpurple/plugins/idle.c | 4 +-
libpurple/plugins/log_reader.c | 6 +-
libpurple/plugins/perl/Makefile.am | 4 +-
libpurple/plugins/perl/Makefile.mingw | 10 +-
libpurple/plugins/perl/common/BuddyList.xs | 3 +-
libpurple/plugins/perl/common/Certificate.xs | 1 -
libpurple/plugins/perl/common/Cipher.xs | 126 +++---
libpurple/plugins/perl/common/Makefile.mingw | 12 +-
libpurple/plugins/perl/common/Network.xs | 4 -
libpurple/plugins/perl/common/Request.xs | 8 +-
libpurple/plugins/perl/common/Util.xs | 3 +-
libpurple/plugins/perl/perl-common.c | 3 +-
libpurple/plugins/perl/perl-common.h | 3 +
libpurple/plugins/perl/perl.c | 56 ++-
libpurple/plugins/ssl/Makefile.mingw | 39 +-
libpurple/plugins/ssl/ssl-gnutls.c | 42 +-
libpurple/plugins/ssl/ssl-nss.c | 4 +-
libpurple/plugins/startup.py | 13 +-
libpurple/plugins/tcl/Makefile.mingw | 6 +-
libpurple/plugins/tcl/tcl.c | 113 ++---
libpurple/plugins/tcl/tcl_cmds.c | 6 +-
libpurple/prefs.c | 1 -
libpurple/protocols/Makefile.mingw | 6 +-
libpurple/protocols/bonjour/bonjour.c | 8 +-
libpurple/protocols/bonjour/bonjour_ft.c | 4 +-
libpurple/protocols/bonjour/jabber.c | 3 +-
libpurple/protocols/gg/Makefile.mingw | 39 +-
libpurple/protocols/gg/account.c | 2 +-
libpurple/protocols/gg/avatar.c | 2 +-
libpurple/protocols/gg/image.c | 2 +-
libpurple/protocols/gg/lib/config.h | 2 +
libpurple/protocols/gg/libgadu-events.c | 4 +-
libpurple/protocols/gg/oauth/oauth-purple.c | 2 +-
libpurple/protocols/gg/oauth/oauth.c | 4 +-
libpurple/protocols/gg/pubdir-prpl.c | 2 +-
libpurple/protocols/gg/status.c | 2 +-
libpurple/protocols/irc/Makefile.am | 2 +-
libpurple/protocols/irc/msgs.c | 10 +-
libpurple/protocols/jabber/auth.c | 4 +-
libpurple/protocols/jabber/auth_digest_md5.c | 8 +-
libpurple/protocols/jabber/auth_scram.c | 14 +-
libpurple/protocols/jabber/caps.c | 4 +-
libpurple/protocols/jabber/jingle/jingle.c | 3 +-
libpurple/protocols/jabber/jutil.c | 2 +-
libpurple/protocols/jabber/si.c | 4 +-
libpurple/protocols/msn/directconn.c | 2 +-
libpurple/protocols/msn/msnutils.c | 7 +-
libpurple/protocols/msn/nexus.c | 43 +-
libpurple/protocols/msn/notification.c | 2 +-
libpurple/protocols/msn/object.c | 4 +-
libpurple/protocols/msn/slplink.c | 4 +-
libpurple/protocols/mxit/actions.c | 7 +-
libpurple/protocols/mxit/chunk.c | 5 +-
libpurple/protocols/mxit/cipher.c | 36 +-
libpurple/protocols/mxit/filexfer.c | 44 +-
libpurple/protocols/mxit/formcmds.c | 8 +-
libpurple/protocols/mxit/formcmds.h | 4 +-
libpurple/protocols/mxit/http.c | 9 +-
libpurple/protocols/mxit/login.c | 8 +-
libpurple/protocols/mxit/markup.c | 41 +-
libpurple/protocols/mxit/multimx.c | 3 +-
libpurple/protocols/mxit/mxit.c | 63 +++-
libpurple/protocols/mxit/profile.c | 3 +-
libpurple/protocols/mxit/profile.h | 4 +-
libpurple/protocols/mxit/protocol.c | 154 ++++---
libpurple/protocols/mxit/roster.c | 10 +-
libpurple/protocols/mxit/roster.h | 2 +-
libpurple/protocols/mxit/splashscreen.c | 6 +-
libpurple/protocols/mxit/voicevideo.c | 5 +-
libpurple/protocols/mxit/voicevideo.h | 5 -
libpurple/protocols/myspace/myspace.c | 15 +-
libpurple/protocols/myspace/user.c | 6 +-
libpurple/protocols/oscar/clientlogin.c | 4 +-
libpurple/protocols/oscar/family_auth.c | 7 +-
libpurple/protocols/oscar/family_bart.c | 12 +-
libpurple/protocols/oscar/family_chatnav.c | 7 +-
libpurple/protocols/oscar/family_icbm.c | 3 +-
libpurple/protocols/oscar/family_locate.c | 3 +-
libpurple/protocols/oscar/family_oservice.c | 7 +-
libpurple/protocols/oscar/oscar.c | 43 +-
libpurple/protocols/oscar/peer.c | 38 +-
libpurple/protocols/sametime/Makefile.mingw | 2 -
libpurple/protocols/sametime/sametime.c | 49 +--
libpurple/protocols/silc/Makefile.mingw | 3 -
libpurple/protocols/silc/buddy.c | 2 +-
libpurple/protocols/silc/ops.c | 5 +-
libpurple/protocols/silc/pk.c | 2 +-
libpurple/protocols/silc/silc.c | 4 +
libpurple/protocols/silc/util.c | 26 +-
libpurple/protocols/yahoo/libymsg.c | 14 +-
libpurple/protocols/yahoo/yahoo_filexfer.c | 26 +-
libpurple/protocols/yahoo/yahoo_picture.c | 5 +-
libpurple/protocols/yahoo/yahoochat.c | 13 +-
libpurple/protocols/zephyr/ZParseNot.c | 3 +
libpurple/protocols/zephyr/zephyr.c | 17 +-
libpurple/proxy.c | 15 +-
libpurple/prpl.h | 5 +-
libpurple/purple-client.c | 5 +-
libpurple/request.c | 104 ++--
libpurple/request.h | 54 ++-
libpurple/tag.sh | 58 +++
libpurple/tests/check_libpurple.c | 3 +
libpurple/util.c | 22 +-
libpurple/win32/global.mak | 39 +-
libpurple/win32/libc_interface.c | 4 +-
libpurple/win32/rules.mak | 11 +-
libpurple/win32/targets.mak | 19 +-
libpurple/win32/win32dep.c | 16 +-
libpurple/win32/wpurpleerror.h | 25 +-
libpurple/xmlnode.h | 24 +-
pidgin/Makefile.am | 16 +-
pidgin/Makefile.mingw | 30 +-
pidgin/gtk3compat.h | 7 +-
pidgin/gtkblist.c | 2 +-
pidgin/gtkconv-theme.c | 9 +-
pidgin/gtkconv.c | 31 +-
pidgin/gtkdebug.c | 407 ++++-----------------
pidgin/gtkdebug.html | 251 +++++++++++++
pidgin/gtkdialogs.c | 14 +-
pidgin/gtkimhtml.c | 2 +-
pidgin/gtkmain.c | 37 +-
pidgin/gtkmedia.c | 3 +
pidgin/gtkprefs.c | 57 ++-
pidgin/gtkrequest.c | 76 ++-
pidgin/gtkstatusbox.c | 8 +-
pidgin/gtkutils.c | 4 +-
pidgin/gtkwebview.c | 22 +-
pidgin/pidgin-3.pc.in | 2 +-
pidgin/pixmaps/Makefile.mingw | 4 +-
pidgin/plugins/Makefile.mingw | 38 +-
pidgin/plugins/disco/Makefile.mingw | 1 +
pidgin/plugins/mailchk.c | 8 +-
pidgin/plugins/perl/Makefile.am | 4 +-
pidgin/plugins/perl/Makefile.mingw | 6 +-
pidgin/plugins/perl/common/Makefile.mingw | 8 +-
pidgin/plugins/spellchk.c | 1 -
pidgin/plugins/ticker/Makefile.mingw | 1 +
pidgin/plugins/timestamp.c | 240 -------------
pidgin/plugins/timestamp_format.c | 313 -----------------
pidgin/plugins/win32/transparency/Makefile.mingw | 1 +
pidgin/plugins/win32/transparency/win2ktrans.c | 5 +-
pidgin/plugins/win32/winprefs/Makefile.mingw | 1 +
pidgin/plugins/win32/winprefs/winprefs.c | 3 -
pidgin/win32/MinimizeToTray.c | 2 +-
pidgin/win32/gtkwin32dep.c | 6 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 190 ++++++++--
pidgin/win32/nsis/pidgin-installer.nsi | 1 +
pidgin/win32/nsis/rpm2zip.sh | 65 ---
pidgin/win32/prepare-workspace.sh | 422 +++++++++++++++++++++++
pidgin/win32/winpidgin.c | 7 +-
pidgin/win32/wspell.c | 15 +-
po/Makefile.mingw | 3 +-
share/ca-certs/DigiCertHighAssuranceEVRootCA.pem | 23 +
share/ca-certs/Makefile.am | 1 +
204 files changed, 3159 insertions(+), 2503 deletions(-)
diffs (truncated from 11895 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -88,6 +88,7 @@ pidgin-.*.tar.gz
pidgin.apspec$
pidgin.desktop$
pidgin.spec$
+pidgin/.*\.html\.h$
pidgin/pidgin$
pidgin/pixmaps/emotes/default/24/theme
pidgin/pixmaps/emotes/none/theme
@@ -97,6 +98,7 @@ pidgin/plugins/perl/common/Makefile.PL$
pidgin/plugins/perl/common/Makefile.old
pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
pidgin/win32/nsis/gtk_runtime_stage$
+pidgin/win32/nsis/cacert.pem
pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/nsis_translations.desktop
pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -216,6 +216,7 @@ Christian Grothoff
Vladislav Guberinić
Gideon N. Guillen
Aman Gupta
+Ashish Gupta
Christian Hammond
Erick Hamness
Fred Hampton
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,13 @@ version 3.0.0 (??/??/????):
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
+ General:
+ * Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
+
+ Windows-Specific Changes:
+ * Updates to dependencies:
+ * NSS 3.14.3 and NSPR 4.9.5
+
version 2.10.7 (02/13/2013):
Alien hatchery:
* No changes
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -196,6 +196,7 @@ version 3.0.0 (??/??/????):
* purple_network_listen_map_external
* purple_network_listen_range_family. Use purple_network_listen,
instead.
+ * purple_network_ip_atoi
* purple_notify_searchresults_column_get_title
* purple_notify_searchresults_get_columns_count
* purple_notify_searchresults_get_rows_count
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,7 +31,7 @@ awk 'BEGIN {FS="."} { \
exit; \
}' VERSION)
-GTK_INSTALL_VERSION = 2.16.6.1
+GTK_INSTALL_VERSION = 2.24.14.0
authenticode_sign = $(MONO_SIGNCODE) \
-spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
@@ -50,37 +50,14 @@ PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pi
# Any *.dll or *.exe files included in win32-install-dir that we don't compile
# should be included in this list so they don't get stripped
EXTERNAL_DLLS = \
- comerr32.dll \
exchndl.dll \
- freebl3.dll \
- gssapi32.dll \
- k5sprt32.dll \
- krb5_32.dll \
- libenchant.dll \
- libenchant_ispell.dll \
- libenchant_myspell.dll \
- libgtkspell-0.dll \
- libmeanwhile-1.dll \
- libnspr4.dll \
- libplc4.dll \
- libplds4.dll \
libsasl.dll \
- libssp-0.dll \
- libxml2-2.dll \
- nss3.dll \
- nssutil3.dll \
saslANONYMOUS.dll \
saslCRAMMD5.dll \
saslDIGESTMD5.dll \
saslGSSAPI.dll \
saslLOGIN.dll \
- saslPLAIN.dll \
- libsilc-1-1-2.dll \
- libsilcclient-1-1-3.dll \
- smime3.dll \
- softokn3.dll \
- sqlite3.dll \
- ssl3.dll
+ saslPLAIN.dll
#build an expression for `find` to use to ignore the above files
EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
@@ -90,29 +67,25 @@ include $(PIDGIN_COMMON_RULES)
.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) gtk_runtime_zip
all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
ifndef DISABLE_NLS
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)
endif
install: all $(PIDGIN_INSTALL_DIR)
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
ifndef DISABLE_NLS
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install
endif
- $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
- $(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
- mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
- cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
- cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
- cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
+ $(MAKE_at) $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
+ $(MAKE_at) $(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
cp $(PIDGIN_INST_DEP_DIR)/exchndl.dll $(PIDGIN_INSTALL_DIR)
- cp $(GCC_SSP_TOP)/libssp-0.dll $(PIDGIN_INSTALL_DIR)
+ chmod -R 777 $(PIDGIN_INSTALL_DIR)
gtk_runtime_zip:
- pidgin/win32/nsis/generate_gtk_zip.sh "`pwd`" "$(GPG_SIGN)"
+ cd pidgin/win32/nsis/ ; ./generate_gtk_zip.sh "$(GPG_SIGN)"
generate_installer_includes: create_release_install_dir gtk_runtime_zip debug_symbols_zip $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop
rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
@@ -148,7 +121,9 @@ create_release_install_dir: install
find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \
-exec $(STRIP) --strip-unneeded {} ';'
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, $(STRIPPED_RELEASE_DIR)/pidgin.exe, "Pidgin $(PIDGIN_VERSION)")
+endif
installer: generate_installer_includes
$(eval $@_DEBUG_SYMBOLS_SHA1SUM := $(shell sha1sum $(DEBUG_SYMBOLS_DIR).zip | sed -e "s/\ .*$$//"))
@@ -157,23 +132,33 @@ installer: generate_installer_includes
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
-DDEBUG_SYMBOLS_SHA1SUM="$($@_DEBUG_SYMBOLS_SHA1SUM)" -DGTK_SHA1SUM="$($@_GTK_SHA1SUM)"\
pidgin/win32/nsis/pidgin-installer.nsi
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe, "Pidgin Installer")
+endif
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION).exe)
+endif
installer_offline: generate_installer_includes
$(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
-DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
-DOFFLINE_INSTALLER \
pidgin/win32/nsis/pidgin-installer.nsi
+ifdef SIGN_EXECUTABLES
$(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe, "Pidgin Installer")
+endif
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION)-offline.exe)
+endif
installer_zip: create_release_install_dir
rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, pidgin-$(PIDGIN_VERSION)-win32-bin.zip)
+endif
debug_symbols_zip: install
rm -rf $(DEBUG_SYMBOLS_DIR) $(DEBUG_SYMBOLS_DIR).zip
@@ -181,9 +166,11 @@ debug_symbols_zip: install
tar -cf - `find $(PIDGIN_INSTALL_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -print` \
| tar --strip 2 --xform s/$$/.dbgsym/ -xC $(DEBUG_SYMBOLS_DIR) -f -
- cp $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll.unstripped $(DEBUG_SYMBOLS_DIR)/libmeanwhile-1.dll.dbgsym
+ cp $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll.debug $(DEBUG_SYMBOLS_DIR)/libmeanwhile-1.dll.dbgsym
zip -9 -r $(DEBUG_SYMBOLS_DIR).zip $(DEBUG_SYMBOLS_DIR)
+ifdef SIGN_EXECUTABLES
$(call gpg_sign, $(DEBUG_SYMBOLS_DIR).zip)
+endif
installers: installer installer_offline debug_symbols_zip installer_zip
@@ -195,10 +182,10 @@ docs: Doxyfile.mingw
@doxygen Doxyfile.mingw
clean:
- $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
- $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
+ $(MAKE_at) $(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
rm -f $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(DEBUG_SYMBOLS_DIR).zip
rm -rf doc/html Doxyfile.mingw
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -29,6 +29,7 @@
/* #undef HAVE_CONNECT */
/* Define to 1 if Cyrus SASL is present */
+/* It's defined in global.mak. */
/* #undef HAVE_CYRUS_SASL */
/* Define if you have the external 'daylight' variable. */
@@ -62,9 +63,8 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
-/* Define to 1 if you have the getaddrinfo function. */
-/* TODO: Use this on new enough versions of Windows */
-/* #define HAVE_GETADDRINFO 1 */
+/* Define to 1 if you have the getaddrinfo function (since WinXP). */
+#define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `gethostid' function. */
/* #define HAVE_GETHOSTID 1 */
@@ -76,10 +76,10 @@
/* #define HAVE_GETTEXT 1 */
/* Define if you have GNUTLS */
-/* #define HAVE_GNUTLS 1 */
+#define HAVE_GNUTLS 1
/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
-/* #define HAVE_GNUTLS_GNUTLS_H 1 */
+#define HAVE_GNUTLS_GNUTLS_H 1
/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
#define HAVE_INTTYPES_H 1
@@ -148,13 +148,13 @@
/* #undef HAVE_MONO_METADATA_OBJECT_H */
/* Define to 1 if you have the <nspr.h> header file. */
-/* #undef HAVE_NSPR_H */
+#define HAVE_NSPR_H 1
/* Define if you have Mozilla NSS */
#define HAVE_NSS 1
/* Define to 1 if you have the <nss.h> header file. */
-/* #undef HAVE_NSS_H */
+#define HAVE_NSS_H 1
/* Define if we have Pango 1.4 or newer. */
#define HAVE_PANGO14 1
@@ -409,4 +409,7 @@
#define HAVE_FILENO 1
-
+#ifndef _WIN32_WINNT
+/* _WIN32_WINNT_WINXP = 0x0501 */
+#define _WIN32_WINNT 0x0501
+#endif
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ GNT_LT_VERSION_INFO="gnt_lt_current:gnt_
AC_SUBST(GNT_LT_VERSION_INFO)
AC_PATH_PROG(sedpath, sed)
+AC_PATH_PROG(xxdpath, xxd)
dnl Storing configure arguments
AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])
@@ -471,7 +472,8 @@ running configure.
WEBKIT_VERSION=1.1.1
if test "x$with_gtk" = "x3"; then
- PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_VERSION], , [
+ WEBKIT_PC_MODULE="webkitgtk-3.0"
+ PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
More information about the Commits
mailing list