[SM-Commit] GIT changes to master grimoire by Eric Sandall (78533c0d5ca46c2bcc470a6bef257dde7aa7c1ee)

Eric Sandall scm at sourcemage.org
Thu Apr 19 14:27:35 EDT 2007


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 devel/g-wrap/BUILD                      |    8 ++++++--
 devel/g-wrap/HISTORY                    |    5 +++++
 devel/g-wrap/PRE_SUB_DEPENDS            |    5 +++++
 devel/g-wrap/SUB_DEPENDS                |    7 +++++++
 gnome2-apps/gnucash2/DEPENDS            |    3 ++-
 gnome2-apps/gnucash2/HISTORY            |    5 +++++
 gnome2-apps/gnucash2/INSTALL            |    3 +++
 gnome2-libs/goffice-dev/BUILD           |    2 ++
 gnome2-libs/goffice-dev/DEPENDS         |    5 +++++
 gnome2-libs/goffice-dev/HISTORY         |    6 ++++++
 gnome2-libs/goffice-dev/PRE_SUB_DEPENDS |    4 ++++
 gnome2-libs/goffice-dev/SUB_DEPENDS     |    6 ++++++
 12 files changed, 56 insertions(+), 3 deletions(-)

New commits:
commit 78533c0d5ca46c2bcc470a6bef257dde7aa7c1ee
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnucash2: Fails installation with multiple make jobs

commit eb950dab70cbb53b4b4e310b389b39d470ec359e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnucash2,g-wrap: gnucash2 needs g-wrap's devel version (Bug #13722)

commit 7fa993983eb3234f6346e1831bcd87db047c31c0
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    g-wrap: Fails with multiple make jobs

commit fcbab8cf11590a415f19b526c013eaf6335ded0c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    goffice-dev: Fails with -ffast-math

commit ad2b5d2859ebd0adca78b5e10f49dc647d7473bf
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnucash2,goffice-dev: gnucash2 needs goffice-dev built against cairo (Bug #13688)

diff --git a/devel/g-wrap/BUILD b/devel/g-wrap/BUILD
index 436579d..768567f 100755
--- a/devel/g-wrap/BUILD
+++ b/devel/g-wrap/BUILD
@@ -1,4 +1,8 @@
+make_single  &&
+
 if  [ "${GWRAP_DEVEL}" == "y" ]; then
   CFLAGS="$CFLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"
-fi         &&
-default_build
+fi  &&
+
+default_build  &&
+make_normal
diff --git a/devel/g-wrap/HISTORY b/devel/g-wrap/HISTORY
index ecf97bb..6ee4cec 100644
--- a/devel/g-wrap/HISTORY
+++ b/devel/g-wrap/HISTORY
@@ -1,3 +1,8 @@
+2007-04-19 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: gnucash2 requires g-wrap's devel
+	  version (Bug #13722)
+	* BUILD: Fails with multiple make jobs
+
 2006-11-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* CONFLICTS: add
diff --git a/devel/g-wrap/PRE_SUB_DEPENDS b/devel/g-wrap/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..2d8a46a
--- /dev/null
+++ b/devel/g-wrap/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  G_WRAP_DEVEL)  [[  "$GWRAP_DEVEL"  ==  "y"  ]]  && return 0 ;;
+esac
+
+return 1
diff --git a/devel/g-wrap/SUB_DEPENDS b/devel/g-wrap/SUB_DEPENDS
new file mode 100755
index 0000000..8f0963a
--- /dev/null
+++ b/devel/g-wrap/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+  G_WRAP_DEVEL) echo "Development version requested, forcing GWRAP_DEVEL=y"
+                GWRAP_DEVEL=y
+                persistent_add  GWRAP_DEVEL;;
+             *) echo "Unknown sub-dependecy: $THIS_SUB_DEPENDS"
+                return 1;;
+esac
diff --git a/gnome2-apps/gnucash2/DEPENDS b/gnome2-apps/gnucash2/DEPENDS
index f34137d..7e388f4 100755
--- a/gnome2-apps/gnucash2/DEPENDS
+++ b/gnome2-apps/gnucash2/DEPENDS
@@ -1,3 +1,4 @@
+  depends  -sub CAIRO goffice-dev  &&
   depends  perl           &&
   depends  pkgconfig      &&
   depends  gtkhtml2       &&
@@ -8,7 +9,7 @@
   depends  libgnomeprint  &&
   depends  libtool  &&
   depends  libxml2  &&
-#  depends  g-wrap   &&
+  depends  -sub G_WRAP_DEVEL g-wrap  &&
   depends   swig     &&
   depends  slib     &&
 
diff --git a/gnome2-apps/gnucash2/HISTORY b/gnome2-apps/gnucash2/HISTORY
index f167eba..8258449 100644
--- a/gnome2-apps/gnucash2/HISTORY
+++ b/gnome2-apps/gnucash2/HISTORY
@@ -1,3 +1,8 @@
+2007-04-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Depends on goffice built with cairo support (Bug #13688)
+	  Depends on g-wrap devel version (Bug #13722)
+	* INSTALL: Fails installation with multiple make jobs
+
 2007-04-15 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to version 2.1.0. All other versions are
 	  broke with our current gtkhtml2 version.
diff --git a/gnome2-apps/gnucash2/INSTALL b/gnome2-apps/gnucash2/INSTALL
new file mode 100755
index 0000000..89db2c6
--- /dev/null
+++ b/gnome2-apps/gnucash2/INSTALL
@@ -0,0 +1,3 @@
+make_single      &&
+default_install  &&
+make_normal
diff --git a/gnome2-libs/goffice-dev/BUILD b/gnome2-libs/goffice-dev/BUILD
new file mode 100755
index 0000000..147da82
--- /dev/null
+++ b/gnome2-libs/goffice-dev/BUILD
@@ -0,0 +1,2 @@
+CFLAGS=${CFLAGS//-ffast-math/}  &&
+default_build
diff --git a/gnome2-libs/goffice-dev/DEPENDS b/gnome2-libs/goffice-dev/DEPENDS
index 1093108..cc5f95f 100755
--- a/gnome2-libs/goffice-dev/DEPENDS
+++ b/gnome2-libs/goffice-dev/DEPENDS
@@ -2,6 +2,11 @@ depends glib2                                      &&
 depends libgsf                                     &&
 depends xml-parser-expat                           &&
 
+optional_depends cairo                    \
+                 '--with-cairo'           \
+                 '--without-cairo'        \
+                 'for Cairo SVG support'  &&
+
 optional_depends gtk+2                             \
                  "--with-gtk"                      \
                  "--without-gtk"                   \
diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY
index f87e45c..b182141 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,9 @@
+2007-04-19 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: gnucash2 requires goffice-dev to be
+	  built against cairo (Bug #13688)
+	* DEPENDS: Optionally depends on cairo
+	* BUILD: Fails with -ffast-math
+
 2007-03-05 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to version 0.3.7
 
diff --git a/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS b/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..30129e7
--- /dev/null
+++ b/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+  CAIRO) is_depends_enabled $SPELL cairo  &&  return 0;;
+esac
+return 1
diff --git a/gnome2-libs/goffice-dev/SUB_DEPENDS b/gnome2-libs/goffice-dev/SUB_DEPENDS
new file mode 100755
index 0000000..cc0159f
--- /dev/null
+++ b/gnome2-libs/goffice-dev/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  CAIRO) echo "Cairo support requested: forcing cairo dependency."
+         depends  cairo  '--with-cairo';;
+      *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
+         return 1;;
+esac



More information about the SM-Commit mailing list