Your gnome branch in git repo

Terry Chan tpchan at comcast.net
Thu Jul 3 07:10:31 CEST 2008


ElAngelo,

I've pulled your gnome branch and made a few fixes in my fixgnome branch in my
git repo on doppio.  I'va also just attached a diff from my branch with your 
gnome branch.

No real problems except that I had to revert gtk+-2 back to 2.12.11. 2.13.2
kills evolution.

Of note is the fact that I was able to bump goffice2 to 0.6.4, and now none of
them major gnome apps (abiword, balsa, evolution*, gnumeric, or gnucash) use
goffice-0.2.2. Both gnumeric-1.8.3 and gnucash-2.2.5 both use goffice-0.6.4.
Abiword has its own internal goffice (0.4.x, I believe). So now there is no
longer a need for the plain old goffice module (0.2.2) in moonbase as far as
I can tell.

My gnome recompile order was:

glib-2 atk pango gtk+-2 intltool libsoup GConf gnome-keyring

libglade libart_lgpl libgnomecanvas gnome-icon-theme libbonobo libbonoboui
libgnomeui ORBit2 libgnomeprint libgnomeprintui gmime gtksourceview gtkhtml3 gtk-doc

abiword
balsa
evolution-data-server
evolution
evolution-exchange
pygobject pygtk2
gnumeric2 (say no to gda support to get this to compile)
gnucash

Terry Chan
-------------- next part --------------
diff --git a/gnome2/apps/abiword/DEPENDS b/gnome2/apps/abiword/DEPENDS
index a9f8627..86cce05 100644
--- a/gnome2/apps/abiword/DEPENDS
+++ b/gnome2/apps/abiword/DEPENDS
@@ -5,5 +5,4 @@ depends  enchant
 depends  boost
 
 optional_depends  "gucharmap" "" "" "enable character map for abiword"
-optional_depends  "goffice"   "" "" "enable some plugins for abiword" 
 optional_depends  "gtkmathview" "" "" "enable a built-in formula editor"
diff --git a/gnome2/apps/abiword/DETAILS b/gnome2/apps/abiword/DETAILS
index 5d155a6..0905fd1 100644
--- a/gnome2/apps/abiword/DETAILS
+++ b/gnome2/apps/abiword/DETAILS
@@ -1,14 +1,14 @@
           MODULE=abiword
-         VERSION=2.6.2
+         VERSION=2.6.3
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-plugins-$VERSION.tar.gz
       SOURCE_URL=http://www.abisource.com/downloads/$MODULE/$VERSION/source
      SOURCE2_URL=http://www.abisource.com/downloads/$MODULE/$VERSION/source
-      SOURCE_VFY=sha1:b7179ac4c14b476a2abc407aaf534f7b4b7786d7
-     SOURCE2_VFY=sha1:96c48febc058d14907cf069429e32c5d1374a95d
+      SOURCE_VFY=sha1:91e6dd8e0cb9c82dec35d3d3d9089f22c9ab5bcc
+     SOURCE2_VFY=sha1:56ab0ffe3e9ca0e397baac4289f9faef6f498cfd
         WEB_SITE=http://www.abisource.com
          ENTERED=20011224
-         UPDATED=20080411
+         UPDATED=20080702
            SHORT="a full-featured, yet light and fast word processor"
 
 cat << EOF
diff --git a/gnome2/apps/gnumeric2/DEPENDS b/gnome2/apps/gnumeric2/DEPENDS
index 49b0073..aee1c38 100644
--- a/gnome2/apps/gnumeric2/DEPENDS
+++ b/gnome2/apps/gnumeric2/DEPENDS
@@ -1,5 +1,5 @@
 depends  libgnomeprintui  &&
-depends  goffice          &&
+depends  goffice2         &&
 
 optional_depends  libgnomedb    ""  ""                 "enable gnome-db for gnumeric"  &&
 optional_depends  scrollkeeper  ""  "--without-gnome"  "enable cataloging system"      &&
diff --git a/gnome2/apps/gnumeric2/DETAILS b/gnome2/apps/gnumeric2/DETAILS
index 3d3bfb7..e685fc0 100644
--- a/gnome2/apps/gnumeric2/DETAILS
+++ b/gnome2/apps/gnumeric2/DETAILS
@@ -1,13 +1,13 @@
           MODULE=gnumeric2
              MOD=gnumeric
-         VERSION=1.6.3
+         VERSION=1.8.3
           SOURCE=$MOD-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION
-      SOURCE_URL=$GNOME_URL/sources/$MOD/1.6/
-      SOURCE_VFY=sha1:2261b3276ed5ead65047208a6ddb7f3436b7e544
+      SOURCE_URL=$GNOME_URL/sources/$MOD/1.8/
+      SOURCE_VFY=sha1:5a6585549bd705bf1d0e590981c3ef38173f8c08
         WEB_SITE=http://www.gnumeric.org
          ENTERED=20021224
-         UPDATED=20060323
+         UPDATED=20080702
            SHORT="the GNOME spreadsheet application"
 
 cat << EOF
diff --git a/gnome2/desktop/evolution-data-server/DETAILS b/gnome2/desktop/evolution-data-server/DETAILS
index 7b0dc48..634429e 100644
--- a/gnome2/desktop/evolution-data-server/DETAILS
+++ b/gnome2/desktop/evolution-data-server/DETAILS
@@ -1,15 +1,15 @@
           MODULE=evolution-data-server
-         VERSION=2.22.2
+         VERSION=2.22.3
            MAJOR=2.22
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-1.12.3-gtkdoc-rebase.patch
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:d3fc33802fec51a16b017abb7516f4ed79311dfa
+      SOURCE_VFY=sha1:5d01b1248fcacef9c478787892f223338dff731b
      SOURCE2_VFY=sha1:8947bce20b0fe967d29aa86d5f282c4b3699fb18
         WEB_SITE=http://gnome.org/projects/evolution/
          ENTERED=20011109
