sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (dc8e9fbc8b2287c132fd4788abb3b417f3dc723b)

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 (dc8e9fbc8b2287c132fd4788abb3b417f3dc723b)
Date: Tue, 29 Jun 2010 13:33:37 -0500

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

gnome2-apps/gucharmap/BUILD | 8 +++++++-
gnome2-apps/gucharmap/DEPENDS | 16 +++++++++-------
gnome2-apps/gucharmap/HISTORY | 4 ++++
3 files changed, 20 insertions(+), 8 deletions(-)

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

gucharmap: fixed building without gtk-doc and scrollkeeper

diff --git a/gnome2-apps/gucharmap/BUILD b/gnome2-apps/gucharmap/BUILD
index 47de762..3ec6b5f 100755
--- a/gnome2-apps/gucharmap/BUILD
+++ b/gnome2-apps/gucharmap/BUILD
@@ -4,5 +4,11 @@ else
OPTS="$OPTS --disable-unihan"
fi &&

-default_build
+if ! is_depends_enabled $SPELL gtk-doc; then
+ OPTS="$OPTS --disable-scrollkeeper" &&
+ sedit 's/help//' Makefile.in &&
+ sedit 's/^HELP_DIR.*/HELP_DIR =/' Makefile.in &&
+ sedit '/DIST_SUBDIRS/s/help//' Makefile.in
+fi &&

+default_build
diff --git a/gnome2-apps/gucharmap/DEPENDS b/gnome2-apps/gucharmap/DEPENDS
index 8f2a93e..dfa5031 100755
--- a/gnome2-apps/gucharmap/DEPENDS
+++ b/gnome2-apps/gucharmap/DEPENDS
@@ -2,11 +2,6 @@ depends gtk+2 &&
depends gconf2 &&
depends libxml2 &&

-optional_depends rarian \
- '--enable-scrollkeeper' \
- '--disable-scrollkeeper' \
- 'Register with rarian?' &&
-
optional_depends gobject-introspection \
"--enable-introspection" \
"--disable-introspection" \
@@ -14,5 +9,12 @@ optional_depends gobject-introspection \

optional_depends gtk-doc \
"--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "to build documentation"
+ "--disable-gtk-doc --disable--gtk-doc-html" \
+ "to build documentation" &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+optional_depends rarian \
+ '--enable-scrollkeeper' \
+ '--disable-scrollkeeper' \
+ 'Register with rarian?'
+fi
diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY
index ac33452..a8aca4a 100644
--- a/gnome2-apps/gucharmap/HISTORY
+++ b/gnome2-apps/gucharmap/HISTORY
@@ -1,3 +1,7 @@
+2010-06-29 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS,BUILD: allow building and installing without
gtk-doc/scrollkeeper
+ and skip the scrollkeeper optional dep when gtk-doc is disabled
+
2010-06-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.30.2

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (dc8e9fbc8b2287c132fd4788abb3b417f3dc723b), Arjan Bouter, 06/29/2010