[SM-Commit] GIT changes to master grimoire by George Sherwood (641084f1482d9f834d95c484432c819b48ad8048)

George Sherwood scm at sourcemage.org
Mon Oct 29 02:48:50 EDT 2007


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 gnome2-apps/abiword/DEPENDS |   18 ++++++++++++------
 gnome2-apps/abiword/HISTORY |    4 ++++
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 641084f1482d9f834d95c484432c819b48ad8048
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    abiword: Cleaned up DEPENDS. Can now build devel version without
    gnomelibs, but with no printing.

diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 55bc8b5..3f1c1b0 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -8,8 +8,14 @@ depends popt       "--with-popt"    &&
 depends fontconfig                  &&
 depends libglade2                   &&
 depends wv         "--with-sys-wv"  &&
-depends gucharmap                   &&
-
+if [ "$DEVEL" == "n" ]; then
+  depends  libgnomeprintui
+else
+  optional_depends  libgnomeprintui                             \
+                  "--enable-gnomeui"                            \
+                  "--disable-gnomeui --disable-printing"        \
+                  "for gnome and printing support" 
+fi &&
 optional_depends  imagemagick                                   \
                   "--with-ImageMagick"                          \
                   ""                                            \
@@ -26,10 +32,10 @@ optional_depends  jpeg                                          \
                   ""                                            \
                   ""                                            \
                   "for jpeg image support"                      &&
-optional_depends  libgnomeprintui                               \
-                  "--enable-gnome"                              \
-                  ""                                            \
-                  "for gnome support"                           &&
+optional_depends  gucharmap                                     \
+                  "--enable-gucharmap"                          \
+                  "--disable-gucharmap"                         \
+                  "for gucharmap support"                       &&
 optional_depends  nautilus2                                     \
                   ""                                            \
                   ""                                            \
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index c7be95e..c5453a7 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,7 @@
+2007-10-29 George Sherwood <george at beernabeer.com>
+	* DEPENDS: Updated so devel version builds without gnome libs.
+	  Stable still depends on libgnomeprintui.
+
 2007-09-05 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated devel version to 2.5.2
 



More information about the SM-Commit mailing list