3.0.0-alt5

.gear/rules

+copy: *.keys
+copy: *.mime
 copy: *.patch
+copy: *.xml
 tar.gz: abiword name=abiword-3.0.0

abiword-2.6.0-boolean.patch

+diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
+--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h	2008-03-18 23:16:20.000000000 +0100
++++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h	2008-03-25 17:14:23.000000000 +0100
+@@ -23,6 +23,9 @@
+ #ifndef PD_STYLE_H
+ #define PD_STYLE_H
+ 
++#ifndef FALSE
++#define FALSE 0
++#endif /* FALSE */
+ #include "ut_types.h"
+ #include "pt_Types.h"
+ #include "ut_xml.h"

abiword-2.8.3-desktop.patch

+diff -u -r abiword-2.8.3.orig/abiword.desktop abiword-2.8.3/abiword.desktop
+--- abiword-2.8.3.orig/abiword.desktop	2010-04-02 19:59:58.000000000 +0200
++++ abiword-2.8.3/abiword.desktop	2010-04-08 09:07:01.000000000 +0200
+@@ -6,7 +6,7 @@
+ Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
+ StartupNotify=true
+ X-Desktop-File-Install-Version=0.9
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
+ Name=AbiWord
+ GenericName=Word Processor
+ Comment=Compose, edit, and view documents

abiword-3.0.0-fix-redraw.patch

