abiword 3.0.1

6 files changed, 43 insertions, 70 deletions

diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index abaa8117a6..5718608810 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -2,7 +2,6 @@ depends libpng &&
 depends zlib &&
 depends pango &&
 depends -sub "PDF PS SVG" cairo &&
-depends gtk+2 &&
 depends fribidi &&
 depends freetype2 &&
 depends libgsf &&
@@ -11,6 +10,13 @@ depends libxml2 &&
 depends -sub FONT fontconfig &&
 depends librsvg2 &&
 
+optional_depends gtk+2 \
+		 --with-gtk2 '' \
+		 'use GTK+ version 2 instead of version 3' &&
+if ! is_depends_enabled $SPELL gtk+2; then
+    depends gtk+3
+fi &&
+
 if list_find "$ABIWORD_OPTS" "--enable-plugins"; then
   depends boost "--with-boost"
 else
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 173047ec11..1fec9def76 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,14 +1,14 @@
            SPELL=abiword
 if [[ $DEVEL == y ]]; then
-         VERSION=3.0.0
+         VERSION=3.0.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-     SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
+     SOURCE_HASH=sha512:c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf
 else
-         VERSION=3.0.0
+         VERSION=3.0.1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
-     SOURCE_HASH=sha512:3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637
+     SOURCE_HASH=sha512:c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       LICENSE[0]=GPL
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 45cdd96985..4725450d7b 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,8 @@
+2015-01-11 Ismael Luceno <ismael@sourcemage.org>
+	* PRE_BUILD: copied code from mawk
+	* abiword-gcc46.patch: removed, no longer needed
+	* DETAILS: updated spell to 3.0.1
+
 2014-07-25 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS: Fix typo
 
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index de954b5979..f9d7f22c09 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,8 +1,6 @@
-default_pre_build &&
-
-if [ "$DEVEL" == "n" ]; then
-   cd $SOURCE_DIRECTORY                                       &&
-   patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch           &&
-# only glib.h can be included
-   sedit 34d src/af/util/xp/ut_go_file.h
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+if [ -d "$SPELL_DIRECTORY/patches" ]; then
+  find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
+       -exec patch -fp1 -i '{}' \;
 fi
diff --git a/gnome2-apps/abiword/abiword-gcc46.patch b/gnome2-apps/abiword/abiword-gcc46.patch
deleted file mode 100644
index c4b9e9cbe3..0000000000
--- a/gnome2-apps/abiword/abiword-gcc46.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ src/Makefile.am	2011-05-16 10:12:55.378621418 +0200
-@@ -44,7 +44,7 @@
- 
- libabiword_2_8_la_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic
- 
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
---- src/Makefile.in	2010-06-13 23:17:56.000000000 +0200
-+++ src/Makefile.in	2011-05-16 10:13:35.595224769 +0200
-@@ -503,7 +503,7 @@
- 	$(WP_CPPFLAGS) \
- 	-DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
- 
--libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
-+libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \
- 	-export-dynamic $(am__append_6)
- libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
- 	text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
-@@ -538,7 +538,7 @@
- 
- @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
- @TOOLKIT_COCOA_TRUE@	$(DEPS_LIBS) \
--@TOOLKIT_COCOA_TRUE@	--no-undefined \
-+@TOOLKIT_COCOA_TRUE@	-Wl,--no-undefined \
- @TOOLKIT_COCOA_TRUE@	-avoid-version \
- @TOOLKIT_COCOA_TRUE@	-export-dynamic \
- @TOOLKIT_COCOA_TRUE@	-headerpad_max_install_names 
-@@ -554,7 +554,7 @@
- 
- @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
- @TOOLKIT_COCOA_FALSE@	$(platform_ldflags) \
--@TOOLKIT_COCOA_FALSE@	--no-undefined      \
-+@TOOLKIT_COCOA_FALSE@	-Wl,--no-undefined      \
- @TOOLKIT_COCOA_FALSE@	-avoid-version      \
- @TOOLKIT_COCOA_FALSE@	-export-dynamic
- 
diff --git a/gnome2-apps/abiword/patches/menu.patch b/gnome2-apps/abiword/patches/menu.patch
new file mode 100644
index 0000000000..cc678093c7
--- /dev/null
+++ b/gnome2-apps/abiword/patches/menu.patch
@@ -0,0 +1,22 @@
+Author:  Ismael Luceno <ismael.luceno@sourcemage.org>
+Subject: Fix missing declaration of wVBox at EV_UnixMenuBar::synthesizeMenuBar
+
+--- a/src/af/ev/gtk/ev_UnixMenu.cpp	2013-04-07 10:53:03.000000000 -0300
++++ b/src/af/ev/gtk/ev_UnixMenu.cpp	2015-01-11 03:00:48.762458410 -0300
+@@ -978,12 +978,14 @@
+	GtkWidget * wWidget = static_cast<XAP_UnixFrameImpl *>(m_pFrame->getFrameImpl())->getTopLevelWindow();
+	m_wMenuBar = gtk_menu_new ();
+     hildon_window_set_menu (HILDON_WINDOW (wWidget), GTK_MENU (m_wMenuBar));
+-#elif defined (ENABLE_MENUBUTTON)
+-	m_wMenuBar = gtk_menu_new ();
+ #else
+	GtkWidget * wVBox = static_cast<XAP_UnixFrameImpl *>(m_pFrame->getFrameImpl())->getVBoxWidget();
++#if defined (ENABLE_MENUBUTTON)
++	m_wMenuBar = gtk_menu_new ();
++#else
+	m_wMenuBar = gtk_menu_bar_new();
+ #endif
++#endif
+
+	synthesizeMenu(m_wMenuBar, false);
+	gtk_widget_show_all(m_wMenuBar);