Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b468f9a91e23f6f2e41b5550dad1a6d0e93a7f23)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b468f9a91e23f6f2e41b5550dad1a6d0e93a7f23)
  • Date: Sun, 20 May 2012 18:59:30 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

chat-libs/loudmouth/HISTORY | 3 +++
chat-libs/loudmouth/PRE_BUILD | 3 ++-
gnome2-apps/abiword/HISTORY | 3 +++
gnome2-apps/abiword/PRE_BUILD | 4 +++-
4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a3bb220a8acef44223da00a63cbba14e2dbe30f4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

abiword: fixed glib includes, only glib.h can be included.

commit 58cc88ed67d9371dd82285cc03c649e42859fa6e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

loudmouth: fixed glib2 includes

diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index e6427ef..e20fa20 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fix for glib2 includes
+
2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: fix ssl dependency

diff --git a/chat-libs/loudmouth/PRE_BUILD b/chat-libs/loudmouth/PRE_BUILD
index fce4a96..4fe4605 100755
--- a/chat-libs/loudmouth/PRE_BUILD
+++ b/chat-libs/loudmouth/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-
+sedit 's#glib/gerror.h#glib.h#' loudmouth/lm-error.c &&
+sedit '#*glib/gi18n.h*#d' loudmouth/lm-sock.c &&
if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
sedit 's/HAVE_STRNDUP/__USE_XOPEN2K8/' loudmouth/asyncns.c
fi
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 2a20157..9227111 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: only glib.h can be included or build will fail
+
2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index 410429d..ae86946 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&

cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch &&
+# only glib.h can be included
+sedit 34d src/af/util/xp/ut_go_file.h



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (b468f9a91e23f6f2e41b5550dad1a6d0e93a7f23), Arjan Bouter, 05/20/2012

Archive powered by MHonArc 2.6.24.

Top of Page