+commit f1d711aa84c95430319fd92ffbcb03df36e5e76e
+Author: Hubert Figuière <hub@figuiere.net>
+Date:   Sat Feb 22 10:41:55 2014 -0500
+
+    Bug 13582 - Fix redraw region in custom widget.
+    
+    Cherry-picked from trunk@33870 and reworked for 3.0.x
+
+diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+index 4c8d23c..15d7a7d 100644
+--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+@@ -520,7 +520,7 @@ void GR_UnixCairoGraphics::_beginPaint()
+ 		{
+ 			UT_ASSERT(ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE);
+ 			if (ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE)
+-				UT_ASSERT(ev->expose.window == m_pWin);
++				UT_ASSERT(ev->expose.window == m_pWin || ev->expose.window == gdk_window_get_effective_parent (m_pWin));
+ 		}
+ 	}
+ #endif
+diff --git a/src/af/xap/gtk/xap_UnixCustomWidget.cpp b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
+index b0b7015..5150afe 100644
+--- a/src/af/xap/gtk/xap_UnixCustomWidget.cpp
++++ b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
+@@ -45,16 +45,18 @@ void XAP_UnixCustomWidget::_fe::expose(XAP_UnixCustomWidget *self, GdkEventExpos
+ #endif
+ {
+ #if GTK_CHECK_VERSION(3,0,0)
+-	GdkEventExpose *ev = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
+-#endif
++	self->m_cr = cr;
++	double x1, y1, x2, y2;
++	cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
++
++	UT_Rect r(x1, y1, x2 - x1, y2 - y1);
++#else
+ 	UT_Rect r(
+ 			ev->area.x,
+ 			ev->area.y,
+ 			ev->area.width,
+ 			ev->area.height
+ 		);
+-#if GTK_CHECK_VERSION(3,0,0)
+-	self->m_cr = cr;
+ #endif
+ 	self->draw(&r);
+ }

abiword-3.0.0-fixintrospection.patch

+diff --git a/src/wp/main/gtk/libabiword.cpp b/src/wp/main/gtk/libabiword.cpp
+index 7567a54..c4d8e12 100644
+--- a/src/wp/main/gtk/libabiword.cpp
++++ b/src/wp/main/gtk/libabiword.cpp
+@@ -30,8 +30,8 @@ static AP_UnixApp *_abiword_app = NULL;
+ 
+ /**
+  * libabiword_init:
+- * @argc: (inout): argument count
+- * @argv: (array length=argc) (inout) (allow-none): Commandline arguments
++ * @argc: argument count
++ * @argv: (array length=argc): Commandline arguments
+  *
+  * Initializes libabiword
+  */
+

abiword-3.0.0-gnutls-no-libgcrypt.patch

+diff -up abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.cpp.nogcrypt abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.cpp
+--- abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.cpp.nogcrypt	2014-04-22 22:28:24.589947888 +0200
++++ abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.cpp	2014-04-22 22:31:36.729898497 +0200
+@@ -49,89 +49,7 @@ typedef boost::shared_ptr<asio::ip::tcp:
+ typedef boost::shared_ptr<gnutls_session_t> session_ptr_t;
+ typedef boost::shared_ptr< std::vector<char> > buffer_ptr_t;
+ 
+-class mutex {
+-public:
+-	mutex()	{
+-#ifdef WIN32
+-		repr = CreateMutex(0, FALSE, 0);
+-#else
+-		pthread_mutex_init(&repr, NULL);
+-#endif
+-	}
+-
+-	void lock() {
+-#ifdef WIN32
+-		WaitForSingleObject(repr, INFINITE);
+-#else
+-		pthread_mutex_lock(&repr);
+-#endif	
+-	}
+-	
+-	void unlock() {
+-#ifdef WIN32
+-		ReleaseMutex(repr);
+-#else
+-		pthread_mutex_unlock(&repr);
+-#endif	
+-	}
+-
+-	~mutex()
+-	{
+-#ifdef WIN32
+-		CloseHandle(repr);
+-#else
+-		pthread_mutex_destroy(&repr);
+-#endif
+-	}
+-
+-private:
+-	mutex( const mutex& );
+-	const mutex& operator=( const mutex& );
+-
+-#ifdef WIN32
+-	HANDLE repr;
+-#else
+-	pthread_mutex_t repr;
+-#endif
+-};
+-
+-static int gcry_tunnel_mutex_init(void **priv)
+-{
+-	if (!priv)
+-		return -1;
+-	*priv = new mutex();
+-	return 0;
+-}
+-
+-static int gcry_tunnel_mutex_destroy(void **priv)
+-{
+-	if (!priv || !*priv)
+-		return -1;
+-	delete reinterpret_cast<mutex*>(*priv);
+-	return 0;
+-}
+-
+-static int gcry_tunnel_mutex_lock(void **priv)
+-{
+-	reinterpret_cast<mutex*>(*priv)->lock();
+-	return 0;
+-}
+-
+-static int gcry_tunnel_mutex_unlock(void **priv)
+-{
+-	reinterpret_cast<mutex*>(*priv)->unlock();
+-	return 0;
+-}
+-
+-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 };
+-
+ bool Proxy::tls_tunnel_init() {
+-	if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)
+-		return false;
+ 	if (gnutls_global_init() != 0)
+ 		return false;
+ 	return true;
+diff -up abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.h.nogcrypt abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.h
+--- abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.h.nogcrypt	2012-05-25 18:12:56.000000000 +0200
++++ abiword-3.0.0/plugins/collab/backends/service/xp/tls_tunnel.h	2014-04-22 22:32:49.534292862 +0200
+@@ -40,7 +40,6 @@
+ typedef long ssize_t;
+ typedef int pid_t;
+ #endif
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ 

abiword-3.0.0-libebook.patch

+From ca0495e8c69c53dca85f06ea1f4b063c57717a2b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 27 May 2014 18:56:38 +0200
+Subject: [PATCH] fix build on F-20
+
+---
+ src/text/ptbl/xp/pd_DocumentRDF.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+index 87b372e..798e262 100644
+--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -1884,7 +1884,7 @@ PD_RDFContact::className() const
+ 
+ #ifdef WITH_EVOLUTION_DATA_SERVER
+ extern "C" {
+-  #include <libebook/e-book.h>
++  #include <libebook/libebook.h>
+ };
+ 
+ static std::string get( EVCard* c, const char* v )
+-- 
+1.9.3
+

abiword-3.0.spec

