[Lunar-commits] CVS: moonbase/gnome2-apps/abiword BUILD, 1.2, 1.2.2.1 DEPENDS, 1.1, 1.1.2.1 DETAILS, 1.6.2.2, 1.6.2.3

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/gnome2-apps/abiword
In directory dbguin.lunar-linux.org:/tmp/cvs-serv31634

Modified Files:
      Tag: GNOME_UNSTABLE
	BUILD DEPENDS DETAILS 
Log Message:

Fixng abiword build in GNOME_UNSTABLE, adding plugin support and compiling plugins.  Adding more depends and optional depends, now things should work alot better than before.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-apps/abiword/BUILD,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- BUILD	17 Dec 2003 05:02:14 -0000	1.2
+++ BUILD	25 Apr 2004 23:17:20 -0000	1.2.2.1
@@ -1,6 +1,6 @@
 (
 
-  unset CFLAGS CXXFLAGS CPPFLAGS CCACHE_NOLINK CCACHE_DIR && 
+#  unset CFLAGS CXXFLAGS CPPFLAGS CCACHE_NOLINK CCACHE_DIR && 
 
   cd    abi       &&                         
 
@@ -13,9 +13,26 @@
 		--localstatedir=/var				\
 		--infodir=/usr/share/info			\
 		--mandir=/usr/share/man				\
-		--with-sys-wv                                   &&
+                --with-ImageMagick                              \
+                --with-zlib                                     \
+                --with-libpng                                   \
+                --with-popt                                     \
+		--with-sys-wv                                   \
+                --enable-extra-optimization                     \
+                --enable-threads                                \
+                $OPTS                                           &&
              
-  default_make 
+  default_make                                                  &&
+
+  echo "Building Plugins for Abiword"                           &&
+  cd $SOURCE_DIRECTORY/abiword-plugins                          &&
+  ./nextgen.sh                                                  &&
+  ./configure --prefix=/usr                                     \
+              --with-python=/usr/lib/python2.3                  \ 
+              --enable-babelfish                                \
+              --enable-wikipedia                                \
+              $OPTS                                             &&    
+   default_make                  
             
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-apps/abiword/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- DEPENDS	14 Sep 2003 19:48:39 -0000	1.1
+++ DEPENDS	25 Apr 2004 23:17:20 -0000	1.1.2.1
@@ -3,5 +3,14 @@
 depends  libglade2 &&
 depends  fribidi   &&
 depends  wv        &&
-optional_depends  "gucharmap" "" "" "enable character map for abiword" 
+depends  psiconv   &&
+depends  librsvg   &&
+depends  ImageMagick &&
+depends  expat     &&
+depends  popt      &&
+depends  enchant   &&
+optional_depends  "gucharmap" "" "" "enable character map for abiword" &&
+optional_depends  "libgda2" "" "" "for libgda plugin support"  &&
+optional_depends  "libgnomeui" "--enable-gnome" "" "for gnome support" &&
+optional_depends  "gimp" "--enable-abigimp" "--disable-abigimp" "for gimp plugin support" 
 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-apps/abiword/DETAILS,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- DETAILS	23 Mar 2004 04:52:35 -0000	1.6.2.2
+++ DETAILS	25 Apr 2004 23:17:20 -0000	1.6.2.3
@@ -1,9 +1,8 @@
           MODULE=abiword
-         VERSION=2.1.1
+         VERSION=2.1.2
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
    SOURCE_URL[0]=$SFORGE_URL/$MODULE/$SOURCE
-      SOURCE_VFY=md5:f934412f56eb079f12e8e0fdec58951f
         WEB_SITE=http://www.abisource.org/
        MAINTANER=nhudson at lunar-linux.org
          ENTERED=20011224