[arch-commits] Commit in abiword/repos (3 files)

[Aaron Griffin]

    Date: Monday, April 21, 2008 @ 23:36:03
  Author: aaron
Revision: 726

archrelease failure due to locking
Manual commit

Modified:
  abiword/repos/extra-i686/	(properties)
  abiword/repos/extra-i686/PKGBUILD
Deleted:
  abiword/repos/extra-i686/abiword-2.4.2-spell.diff

--------------------------+
 PKGBUILD                 |   13 +++++------
 abiword-2.4.2-spell.diff |   53 ---------------------------------------------
 2 files changed, 7 insertions(+), 59 deletions(-)


Property changes on: abiword/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /abiword/trunk:1
   + /abiword/trunk:1-724

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-22 03:33:45 UTC (rev 725)
+++ extra-i686/PKGBUILD	2008-04-22 03:36:03 UTC (rev 726)
@@ -2,20 +2,21 @@
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=abiword
-pkgver=2.4.6
-pkgrel=2
+pkgver=2.6.2
+pkgrel=1
 pkgdesc="A fully-featured word processor"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.abisource.com"
-depends=('libsm' 'fribidi>=0.10.7' 'enchant>=1.3.0' 'libgnomeprintui' 'wv>=1.2.4')
+depends=('libsm' 'fribidi>=0.10.9' 'enchant>=1.3.0' 'libgnomeprintui' 'wv>=1.2.4'
+        'libgnomeui>=2.22.01' 'libgsf-gnome>=1.14.8')
 makedepends=('pkgconfig')
-source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8ed5fb282b9741aca75b9e47500d39a1')
+source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8e756c0529880fbe6ea3aaef8d5df0b5')
 
 build() {
   export MAKEFLAGS="-j1"
-  cd ${startdir}/src/${pkgname}-${pkgver}/abi
+  cd ${startdir}/src/${pkgname}-${pkgver}/
   ./configure --prefix=/usr --with-libxml2 --disable-gucharmap --with-sys-wv
   make || return 1
   make DESTDIR=${startdir}/pkg install

Deleted: extra-i686/abiword-2.4.2-spell.diff
===================================================================
--- extra-i686/abiword-2.4.2-spell.diff	2008-04-22 03:33:45 UTC (rev 725)
+++ extra-i686/abiword-2.4.2-spell.diff	2008-04-22 03:36:03 UTC (rev 726)
@@ -1,53 +0,0 @@
-diff -Naur abiword-2.4.2.orig/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp abiword-2.4.2/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp
---- abiword-2.4.2.orig/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp	2005-02-19 05:50:22.000000000 +0100
-+++ abiword-2.4.2/abi/src/wp/ap/unix/ap_UnixDialog_Spell.cpp	2006-03-22 23:03:40.000000000 +0100
-@@ -206,10 +206,13 @@
-             // show word in main window
-             makeWordVisible();
-      
-+			gpointer inst = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions));
-+			g_signal_handler_block (inst, m_listHandlerID);
-             // update dialog with new misspelled word info/suggestions
-             _updateWindow();
--     
--            // run into the GTK event loop for this window
-+			g_signal_handler_unblock (inst, m_listHandlerID);
-+
-+			// run into the GTK event loop for this window
- 	    gint response = abiRunModalDialog (GTK_DIALOG(mainWindow), false);
- 	    UT_DEBUGMSG (("ROB: response='%d'\n", response));
-             switch(response) {
-@@ -303,10 +306,6 @@
- 					  "row-activated", 
- 					  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionDblClicked), 
- 					  (gpointer)this);
--	m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
--					  "changed",
--					  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
--					  (gpointer)this);
-     m_replaceHandlerID = g_signal_connect (G_OBJECT(m_eChange), 
- 					   "changed",
- 					   G_CALLBACK (AP_UnixDialog_Spell__onSuggestionChanged),
-@@ -336,6 +335,10 @@
- 	GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW (m_lvSuggestions), 0);
- 	gtk_tree_view_column_set_sort_column_id (column, COLUMN_SUGGESTION);
- 
-+	m_listHandlerID = g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_lvSuggestions)), 
-+				  "changed",
-+				  G_CALLBACK (AP_UnixDialog_Spell__onSuggestionSelected), 
-+				  (gpointer)this);
- 
-     gtk_widget_show_all (m_wDialog);
-     return m_wDialog;
-@@ -433,6 +436,11 @@
- 								COLUMN_NUMBER, i,
- 								-1);
- 	    }
-+		// put the first suggestion in the entry
-+		suggest = (gchar*) _convertToMB((UT_UCSChar*)m_Suggestions->getNthItem(0));
-+        g_signal_handler_block(G_OBJECT(m_eChange), m_replaceHandlerID);
-+        gtk_entry_set_text(GTK_ENTRY(m_eChange), suggest);
-+        g_signal_handler_unblock(G_OBJECT(m_eChange), m_replaceHandlerID);      
-     }
- 
- 	gtk_tree_view_set_model (GTK_TREE_VIEW (m_lvSuggestions), model);