-         UPDATED=20080601
+         UPDATED=20080702
            SHORT="backend data manager for Evolution"
 PSAFE=no
 
diff --git a/gnome2/desktop/evolution-exchange/DETAILS b/gnome2/desktop/evolution-exchange/DETAILS
index bf9344d..5c14fc2 100644
--- a/gnome2/desktop/evolution-exchange/DETAILS
+++ b/gnome2/desktop/evolution-exchange/DETAILS
@@ -1,12 +1,12 @@
           MODULE=evolution-exchange
-         VERSION=2.12.3
-           MAJOR=2.12
+         VERSION=2.22.3
+           MAJOR=2.22
           SOURCE=${MODULE}-${VERSION}.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:099f61a31528b7cb6f14f382eb39e7e2e110dcd5
+      SOURCE_VFY=sha1:162383003589100f0239612e2d184cb720164de2
         WEB_SITE=http://www.gnome.org
          ENTERED=20060317
-         UPDATED=20080221
+         UPDATED=20080702
            SHORT="allows Evolution to talk to Exchange"
 cat << EOF
 This is the Ximian Connector for Microsoft Exchange, which adds
diff --git a/gnome2/desktop/evolution/DETAILS b/gnome2/desktop/evolution/DETAILS
index 84fb231..c7b74e4 100644
--- a/gnome2/desktop/evolution/DETAILS
+++ b/gnome2/desktop/evolution/DETAILS
@@ -1,12 +1,12 @@
           MODULE=evolution
-           MAJOR=2.12
-         VERSION=2.12.3
+           MAJOR=2.22
+         VERSION=2.22.3.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:14861dd497e935074424269f2d1e6c11be56abfe
+      SOURCE_VFY=sha1:806058728c497bbb2ac6c4ddb5182eebdf97d078
         WEB_SITE=http://gnome.org/projects/evolution/
          ENTERED=20011109
-         UPDATED=20080221
+         UPDATED=20080702
            SHORT="email, calendar and notes information management solution."
 cat << EOF
 Ximian Evolution is the premiere personal and workgroup information
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index 1a55184..6fd6fea 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -1,10 +1,10 @@
           MODULE=gtk\+-2
-         VERSION=13.2
+         VERSION=12.11
           SOURCE=$MODULE.$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
-   SOURCE_URL[0]=$GNOME_URL/sources/gtk+/2.13
-   SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v2.13
-      SOURCE_VFY=sha1:0113b239d04dfcb1aefcc438f74ad0ddebb9e231
+   SOURCE_URL[0]=$GNOME_URL/sources/gtk+/2.12
+   SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v2.12
+      SOURCE_VFY=sha1:c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b
         WEB_SITE=http://www.gtk.org
          ENTERED=20020313
          UPDATED=20080702
diff --git a/libs/goffice2/DETAILS b/libs/goffice2/DETAILS
index 903fbc6..78742cd 100644
--- a/libs/goffice2/DETAILS
+++ b/libs/goffice2/DETAILS
@@ -1,13 +1,13 @@
           MODULE=goffice2
-           MAJOR=0.4
-         VERSION=0.4.3
+           MAJOR=0.6
+         VERSION=0.6.4
           SOURCE=goffice-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION/
       SOURCE_URL=$GNOME_URL/sources/goffice/$MAJOR/
-      SOURCE_VFY=sha1:56386b7554ec8e0d2fac47251344ab7edaa7fea4
+      SOURCE_VFY=sha1:b6ce7576396fc69a1a44c9fea4b2b2f159948101
         WEB_SITE=www.gnome.org
          ENTERED=20071104
-         UPDATED=20071104
+         UPDATED=20080702
            SHORT="A glib/gtk set of document centric objects and utilities"
 cat << EOF
 This version is specific to gnucash-2.2.x.
diff --git a/mail/balsa/DEPENDS b/mail/balsa/DEPENDS
index 8394cdf..3157300 100644
--- a/mail/balsa/DEPENDS
+++ b/mail/balsa/DEPENDS
@@ -5,7 +5,7 @@ depends  aspell      &&
 depends  gmime       &&
 depends  libnotify   &&
 
-optional_depends "libgtkhtml"     \
+optional_depends "gtkhtml3"     \
                  "--with-gtkhtml" \
                  ""               \
                  "to enable display of html messages" &&
diff --git a/x11-apps/gnucash/DETAILS b/x11-apps/gnucash/DETAILS
index 8f15b24..6ec167c 100644
--- a/x11-apps/gnucash/DETAILS
+++ b/x11-apps/gnucash/DETAILS
@@ -1,14 +1,14 @@
           MODULE=gnucash
-         VERSION=2.2.4
+         VERSION=2.2.5
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=$SFORGE_URL/$MODULE/
    SOURCE_URL[1]=http://ibiblio.org/pub/Linux/X11/gnome/sources/gnucash/
    SOURCE_URL[2]=http://www.gnucash.org/pub/gnucash/sources/stable/
-      SOURCE_VFY=sha1:80a586e56f460c22f7a903cce5b5993fbd9bf327
+      SOURCE_VFY=sha1:91fc316baf7d29a49d3f4be3b2e4aefb5403159c
         WEB_SITE=http://www.gnucash.org
       MAINTAINER=tchan at lunar-linux.org
          ENTERED=20011105
-         UPDATED=20080303
+         UPDATED=20080702
            SHORT="GNUCash a open source personal finance suite"
 cat << EOF
 GnuCash allows you to track bank accounts, stocks, income, and expenses.


More information about the Lunar-dev mailing list