Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Haley (e26897a32148c364b177204f8a877f9024559123)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Haley <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Haley (e26897a32148c364b177204f8a877f9024559123)
  • Date: Thu, 26 Aug 2010 10:59:56 -0500

GIT changes to master grimoire by David Haley <khoralin AT gmail.com>:

gnome2-apps/gnucash/DEPENDS | 59
+++++++++++++++----------
gnome2-apps/gnucash/DETAILS | 8 +--
gnome2-apps/gnucash/HISTORY | 8 +++
gnome2-libs/goffice/HISTORY | 4 +
gnome2-libs/goffice/PRE_SUB_DEPENDS | 4 +
gnome2-libs/goffice/REPAIR^all^PRE_SUB_DEPENDS | 4 +
gnome2-libs/goffice/SUB_DEPENDS | 4 +
7 files changed, 65 insertions(+), 26 deletions(-)

New commits:
commit f6530b2a7748094ab67b2366099f2a4793ec7b5a
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

gnucash: DEPENDS updated if development version used.

It was found that development version has slightly different
requirements for dependencies. 'libdbi' is needed to compile
database support for this devel version and will not compile
without it.

Also wrapped IF logic acround older postgresql optional
dependency so both are not cast at the same time.

commit 0841e819cf7f3245698aa32f6c1759a7bdb7ac70
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

gnucash,goffice: gnucash DETAILS updated, sub-depends added.

Per request from lace IF/ELSE logic in gnucash/DETAILS has been
revised and corrected.

Two sub-dependencies have been added: goffice w/gtk+2, swig w/guile.
During testing gnucash would not compile without these
sub-dependencies enabled. gnucash/DEPENDS has been updated
accordingly with the sub-depends notations. swig already had
appropriate files an did not need any additional work. goffice
was in need of PRE_SUB_DEPENDS and SUB_DEPENDS files. These were
created and appropriate informaito npaced in them. A REPAIR file
was also placed into the goffice spell directory.

diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS
index 46c148f..e11da1f 100755
--- a/gnome2-apps/gnucash/DEPENDS
+++ b/gnome2-apps/gnucash/DEPENDS
@@ -1,17 +1,40 @@
-depends goffice &&
-depends gtkhtml2 &&
+if [ "$GNUCASH_DEVEL" == "y" ]; then
+ depends libdbi
+fi &&
+
+optional_depends aqbanking \
+ '--enable-hbci' \
+ '--disable-hbci' \
+ 'to enable HBCI support' &&
+
+depends gconf2 &&
+depends glib2 &&
+depends gtk+2 &&
depends guile &&
depends libart_lgpl &&
+depends libglade2 &&
depends libgnomeprint &&
+depends libgnomeui &&
+depends -sub "GTK2" goffice &&
depends libgsf &&
-depends libtool &&
+depends gtkhtml2 &&
+
+optional_depends libofx \
+ '--enable-ofx' \
+ '--disable-ofx' \
+ 'to compile with ofx support' &&
+
depends libxml2 &&
-depends perl &&
-depends pkgconfig &&
+depends pango &&
+depends -sub "GUILE" swig &&
+
+
+### ALL PAST THIS POINT NOT UPSTREAM DEPENDENCY###
+
+#Required, upstream provider states this may be needed
+# if guile and gnucash are not acting nice together:
+# http://wiki.gnucash.org/wiki/Building#slib_Issues
depends slib &&
-depends gtk+2 &&
-depends gnome-vfs2 &&
-depends libgnomeui &&

optional_depends texinfo \
'' \
@@ -23,20 +46,12 @@ optional_depends bzip2 \
'' \
'to build with BZip2 support' &&

-optional_depends libofx \
- '--enable-ofx' \
- '--disable-ofx' \
- 'to compile with ofx support' &&
-
-optional_depends aqbanking \
- '--enable-hbci' \
- '--disable-hbci' \
- 'to enable HBCI support' &&
-
-optional_depends postgresql \
- '--enable-sql' \
- '--disable-sql' \
- 'for SQL support' &&
+if [ "$GNUCASH_DEVEL" == "n" ]; then
+ optional_depends postgresql \
+ '--enable-sql' \
+ '--disable-sql' \
+ 'for SQL support'
+fi &&

optional_depends doxygen \
'--enable-doxygen' \
diff --git a/gnome2-apps/gnucash/DETAILS b/gnome2-apps/gnucash/DETAILS
index d760591..091a666 100755
--- a/gnome2-apps/gnucash/DETAILS
+++ b/gnome2-apps/gnucash/DETAILS
@@ -1,10 +1,10 @@
SPELL=gnucash
-if [ "$GNUCASH_DEVEL" == "n" ]; then
- VERSION=2.2.9
-
SOURCE_HASH=sha512:211082ec4504524456ebc6bad3a0e315201f717827d7eb6a789efea3b1cdf243456f4a08c33590123f80f6e5126002af5c1b7c95b312bc4ea22e2c00a4b17323
-else
+if [ "$GNUCASH_DEVEL" == "y" ]; then
VERSION=2.3.15

SOURCE_HASH=sha512:9763903ce46b52b86d7d7e0e790d3049a73eb52a723f82416cc5e99a10cf2d551be6ffb8298983c31d35d86419176c80da0b2bbb8ea8132b70b3a6de92201e5e
+else
+ VERSION=2.2.9
+
SOURCE_HASH=sha512:211082ec4504524456ebc6bad3a0e315201f717827d7eb6a789efea3b1cdf243456f4a08c33590123f80f6e5126002af5c1b7c95b312bc4ea22e2c00a4b17323
fi
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 25579e3..3c22548 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,11 @@
+2010-08-26 David C. Haley <khoralin AT gmail.com>
+ * DEPENDS: if DEVEL, libdbi needed
+
+2010-08-24 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: updated IF/ELSE logic per request from lace
+ * DEPENDS: added sub-dependencies; swig with guile,
+ goffice with gtk+2
+
2010-08-21 David C. Haley <khoralin AT gmail.com>
* PREPARE: Created.
* DETAILS: Added develop version to DETAIL.
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index 316be95..46fbdaa 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,7 @@
+2010-08-24 David C. Haley <khoralin AT gmail.com>
+ * SUB_DEPENDS: Created.
+ * PRE_SUB_DEPENDS: Created.
+
2010-08-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.9

diff --git a/gnome2-libs/goffice/PRE_SUB_DEPENDS
b/gnome2-libs/goffice/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..a473d34
--- /dev/null
+++ b/gnome2-libs/goffice/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0;;
+esac
+return 1
diff --git a/gnome2-libs/goffice/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/goffice/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..a473d34
--- /dev/null
+++ b/gnome2-libs/goffice/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0;;
+esac
+return 1
diff --git a/gnome2-libs/goffice/SUB_DEPENDS b/gnome2-libs/goffice/SUB_DEPENDS
new file mode 100755
index 0000000..4698f04
--- /dev/null
+++ b/gnome2-libs/goffice/SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ GTK2) depends gtk+2;;
+ *) echo "Bogus sub_depends"; return 1;;
+esac



  • [SM-Commit] GIT changes to master grimoire by David Haley (e26897a32148c364b177204f8a877f9024559123), David Haley, 08/26/2010

Archive powered by MHonArc 2.6.24.

Top of Page