| 1 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/chm/CHMFile.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/chm/CHMFile.cpp |
|---|
| 2 | 22d21 |
|---|
| 3 | < #include <string.h> |
|---|
| 4 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/fb2/FB2BookReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/fb2/FB2BookReader.cpp |
|---|
| 5 | 22d21 |
|---|
| 6 | < #include <string.h> |
|---|
| 7 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/fb2/FB2DescriptionReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/fb2/FB2DescriptionReader.cpp |
|---|
| 8 | 22,23d21 |
|---|
| 9 | < #include <string.h> |
|---|
| 10 | < #include <stdlib.h> |
|---|
| 11 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/fb2/FB2Reader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/fb2/FB2Reader.cpp |
|---|
| 12 | 22d21 |
|---|
| 13 | < #include <string.h> |
|---|
| 14 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/html/HtmlEntityCollection.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/html/HtmlEntityCollection.cpp |
|---|
| 15 | 22,23d21 |
|---|
| 16 | < #include <stdlib.h> |
|---|
| 17 | < #include <string.h> |
|---|
| 18 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/oeb/XHTMLReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/oeb/XHTMLReader.cpp |
|---|
| 19 | 22d21 |
|---|
| 20 | < #include <string.h> |
|---|
| 21 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/openreader/ORBookReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/openreader/ORBookReader.cpp |
|---|
| 22 | 22d21 |
|---|
| 23 | < #include <string.h> |
|---|
| 24 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/pdb/DocDecompressor.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/pdb/DocDecompressor.cpp |
|---|
| 25 | 22d21 |
|---|
| 26 | < #include <string.h> |
|---|
| 27 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp |
|---|
| 28 | 22d21 |
|---|
| 29 | < #include <string.h> |
|---|
| 30 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/pdb/PdbStream.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/pdb/PdbStream.cpp |
|---|
| 31 | 22d21 |
|---|
| 32 | < #include <string.h> |
|---|
| 33 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/pdb/PluckerBookReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/pdb/PluckerBookReader.cpp |
|---|
| 34 | 22d21 |
|---|
| 35 | < #include <string.h> |
|---|
| 36 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/pdb/PluckerTextStream.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/pdb/PluckerTextStream.cpp |
|---|
| 37 | 22d21 |
|---|
| 38 | < #include <string.h> |
|---|
| 39 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/rtf/RtfReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/rtf/RtfReader.cpp |
|---|
| 40 | 23,24d22 |
|---|
| 41 | < #include <stdlib.h> |
|---|
| 42 | < #include <string.h> |
|---|
| 43 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/tcr/PPLBookReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/tcr/PPLBookReader.cpp |
|---|
| 44 | 22d21 |
|---|
| 45 | < #include <string.h> |
|---|
| 46 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/tcr/TcrStream.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/tcr/TcrStream.cpp |
|---|
| 47 | 22d21 |
|---|
| 48 | < #include <string.h> |
|---|
| 49 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/util/MiscUtil.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/util/MiscUtil.cpp |
|---|
| 50 | 22d21 |
|---|
| 51 | < #include <stdlib.h> |
|---|
| 52 | diff -r source/fbreaader-0.8.2a/fbreader/src/formats/util/TextFormatDetector.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/formats/util/TextFormatDetector.cpp |
|---|
| 53 | 22d21 |
|---|
| 54 | < #include <string.h> |
|---|
| 55 | diff -r source/fbreaader-0.8.2a/fbreader/src/model/Paragraph.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/model/Paragraph.cpp |
|---|
| 56 | 22d21 |
|---|
| 57 | < #include <string.h> |
|---|
| 58 | diff -r source/fbreaader-0.8.2a/fbreader/src/model/RowMemoryAllocator.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/model/RowMemoryAllocator.cpp |
|---|
| 59 | 22d21 |
|---|
| 60 | < #include <string.h> |
|---|
| 61 | diff -r source/fbreaader-0.8.2a/fbreader/src/model/TextModel.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/model/TextModel.cpp |
|---|
| 62 | 22d21 |
|---|
| 63 | < #include <string.h> |
|---|
| 64 | diff -r source/fbreaader-0.8.2a/fbreader/src/textview/TextStyleCollection.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/textview/TextStyleCollection.cpp |
|---|
| 65 | 22,23d21 |
|---|
| 66 | < #include <string.h> |
|---|
| 67 | < #include <stdlib.h> |
|---|
| 68 | diff -r source/fbreaader-0.8.2a/fbreader/src/textview/TextView.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/fbreader/src/textview/TextView.cpp |
|---|
| 69 | 417d416 |
|---|
| 70 | < printf ("STYLUS\n"); |
|---|
| 71 | Only in OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/: .pc |
|---|
| 72 | diff -r source/fbreaader-0.8.2a/zlibrary/src/abstract/application/ZLKeyBindings.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/abstract/application/ZLKeyBindings.cpp |
|---|
| 73 | 21d20 |
|---|
| 74 | < #include <stdlib.h> |
|---|
| 75 | diff -r source/fbreaader-0.8.2a/zlibrary/src/abstract/encoding/MyEncodingConverter.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/abstract/encoding/MyEncodingConverter.cpp |
|---|
| 76 | 21d20 |
|---|
| 77 | < #include <string.h> |
|---|
| 78 | diff -r source/fbreaader-0.8.2a/zlibrary/src/abstract/filesystem/zip/ZLZDecompressor.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/abstract/filesystem/zip/ZLZDecompressor.cpp |
|---|
| 79 | 21d20 |
|---|
| 80 | < #include <string.h> |
|---|
| 81 | diff -r source/fbreaader-0.8.2a/zlibrary/src/abstract/util/ZLKeyUtil.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/abstract/util/ZLKeyUtil.cpp |
|---|
| 82 | 21,22d20 |
|---|
| 83 | < #include <string.h> |
|---|
| 84 | < #include <stdlib.h> |
|---|
| 85 | diff -r source/fbreaader-0.8.2a/zlibrary/src/abstract/xml/ZLXMLReader.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/abstract/xml/ZLXMLReader.cpp |
|---|
| 86 | 21,22d20 |
|---|
| 87 | < #include <stdlib.h> |
|---|
| 88 | < #include <string.h> |
|---|
| 89 | diff -r source/fbreaader-0.8.2a/zlibrary/src/gpe/application/ZLGtkApplicationWindow.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/gpe/application/ZLGtkApplicationWindow.cpp |
|---|
| 90 | 128c128 |
|---|
| 91 | < gtk_container_set_border_width(GTK_CONTAINER(button), 10); |
|---|
| 92 | --- |
|---|
| 93 | > gtk_container_set_border_width(GTK_CONTAINER(button), 1); |
|---|
| 94 | 188c188 |
|---|
| 95 | < return true; // KB fix for Archos 5 |
|---|
| 96 | --- |
|---|
| 97 | > return false; |
|---|
| 98 | diff -r source/fbreaader-0.8.2a/zlibrary/src/gpe/dialogs/ZLGtkOptionsDialog.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/gpe/dialogs/ZLGtkOptionsDialog.cpp |
|---|
| 99 | 21d20 |
|---|
| 100 | < #include <algorithm> |
|---|
| 101 | diff -r source/fbreaader-0.8.2a/zlibrary/src/gpe/view/ZLGtkPaintContext.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/gpe/view/ZLGtkPaintContext.cpp |
|---|
| 102 | 21d20 |
|---|
| 103 | < #include <algorithm> |
|---|
| 104 | diff -r source/fbreaader-0.8.2a/zlibrary/src/gpe/view/ZLGtkViewWidget.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/gpe/view/ZLGtkViewWidget.cpp |
|---|
| 105 | 48,50c48,49 |
|---|
| 106 | < //view()->onStylusMove(x, y); |
|---|
| 107 | < //view()->onStylusPress(x, y); |
|---|
| 108 | < view()->onFingerTap(x,y); // KB fix for Archos 5 |
|---|
| 109 | --- |
|---|
| 110 | > view()->onStylusMove(x, y); |
|---|
| 111 | > view()->onStylusPress(x, y); |
|---|
| 112 | diff -r source/fbreaader-0.8.2a/zlibrary/src/unix/filesystem/ZLUnixFSManager.cpp OE/angstrom-dev/work/archos5-angstrom-linux-gnueabi/fbreader-0.8.2a-r5/fbreader-0.8.2a/zlibrary/src/unix/filesystem/ZLUnixFSManager.cpp |
|---|
| 113 | 21d20 |
|---|
| 114 | < #include <stdlib.h> |
|---|
