diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/qpdf2/files | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/qpdf2/files')
-rw-r--r-- | recipes/qpdf2/files/fix-sigsegv.patch | 22 | ||||
-rw-r--r-- | recipes/qpdf2/files/fix_qtversion_check.patch | 11 | ||||
-rw-r--r-- | recipes/qpdf2/files/gcc4.patch | 31 | ||||
-rw-r--r-- | recipes/qpdf2/files/hack-the-hack.patch | 173 |
4 files changed, 237 insertions, 0 deletions
diff --git a/recipes/qpdf2/files/fix-sigsegv.patch b/recipes/qpdf2/files/fix-sigsegv.patch new file mode 100644 index 0000000000..33e9599d1c --- /dev/null +++ b/recipes/qpdf2/files/fix-sigsegv.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpdf2_2.2.1/qpdf.cpp~fix-sigsegv ++++ qpdf2_2.2.1/qpdf.cpp +@@ -42,10 +42,10 @@ + { + QPEApplication app ( argc, argv ); + +- if (argc >= 1 +- && strcmp(argv[1],"-d") == 0) { +- qpdf_debug_level = atoi(argv[2]); +- } ++// if (argc >= 1 ++// && strcmp(argv[1],"-d") == 0) { ++// qpdf_debug_level = atoi(argv[2]); ++// } + + // read config file + globalParams = new GlobalParams ( "" ); diff --git a/recipes/qpdf2/files/fix_qtversion_check.patch b/recipes/qpdf2/files/fix_qtversion_check.patch new file mode 100644 index 0000000000..4dcb32d350 --- /dev/null +++ b/recipes/qpdf2/files/fix_qtversion_check.patch @@ -0,0 +1,11 @@ +--- qpdf2_2.2.1/QOutputDev.cpp.orig 2005-01-31 10:57:03.000000000 +0000 ++++ qpdf2_2.2.1/QOutputDev.cpp 2005-01-31 10:57:36.000000000 +0000 +@@ -1083,7 +1083,7 @@ + tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ), + lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 )); + +-#if QT_VERSION < 300 ++#if QT_VERSION < 0x030000 + tmp = tmp. quadBezier ( ); + + for ( uint loop = 0; loop < tmp. count ( ); loop++ ) { diff --git a/recipes/qpdf2/files/gcc4.patch b/recipes/qpdf2/files/gcc4.patch new file mode 100644 index 0000000000..5e90302bd6 --- /dev/null +++ b/recipes/qpdf2/files/gcc4.patch @@ -0,0 +1,31 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qpdf2_2.2.1/qdocnotes.h~gcc4 2004-02-17 18:13:18.000000000 +0100 ++++ qpdf2_2.2.1/qdocnotes.h 2006-03-20 19:16:38.000000000 +0100 +@@ -1,6 +1,6 @@ + #include "xmlparser.h" + #include <qmap.h> +- ++class QDocNotes; + class QDocNote { + public: + friend class QDocNotes; +--- qpdf2_2.2.1/xpdf/TextOutputDev.h~gcc4 2004-02-17 18:13:18.000000000 +0100 ++++ qpdf2_2.2.1/xpdf/TextOutputDev.h 2006-03-20 19:19:47.000000000 +0100 +@@ -139,6 +139,13 @@ + //------------------------------------------------------------------------ + // TextPool + //------------------------------------------------------------------------ ++class TextPool; ++class TextLine; ++class TextBlock; ++class TextFlow; ++class TextWordList; ++class TextPage; ++class TextLineFrag; + + class TextPool { + public: diff --git a/recipes/qpdf2/files/hack-the-hack.patch b/recipes/qpdf2/files/hack-the-hack.patch new file mode 100644 index 0000000000..52fc488f68 --- /dev/null +++ b/recipes/qpdf2/files/hack-the-hack.patch @@ -0,0 +1,173 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpdf2_2.2.1/qpdfview.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qpdfview.cpp +@@ -4,7 +4,7 @@ + #ifdef __GNUC__ + #pragma implementation + #endif +- ++#define private public + #include "aconf.h" + + #include "qpdf.h" +--- qpdf2_2.2.1/qpdf.h~hack-the-hack.patch ++++ qpdf2_2.2.1/qpdf.h +@@ -1,3 +1,4 @@ ++#define private public + #ifndef __QPDF_H__ + #define __QPDF_H__ + +@@ -12,6 +13,8 @@ + + #include "signal.h" + ++#define private public ++#include <qobject.h> + #include <qpe/qpeapplication.h> + #include <qpe/resource.h> + #include <qpe/applnk.h> +--- qpdf2_2.2.1/qpdf.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qpdf.cpp +@@ -12,11 +12,11 @@ + // + //======================================================================== + +- ++#define private public + #include "qpdf.h" + #include <qpe/qpemenubar.h> + #include <qdir.h> +- ++#include <errno.h> + #ifdef AUTOTEST + #define MAX_ZOOM 1.2 + #else +@@ -2636,15 +2636,6 @@ + setRenameBar( false ); + } + +- +-#ifdef ARM +-extern int errno; +-#else +-extern "C" { +- int errno; +-}; +-#endif +- + void + QPDFWindow::writeConfig() + { +--- qpdf2_2.2.1/textedit.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/textedit.cpp +@@ -19,7 +19,7 @@ + **********************************************************************/ + + #include <stdlib.h> //getenv +- ++#define private public + #include <qpe/global.h> + #include <qpe/fileselector.h> + #include <qpe/applnk.h> +--- qpdf2_2.2.1/autotest.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/autotest.cpp +@@ -7,7 +7,7 @@ + qobject.h - make the activate_xxx functions public + + */ +- ++#define private public + #include "qpdf.h" + #ifdef AUTOTEST + //#define MEM_LEAKS_EVENT_COUNT 50000 +--- qpdf2_2.2.1/qpdffileselector.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qpdffileselector.cpp +@@ -3,7 +3,7 @@ + + + */ +- ++#define private public + #include "qpdf.h" + + #include <qwmatrix.h> +--- qpdf2_2.2.1/qpdfconfig.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qpdfconfig.cpp +@@ -1,3 +1,4 @@ ++#define private public + #include "qpdf.h" + #include <qpushbutton.h> + #include <qradiobutton.h> +--- qpdf2_2.2.1/qqimage.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qqimage.cpp +@@ -8,7 +8,7 @@ + "protected:" and add "friend class QQImage" to class QImage. + + */ +- ++#define private public + + /**************************************************************************** + ** $Id: qt/src/kernel/qimage.cpp 2.3.8-snapshot-20040114 edited 2003-12-29 $ +--- qpdf2_2.2.1/qdocnotes.cpp~hack-the-hack.patch ++++ qpdf2_2.2.1/qdocnotes.cpp +@@ -5,7 +5,7 @@ + #include <qpe/stringutil.h> + #include <qfile.h> + #include <qfileinfo.h> +- ++#include <errno.h> + #define assert(X) + + QDocNote::QDocNote() +@@ -698,18 +698,6 @@ + return(save(m_filepath, state)); + } + +- +-#ifdef ARM +-extern int errno; +-extern char *strerror(int); +-#else +-extern "C" { +- int errno; +- extern char *strerror(int); +-} +-#endif +- +- + bool + QDocNotes::save(const QString &filepath, QDocState *state) + { +--- qpdf2_2.2.1/xpdf/PDFDoc.cc~hack-the-hack.patch ++++ qpdf2_2.2.1/xpdf/PDFDoc.cc +@@ -7,7 +7,7 @@ + //======================================================================== + + #include <aconf.h> +- ++#include <errno.h> + #ifdef USE_GCC_PRAGMAS + #pragma implementation + #endif +@@ -205,16 +205,6 @@ + } + } + +-#ifdef ARM +-extern int errno; +-extern char *strerror(int); +-#else +-extern "C" { +- int errno; +- extern char *strerror(int); +-} +-#endif +- + void PDFDoc::displayPage(OutputDev *out, int page, fouble hDPI, fouble vDPI, + int rotate, GBool doLinks, + GBool (*abortCheckCbk)(void *data), |