pidgin: 6c480ed0: Remove the QQ CURRENT_REVISION stuff in ...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 6c480ed0bfda22bc5131c6a0465140f17e3bf40c
Ancestor: 3fa3a746613f1d6095334bfc54443d61166dd9fa
Author: rlaager at pidgin.im
Date: 2008-11-02T22:56:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6c480ed0bfda22bc5131c6a0465140f17e3bf40c

Modified files:
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw

ChangeLog: 

Remove the QQ CURRENT_REVISION stuff in the Makefile.  This, even with their
suggested fix, is broken:
	1. It probably breaks builds with a separate build directory.
	2. qq.c has code to set OPENQ_VERSION to DISPLAY_VERSION (from us)
	   if OPENQ_VERSION is not defined.  However, the Makefile always
	   defines it.  Right now, it defines it with no value if you're not
	   using Mercurial, so the #ifndef won't work.

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/Makefile.am	4804c7503cd191513a246fcaca736b0f35372128
+++ libpurple/protocols/qq/Makefile.am	cd2d4c4c0834493c513a7b584c780f826a52517b
@@ -53,11 +53,6 @@ libqq_la_LDFLAGS = -module -avoid-versio
 
 libqq_la_LDFLAGS = -module -avoid-version
 
-CURRENT_REVISION=$(shell \
-		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		 rev=substr(rev,7,6); \
-		 print rev}')
-
 if STATIC_QQ
 
 st = -DPURPLE_STATIC_PRPL
@@ -79,5 +74,4 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
+	$(GLIB_CFLAGS)
============================================================
--- libpurple/protocols/qq/Makefile.mingw	23335c2ce20665a4e3b70375ddc43762ee4a301d
+++ libpurple/protocols/qq/Makefile.mingw	7da9f6b461e751a38cc1b3c37b96e83d00a1b073
@@ -6,10 +6,6 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-CURRENT_REVISION=$(shell \
-		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		 rev=substr(rev,7,6); \
-		 print rev}')
 TARGET = libqq
 TYPE = PLUGIN
 
@@ -19,7 +15,6 @@ ifeq ($(TYPE),PLUGIN)
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-	DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif