Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7b934e39addc1ef73c96f5b606067bd5f8efc57)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7b934e39addc1ef73c96f5b606067bd5f8efc57)
  • Date: Sat, 5 May 2012 10:54:33 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch | 97
+++++++++++++
chat-irc/xchat/HISTORY | 4
chat-irc/xchat/PRE_BUILD | 3
3 files changed, 104 insertions(+)

New commits:
commit c7b934e39addc1ef73c96f5b606067bd5f8efc57
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-irc/xchat: fix build with glib 2.32

diff --git a/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
b/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
new file mode 100644
index 0000000..79ccf7b
--- /dev/null
+++ b/chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch
@@ -0,0 +1,97 @@
+From 0a06967cc8a42c6bab6b1adb708d8fb0c7c3e187 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 5 May 2012 17:46:02 +0200
+Subject: [PATCH] fix build with glib version 2.32
+
+---
+ src/common/modes.c | 1 -
+ src/common/servlist.c | 2 +-
+ src/common/text.c | 2 +-
+ src/common/util.c | 2 +-
+ src/common/xchat.h | 6 +-----
+ src/fe-gtk/sexy-spell-entry.c | 2 +-
+ 6 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/common/modes.c b/src/common/modes.c
+index 1acf7f5..b10dee4 100644
+--- a/src/common/modes.c
++++ b/src/common/modes.c
+@@ -20,7 +20,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
+
+ #include "xchat.h"
+ #include "xchatc.h"
+diff --git a/src/common/servlist.c b/src/common/servlist.c
+index 1728928..0829c99 100644
+--- a/src/common/servlist.c
++++ b/src/common/servlist.c
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "cfgfiles.h"
+ #include "fe.h"
+diff --git a/src/common/text.c b/src/common/text.c
+index a219851..6b11174 100644
+--- a/src/common/text.c
++++ b/src/common/text.c
+@@ -28,7 +28,7 @@
+ #include <sys/mman.h>
+
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
+diff --git a/src/common/util.c b/src/common/util.c
+index 49517ec..5a0ab6c 100644
+--- a/src/common/util.c
++++ b/src/common/util.c
+@@ -39,7 +39,7 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+diff --git a/src/common/xchat.h b/src/common/xchat.h
+index 013d6a1..e3f15a8 100644
+--- a/src/common/xchat.h
++++ b/src/common/xchat.h
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h> /* need time_t */
+
+ #ifndef XCHAT_H
+diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
+index d67ffe2..a926387 100644
+--- a/src/fe-gtk/sexy-spell-entry.c
++++ b/src/fe-gtk/sexy-spell-entry.c
+@@ -26,7 +26,7 @@
+ #include <gtk/gtk.h>
+ #include "sexy-spell-entry.h"
+ #include <string.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ #include <sys/types.h>
+ /*#include "gtkspell-iso-codes.h"
+ #include "sexy-marshal.h"*/
+--
+1.7.10.1
+
diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index cbba1c0..8fcb0f9 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,7 @@
+2012-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-build-with-glib-version-2.32.patch:
+ fix build with glib 2.32
+
2010-05-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.8.8; quoting paths
* INSTALL: quoting paths
diff --git a/chat-irc/xchat/PRE_BUILD b/chat-irc/xchat/PRE_BUILD
new file mode 100755
index 0000000..2c38362
--- /dev/null
+++ b/chat-irc/xchat/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/0001-fix-build-with-glib-version-2.32.patch



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c7b934e39addc1ef73c96f5b606067bd5f8efc57), Florian Franzmann, 05/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page