/pidgin/main: c30787ce6256: Use external libgadu for win32 build...

Tomasz Wasilczyk twasilczyk at pidgin.im
Sat Jan 4 18:41:43 EST 2014 

Changeset: c30787ce6256fcb74863d5739e30e1fb32b4b70c
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-01-05 00:41 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/c30787ce6256

Description:

Use external libgadu for win32 build and update some dependencies. Refs #343

diffstat:

 libpurple/internal.h                  |   1 +
 libpurple/protocols/gg/Makefile.mingw |  22 ++++------------------
 libpurple/protocols/gg/gg.c           |   3 ++-
 libpurple/protocols/gg/gg.h           |   6 ++++++
 libpurple/protocols/gg/multilogon.c   |   2 +-
 libpurple/win32/global.mak            |   3 ++-
 pidgin/win32/nsis/generate_gtk_zip.sh |  29 +++++++++++++++++++++++++----
 pidgin/win32/prepare-workspace.sh     |   8 ++++++--
 8 files changed, 47 insertions(+), 27 deletions(-)

diffs (248 lines):

diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -48,6 +48,7 @@
 #ifdef ENABLE_NLS
 #  include <locale.h>
 #  include <libintl.h>
+#  undef printf
 #  define _(String) ((const char *)dgettext(PACKAGE, String))
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
diff --git a/libpurple/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
--- a/libpurple/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
@@ -28,16 +28,17 @@ INCLUDE_PATHS +=\
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
-			-I./lib \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GNUTLS_TOP)/include \
-			-I$(JSON_GLIB_TOP)/include/json-glib-1.0
+			-I$(JSON_GLIB_TOP)/include/json-glib-1.0 \
+			-I$(LIBGADU_TOP)/include
 
 LIB_PATHS += \
 			-L$(GTK_TOP)/lib \
 			-L$(GNUTLS_TOP)/lib \
+			-L$(LIBGADU_TOP)/lib \
 			-L$(JSON_GLIB_TOP)/lib \
 			-L$(PURPLE_TOP)
 
@@ -54,22 +55,6 @@ C_SRC =	\
 	gg.c \
 	html.c \
 	image.c \
-	lib/common.c \
-	lib/dcc.c \
-	lib/dcc7.c \
-	lib/debug.c \
-	lib/deflate.c \
-	lib/encoding.c \
-	lib/events.c \
-	lib/handlers.c \
-	lib/http.c \
-	lib/libgadu.c \
-	lib/message.c \
-	lib/obsolete.c \
-	lib/pubdir.c \
-	lib/pubdir50.c \
-	lib/resolver.c \
-	lib/sha1.c \
 	libgadu-events.c \
 	libgaduw.c \
 	message-prpl.c \
@@ -94,6 +79,7 @@ OBJECTS = $(C_SRC:%.c=%.o)
 ## LIBRARIES
 ##
 LIBS =	\
+			-lgadu \
 			-lglib-2.0 \
 			-lgobject-2.0 \
 			-lgnutls \
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -395,7 +395,8 @@ static void ggp_callback_recv(gpointer _
 			info->imtoken = g_strdup(ev->event.imtoken.imtoken);
 			break;
 		case GG_EVENT_PONG110:
-			purple_debug_info("gg", "gg11: got PONG110 %lu\n", ev->event.pong110.time);
+			purple_debug_info("gg", "gg11: got PONG110 %lu\n",
+				(long unsigned)ev->event.pong110.time);
 			break;
 		case GG_EVENT_CHAT_INFO:
 		case GG_EVENT_CHAT_INFO_GOT_ALL:
diff --git a/libpurple/protocols/gg/gg.h b/libpurple/protocols/gg/gg.h
--- a/libpurple/protocols/gg/gg.h
+++ b/libpurple/protocols/gg/gg.h
@@ -25,9 +25,15 @@
 #define _PURPLE_GG_H
 
 #define GGP_UIN_LEN_MAX 10
+
+#ifdef _WIN32
+#define GGP_ENABLE_GG11 1
+#else
 #define GGP_ENABLE_GG11 0
+#endif
 
 #include <libgadu.h>
+
 #include "internal.h"
 #include "search.h"
 #include "connection.h"
diff --git a/libpurple/protocols/gg/multilogon.c b/libpurple/protocols/gg/multilogon.c
--- a/libpurple/protocols/gg/multilogon.c
+++ b/libpurple/protocols/gg/multilogon.c
@@ -79,7 +79,7 @@ void ggp_multilogon_info(PurpleConnectio
 		purple_debug_misc("gg", "ggp_multilogon_info: "
 			"session [%s] logged in at %lu\n",
 			info->sessions[i].name,
-			info->sessions[i].logon_time);
+			(unsigned long)info->sessions[i].logon_time);
 	}
 
 	mldata->session_count = info->count;
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -12,7 +12,7 @@
 WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0
 ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant-1.6
