diff --git a/.files b/.files
index b2daa28..ab39083 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 99e2da7..130ecf2 100644
--- a/.rev
+++ b/.rev
@@ -426,4 +426,12 @@
589810
+
+ 5c424a65f6af4731007708bc82050428
+ 3.0.4
+
+ dimstar_suse
+
+ 789729
+
diff --git a/abiword-3.0.2.tar.gz b/abiword-3.0.2.tar.gz
deleted file mode 120000
index 95c3932..0000000
--- a/abiword-3.0.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihjfz7hmuxu6emhxksa5rdmkbjhuvfk6wfkcnm4rr37ymhovxkmka
\ No newline at end of file
diff --git a/abiword-3.0.4.tar.gz b/abiword-3.0.4.tar.gz
new file mode 120000
index 0000000..fd41587
--- /dev/null
+++ b/abiword-3.0.4.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiej3aclfxk47ugbo7jk22u2px35cx2yf5rp2onkeynjelc2w3w6aa
\ No newline at end of file
diff --git a/abiword-fix-black-overlay.patch b/abiword-fix-black-overlay.patch
deleted file mode 100644
index 9a7332d..0000000
--- a/abiword-fix-black-overlay.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: abiword-3.0.2/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-===================================================================
---- src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_even
- }
-
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
--gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
-+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data"));
-@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkW
- pView->draw(&rClip);
- #endif
- }
-- return FALSE;
-+ return TRUE;
- }
-
- static bool bScrollWait = false;
-Index: abiword-3.0.2/src/af/xap/gtk/xap_UnixFrameImpl.h
-===================================================================
---- src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,9 +152,9 @@ protected:
- static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
-- static gint draw(GtkWidget * w, cairo_t * cr);
-+ static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
-- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
-+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
- static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
- static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
diff --git a/abiword.changes b/abiword.changes
index 65a3840..15cd8fc 100644
--- a/abiword.changes
+++ b/abiword.changes
@@ -1,9 +1,24 @@
-------------------------------------------------------------------
+Fri Mar 27 17:35:54 UTC 2020 - Dominique Leuenberger
+
+
+- Update to version 3.0.4:
+ + AbiWord 3.0.4 mostly address an issue with the tarball for
+ 3.0.3 that was not properly generated.
+- Changes from version 3.0.3:
+ + AbiWord 3.0.3 address several issues with recent version of
+ Gtk+.
+ + Updated translations.
+- Drop abiword-fix-black-overlay.patch: fixed upstream.
+- Add autoconf-archive BuildRequires: new dependency to be able to
+ bootstrap.
+
+-------------------------------------------------------------------
Wed Mar 21 20:28:12 UTC 2018 - dimstar@opensuse.org
- Drop --with-pic configure parameter: since we disable static
libs, it has no effect.
-
+
-------------------------------------------------------------------
Sun Mar 18 09:37:21 UTC 2018 - bjorn.lie@gmail.com
diff --git a/abiword.spec b/abiword.spec
index 6aecaf1..69757b0 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -1,7 +1,7 @@
#
# spec file for package abiword
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: abiword
-Version: 3.0.2
+Version: 3.0.4
Release: 0
Summary: A Multiplatform Word Processor
# FIXME next version: check if the telepathy support still requires old version of empathy (with libempathy-gtk)
@@ -25,7 +25,7 @@ Summary: A Multiplatform Word Processor
License: GPL-2.0-or-later
Group: Productivity/Office/Word Processor
URL: http://www.abisource.com/
-Source0: http://abisource.com/downloads/abiword/latest/source/%{name}-%{version}.tar.gz
+Source0: http://abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz
Source1: abiword.appdata.xml
# PATCH-FIX-UPSTREAM abiword-librevenge.patch fstrba@suse.com -- Fix build against librevenge-based libraries (svn revs 34461, 34462, 34463, 34464 and 34468)
Patch5: abiword-librevenge.patch
@@ -33,8 +33,7 @@ Patch5: abiword-librevenge.patch
Patch6: abiword-libwps-0.4.patch
# PATCH-FIX-UPSTREAM boost_asio.patch adam.majer@suse.de -- Aadd support for boost::asio
Patch7: boost_asio.patch
-#PATCH-FIX-UPSTREAM abiword-fix-black-overlay.patch -- Remove the black that covers the full window and make all unreadable
-Patch8: abiword-fix-black-overlay.patch
+BuildRequires: autoconf-archive
BuildRequires: bison
BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes
@@ -47,8 +46,8 @@ BuildRequires: libsoup-devel
BuildRequires: libtool
BuildRequires: libwmf-devel
BuildRequires: link-grammar-devel
-BuildRequires: readline-devel
BuildRequires: pkgconfig
+BuildRequires: readline-devel
BuildRequires: pkgconfig(cairo) >= 1.10
BuildRequires: pkgconfig(enchant) >= 1.2.0
BuildRequires: pkgconfig(fribidi) >= 0.10.4
@@ -110,7 +109,6 @@ UNIX platform.
%patch5
%patch6
%patch7
-%patch8
%build
# We modified plugin configuration and thus we need to regenerate the whole build system
@@ -156,7 +154,6 @@ install -dm 0755 %{buildroot}%{_datadir}/appdata
install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/abiword.appdata.xml
%fdupes %{buildroot}
-
%post -n libabiword-3_0 -p /sbin/ldconfig
%postun -n libabiword-3_0 -p /sbin/ldconfig