Mailmerge patch to fix the build
This commit is contained in:
parent
afe054def2
commit
d9fdc1208e
12
abiword-2.2.8-mailmerge.patch
Normal file
12
abiword-2.2.8-mailmerge.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -r -u abiword-2.2.8.orig/abi/src/wp/impexp/xp/ie_mailmerge.h abiword-2.2.8/abi/src/wp/impexp/xp/ie_mailmerge.h
|
||||
--- abiword-2.2.8.orig/abi/src/wp/impexp/xp/ie_mailmerge.h 2005-01-23 15:37:50.000000000 +0100
|
||||
+++ abiword-2.2.8/abi/src/wp/impexp/xp/ie_mailmerge.h 2005-06-06 22:28:30.000000000 +0200
|
||||
@@ -28,6 +28,8 @@
|
||||
typedef UT_sint32 IEMergeType;
|
||||
#define IEMT_Unknown ((IEMergeType)-1)
|
||||
|
||||
+class IE_MailMerge;
|
||||
+
|
||||
class ABI_EXPORT IE_MergeSniffer : public UT_AbiObject
|
||||
{
|
||||
friend class IE_MailMerge;
|
@ -3,7 +3,7 @@
|
||||
Summary: The AbiWord word processor
|
||||
Name: abiword
|
||||
Version: 2.2.8
|
||||
Release: 1
|
||||
Release: 2
|
||||
Epoch: 1
|
||||
Group: Applications/Editors
|
||||
License: GPL
|
||||
@ -40,6 +40,7 @@ URL: http://www.abisource.com/
|
||||
|
||||
Patch0: abiword-2.0.9-windowshelppaths.patch
|
||||
Patch1: abiword-2.2.6-desktop.patch
|
||||
Patch2: abiword-2.2.8-mailmerge.patch
|
||||
|
||||
%description
|
||||
AbiWord is a cross-platform Open Source word processor. The goal is to make
|
||||
@ -49,6 +50,7 @@ AbiWord full-featured, and remain lean.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .windowshelppaths
|
||||
%patch1 -p1 -b .desktop
|
||||
%patch2 -p1 -b .mailmerge
|
||||
|
||||
%build
|
||||
cd abi
|
||||
@ -127,6 +129,9 @@ update-desktop-database %{_datadir}/applications
|
||||
%{_datadir}/icons/*png
|
||||
|
||||
%changelog
|
||||
* Sun Jun 6 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.8-2
|
||||
- Fix build with mailmerge patch
|
||||
|
||||
* Sun Jun 6 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.8-1
|
||||
- Update to 2.2.8
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user