gobjectification: c0f5cd0d: Here's a nice patch from Lee Roach to ma...

datallah at pidgin.im datallah at pidgin.im
Fri Jul 18 16:30:45 EDT 2008


-----------------------------------------------------------------
Revision: c0f5cd0dee6b7415c1b282c3623bf48ed91ef769
Ancestor: 1eda51cc8fffd505ced8d501529358fdf78a721a
Author: datallah at pidgin.im
Date: 2008-07-18T20:27:13
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/c0f5cd0dee6b7415c1b282c3623bf48ed91ef769

Modified files:
        libpurple/Makefile.mingw libpurple/protocols/Makefile.mingw
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/gg/Makefile.mingw
        libpurple/protocols/irc/Makefile.mingw
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/myspace/Makefile.mingw
        libpurple/protocols/novell/Makefile.mingw
        libpurple/protocols/null/Makefile.mingw
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/sametime/Makefile.mingw
        libpurple/protocols/silc/Makefile.mingw
        libpurple/protocols/simple/Makefile.mingw
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/win32/global.mak

ChangeLog: 

Here's a nice patch from Lee Roach to make the gobjectification branch compile
on Windows.  This requires that you have the glib runtime in your PATH (for
 glib-genmarshal to use).
Fixes #6200

-------------- next part --------------
============================================================
--- libpurple/Makefile.mingw	b2ff98bfc1a3f857f03e3b3c6f337ed251d07635
+++ libpurple/Makefile.mingw	aba878d153a41bbe6207e3c7da263d5a625fb54f
@@ -30,6 +30,7 @@ C_SRC =	\
 ##
 C_SRC =	\
 			account.c \
+			accountmanager.c \
 			accountopt.c \
 			blist.c \
 			buddyicon.c \
@@ -40,14 +41,20 @@ C_SRC =	\
 			conversation.c \
 			core.c \
 			debug.c \
+			des3cipher.c \
+			descipher.c \
 			dnsquery.c \
 			dnssrv.c \
 			eventloop.c \
 			ft.c \
 			circbuffer.c \
+			hmaccipher.c \
 			idle.c \
 			imgstore.c \
 			log.c \
+			marshallers.c \
+			md4cipher.c \
+			md5cipher.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
@@ -55,15 +62,18 @@ C_SRC =	\
 			ntlm.c \
 			plugin.c \
 			pluginpref.c \
+			pobject.c \
 			pounce.c \
 			prefs.c \
 			privacy.c \
 			proxy.c \
 			prpl.c \
+			rc4cipher.c \
 			request.c \
 			roomlist.c \
 			savedstatuses.c \
 			server.c \
+			sha1cipher.c \
 			signals.c \
 			smiley.c \
 			sound.c \
@@ -120,8 +130,14 @@ install: install_shallow all
 	sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
 	    $@.in > $@
 
-$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
+marshallers.h: marshallers.list
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --header > $@
+ 
+marshallers.c: marshallers.list
+	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --body > $@
 
+$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) marshallers.c marshallers.h
+
 $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
 
@@ -129,7 +145,7 @@ clean:
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
+	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) marshallers.h marshallers.c
 	rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
 	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
============================================================
--- libpurple/protocols/Makefile.mingw	4024cb4925accddaff623f5bcff5e6793fcf89f2
+++ libpurple/protocols/Makefile.mingw	bea8d4f034c26c3ca46b4b4dc2678380e02177e1
@@ -8,7 +8,7 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msnp9 novell null oscar qq sametime silc simple yahoo bonjour myspace
+SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace
 
 .PHONY: all install clean
 
============================================================
--- libpurple/protocols/bonjour/Makefile.mingw	777e0daf0004d08a563a2d1d9dca1e6eeffe9e57
+++ libpurple/protocols/bonjour/Makefile.mingw	a0a6e4a6645378731e1f4cc3aabf59b28a506303
@@ -58,6 +58,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lnetapi32 \
============================================================
--- libpurple/protocols/gg/Makefile.mingw	b29901fe3c5723e10a76dceb61ae347642b56d90
+++ libpurple/protocols/gg/Makefile.mingw	16d57c191f1b73181c3a6eb726540f7620005ede
@@ -60,6 +60,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lintl \
 			-lpurple \
 			-lws2_32
============================================================
--- libpurple/protocols/irc/Makefile.mingw	e9c7de57919255712fff0428fb55b67d49eecb59
+++ libpurple/protocols/irc/Makefile.mingw	27b1b3c5506fbd4ce301169462890e61f8b27f29
@@ -50,6 +50,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple
============================================================
--- libpurple/protocols/jabber/Makefile.mingw	f0ba792560dee01a48fc6252c5fb4b1fd8e71689
+++ libpurple/protocols/jabber/Makefile.mingw	8dc088f0ea7dca3422bdef4a96223d63fb900ab7
@@ -77,6 +77,7 @@ LIBS = \
 ##
 LIBS = \
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lxml2 \
 			-lws2_32 \
 			-lintl \
