abiword: updated to 3.0.0

5 files changed, 68 insertions, 13 deletions

diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD
index 94733f6138..542503b7d7 100755
--- a/gnome2-apps/abiword/BUILD
+++ b/gnome2-apps/abiword/BUILD
@@ -1,3 +1,3 @@
-OPTS="$ABIWORD_OPTS $OPTS" &&
+OPTS="--disable-collab-backend-service --disable-collab-backend-tcp $ABIWORD_OPTS $OPTS" &&
 
 default_build
diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index a226d3bb6c..8e3d9def7e 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -7,4 +7,19 @@ config_query_option ABIWORD_OPTS "Install additional templates?" n \
                                  "--disable-templates" &&
 
 config_query_option ABIWORD_OPTS "Install additional plugins?" y \
-                                 "--enable-plugins" ""
+                                 "--enable-plugins" "" &&
+
+config_query_option ABIWORD_OPTS "Menu Button instead of Menu Bar?" n \
+                                 "--enable-menubutton" "" &&
+
+config_query_option ABIWORD_OPTS "Include printing support?" y \
+                                 "" "--disable-print" &&
+
+config_query_option ABIWORD_OPTS "Include statusbar?" y \
+                                 "" "--disable-statusbar" &&
+
+config_query_option ABIWORD_OPTS "Enable use of EMACS keybindings?" n \
+                                 "--enable-emacs-keybindings" "" &&
+
+config_query_option ABIWORD_OPTS "Enable use of VI keybindings?" n \
+                                 "--enable-vi-keybindings" ""
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 204071b3b2..c35602e133 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -30,34 +30,69 @@ optional_depends gnome-vfs2 \
                  "--without-gnomevfs" \
                  "for gnome-vfs library support" &&
 
+optional_depends glib2 \
+                 "--with-gio" "--without-gio" \
+                 "Use GIO library?" &&
+
 optional_depends enchant \
                  "--enable-spell" \
                  "--disable-spell" \
                  "for spell checking support" &&
-optional_depends asio '--enable-collab-backend-tcp' \
-                      '--disable-collab-backend-tcp' \
-                      'for the tcp collaboration plugin' &&
+
+#optional_depends asio '--enable-collab-backend-tcp' \
+#                      '--disable-collab-backend-tcp' \
+#                      'for the tcp collaboration plugin' &&
+
 optional_depends empathy '--enable-collab-backend-telepathy' \
                          '--disable-collab-backend-telepathy' \
                          'for the telepathy collaboration plugin' &&
+
 optional_depends loudmouth '--enable-collab-backend-xmpp' \
                            '--disable-collab-backend-xmpp' \
                            'for the XMPP/Jabber collaboration plugin' &&
+
 optional_depends dbus-glib '--enable-collab-backend-sugar' \
                            '--disable-collab-backend-sugar' \
                            'for the Sugar collaboration plugin' &&
-optional_depends libsoup '--enable-collab-backend-service' \
-                         '--disable-collab-backend-service' \
-                         'for the service collaboration plugin' &&
+
+#optional_depends libsoup '--enable-collab-backend-service' \
+#                         '--disable-collab-backend-service' \
+#                         'for the service collaboration plugin' &&
+
 if is_depends_enabled $SPELL libsoup; then
   depends asio
 fi &&
+
+optional_depends libical \
+                 "--with-libical" "--without-libical" \
+                 "Use libical and raptor libraries?" &&
+
+optional_depends evolution-data-server \
+                 "--with-evolution-data-server" \
+                 "--without-evolution-data-server" \
+                 "Use Evolution Data Server to get at contact and calendar information?" &&
+
+optional_depends libchamplain \
+                 "--with-champlain" "--without-champlain" \
+                 "Use champlain to display maps?" &&
+
 optional_depends libwmf '' '' 'for the Windows Metafile Format plugin' &&
+
 optional_depends libgda4 '' '' 'for gda database access plugin' &&
+
 optional_depends gtkmathview '' '' 'for mathview MathML plugin' &&
+
 optional_depends libwpd '' '' 'for the WordPerfect plugin' &&
+
 optional_depends libwpg '' '' 'for the WordPerfect graphics plugin' &&
+
 optional_depends aiksaurus '' '' 'for the aiksaurus (thesaurus) plugin' &&
+
 optional_depends psiconv '' '' 'for the psiconv (psion conversion) plugin' &&
+
 optional_depends gimp '' '' 'for the gimp plugin' &&
-optional_depends tidy '' '' 'for HTML cleaning using tidy'
+
+optional_depends tidy \
+                 "--with-libtidy" "--without-libtidy"' \
+                 "for HTML cleaning using tidy"
+
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 2b4dc45af0..173047ec11 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,14 +1,14 @@
            SPELL=abiword
 if [[ $DEVEL == y ]]; then
-         VERSION=2.9.4
+         VERSION=3.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-     SOURCE_HASH=sha512:8f09741bbd1d492be1e5f3486253c6d6c0c21895aaaa85fe60b167e30adbb72f9baa790a50370ec1cf0321229f6173aa2c48d05456fe8d06e08ef9685bb01d32
+     SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
 else
-         VERSION=2.8.6
+         VERSION=3.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-     SOURCE_HASH=sha512:327ffa6da73f7a1b74d1bc374239ac087ee76672da590626da3a068f972684b0963c50641718c39a7fb2429a56c1076bdfd67e8f7f0eab0eda90b70cf846bbbd
+     SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       LICENSE[0]=GPL
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index c87c4220c6..25878ace9d 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,8 @@
+2014-01-28 Robin Cook <rcook@wyrms.net>
+	* DETAILS: updated devel version to 3.0.0
+	* DEPENDS: updated depends, commented out currently broken backends
+	* CONFIGURE: added new configure options
+
 2014-01-25 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated devel version to 2.9.4