+%set_automake_version 1.11
+
 %define _name abiword
 %define abi_ver 3.0
 %define ver_major 3.0
@@ -9,7 +11,7 @@
 
 Name: %_name-%abi_ver
 Version: %ver_major.0
-Release: alt4
+Release: alt5
 
 Summary: Lean and fast full-featured word processor
 Group: Office
@@ -19,15 +21,32 @@ Url: http://www.abisource.com/
 Source: http://www.abisource.com/downloads/abiword/%version/source/%_name-%version.tar.gz
 # http://bugzilla.abisource.com/show_bug.cgi?id=13564
 Patch: abiword-3.0-up-13564.patch
+Patch2: abiword-boost54.patch
+
+#fedora patches
+Source11: abiword.mime
+Source12: abiword.keys
+Source13: abiword.xml
+
+Patch11: abiword-2.8.3-desktop.patch
+Patch12: abiword-2.6.0-boolean.patch
+Patch13: abiword-3.0.0-fixintrospection.patch
+Patch14: abiword-3.0.0-fix-redraw.patch
+Patch15: abiword-3.0.0-gnutls-no-libgcrypt.patch
+Patch16: abiword-3.0.0-librevenge.patch
+Patch17: abiword-3.0.0-libebook.patch
+
 
 Obsoletes: abisuite, abisuite-koi8, abisuite-cp1251, abisuite-iso8859-8
 Conflicts: %_name %_name-light
 Requires: %name-data = %version-%release
 
-BuildRequires: gcc-c++ boost-devel libreadline
+BuildRequires: gcc-c++ boost-devel asio libreadline-devel flex
+BuildRequires: gobject-introspection-devel libgtk+3-gir-devel libgsf-gir-devel
 BuildRequires: libgtk+3-devel librsvg-devel libfribidi-devel libredland-devel libots-devel
-BuildRequires: liblink-grammar-devel libgsf-devel bzlib-devel libjpeg-devel libxslt-devel
-BuildRequires: libwv-devel libwpd9-devel libwpg-devel libwmf-devel libexpat-devel
+BuildRequires: liblink-grammar-devel libgsf-devel bzlib-devel zlib-devel libjpeg-devel libpng-devel libxslt-devel
+BuildRequires: libwv-devel libwpd10-devel libwpg-devel libwmf-devel libexpat-devel
+BuildRequires: telepathy-glib-devel libdbus-glib-devel libgnutls-devel libsoup-devel libgcrypt-devel
 %{?_enable_spell:BuildRequires: libenchant-devel}
 %{?_with_goffice:BuildRequires: libgnomeoffice0.10-devel}
 %{?_with_champlain:BuildRequires: libchamplain-gtk3-devel}
@@ -73,17 +92,56 @@ Requires: %name = %version-%release
 Headers and pkgconfig support for  Abiword plugin building.
 Conflicts: %_name-devel %_name-light-devel
 
+%package gir
+Summary: GObject introspection data for the %name
+Group: System/Libraries
+Requires: %name = %version-%release
+
+%description gir
+GObject introspection data for the %name
+
+%package gir-devel
+Summary: GObject introspection devel data for the %name
+Group: System/Libraries
+BuildArch: noarch
+Requires: %name-gir = %version-%release
+
+%description gir-devel
+GObject introspection devel data for the Tracker library
+
 %prep
 %setup -n %_name-%version
 %patch -p1
+%patch2 -p1
+
+# fedora patches
+%patch11 -p1 -b .desktop
+%patch12 -p1 -b .boolean
+%patch13 -p1 -b .introspection
+%patch14 -p1 -b .redraw
+%patch15 -p1 -b .nogcrypt
+%patch16 -p0 -b .librevenge
+%patch17 -p1 -b .libebook
 
 %build
+find plugins -name Makefile.am | sed  's|.am$||g' > plugin-makefiles.m4
+(cd ./plugins && find . -maxdepth 1 -type d | grep -v '^\.$' | grep -v '\./\.' | sed 's|\./||g' | xargs echo) > plugin-list.m4
+(for plugin in `cat plugin-list.m4`; do
+  u=`echo $plugin | tr '[:lower:]' '[:upper:]'`
+  echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin" = "yes")'
+done) > plugin-builtin.m4
+find plugins -name plugin.m4 | xargs cat > plugin-configure.m4
+for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do
+    ln -sf $f
+done
+
 %autoreconf
 %configure \
 	--enable-print \
 	--enable-plugins \
 	--enable-templates \
 	--enable-clipart \
+	--enable-introspection \
 	%{subst_enable spell} \
 	%{subst_with goffice} \
 	%{subst_with champlain} \
@@ -91,11 +149,16 @@ Conflicts: %_name-devel %_name-light-devel
 	%{?_without_eds:--without-evolution-data-server} \
 	--disable-static
 
-%make_build
+# failed paralell build
+%make
 
 %install
 %make_install DESTDIR=%buildroot install
 
+install -p -m 0644 -D %SOURCE11 %buildroot%_datadir/mime-info/abiword.mime
+install -p -m 0644 -D %SOURCE12 %buildroot%_datadir/mime-info/abiword.keys
+install -p -m 0644 -D %SOURCE13 %buildroot%_datadir/mime/packages/abiword.xml
+
 %files
 %_bindir/%_name
 %_libdir/lib%_name-%ver_major.so
@@ -103,18 +166,31 @@ Conflicts: %_name-devel %_name-light-devel
 %dir %_libdir/%_name-%ver_major/plugins
 %_libdir/%_name-%ver_major/plugins/*.so
 %exclude %_libdir/abiword-%ver_major/plugins/*.la
+%_datadir/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
+%_datadir/telepathy/clients/AbiCollab.client
 
 %files data
 %_desktopdir/%_name.desktop
 %_iconsdir/hicolor/*/*/*
 %_datadir/%_name-%ver_major/
+%_datadir/mime-info/*
+%_datadir/mime/packages/*
 %_man1dir/*
 
 %files devel
 %_includedir/*
 %_pkgconfigdir/*
 
+%files gir
+%_typelibdir/*.typelib
+
+%files gir-devel
+%_girdir/*.gir
+
 %changelog
+* Fri Jun 06 2014 Alexey Shabalin <shaba@altlinux.ru> 3.0.0-alt5
+- add patches from fedora for porting to librevenge framework
+
 * Mon Feb 10 2014 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt4
 - updated buildreqs
 

abiword-boost54.patch

+Last-Update: 2014-02-05
+Forwarded: yes
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Bug-Debian: http://bugs.debian.org/737551
+Bug-Abiword: http://bugzilla.abisource.com/13602
+Description: fix FTBFS with libboost1.54-dev
+
+--- a/plugins/collab/core/sync/xp/SynchronizedQueue.h
++++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h
+@@ -21,8 +21,9 @@
+ 
+ #include <deque>
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
++#include <boost/noncopyable.hpp>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+ 
+ class EmptyQueueException {};
+--- a/plugins/collab/backends/tcp/xp/Session.h
++++ b/plugins/collab/backends/tcp/xp/Session.h
+@@ -21,8 +21,9 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/enable_shared_from_this.hpp>
++#include <boost/noncopyable.hpp>
+ #include <deque>
+ #include <sync/xp/lock.h>
+ #include <sync/xp/Synchronizer.h>
+ 

abiword.keys

+application/x-abiword
+	open=abiword %f
+	view=abiword %f
+
+application/x-abicollab
+	open=abiword %f
+	view=abiword %f

abiword.mime

+application/x-abiword
+	ext: abw
+
+application/x-abicollab
+	ext: abicollab

abiword.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-abicollab">
+    <comment>AbiWord Collaborative Document</comment>
+    <glob pattern="*.abicollab"/>
+  </mime-type>
+</mime-info>
+