diff --git a/abiword-3.0.0-fix-redraw.patch b/abiword-3.0.0-fix-redraw.patch deleted file mode 100644 index 3f47083..0000000 --- a/abiword-3.0.0-fix-redraw.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit f1d711aa84c95430319fd92ffbcb03df36e5e76e -Author: Hubert Figuière -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(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); - } diff --git a/abiword-3.0.0-fixintrospection.patch b/abiword-3.0.0-fixintrospection.patch deleted file mode 100644 index cc126d9..0000000 --- a/abiword-3.0.0-fixintrospection.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - */ - diff --git a/abiword-3.0.0-gnutls-no-libgcrypt.patch b/abiword-3.0.0-gnutls-no-libgcrypt.patch deleted file mode 100644 index 99a0235..0000000 --- a/abiword-3.0.0-gnutls-no-libgcrypt.patch +++ /dev/null @@ -1,104 +0,0 @@ -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 session_ptr_t; - typedef boost::shared_ptr< std::vector > 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(*priv); -- return 0; --} -- --static int gcry_tunnel_mutex_lock(void **priv) --{ -- reinterpret_cast(*priv)->lock(); -- return 0; --} -- --static int gcry_tunnel_mutex_unlock(void **priv) --{ -- reinterpret_cast(*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 - #include - #include - diff --git a/abiword-3.0.0-libebook.patch b/abiword-3.0.0-libebook.patch deleted file mode 100644 index 121cd9d..0000000 --- a/abiword-3.0.0-libebook.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ca0495e8c69c53dca85f06ea1f4b063c57717a2b Mon Sep 17 00:00:00 2001 -From: David Tardon -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 -+ #include - }; - - static std::string get( EVCard* c, const char* v ) --- -1.9.3 - diff --git a/abiword.spec b/abiword.spec index 9f9a53b..4ab8121 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,12 +1,12 @@ %define majorversion 3 %define minorversion 0 -%define microversion 0 +%define microversion 1 %define svnver 0 Summary: Word processing program Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 14%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -20,13 +20,9 @@ Source13: abiword.xml Patch0: abiword-2.6.0-windowshelppaths.patch Patch1: abiword-2.8.3-desktop.patch Patch2: abiword-2.6.0-boolean.patch -Patch3: abiword-3.0.0-fixintrospection.patch -Patch4: abiword-3.0.0-fix-redraw.patch -Patch5: abiword-3.0.0-gnutls-no-libgcrypt.patch -Patch6: abiword-3.0.0-librevenge.patch -Patch7: abiword-3.0.0-libebook.patch -Patch8: abiword-3.0.0-link-grammar-5.patch -Patch9: abiword-3.0.0-link-grammar-5-second.patch +Patch3: abiword-3.0.0-librevenge.patch +Patch4: abiword-3.0.0-link-grammar-5.patch +Patch5: abiword-3.0.0-link-grammar-5-second.patch BuildRequires: autoconf BuildRequires: automake @@ -111,13 +107,9 @@ Python bindings for developing with libabiword # patch abiword %patch1 -p1 -b .desktop %patch2 -p1 -b .boolean -%patch3 -p1 -b .introspection -%patch4 -p1 -b .redraw -%patch5 -p1 -b .nogcrypt -%patch6 -p0 -b .librevenge -%patch7 -p1 -b .libebook -%patch8 -p1 -b .link-grammar-5 -%patch9 -p1 -b .link-grammar-5-second +%patch3 -p0 -b .librevenge +%patch4 -p1 -b .link-grammar-5 +%patch5 -p1 -b .link-grammar-5-second # setup abiword documentation %setup -q -T -b 1 -n abiword-docs-%{version} @@ -154,8 +146,8 @@ install -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.k install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml # Remove libtool archives and static libs -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.a' -delete %post /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -181,7 +173,8 @@ fi %{_datadir}/mime-info/abiword.mime %{_datadir}/mime-info/abiword.keys %{_datadir}/mime/packages/abiword.xml -%{_datadir}/icons/hicolor/48x48/apps/abiword.png +%{_datadir}/icons/hicolor/*/apps/abiword.png +%{_datadir}/icons/hicolor/scalable/apps/abiword.svg # Abiword help %{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord %{_mandir}/man1/abiword.1.gz @@ -189,6 +182,7 @@ fi %files -n libabiword %doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT %{_libdir}/libabiword-%{majorversion}.%{minorversion}.so +%{_libdir}/libAiksaurusGtk3* %{_libdir}/%{name}-%{majorversion}.%{minorversion} %{_libdir}/girepository-1.0/Abi-3.0.typelib %{_datadir}/%{name}-%{majorversion}.%{minorversion} @@ -206,6 +200,9 @@ fi %{python_sitearch}/* %changelog +* Wed Dec 24 2014 Peter Robinson 1:3.0.1-1 +- Update to 3.0.1 stable + * Fri Aug 15 2014 Fedora Release Engineering - 1:3.0.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index b41a0fd..5be6e78 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8d9c41cff3a8fbef8d0c835c65600e65 abiword-3.0.0.tar.gz -ed73d0743a19eb85e46b59464e0ef2bb abiword-docs-3.0.0.tar.gz +f3f8052e7b4979a43b75775a381e6cb8 abiword-3.0.1.tar.gz +c9b78cb5f9c415ed63ce1cf9874fa8a4 abiword-docs-3.0.1.tar.gz