Mercurial Mercurial > mcabber-isbear-patches / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add fix-separate-build.diff
authorMyhailo Danylenko <isbear@ukrpost.net>
Thu, 22 Nov 2012 00:56:12 +0200
changeset 55 8f5cf5969e25
parent 54 8688a72eb1ac
child 56 4d62742b3c72
Add fix-separate-build.diff
fix-api-h.diff file | annotate | diff | comparison | revisions
fix-api.h file | annotate | diff | comparison | revisions
fix-separate-build.diff file | annotate | diff | comparison | revisions
modularize-extcmd.diff file | annotate | diff | comparison | revisions
separate-extcmd.diff file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-api-h.diff	Thu Nov 22 00:56:12 2012 +0200
@@ -0,0 +1,15 @@
+# HG changeset patch
+# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
+api.h should include glib header
+
+diff -r f8958ab545ac -r c6fafa6e6be9 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Mon Oct 15 19:53:02 2012 +0200
++++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:25 2012 +0300
+@@ -1,6 +1,7 @@
+ #ifndef __MCABBER_API_H__
+ #define __MCABBER_API_H__ 1
+ 
++#include <glib.h>
+ #include <mcabber/config.h> // For MCABBER_BRANCH
+ 
+ #define MCABBER_API_VERSION 23
--- a/fix-api.h	Sat Oct 20 18:29:49 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# HG changeset patch
-# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
-api.h should include glib header
-
-diff -r f8958ab545ac -r c6fafa6e6be9 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:25 2012 +0300
-@@ -1,6 +1,7 @@
- #ifndef __MCABBER_API_H__
- #define __MCABBER_API_H__ 1
- 
-+#include <glib.h>
- #include <mcabber/config.h> // For MCABBER_BRANCH
- 
- #define MCABBER_API_VERSION 23
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-separate-build.diff	Thu Nov 22 00:56:12 2012 +0200
@@ -0,0 +1,120 @@
+# HG changeset patch
+# Parent 1466c4a807787958dcb35e478de1e812999d97c9
+Fix building from separate directory
+
+diff -r 1466c4a80778 mcabber/hgcset.sh
+--- a/mcabber/hgcset.sh	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/hgcset.sh	Thu Nov 22 00:52:30 2012 +0200
+@@ -1,19 +1,24 @@
+ #! /bin/sh
+ 
+-if [ ! -f logprint.h ]; then
+-  echo "You are not in the mcabber directory" >&2
++srcdir="$1"
++builddir="$2"
++
++if [ ! -f "$srcdir/logprint.h" ]; then
++  echo "Unable to find mcabber sources!" >&2
+   exit 1
+ fi
+ 
++cd "$srcdir"
++
+ if which hg > /dev/null 2>&1; then
+   cs=$(hg id 2> /dev/null | cut -d' ' -f1)
+   if test $? -eq 0; then
+     if [ x"$cs" != x ]; then
+-      grep -q "$cs" hgcset.h > /dev/null 2>&1 || \
+-        echo "#define HGCSET \"$cs\"" > hgcset.h
++      grep -q "$cs" "$builddir/hgcset.h" > /dev/null 2>&1 || \
++        echo "#define HGCSET \"$cs\"" > "$builddir/hgcset.h"
+       exit 0
+     fi
+   fi
+ fi
+ 
+-echo > hgcset.h
++echo > "$builddir/hgcset.h"
+diff -r 1466c4a80778 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/mcabber/Makefile.am	Thu Nov 22 00:52:30 2012 +0200
+@@ -16,7 +16,8 @@
+ LDADD = $(GLIB_LIBS) $(LOUDMOUTH_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \
+ 				$(ENCHANT_LIBS) $(LIBIDN_LIBS)
+ 
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
++				$(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ 				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ 				$(ENCHANT_CFLAGS) $(LIBIDN_CFLAGS)
+ 
+@@ -26,7 +27,7 @@
+ BUILT_SOURCES = hgcset.h
+ 
+ hgcset.h:
+-	../hgcset.sh
++	$(top_srcdir)/hgcset.sh "$(top_srcdir)/mcabber" "$(top_builddir)/mcabber"
+ 
+ .PHONY: hgcset.h
+ endif
+@@ -42,7 +43,7 @@
+ 			 xmpp_iq.h xmpp_iqrequest.h \
+ 			 xmpp_muc.h xmpp_s10n.h \
+ 			 caps.h fifo.h help.h modules.h api.h \
+-			 $(top_srcdir)/include/config.h
++			 $(top_builddir)/include/config.h
+ 
+ if OTR
+ mcabberinclude_HEADERS += otr.h nohtml.h
+diff -r 1466c4a80778 mcabber/modules/beep/Makefile.am
+--- a/mcabber/modules/beep/Makefile.am	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/modules/beep/Makefile.am	Thu Nov 22 00:52:30 2012 +0200
+@@ -6,7 +6,8 @@
+ libbeep_la_LDFLAGS = -module -avoid-version -shared
+ 
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++			      $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+                               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+                               $(ENCHANT_CFLAGS)
+ 
+diff -r 1466c4a80778 mcabber/modules/fifo/Makefile.am
+--- a/mcabber/modules/fifo/Makefile.am	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/modules/fifo/Makefile.am	Thu Nov 22 00:52:30 2012 +0200
+@@ -5,7 +5,8 @@
+ libfifo_la_LDFLAGS = -module -avoid-version -shared
+ 
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++				$(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+ 				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+ 				$(ENCHANT_CFLAGS)
+ endif
+diff -r 1466c4a80778 mcabber/modules/urlregex/Makefile.am
+--- a/mcabber/modules/urlregex/Makefile.am	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/modules/urlregex/Makefile.am	Thu Nov 22 00:52:30 2012 +0200
+@@ -6,7 +6,8 @@
+ liburlregex_la_LDFLAGS = -module -avoid-version -shared
+ 
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++			      $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+                               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
+                               $(ENCHANT_CFLAGS)
+ 
+diff -r 1466c4a80778 mcabber/modules/xttitle/Makefile.am
+--- a/mcabber/modules/xttitle/Makefile.am	Thu Nov 22 00:50:00 2012 +0200
++++ b/mcabber/modules/xttitle/Makefile.am	Thu Nov 22 00:52:30 2012 +0200
+@@ -6,7 +6,8 @@
+ libxttitle_la_LDFLAGS = -module -avoid-version -shared
+ 
+ LDADD = $(GLIB_LIBS)
+-AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++              $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
+               $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) $(ENCHANT_CFLAGS)
+ 
+ endif
--- a/modularize-extcmd.diff	Sat Oct 20 18:29:49 2012 +0300
+++ b/modularize-extcmd.diff	Thu Nov 22 00:56:12 2012 +0200
@@ -1,8 +1,8 @@
 Convert extcmd into a module
 
-diff -r 27d19b6bc194 mcabber/configure.ac
---- a/mcabber/configure.ac	Mon Apr 30 23:36:55 2012 +0300
-+++ b/mcabber/configure.ac	Mon Apr 30 23:37:25 2012 +0300
+diff -r d9fd111057c1 mcabber/configure.ac
+--- a/mcabber/configure.ac	Thu Nov 22 00:53:15 2012 +0200
++++ b/mcabber/configure.ac	Thu Nov 22 00:54:43 2012 +0200
 @@ -283,6 +283,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
@@ -11,9 +11,9 @@
                   modules/urlregex/Makefile
                   doc/Makefile
                   doc/guide/Makefile
-diff -r 27d19b6bc194 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Mon Apr 30 23:36:55 2012 +0300
-+++ b/mcabber/mcabber/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
+diff -r d9fd111057c1 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Thu Nov 22 00:53:15 2012 +0200
++++ b/mcabber/mcabber/Makefile.am	Thu Nov 22 00:54:43 2012 +0200
 @@ -7,7 +7,7 @@
  		  xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
  		  xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -23,7 +23,7 @@
  
  if OTR
  mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  
  mcabberincludedir = $(includedir)/mcabber
  else
@@ -32,9 +32,9 @@
  endif
  
  #SUBDIRS =
-diff -r 27d19b6bc194 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Mon Apr 30 23:36:55 2012 +0300
-+++ b/mcabber/mcabber/hooks.c	Mon Apr 30 23:37:25 2012 +0300
+diff -r d9fd111057c1 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Thu Nov 22 00:53:15 2012 +0200
++++ b/mcabber/mcabber/hooks.c	Thu Nov 22 00:54:43 2012 +0200
 @@ -36,7 +36,10 @@
  #include "utf8.h"
  #include "commands.h"
@@ -110,9 +110,9 @@
  }
  
  //  hk_presence_subscription_request(jid, message)
-diff -r 27d19b6bc194 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Mon Apr 30 23:36:55 2012 +0300
-+++ b/mcabber/mcabber/main.c	Mon Apr 30 23:37:25 2012 +0300
+diff -r d9fd111057c1 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Thu Nov 22 00:53:15 2012 +0200
++++ b/mcabber/mcabber/main.c	Thu Nov 22 00:54:43 2012 +0200
 @@ -44,7 +44,10 @@
  #include "xmpp.h"
  #include "help.h"
@@ -137,16 +137,16 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r 27d19b6bc194 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Mon Apr 30 23:36:55 2012 +0300
-+++ b/mcabber/modules/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
+diff -r d9fd111057c1 mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am	Thu Nov 22 00:53:15 2012 +0200
++++ b/mcabber/modules/Makefile.am	Thu Nov 22 00:54:43 2012 +0200
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo urlregex
 +SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r 27d19b6bc194 mcabber/modules/eventcmd/Makefile.am
+diff -r d9fd111057c1 mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Mon Apr 30 23:37:25 2012 +0300
-@@ -0,0 +1,12 @@
++++ b/mcabber/modules/eventcmd/Makefile.am	Thu Nov 22 00:54:43 2012 +0200
+@@ -0,0 +1,13 @@
 +
 +if INSTALL_HEADERS
 +pkglib_LTLIBRARIES = libeventcmd.la
@@ -154,14 +154,15 @@
 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared
 +
 +LDADD = $(GLIB_LIBS)
-+AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
++				$(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \
 +				$(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r 27d19b6bc194 mcabber/modules/eventcmd/eventcmd.c
+diff -r d9fd111057c1 mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Mon Apr 30 23:37:25 2012 +0300
++++ b/mcabber/modules/eventcmd/eventcmd.c	Thu Nov 22 00:54:43 2012 +0200
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko
--- a/separate-extcmd.diff	Sat Oct 20 18:29:49 2012 +0300
+++ b/separate-extcmd.diff	Thu Nov 22 00:56:12 2012 +0200
@@ -1,8 +1,8 @@
 Move extcmd code from hooks
 
-diff -r 64da54766f99 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Mon Apr 30 23:36:31 2012 +0300
-+++ b/mcabber/mcabber/Makefile.am	Mon Apr 30 23:36:55 2012 +0300
+diff -r c6f9fa178a53 mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Thu Nov 22 00:52:37 2012 +0200
++++ b/mcabber/mcabber/Makefile.am	Thu Nov 22 00:53:15 2012 +0200
 @@ -7,7 +7,7 @@
  		  xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
  		  xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -12,17 +12,17 @@
  
  if OTR
  mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
  			 xmpp_iq.h xmpp_iqrequest.h \
  			 xmpp_muc.h xmpp_s10n.h \
  			 caps.h fifo.h help.h modules.h api.h \
 +			 extcmd.h \
- 			 $(top_srcdir)/include/config.h
+ 			 $(top_builddir)/include/config.h
  
  if OTR
-diff -r 64da54766f99 mcabber/mcabber/extcmd.c
+diff -r c6f9fa178a53 mcabber/mcabber/extcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.c	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/extcmd.c	Thu Nov 22 00:53:15 2012 +0200
 @@ -0,0 +1,121 @@
 +/*
 + * extcmd.c      -- External event handler command
@@ -145,9 +145,9 @@
 +}
 +
 +/* vim: set expandtab cindent cinoptions=>2\:2(0:  For Vim users... */
-diff -r 64da54766f99 mcabber/mcabber/extcmd.h
+diff -r c6f9fa178a53 mcabber/mcabber/extcmd.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/mcabber/extcmd.h	Mon Apr 30 23:36:55 2012 +0300
++++ b/mcabber/mcabber/extcmd.h	Thu Nov 22 00:53:15 2012 +0200
 @@ -0,0 +1,15 @@
 +#ifndef __MCABBER_EXTCMD_H__
 +#define __MCABBER_EXTCMD_H__ 1
@@ -164,9 +164,9 @@
 +void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data);
 +
 +#endif
-diff -r 64da54766f99 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Mon Apr 30 23:36:31 2012 +0300
-+++ b/mcabber/mcabber/hooks.c	Mon Apr 30 23:36:55 2012 +0300
+diff -r c6f9fa178a53 mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Thu Nov 22 00:52:37 2012 +0200
++++ b/mcabber/mcabber/hooks.c	Thu Nov 22 00:53:15 2012 +0200
 @@ -24,6 +24,7 @@
  #include <string.h>
  #include <sys/types.h>
@@ -433,9 +433,9 @@
 -}
 -
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 64da54766f99 mcabber/mcabber/hooks.h
---- a/mcabber/mcabber/hooks.h	Mon Apr 30 23:36:31 2012 +0300
-+++ b/mcabber/mcabber/hooks.h	Mon Apr 30 23:36:55 2012 +0300
+diff -r c6f9fa178a53 mcabber/mcabber/hooks.h
+--- a/mcabber/mcabber/hooks.h	Thu Nov 22 00:52:37 2012 +0200
++++ b/mcabber/mcabber/hooks.h	Thu Nov 22 00:53:15 2012 +0200
 @@ -66,9 +66,6 @@
  guint hk_subscription(LmMessageSubType mstype, const gchar *bjid,
                        const gchar *msg);
@@ -446,9 +446,9 @@
  #endif /* __MCABBER_HOOKS_H__ */
  
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 64da54766f99 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Mon Apr 30 23:36:31 2012 +0300
-+++ b/mcabber/mcabber/main.c	Mon Apr 30 23:36:55 2012 +0300
+diff -r c6f9fa178a53 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Thu Nov 22 00:52:37 2012 +0200
++++ b/mcabber/mcabber/main.c	Thu Nov 22 00:53:15 2012 +0200
 @@ -44,6 +44,7 @@
  #include "xmpp.h"
  #include "help.h"
--- a/series	Sat Oct 20 18:29:49 2012 +0300
+++ b/series	Thu Nov 22 00:56:12 2012 +0200
@@ -1,4 +1,5 @@
-fix-api.h
+fix-api-h.diff
+fix-separate-build.diff
 completion-sorting.diff
 fix-date-fill.diff
 switch-to-experimental.diff
mcabber-isbear-patches