From 83ffa6f1c9f6994bc2075414071b7e0cf1769c83 Mon Sep 17 00:00:00 2001 From: Szymon Siwek Date: Mon, 7 Apr 2008 03:47:40 +0000 Subject: [PATCH] - obsolete in 2.6.x Changed files: abiword-eps15.patch -> 1.2 abiword-poppler-0.6-api.patch -> 1.2 abiword-poppler05x.patch -> 1.2 --- abiword-eps15.patch | 32 -------------------------------- abiword-poppler-0.6-api.patch | 11 ----------- abiword-poppler05x.patch | 12 ------------ 3 files changed, 55 deletions(-) delete mode 100644 abiword-eps15.patch delete mode 100644 abiword-poppler-0.6-api.patch delete mode 100644 abiword-poppler05x.patch diff --git a/abiword-eps15.patch b/abiword-eps15.patch deleted file mode 100644 index ae592c5..0000000 --- a/abiword-eps15.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- abiword-2.4.4/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.cpp.orig 2006-06-28 18:43:26.000000000 +0000 -+++ abiword-2.4.4/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.cpp 2006-06-28 18:44:12.000000000 +0000 -@@ -159,7 +159,7 @@ - - bool bValid = false; - -- for (struct header_t * h = eps_next_header (m_eps); h; h = eps_next_header (m_eps)) -+ for (header_t * h = eps_next_header (m_eps); h; h = eps_next_header (m_eps)) - { - const char * name = reinterpret_cast(h->name); - const char * data = reinterpret_cast(h->data); -@@ -359,7 +359,7 @@ - UT_Multipart * part = new UT_Multipart; - if (part == 0) return 0; - -- for (struct header_t * h = mime_next_header (m_eps); h; h = mime_next_header (m_eps)) -+ for (header_t * h = mime_next_header (m_eps); h; h = mime_next_header (m_eps)) - { - const char * name = reinterpret_cast(h->name); - const char * data = reinterpret_cast(h->data); ---- abiword-2.4.4/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h.orig 2006-06-28 18:34:08.000000000 +0000 -+++ abiword-2.4.4/abiword-plugins/wp/impexp/xhtml/xp/ie_imp_MHT.h 2006-06-28 18:34:47.000000000 +0000 -@@ -138,7 +138,7 @@ - UT_Multipart * m_document; - UT_Vector * m_parts; - -- struct eps_t * m_eps; -+ eps_t * m_eps; - }; - - class MultiReader : public UT_XML::Reader - diff --git a/abiword-poppler-0.6-api.patch b/abiword-poppler-0.6-api.patch deleted file mode 100644 index 045e7fe..0000000 --- a/abiword-poppler-0.6-api.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2007-09-07 21:45:24.000000000 +0000 -+++ abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2007-09-07 21:49:02.000000000 +0000 -@@ -63,7 +63,7 @@ - - PDFDoc * doc = new PDFDoc(fileName); - -- globalParams = new GlobalParams(""); -+ globalParams = new GlobalParams(); - globalParams->setTextEncoding("UTF-8"); - globalParams->setTextEOL("\n"); - globalParams->setTextPageBreaks(gFalse); diff --git a/abiword-poppler05x.patch b/abiword-poppler05x.patch deleted file mode 100644 index 6b74e35..0000000 --- a/abiword-poppler05x.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aurN abiword-2.4.2.orig/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp abiword-2.4.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp ---- abiword-2.4.2.orig/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2005-06-29 04:22:13.000000000 +0200 -+++ abiword-2.4.2/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp 2006-03-23 21:21:23.777224992 +0100 -@@ -75,7 +75,7 @@ - UT_tmpnam(temporary_file); - - TextOutputDev *textOut = new TextOutputDev(temporary_file, gFalse, gFalse, gFalse); -- doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse); -+ doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse, gFalse); - delete textOut; - - IE_Imp_Text txt_imp(getDoc(), "UTF-8"); -- 2.43.0