============================================================
--- libpurple/protocols/msn/Makefile.mingw	ad3ff1fb8660a9e7a40baef8d2216e7f6fbed927
+++ libpurple/protocols/msn/Makefile.mingw	ec7dbb08641302aa46ba18a8ca47393533e61213
@@ -77,6 +77,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lintl \
 			-lws2_32 \
 			-lpurple
============================================================
--- libpurple/protocols/msnp9/Makefile.mingw	5fac12f6d0be965e45235f056d01bc0eb6c32c67
+++ libpurple/protocols/msnp9/Makefile.mingw	40aa0c5f0996e81453440b894cb6c90f623984ad
@@ -74,6 +74,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lintl \
 			-lws2_32 \
 			-lpurple
============================================================
--- libpurple/protocols/myspace/Makefile.mingw	ffcee85d43bf4909895afadf82a8d7afe4b791a0
+++ libpurple/protocols/myspace/Makefile.mingw	8b33a57bb58f02648e88f5dd677c882cf3cf724f
@@ -46,6 +46,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple
============================================================
--- libpurple/protocols/novell/Makefile.mingw	f99d50e6fde74b0b32ba9ea099a1d43652a73551
+++ libpurple/protocols/novell/Makefile.mingw	f4f13a64a4d56519c0b7d932290fdca9010eda2f
@@ -57,6 +57,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple
============================================================
--- libpurple/protocols/null/Makefile.mingw	fab3a49822aff4e1d578e49ec784d761b75675ba
+++ libpurple/protocols/null/Makefile.mingw	708d61fc3e91c2bc68f4f582b57aaab8b9308647
@@ -46,6 +46,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lintl \
 			-lws2_32 \
 			-lpurple
============================================================
--- libpurple/protocols/oscar/Makefile.mingw	a0bc11ebd0a5d791594f956f6188445fca274426
+++ libpurple/protocols/oscar/Makefile.mingw	1bbf144a579f3bc833fcfab935478e6b301e8b7b
@@ -89,6 +89,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lintl \
 			-lws2_32 \
 			-lpurple
============================================================
--- libpurple/protocols/qq/Makefile.mingw	23928c33a77a8e87581e0641e317e9314a2279b6
+++ libpurple/protocols/qq/Makefile.mingw	df8a1360e320d02e068edcd049286af333c9e59d
@@ -76,6 +76,7 @@ LIBS = \
 ##
 LIBS = \
 	-lglib-2.0 \
+	-lgobject-2.0 \
 	-lws2_32 \
 	-lintl \
 	-lpurple
============================================================
--- libpurple/protocols/sametime/Makefile.mingw	718ce52eb00bcdc823c41fcc0fec90a38425c002
+++ libpurple/protocols/sametime/Makefile.mingw	d6e371e234bb4088f1bc7dcb4b84ebe2451a952e
@@ -49,6 +49,7 @@ LIBS =		\
 ##
 LIBS =		\
 		-lglib-2.0 \
+		-lgobject-2.0 \
 		-lintl \
 		-lws2_32 \
 		-lmeanwhile \
============================================================
--- libpurple/protocols/silc/Makefile.mingw	9f3db1d56cb2945f77d03eaf2c9659bafe4aac41
+++ libpurple/protocols/silc/Makefile.mingw	733da867350238dcfc54a3c305a42f182ec1218c
@@ -57,6 +57,7 @@ LIBS = \
 ##
 LIBS = \
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple \
============================================================
--- libpurple/protocols/simple/Makefile.mingw	920e0cabdfd107947bf4f4a6f7d411fcdab4b0c0
+++ libpurple/protocols/simple/Makefile.mingw	c272196457903a0384ffae2de9107075befc54ec
@@ -47,6 +47,7 @@ LIBS =	\
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple
============================================================
--- libpurple/protocols/yahoo/Makefile.mingw	7484dd539cfd2f0ce6bd8202f9c2aece4af99fab
+++ libpurple/protocols/yahoo/Makefile.mingw	19595eb5fa2da7085fcdef81ec8e71efb14a4585
@@ -58,6 +58,7 @@ LIBS =			\
 ##
 LIBS =			\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lpurple
============================================================
--- libpurple/win32/global.mak	e7a9cceba61381eb7f05b3fffef39b1e046565c6
+++ libpurple/win32/global.mak	791630b3926598e86adc5cacaee6a7217e5301ef
@@ -101,6 +101,7 @@ endif
 ifeq "$(origin CC)" "default"
   CC := gcc.exe
 endif
+GLIB_GENMARSHAL ?= $(GTK_BIN)/glib-genmarshal
 GMSGFMT ?= $(GTK_BIN)/msgfmt
 MAKENSIS ?= makensis.exe
 PERL ?= /cygdrive/c/perl/bin/perl


More information about the Commits mailing list