Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (166f4fa572a27a369228896671df3691c20e6f2c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (166f4fa572a27a369228896671df3691c20e6f2c)
  • Date: Tue, 22 Jan 2013 06:46:39 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-apps/dia/BUILD | 3 ---
gnome2-apps/dia/HISTORY | 4 ----
libs/gettext/BUILD | 18 +++++++++++++++---
libs/gettext/DETAILS | 3 ++-
libs/gettext/HISTORY | 5 -----
libs/gettext/PRE_BUILD | 4 ++++
6 files changed, 21 insertions(+), 16 deletions(-)

New commits:
commit 166f4fa572a27a369228896671df3691c20e6f2c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "gettext: => 0.18.2"

This reverts commit 6eb6a5a337864a582f003364caaad6be07b8ebbe.

Reverted until #500 is solved.

commit 9420cf5c660b29662302d8dc44bbfa857d0b0485
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "dia: fixed build with recent gettext"

This reverts commit cc5262038c995a16b2a315ee1a226d24af131b48.

diff --git a/gnome2-apps/dia/BUILD b/gnome2-apps/dia/BUILD
deleted file mode 100755
index 3091a0c..0000000
--- a/gnome2-apps/dia/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-LDFLAGS="-lintl $LDFLAGS" &&
-
-default_build
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index 4d4dec4..aa37fb0 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,7 +1,3 @@
-2013-01-22 Vlad Glagolev <stealth AT sourcemage.org>
- * BUILD: added, to fix build with recent gettext (requires additional
- linking with libintl.so for tests)
-
2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: detect docbook-xsl man path and use instead of online one
* DEPENDS: added docbook-xsl required dep
diff --git a/libs/gettext/BUILD b/libs/gettext/BUILD
index 9918937..fcdbecd 100755
--- a/libs/gettext/BUILD
+++ b/libs/gettext/BUILD
@@ -5,10 +5,20 @@ OPTS="--enable-threads=posix $OPTS" &&

# never rely on external glib2
OPTS="--with-included-glib $OPTS" &&
-# use this version of getext
-OPTS+=" --with-included-gettext" &&

-default_build &&
+make_single &&
+
+./configure --build=$BUILD \
+ --host=$HOST \
+ --prefix=${TRACK_ROOT}/usr \
+ --sysconfdir=${TRACK_ROOT}/etc \
+ --infodir=${TRACK_ROOT}/usr/share/info \
+ --mandir=${TRACK_ROOT}/usr/share/man \
+ --with-included-gettext \
+ --includedir=${TRACK_ROOT}/usr/local/include \
+ $OPTS &&
+
+make &&

if is_depends_enabled $SPELL tetex; then
cd gettext-tools/doc &&
@@ -18,6 +28,8 @@ if is_depends_enabled $SPELL tetex; then
cd -
fi &&

+make_normal &&
+
#
# Remove libintl.h from old log files
#
diff --git a/libs/gettext/DETAILS b/libs/gettext/DETAILS
index 1a6bf45..4a8bee0 100755
--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,5 +1,6 @@
SPELL=gettext
- VERSION=0.18.2
+ VERSION=0.18.1.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 5a87381..5f9b20f 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,8 +1,3 @@
-2013-01-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.18.2
- * BUILD: cleanup and simplify
- * PRE_BUILD: deleted , builds ok with glibc-2.17
-.
2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with glibc 2.16

diff --git a/libs/gettext/PRE_BUILD b/libs/gettext/PRE_BUILD
new file mode 100755
index 0000000..32353b6
--- /dev/null
+++ b/libs/gettext/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (166f4fa572a27a369228896671df3691c20e6f2c), Vlad Glagolev, 01/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page