[Lunar-commits] <moonbase-gnome> Merge branch 'master' of github.com:lunar-linux/moonbase-gnome

[Florin Braescu]

commit cec619885f5bfbd8330f38ccfa0a65d9f555405c
Author: Florin Braescu <florin at lunar-linux.org>
Date: Tue, 14 Aug 2012 23:55:48 -0700
URL: https://github.com/lunar-linux/moonbase-gnome/commit/cec619885f5bfbd8330f38ccfa0a65d9f555405c

Merge branch 'master' of github.com:lunar-linux/moonbase-gnome
---
  apps/abiword/BUILD        | +4/-0     
  apps/abiword/CONFIGURE    | +1/-0     
  apps/abiword/DEPENDS      | +6/-2     
  desktop/goffice/BUILD     | +3/-9     
  desktop/goffice/DETAILS   | +1/-1     
  desktop/gucharmap/BUILD   | +0/-13    
  desktop/gucharmap/DEPENDS | +5/-4     
  desktop/gucharmap/DETAILS | +5/-6     
  8 files changed, 25 insertions(+), 35 deletions(-)

--- a/apps/abiword/BUILD
+++ b/apps/abiword/BUILD
@@ -1,5 +1,9 @@
 (
 
+  sedit "s:# *include <glib/[^>]*>:#include <glib.h>:" src/af/util/xp/ut_go_file.h goffice-bits/goffice/app/goffice-app.h &&
+
+  sedit "s:--no-undefined:-no-undefined:" src/Makefile.in &&
+
   OPTS+=" --disable-static" &&
 
   default_build
--- /dev/null
+++ b/apps/abiword/CONFIGURE
@@ -0,0 +1 @@
+mquery PLUGINS "Build all plugins supported by your setup?" y "--enable-plugins" "--disable-plugins"
--- a/apps/abiword/DEPENDS
+++ b/apps/abiword/DEPENDS
@@ -1,7 +1,11 @@
 depends  fribidi
 depends  wv
 depends  boost
+depends  cairo
+depends  gtk+-2
+depends  librsvg
 
-optional_depends  "gucharmap"    "" "" "enable character map for abiword"
-optional_depends  "gtkmathview"  "" "" "enable a built-in formula editor"
+optional_depends  "goffice"      "--with-goffice" "--without-goffice" "use system goffice library"
 optional_depends  "enchant"      "" "--disable-spell" "enable spell-checking"
+
+optional_depends  "gtkmathview"  "" "" "for built-in formula editor(say yes to plugins)"
--- a/desktop/goffice/BUILD
+++ b/desktop/goffice/BUILD
@@ -1,13 +1,7 @@
 (
+    # see https://bugzilla.gnome.org/show_bug.cgi?id=670316
+    sed -e 's:glib/gregex.h:glib.h:' -i configure &&
 
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD        \
-                --sysconfdir=/etc     \
-                --localstatedir=/var  \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
-                $OPTS                                         &&
-
-    default_make
+    default_build
 
 ) > $C_FIFO 2>&1
--- a/desktop/goffice/DETAILS
+++ b/desktop/goffice/DETAILS
@@ -6,7 +6,7 @@
       SOURCE_VFY=sha1:0c8f578f30746b92f37bd8e6eb13dbbaaa124278
         WEB_SITE=www.gnome.org
          ENTERED=20071104
-         UPDATED=20110801
+         UPDATED=20120803
            SHORT="A glib/gtk set of document centric objects and utilities"
 
 cat << EOF
--- a/desktop/gucharmap/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD         \
-                --sysconfdir=/etc      \
-                --localstatedir=/var   \
-                --disable-unihan       \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
-                $OPTS                                         &&
-    default_make
-
-) > $C_FIFO 2>&1
--- a/desktop/gucharmap/DEPENDS
+++ b/desktop/gucharmap/DEPENDS
@@ -1,6 +1,7 @@
-depends  popt
 depends  gtk+-2
-depends  gnome-doc-utils
 
-optional_depends  "libgnomeui"  "--enable-gnome"  "--disable-gnome"  \
-                  "for GNOME support"
+optional_depends  "gnome-doc-utils" "--enable-scrollkeeper" "--disable-scrollkeeper"\
+                  "for user manual"
+
+optional_depends  "GConf"  "--enable-gconf"  "--disable-gconf"  \
+                  "for GNOME GConf support"
--- a/desktop/gucharmap/DETAILS
+++ b/desktop/gucharmap/DETAILS
@@ -1,12 +1,11 @@
           MODULE=gucharmap
-           MAJOR=2.32
-         VERSION=$MAJOR.1
+         VERSION=2.33.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
-      SOURCE_VFY=sha1:4cb86f114e4ed2921fb4ffa58caa0370e4f82f0c
-        WEB_SITE=http://gucharmap.sourceforge.net
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/${VERSION%.*}
+      SOURCE_VFY=sha1:15a81bf193d00ca26ebb47dc99c2d26efd0c8df6
+      WEB_SITE=http://gucharmap.sourceforge.net
          ENTERED=20030421
-         UPDATED=20101229
+         UPDATED=20120802
            SHORT="A GTK+-2 Unicode character map viewer"
 
 cat << EOF