[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (22041e7097718d8b5690392109299f8d94bba38a)

Vlad Glagolev scm at sourcemage.org
Thu May 24 15:51:02 EDT 2012


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 chat-irc/xchat/0001-fix-build-with-glib-version-2.32.patch |   16 -------------
 chat-irc/xchat/HISTORY                                     |    5 ++++
 2 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 0f204730c4a21937099bde1f3cb97b874144a69c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xchat: fixed compilation with static spelling support

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
index 79ccf7b..b416c5b 100644
--- 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
@@ -9,8 +9,7 @@ Subject: [PATCH] fix build with glib version 2.32
  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(-)
+ 5 files changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/src/common/modes.c b/src/common/modes.c
 index 1acf7f5..b10dee4 100644
@@ -79,19 +78,6 @@ index 013d6a1..e3f15a8 100644
  #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 8fcb0f9..7b1876b 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,8 @@
+2012-05-24 Vlad Glagolev <stealth at sourcemage.org>
+	* 0001-fix-build-with-glib-version-2.32.patch: corrected the patch
+	  to fix compilation with static spelling support
+	  <glib/i18n.h> still present in glib2
+
 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


More information about the SM-Commit mailing list