rpms
/
abiword
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0.4, python3 gobject introspection bindings

This commit is contained in:
Peter Robinson 2020-01-22 20:46:12 +00:00
parent 9da8b49de7
commit 6b1444b6f0
4 changed files with 26 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abiword-3.0.2-explicit-python2.patch
View File

@ -4,5 +4,5 @@ Index: abiword-3.0.2/src/gi-overrides/Makefile.am
+++ abiword-3.0.2/src/gi-overrides/Makefile.am
@@ -1,2 +1,2 @@
-overridesdir = `python -c "import gi; print gi._overridesdir"`
+overridesdir = `$(PYTHON) -c "import gi; print gi._overridesdir"`
+overridesdir = `$(PYTHON) -c "import gi; print(gi._overridesdir)"`
overrides_PYTHON = Abi.py

54
abiword-3.0.2-fix-black-drawing-regression.patch
View File

@ -1,54 +0,0 @@
From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Thu, 8 Dec 2016 02:03:10 +0000
Subject: [PATCH] Bug 13815 - draw event should return TRUE
This fix the black drawing regression with Gtk3.22
git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
---
src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
index 780000e..10f8e00 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
}
#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<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
pView->draw(&rClip);
#endif
}
- return FALSE;
+ return TRUE;
}
static bool bScrollWait = false;
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
index 30ee5d8..a0ff57f 100644
--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
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*/);

45
abiword.spec
View File

@ -1,18 +1,18 @@
%define majorversion 3
%define minorversion 0
%define microversion 2
%define microversion 4
%define svnver 0
Summary: Word processing program
Name: abiword
Version: %{majorversion}.%{minorversion}.%{microversion}
Release: 21%{?dist}
Release: 1%{?dist}
Epoch: 1
License: GPLv2+
URL: http://www.abisource.com/
Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-3.0.2.tar.gz
Source11: abiword.mime
Source12: abiword.keys
Source13: abiword.xml
@ -20,8 +20,8 @@ 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-librevenge.patch
Patch4: abiword-3.0.2-fix-black-drawing-regression.patch
Patch5: abiword-3.0.2-explicit-python2.patch
Patch4: abiword-3.0.2-explicit-python2.patch
Patch5: abiword-3.0.4-pygobject.patch
BuildRequires: autoconf
BuildRequires: automake
@ -41,7 +41,7 @@ BuildRequires: gcc-c++
BuildRequires: gobject-introspection-devel
BuildRequires: goffice-devel
BuildRequires: gtk3-devel
BuildRequires: gtkmathview-devel
#BuildRequires: gtkmathview-devel
BuildRequires: libgsf-devel
BuildRequires: libpng-devel
BuildRequires: librevenge-devel
@ -54,12 +54,13 @@ BuildRequires: libxslt-devel
BuildRequires: link-grammar-devel
BuildRequires: loudmouth-devel
BuildRequires: ots-devel
BuildRequires: pkgconf-pkg-config
BuildRequires: pkgconfig(libwps-0.4)
BuildRequires: poppler-devel
BuildRequires: popt-devel
BuildRequires: python2-gobject
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python3-gobject
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: readline-devel
BuildRequires: t1lib-devel
BuildRequires: telepathy-glib-devel
@ -88,14 +89,12 @@ Requires: libabiword = %{epoch}:%{version}-%{release}
Includes and definitions for developing with libabiword.
%package -n python2-abiword
%{?python_provide:%python_provide python2-abiword}
%package -n python3-abiword
%{?python_provide:%python_provide python3-abiword}
Summary: Python bindings for developing with libabiword
Requires: libabiword = %{epoch}:%{version}-%{release}
Obsoletes: pyabiword <= 0.8.0
Provides: pyabiword > 0.8.0
%description -n python2-abiword
%description -n python3-abiword
Python bindings for developing with libabiword
@ -107,8 +106,8 @@ Python bindings for developing with libabiword
%patch1 -p1 -b .desktop
%patch2 -p1 -b .boolean
%patch3 -p0 -b .librevenge
%patch4 -p1 -b .black
%patch5 -p1 -b .explicit_python2
%patch4 -p1 -b .explicit_python2
%patch5 -p1 -b .pygo
# setup abiword documentation
cd abiword-docs-3.0.1
@ -118,11 +117,9 @@ cd abiword-docs-3.0.1
# build libabiword and abiword
cd $RPM_BUILD_DIR/abiword-%{version}
autoreconf -vif
%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
make %{?_smp_mflags} V=1
%{make_build} V=1
# build the documentation
cd abiword-docs-3.0.1
@ -130,7 +127,7 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
%install
cd $RPM_BUILD_DIR/abiword-%{version}
make install DESTDIR=%{buildroot}
%{make_install}
# Register as an application to be visible in the software center
#
@ -224,10 +221,14 @@ find %{buildroot} -name '*.a' -delete
%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
%{_datadir}/gir-1.0/Abi-3.0.gir
%files -n python2-abiword
%{python2_sitearch}/*
%files -n python3-abiword
%{python3_sitearch}/*
%changelog
* Fri Nov 29 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.4-1
- Update to 3.0.4
- Move to python3 gobject introspection bindings
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
cda6dd58c747c133b421cc7eb18f5796 abiword-3.0.2.tar.gz
c92c0e1e2081db20757231a53d80c338 abiword-docs-3.0.2.tar.gz
SHA512 (abiword-3.0.4.tar.gz) = 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
SHA512 (abiword-docs-3.0.2.tar.gz) = 8d6e5987fd2b58019aebe000d6ab1f10943a53cbbeb01fa53bbcf1a90904eed42182d09862070278ecace187d2510a889e763fe493bf2e2fa381b224e17c98e5