- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x - Change the download location from SF to http://www.abisource.com/ - patch libole2 - fix read as a macro in new glibc
This commit is contained in:
parent
4a0338105a
commit
8b464dbba4
@ -1,11 +1,21 @@
|
|||||||
diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
|
diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c
|
||||||
--- abiword-2.2.5.orig/wv/libole2/ms-ole.c 2004-10-23 02:59:51.000000000 +0200
|
--- abiword-2.2.5.orig/wv/libole2/ms-ole.c 2004-10-23 02:59:51.000000000 +0200
|
||||||
+++ abiword-2.2.5/wv/libole2/ms-ole.c 2005-03-14 21:50:48.000000000 +0100
|
+++ abiword-2.2.5/wv/libole2/ms-ole.c 2005-03-14 23:36:08.130603903 +0100
|
||||||
@@ -36,6 +36,7 @@
|
@@ -482,7 +482,7 @@
|
||||||
#include <assert.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <string.h>
|
|
||||||
+#undef read
|
|
||||||
|
|
||||||
#ifdef __MINGW32__ /* incomplete defines on mingw */
|
offset = (b+1)*BB_BLOCK_SIZE;
|
||||||
|
f->syswrap->lseek (f->file_des, offset, SEEK_SET, f->syswrap->closure);
|
||||||
|
- f->syswrap->read (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
|
||||||
|
+ (f->syswrap->read) (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure);
|
||||||
|
attr->usage = 1;
|
||||||
|
attr->dirty = forwrite;
|
||||||
|
|
||||||
|
@@ -1791,7 +1791,7 @@
|
||||||
|
f->mem = g_new (guint8, BB_BLOCK_SIZE);
|
||||||
|
|
||||||
|
if (!f->mem ||
|
||||||
|
- f->syswrap->read (file, f->mem, BB_BLOCK_SIZE,
|
||||||
|
+ (f->syswrap->read) (file, f->mem, BB_BLOCK_SIZE,
|
||||||
|
f->syswrap->closure) == -1) {
|
||||||
|
g_warning ("Error reading header\n");
|
||||||
|
f->syswrap->close (file, f->syswrap->closure) ;
|
||||||
|
@ -136,6 +136,7 @@ update-desktop-database %{_datadir}/applications
|
|||||||
- disable GDA support until the plugin is ported to gnomedb 1.2.x
|
- disable GDA support until the plugin is ported to gnomedb 1.2.x
|
||||||
- Change the download location from SF to http://www.abisource.com/
|
- Change the download location from SF to http://www.abisource.com/
|
||||||
- patch libole2
|
- patch libole2
|
||||||
|
- fix read as a macro in new glibc
|
||||||
|
|
||||||
* Fri Mar 2 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.5-1
|
* Fri Mar 2 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.5-1
|
||||||
- bump to latest stable
|
- bump to latest stable
|
||||||
|
Loading…
Reference in New Issue
Block a user