-GNUTLS_TOP ?= $(WIN32_DEV_TOP)/gnutls-2.12
+GNUTLS_TOP ?= $(WIN32_DEV_TOP)/gnutls-3.1
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk2-2.24
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/bonjour-sdk
@@ -30,6 +30,7 @@ WEBKITGTK_TOP ?= $(WIN32_DEV_TOP)/libweb
 LIBSOUP_TOP ?= $(WIN32_DEV_TOP)/libsoup-2.42
 GETTEXT_TOP ?= $(WIN32_DEV_TOP)/gettext-0.18
 INTLTOOL_TOP ?= $(WIN32_DEV_TOP)/intltool-0.50
+LIBGADU_TOP ?= $(WIN32_DEV_TOP)/libgadu-1.12
 
 # Where we installing this stuff to?
 PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh
--- a/pidgin/win32/nsis/generate_gtk_zip.sh
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -24,7 +24,7 @@ PIDGIN_VERSION=$( < $PIDGIN_BASE/VERSION
 
 #This needs to be changed every time there is any sort of change.
 BUNDLE_VERSION=2.24.14.0
-BUNDLE_SHA1SUM="df28047f00934e6a00a5962387a1005114ec772e"
+BUNDLE_SHA1SUM="cbc0c5fe9849dc7af845af039b940a913a20a199"
 ZIP_FILE="$PIDGIN_BASE/pidgin/win32/nsis/gtk-runtime-$BUNDLE_VERSION.zip"
 #BUNDLE_URL="https://pidgin.im/win32/download_redir.php?version=$PIDGIN_VERSION&gtk_version=$BUNDLE_VERSION&dl_pkg=gtk"
 BUNDLE_URL="https://pidgin.im/~twasilczyk/win32/gtk-runtime-$BUNDLE_VERSION.zip"
@@ -113,10 +113,10 @@ ALL+="ARC_GDK_PIXBUF "
 ARC_GEOCLUE="${DOWNLOAD_HOST}mingw32-libgeoclue-0.12.99-1.10.noarch.rpm Geoclue 0.12.99-1.10 sha1sum:84410ca9a6d2fac46217c51e22ebbc5ac3cae040"
 ALL+="ARC_GEOCLUE "
 
-ARC_GLIB="${DOWNLOAD_HOST}mingw32-glib2-2.36.1-1.1.noarch.rpm Glib 2.36.1-1.1 sha1sum:ed468f064f61c5a12b716c83cba8ccbe05d22992"
+ARC_GLIB="${DOWNLOAD_HOST}mingw32-glib2-2.38.0-1.4.noarch.rpm Glib 2.38.0-1.4 sha1sum:e71d8c2f105548e752df4a0b6ba5958ab4826707"
 ALL+="ARC_GLIB "
 
-ARC_GNUTLS="${DOWNLOAD_HOST}mingw32-libgnutls-2.12.22-2.2.noarch.rpm GnuTLS 2.12.22-2.2 sha1sum:ee65a8971582f55aa469dbce82eb180fb1b35705"
+ARC_GNUTLS="${DOWNLOAD_HOST}mingw32-libgnutls-3.1.16-2.2.noarch.rpm GnuTLS 3.1.16-2.2 sha1sum:19e9b6cfa8511681b4fa569dfdafb930336d437c"
 ALL+="ARC_GNUTLS "
 
 ARC_GNUTLS_GCRYPT="${DOWNLOAD_HOST}mingw32-libgcrypt-1.5.2-1.1.noarch.rpm libgcrypt 1.5.2-1.1 sha1sum:861335a6edaa8419bc8f2d4ba6104c8da197e8e2"
@@ -131,18 +131,27 @@ ALL+="ARC_GTK2 "
 ARC_GTKSPELL="${DOWNLOAD_HOST}mingw32-gtkspell-2.0.16-2.10.noarch.rpm GtkSpell 2.0.16-2.10 sha1sum:623afdc7cc2c43c1f5d39be797c3ec8ee1ab5570"
 ALL+="ARC_GTKSPELL "
 
-ARC_LIBFFI="${DOWNLOAD_HOST}mingw32-libffi-3.0.10-2.7.noarch.rpm libffi 3.0.10-2.7 sha1sum:628b014349dc132d3aa46362b30fc1cdd61f6b97"
+ARC_LIBFFI="${DOWNLOAD_HOST}mingw32-libffi-3.0.13-2.2.noarch.rpm libffi 3.0.13-2.2 sha1sum:0751dddb44eba3f553534c0a2a8ed438ed84a793"
 ALL+="ARC_LIBFFI "
 
+ARC_LIBGADU="${DOWNLOAD_HOST}mingw32-libgadu-1.12.0rc1-1.5.noarch.rpm libgadu 1.12.0rc1-1.5 sha1sum:8a77a356fc66ef9256a99e0040c92581a54a1656"
+ALL+="ARC_LIBGADU "
+
 ARC_LIBGCC="${DOWNLOAD_HOST}mingw32-libgcc-4.8.0-6.1.noarch.rpm libgcc 4.8.0-6.1 sha1sum:ab599bf07bf2d56367c57b442440598358c943af"
 ALL+="ARC_LIBGCC "
 
+ARC_LIBGMP="${DOWNLOAD_HOST}mingw32-libgmp-5.0.5-2.2.noarch.rpm libgmp 5.0.5-2.2 sha1sum:30c8c403d4d2dead7674e567d83c8c069b603e49"
+ALL+="ARC_LIBGMP "
+
 ARC_LIBGNURX="${DOWNLOAD_HOST}mingw32-libgnurx-2.5-4.6.noarch.rpm libgnurx 2.5-4.6 sha1sum:51571e6b1e5e9fb865c110cae04c582ff3c44cb7"
 ALL+="ARC_LIBGNURX "
 
 ARC_LIBHB="${DOWNLOAD_HOST}mingw32-libharfbuzz0-0.9.16-3.1.noarch.rpm libharfbuzz 0.9.16-3.1 sha1sum:5c377190429f45e566b07439c99937798c4c13f0"
 ALL+="ARC_LIBHB "
 
+ARC_LIBHOGWEED="${DOWNLOAD_HOST}mingw32-libhogweed-2.7-2.2.noarch.rpm libhogweed 2.7-2.2 sha1sum:c22ea84a8a5037be6021f9494b8252861dee63b5"
+ALL+="ARC_LIBHOGWEED "
+
 ARC_LIBJASPER="${DOWNLOAD_HOST}mingw32-libjasper-1.900.1-6.6.noarch.rpm JasPer 1.900.1-6.6 sha1sum:1a0f0072e0b0f73bd8d4e26aed93baa10d77e504"
 ALL+="ARC_LIBJASPER "
 
@@ -161,6 +170,12 @@ ALL+="ARC_LIBJSON "
 ARC_LIBLZMA="${DOWNLOAD_HOST}mingw32-liblzma-5.0.4-1.6.noarch.rpm liblzma 5.0.4-1.6 sha1sum:67bad5204ae09d163f799adec3286fff297e3bc8"
 ALL+="ARC_LIBLZMA "
 
+ARC_LIBNETTLE="${DOWNLOAD_HOST}mingw32-libnettle-2.7-2.2.noarch.rpm libnettle 2.7-2.2 sha1sum:45337e6ccb46c0752d2761b6c48a20e97dd09195"
+ALL+="ARC_LIBNETTLE "
+
+ARC_LIBP11="${DOWNLOAD_HOST}mingw32-libp11-kit0-0.20.1-4.3.noarch.rpm libp11 0.20.1-4.3 sha1sum:ee5b7a3e16b29f26ee1c275d8228ba0bb6a27190"
+ALL+="ARC_LIBP11 "
+
 ARC_LIBPNG="${DOWNLOAD_HOST}mingw32-libpng-1.5.11-1.6.noarch.rpm libpng 1.5.11-1.6 sha1sum:bb28549351c1f0d7a8afd129ac656be18a616149"
 ALL+="ARC_LIBPNG "
 
@@ -179,6 +194,9 @@ ALL+="ARC_LIBSSP "
 ARC_LIBSTDCPP="${DOWNLOAD_HOST}mingw32-libstdc++-4.8.0-6.1.noarch.rpm libstdc++ 4.8.0-6.1 sha1sum:627860950e951764fe1aa229d3a63bb01618ba90"
 ALL+="ARC_LIBSTDCPP "
 
+ARC_LIBTASN="${DOWNLOAD_HOST}mingw32-libtasn1-3.3-3.2.noarch.rpm libtasn 3.3-3.2 sha1sum:3d5bb0df8eb7ed5e3f05b5378d3d61dbbbdbbd3f"
+ALL+="ARC_LIBTASN "
+
 ARC_LIBTIFF="${DOWNLOAD_HOST}mingw32-libtiff-4.0.2-1.6.noarch.rpm libtiff 4.0.2-1.6 sha1sum:3a082540386748ead608d388ce55a0c1dd28715d"
 ALL+="ARC_LIBTIFF "
 
@@ -203,6 +221,9 @@ ALL+="ARC_PANGO "
 ARC_PIXMAN="${DOWNLOAD_HOST}mingw32-pixman-0.26.0-1.6.noarch.rpm pixman 0.26.0-1.6 sha1sum:b0a440a3761e77d890a2e7de52405e2ce364c9b2"
 ALL+="ARC_PIXMAN "
 
+ARC_PROTOBUFC="${DOWNLOAD_HOST}mingw32-protobuf-c-0.15-3.6.noarch.rpm protobuf-c 0.15-3.6 sha1sum:48adac0de5df56805a150f6c8bb5c00e75ffc3e1"
+ALL+="ARC_PROTOBUFC "
+
 ARC_PTHREADS="${DOWNLOAD_HOST}mingw32-pthreads-2.8.0-14.6.noarch.rpm pthreads 2.8.0-14.6 sha1sum:e948ae221f82bbcb4fbfd991638e4170c150fe9f"
 ALL+="ARC_PTHREADS "
 
diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -38,7 +38,7 @@ ARCHIVES+="ARC_NSS "
 ARC_NSP="${DOWNLOAD_HOST}mingw32-mozilla-nspr-devel-4.9.6-4.1.noarch.rpm;NSPR;4.9.6-4.1;b15aefbf99ade3042d0e4ed32f9368ff38064ecd;${OBS_SKIP};nss-3.14"
 ARCHIVES+="ARC_NSP "
 
-ARC_GTLS="${DOWNLOAD_HOST}mingw32-libgnutls-devel-2.12.22-2.2.noarch.rpm;GnuTLS;2.12.22-2.2;22ae0425842b2c905bdbb93e8e5f3f813db4680f;${OBS_SKIP};gnutls-2.12"
+ARC_GTLS="${DOWNLOAD_HOST}mingw32-libgnutls-devel-3.1.16-2.2.noarch.rpm;GnuTLS;3.1.16-2.2;50406ff150ff81d1282a2f2a551699aa8a53e175;${OBS_SKIP};gnutls-3.1"
 ARCHIVES+="ARC_GTLS "
 
 ARC_PID="${DOWNLOAD_HOST}pidgin-inst-deps-20130214.tar.gz;inst-deps;20130214;372218ab472c4070cd45489dae175dea5638cf17;;"
@@ -68,7 +68,7 @@ ARCHIVES+="ARC_MGA "
 
 #gtk and friends
 GTK_DIR="gtk2-2.24"
-ARC_GT1="${DOWNLOAD_HOST}mingw32-glib2-devel-2.36.1-1.1.noarch.rpm;gtk: Glib;2.36.1-1.1;af64b014c735cbdb750e35960c0fde9de4fef9f0;${OBS_SKIP};${GTK_DIR}"
+ARC_GT1="${DOWNLOAD_HOST}mingw32-glib2-devel-2.38.0-1.4.noarch.rpm;gtk: Glib;2.38.0-1.4;9299f85c4eb7fc84bc29d47edd9444cc2fdf3c7a;${OBS_SKIP};${GTK_DIR}"
 ARCHIVES+="ARC_GT1 "
 ARC_GT2="${DOWNLOAD_HOST}mingw32-gtk2-devel-2.24.14-2.7.noarch.rpm;gtk: GTK+2;2.24.14-2.7;4abd5fddf7ca2b6ee7ab35f4b549894bc146a005;${OBS_SKIP};${GTK_DIR}"
 ARCHIVES+="ARC_GT2 "
@@ -140,6 +140,10 @@ ARCHIVES+="ARC_VV2 "
 ARC_VV3="${DOWNLOAD_HOST}mingw32-farstream-devel-0.1.2-19.1.noarch.rpm;farstream;0.1.2-19.1;6c9f29de289b661d192c88998ed5bdf17de7bcec;${OBS_SKIP};gstreamer-0.10"
 ARCHIVES+="ARC_VV3 "
 
+ARC_GG="${DOWNLOAD_HOST}mingw32-libgadu-devel-1.12.0rc1-1.5.noarch.rpm;libgadu;1.12.0rc1-1.5;b88941625625628634081cf8aa03dcdc1be63d03;${OBS_SKIP};libgadu-1.12"
+ARCHIVES+="ARC_GG "
+
+
 # implementation
 
 if [ `uname -o` != "Cygwin" ]; then

More information about the Commits mailing list