Upgrade to abiword-3.0.0

diff --git a/config/packages-list b/config/packages-list
index ee89585..7ae916a 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -3,7 +3,7 @@
 # This file contains the name and version of all packages,
 # as well the corresponding patches, if needed.
 
-ABIWORD="abiword-2.8.6"
+ABIWORD="abiword-3.0.0"
 ACK="ack-2.02"
 ACPID="acpid-2.0.23"
 AGG="agg-2.5"

diff --git a/stage5/patches/common/abiword-2.8.6-glib.patch b/stage5/patches/common/abiword-2.8.6-glib.patch
deleted file mode 100644 (file)
index 32db934..0000000
--- a/stage5/patches/common/abiword-2.8.6-glib.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Naur abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6.new/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 09:11:01.000000000 -0400
-+++ abiword-2.8.6.new/src/Makefile.am  2012-08-11 15:35:09.357847411 -0400
-@@ -44,7 +44,7 @@
- 
- libabiword_2_8_la_LDFLAGS = \
-       $(DEPS_LIBS) \
--      --no-undefined \
-+      \
-       -avoid-version \
-       -export-dynamic
- 
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
-       $(DEPS_LIBS) \
--      --no-undefined \
-+      \
-       -avoid-version \
-       -export-dynamic \
-       -headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
-       $(platform_ldflags) \
--      --no-undefined      \
-+           \
-       -avoid-version      \
-       -export-dynamic
- 
-diff -Naur abiword-2.8.6.orig/src/Makefile.in abiword-2.8.6.new/src/Makefile.in
---- abiword-2.8.6.orig/src/Makefile.in 2010-06-13 17:17:56.000000000 -0400
-+++ abiword-2.8.6.new/src/Makefile.in  2012-08-11 15:35:09.382850589 -0400
-@@ -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) -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@  \
- @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@      \
- @TOOLKIT_COCOA_FALSE@ -avoid-version      \
- @TOOLKIT_COCOA_FALSE@ -export-dynamic
- 
-diff -Naur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6.new/src/af/util/xp/ut_go_file.h
---- abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h     2009-08-27 09:27:10.000000000 -0400
-+++ abiword-2.8.6.new/src/af/util/xp/ut_go_file.h      2012-08-11 15:34:43.264531084 -0400
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
-diff -Naur abiword-2.8.6.orig/src/af/util/xp/ut_png.cpp abiword-2.8.6.new/src/af/util/xp/ut_png.cpp
---- abiword-2.8.6.orig/src/af/util/xp/ut_png.cpp       2008-02-23 22:33:07.000000000 -0500
-+++ abiword-2.8.6.new/src/af/util/xp/ut_png.cpp        2012-08-11 15:34:48.994259302 -0400
-@@ -71,7 +71,7 @@
-        * the normal method of doing things with libpng).  REQUIRED unless you
-        * set up your own error handlers in the png_create_read_struct() earlier.
-        */
--      if (setjmp(png_ptr->jmpbuf))
-+      if (setjmp(png_jmpbuf(png_ptr)))
-       {
-               /* Free all of the memory associated with the png_ptr and info_ptr */
-               png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
-diff -Naur abiword-2.8.6.orig/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp abiword-2.8.6.new/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
---- abiword-2.8.6.orig/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp   2009-07-01 00:02:04.000000000 -0400
-+++ abiword-2.8.6.new/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp    2012-08-11 15:35:02.247943778 -0400
-@@ -185,7 +185,7 @@
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--      if (setjmp(m_pPNG->jmpbuf))
-+      if (setjmp(png_jmpbuf(m_pPNG)))
-       {
-               DELETEP(m_pPngBB);
-               png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@
-        * the normal method of doing things with libpng).  REQUIRED unless you
-        * set up your own error handlers in the png_create_read_struct() earlier.
-        */
--      if (setjmp(m_pPNG->jmpbuf))
-+      if (setjmp(png_jmpbuf(m_pPNG)))
-       {
-               /* Free all of the memory associated with the png_ptr and info_ptr */
-               png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);

diff --git a/stage5/patches/common/abiword-3.0.0-libgcrypt_1_6_0-1.patch b/stage5/patches/common/abiword-3.0.0-libgcrypt_1_6_0-1.patch
new file mode 100644 (file)
index 0000000..7ad3dd4
--- /dev/null
+++ b/stage5/patches/common/abiword-3.0.0-libgcrypt_1_6_0-1.patch
@@ -0,0 +1,27 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-12-21
+Initial Package Version: 3.0.0
+Upstream Status:         Not submitted
+Origin:                  Self
+Description:             Fixes building with libgcrypt 1.6.0
+
+diff -Naur a/plugins/collab/backends/service/xp/tls_tunnel.cpp b/plugins/collab/backends/service/xp/tls_tunnel.cpp
+--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp        2009-09-10 12:46:19.000000000 +0200
++++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp        2013-12-20 19:25:38.728798750 +0100
+@@ -123,11 +123,16 @@
+       return 0;
+ }
+ 
++#if GCRYPT_VERSION_NUMBER >= 0x010600
++  GCRY_THREAD_OPTION_PTHREAD_IMPL;
++  static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread;
++#else
+ static struct gcry_thread_cbs gcry_threads_tunnel =
+ { GCRY_THREAD_OPTION_USER, NULL,
+   gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
+   gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
+   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
++#endif
+ 
+ bool Proxy::tls_tunnel_init() {
+       if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)