/pidgin/main: 5744cfb1c3d1: Fix 3.0.0 compilation for win32, swi...
Tomasz Wasilczyk
tomkiewicz at cpw.pidgin.im
Wed Apr 3 19:21:39 EDT 2013
Changeset: 5744cfb1c3d1963234c1650bf69fa1d3c30e707a
Author: Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date: 2013-04-04 01:21 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/5744cfb1c3d1
Description:
Fix 3.0.0 compilation for win32, switch gtk (and others) runtimes from gnome.org to opensuse build service
diffstat:
Makefile.mingw | 2 +-
libpurple/Makefile.mingw | 9 +-
libpurple/http.c | 1 +
libpurple/plugins/tcl/tcl_cmds.c | 3 +-
libpurple/protocols/gg/Makefile.mingw | 27 +++-
libpurple/protocols/gg/status.c | 2 +-
libpurple/win32/global.mak | 7 +-
pidgin/Makefile.mingw | 9 +-
pidgin/plugins/Makefile.mingw | 7 +-
pidgin/plugins/disco/Makefile.mingw | 1 +
pidgin/plugins/perl/common/Makefile.mingw | 3 +
pidgin/plugins/ticker/Makefile.mingw | 1 +
pidgin/plugins/win32/transparency/Makefile.mingw | 1 +
pidgin/plugins/win32/winprefs/Makefile.mingw | 1 +
pidgin/win32/nsis/generate_gtk_zip.sh | 146 ++++++++++++++++------
pidgin/win32/nsis/rpm2zip.sh | 65 ----------
16 files changed, 164 insertions(+), 121 deletions(-)
diffs (truncated from 586 to 300 lines):
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)" \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -33,9 +33,11 @@ INCLUDE_PATHS += \
-I$(GTK_TOP)/include \
-I$(GTK_TOP)/include/glib-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
+ -I$(JSON_GLIB_TOP)/include/json-glib-1.0 \
-I$(LIBXML2_TOP)/include/libxml2
LIB_PATHS += -L$(GTK_TOP)/lib \
+ -L$(JSON_GLIB_TOP)/lib \
-L$(LIBXML2_TOP)/lib
##
@@ -63,15 +65,19 @@ C_SRC = \
dnssrv.c \
eventloop.c \
ft.c \
+ http.c \
idle.c \
imgstore.c \
log.c \
+ media/candidate.c \
+ media/enum-types.c \
mediamanager.c \
media.c \
mime.c \
nat-pmp.c \
network.c \
notify.c \
+ obsolete.c \
ntlm.c \
plugin.c \
pluginpref.c \
@@ -120,7 +126,8 @@ LIBS = \
-lgmodule-2.0 \
-lintl \
-lws2_32 \
- -lxml2
+ -lxml2 \
+ -ljson-glib-1.0
include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -27,6 +27,7 @@
#include "http.h"
#include "internal.h"
+#include "glibcompat.h"
#include "debug.h"
#include "ntlm.h"
diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
--- a/libpurple/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
@@ -1532,7 +1532,8 @@ int tcl_cmd_status(ClientData unused, Tc
switch (cmd) {
case CMD_STATUS_ATTR:
-#if !(defined PURPLE_DISABLE_DEPRECATED)
+# if (0)
+/* #if !(defined PURPLE_DISABLE_DEPRECATED) */
if (objc != 4 && objc != 5) {
Tcl_WrongNumArgs(interp, 2, objv, "status attr_id ?value?");
return TCL_ERROR;
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
@@ -56,12 +56,28 @@ C_SRC = \
lib/pubdir50.c \
lib/resolver.c \
lib/sha1.c \
+ utils.c \
+ confer.c \
buddylist.c \
- confer.c \
gg.c \
- search.c \
- utils.c \
- resolver-purple.c
+ resolver-purple.c \
+ image.c \
+ account.c \
+ deprecated.c \
+ purplew.c \
+ libgaduw.c \
+ avatar.c \
+ libgadu-events.c \
+ roster.c \
+ validator.c \
+ xml.c \
+ multilogon.c \
+ status.c \
+ servconn.c \
+ pubdir-prpl.c \
+ oauth/oauth.c \
+ oauth/oauth-parameter.c \
+ oauth/oauth-purple.c
OBJECTS = $(C_SRC:%.c=%.o)
@@ -72,7 +88,8 @@ LIBS = \
-lglib-2.0 \
-lintl \
-lpurple \
- -lws2_32
+ -lws2_32 \
+ -lz
include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/protocols/gg/status.c b/libpurple/protocols/gg/status.c
--- a/libpurple/protocols/gg/status.c
+++ b/libpurple/protocols/gg/status.c
@@ -292,7 +292,7 @@ void ggp_status_set_disconnected(PurpleA
sleep_time *= 2;
}
*/
- usleep(100000);
+ g_usleep(100000);
g_free(msg);
}
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -12,10 +12,11 @@
WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.16
ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant_1.6.0_win32
-GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
+GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.24
GTK_BIN ?= $(GTK_TOP)/bin
BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
-LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
+JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-glib-0.14
+LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.8.0
MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.14.3-nspr-4.9.5
PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
@@ -24,6 +25,8 @@ TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.
GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
GCC_SSP_TOP ?= $(shell dirname $(shell which $(CC)))
CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
+WEBKITGTK_TOP ?= $(WIN32_DEV_TOP)/libwebkitgtk-1.10
+LIBSOUP_TOP ?= $(WIN32_DEV_TOP)/libsoup-2.36
# Where we installing this stuff to?
PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -39,10 +39,14 @@ INCLUDE_PATHS += \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/gtk-2.0/include \
- -I$(GTKSPELL_TOP)/include/gtkspell-2.0
+ -I$(GTKSPELL_TOP)/include/gtkspell-2.0 \
+ -I$(LIBSOUP_TOP)/include/libsoup-2.4 \
+ -I$(WEBKITGTK_TOP)/include/webkitgtk-1.0
LIB_PATHS += -L$(GTK_TOP)/lib \
+ -L$(WEBKITGTK_TOP)/lib \
-L$(PURPLE_TOP) \
-L$(PIDGIN_TOP)
@@ -129,7 +133,8 @@ PIDGIN_LIBS = \
-lgdk-win32-2.0 \
-lgdk_pixbuf-2.0 \
-lgdi32 \
- -lwinmm
+ -lwinmm \
+ -lwebkitgtk-1.0
include $(PIDGIN_COMMON_RULES)
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -26,8 +26,11 @@ INCLUDE_PATHS += \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
+ -I$(LIBSOUP_TOP)/include/libsoup-2.4 \
+ -I$(WEBKITGTK_TOP)/include/webkitgtk-1.0 \
-I$(PIDGIN_TREE_TOP) \
-I$(PURPLE_TOP) \
-I$(PURPLE_TOP)/win32 \
@@ -35,6 +38,7 @@ INCLUDE_PATHS += \
-I$(PIDGIN_TOP)/win32
LIB_PATHS += -L$(GTK_TOP)/lib \
+ -L$(WEBKITGTK_TOP)/lib \
-L$(PURPLE_TOP) \
-L$(PIDGIN_TOP)
@@ -51,6 +55,7 @@ LIBS = -lgtk-win32-2.0 \
-lcairo \
-lintl \
-lws2_32 \
+ -lwebkitgtk-1.0 \
-lpurple \
-lpidgin
@@ -101,7 +106,7 @@ plugins: \
spellchk.dll \
themeedit.dll \
timestamp_format.dll \
- timestamp.dll \
+ webkit.dll \
xmppconsole.dll
##
diff --git a/pidgin/plugins/disco/Makefile.mingw b/pidgin/plugins/disco/Makefile.mingw
--- a/pidgin/plugins/disco/Makefile.mingw
+++ b/pidgin/plugins/disco/Makefile.mingw
@@ -19,6 +19,7 @@ INCLUDE_PATHS += -I. \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
-I$(PURPLE_TOP) \
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -28,8 +28,11 @@ INCLUDE_PATHS = -I. \
-I$(GTK_TOP)/include/glib-2.0 \
-I$(GTK_TOP)/include/gtk-2.0 \
-I$(GTK_TOP)/include/pango-1.0 \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
+ -I$(LIBSOUP_TOP)/include/libsoup-2.4 \
+ -I$(WEBKITGTK_TOP)/include/webkitgtk-1.0 \
-I$(PERL_LIB_TOP)/CORE
LIB_PATHS += -L$(PERL_LIB_TOP) \
diff --git a/pidgin/plugins/ticker/Makefile.mingw b/pidgin/plugins/ticker/Makefile.mingw
--- a/pidgin/plugins/ticker/Makefile.mingw
+++ b/pidgin/plugins/ticker/Makefile.mingw
@@ -19,6 +19,7 @@ INCLUDE_PATHS += -I. \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
-I$(PURPLE_TOP) \
diff --git a/pidgin/plugins/win32/transparency/Makefile.mingw b/pidgin/plugins/win32/transparency/Makefile.mingw
--- a/pidgin/plugins/win32/transparency/Makefile.mingw
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw
@@ -20,6 +20,7 @@ INCLUDE_PATHS += -I. \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
-I$(PURPLE_TOP) \
diff --git a/pidgin/plugins/win32/winprefs/Makefile.mingw b/pidgin/plugins/win32/winprefs/Makefile.mingw
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw
@@ -21,6 +21,7 @@ INCLUDE_PATHS += -I. \
-I$(GTK_TOP)/include/pango-1.0 \
-I$(GTK_TOP)/include/atk-1.0 \
-I$(GTK_TOP)/include/cairo \
+ -I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/glib-2.0/include \
-I$(GTK_TOP)/lib/gtk-2.0/include \
-I$(PURPLE_TOP) \
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
@@ -1,11 +1,12 @@
#!/bin/bash
# Script to generate zip file for GTK+ runtime to be included in Pidgin installer
More information about the Commits
mailing list