Changeset 159


Ignore:
Timestamp:
Apr 30, 2014, 2:03:03 PM (7 years ago)
Author:
Silvan Scherrer
Message:

new qbit version

Location:
diffs
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • diffs/CoolReader_3.0.55.diff

    r145 r159  
    1 diff -Naur -x build -x .git trunk/.gitignore vendor\current\crengine/.gitignore
    2 --- trunk/.gitignore    1970-01-01 00:00:00.000000000
    3 +++ vendor\current\crengine/.gitignore  2012-09-13 14:14:24.000000000 +0200
    4 @@ -0,0 +1,9 @@
    5 +*.*~
    6 +qtbuild
    7 +v3build
    8 +v5build
    9 +wxbuild
    10 +qtbuild
    11 +qt-build
    12 +qtcreator-build
    13 +*~
    14 diff -Naur -x build -x .git trunk/CMakeLists.txt vendor\current\crengine/CMakeLists.txt
    15 --- trunk/CMakeLists.txt        2012-09-13 15:57:06.000000000 +0200
    16 +++ vendor\current\crengine/CMakeLists.txt      2012-09-13 14:14:24.000000000 +0200
    17 @@ -97,8 +97,6 @@
    18    ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 )
    19  elseif ( WIN32 )
    20    ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 )
    21 -elseif ( OS2 )
    22 -  ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 )
    23  else()
    24    ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 )
    25  endif(MAC)
    26 diff -Naur -x build -x .git trunk/cr3qt/CMakeLists.txt vendor\current\crengine/cr3qt/CMakeLists.txt
    27 --- trunk/cr3qt/CMakeLists.txt  2012-09-13 16:54:12.000000000 +0200
    28 +++ vendor\current\crengine/cr3qt/CMakeLists.txt        2012-09-13 14:14:26.000000000 +0200
    29 @@ -48,10 +48,6 @@
     1diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/.gitignore trunk/.gitignore
     2--- vendor/current/crengine/.gitignore  2012-09-13 14:14:24.000000000 +0200
     3+++ trunk/.gitignore    1970-01-01 01:00:00.000000000 +0100
     4@@ -1,9 +0,0 @@
     5-*.*~
     6-qtbuild
     7-v3build
     8-v5build
     9-wxbuild
     10-qtbuild
     11-qt-build
     12-qtcreator-build
     13-*~
     14diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/CMakeLists.txt trunk/cr3qt/CMakeLists.txt
     15--- vendor/current/crengine/cr3qt/CMakeLists.txt        2012-09-13 14:14:26.000000000 +0200
     16+++ trunk/cr3qt/CMakeLists.txt  2012-09-13 18:25:46.000000000 +0200
     17@@ -48,6 +48,10 @@
    3018     ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/"
    3119           -DUSE_FONTCONFIG=1
    3220     )
    33 -ELSEIF (OS2)
    34 -    ADD_DEFINITIONS(-DCR3_DATA_DIR=""
    35 -          -DUSE_FONTCONFIG=1
    36 -    )
     21+ELSEIF (OS2)
     22+    ADD_DEFINITIONS(-DCR3_DATA_DIR=""
     23+          -DUSE_FONTCONFIG=1
     24+    )
    3725 ELSE()
    3826     ADD_DEFINITIONS(-DCR3_DATA_DIR=""
    3927           -DUSE_FONTCONFIG=0
    40 @@ -75,16 +71,6 @@
     28@@ -71,6 +75,16 @@
    4129   endif(MINGW)
    4230 ENDIF (WIN32)
    4331 
    44 -IF (OS2)
    45 - # init of the rc compiler
    46 - set(RES_FILES "src/cr3_os2.rc")
    47 - ENABLE_LANGUAGE(RC)
    48 - set(CMAKE_RC_COMPILER_INIT rc)
    49 -    SET(CMAKE_RC_COMPILE_OBJECT
    50 -      "<CMAKE_RC_COMPILER> -n -r -i ${CMAKE_CURRENT_SOURCE_DIR}/src <SOURCE> <OBJECT>")
    51 -
    52 - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
    53 -ENDIF (OS2)
     32+IF (OS2)
     33+ # init of the rc compiler
     34+ set(RES_FILES "src/cr3_os2.rc")
     35+ ENABLE_LANGUAGE(RC)
     36+ set(CMAKE_RC_COMPILER_INIT rc)
     37+    SET(CMAKE_RC_COMPILE_OBJECT
     38+      "<CMAKE_RC_COMPILER> -n -r -i ${CMAKE_CURRENT_SOURCE_DIR}/src <SOURCE> <OBJECT>")
     39+
     40+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
     41+ENDIF (OS2)
    5442 
    5543 SET(LANGUAGES ru uk cs de es pl bg hu)
    5644 message( "Languages: ${LANGUAGES}" )
    57 @@ -172,8 +158,6 @@
     45@@ -158,6 +172,8 @@
    5846 #${QT_LIBRARIES}
    5947 ELSEIF (UNIX)
    6048     SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
    61 -ELSEIF (OS2)
    62 -    SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} fontconfig xml2 mmap)
     49+ELSEIF (OS2)
     50+    SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} intl fontconfig xml2 mmap)
    6351 ELSE()
    6452     SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES})
    6553 ENDIF(MAC)
    66 diff -Naur -x build -x .git trunk/cr3qt/src/cr3_os2.rc vendor\current\crengine/cr3qt/src/cr3_os2.rc
    67 --- trunk/cr3qt/src/cr3_os2.rc  2011-09-30 14:59:06.000000000 +0200
    68 +++ vendor\current\crengine/cr3qt/src/cr3_os2.rc        1970-01-01 00:00:00.000000000
    69 @@ -1 +0,0 @@
    70 -ICON   1       DISCARDABLE     "icons/cr3_os2.ico"
    71 \ No newline at end of file
    72 diff -Naur -x build -x .git trunk/cr3qt/src/icons/cr3_os2.ico vendor\current\crengine/cr3qt/src/icons/cr3_os2.ico
    73 --- trunk/cr3qt/src/icons/cr3_os2.ico   2011-06-06 14:37:56.000000000 +0200
    74 +++ vendor\current\crengine/cr3qt/src/icons/cr3_os2.ico 1970-01-01 00:00:00.000000000
    75 @@ -1 +0,0 @@
    76 -CI"
     54diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/cr3_os2.rc trunk/cr3qt/src/cr3_os2.rc
     55--- vendor/current/crengine/cr3qt/src/cr3_os2.rc        1970-01-01 01:00:00.000000000 +0100
     56+++ trunk/cr3qt/src/cr3_os2.rc  2011-09-30 14:59:06.000000000 +0200
     57@@ -0,0 +1 @@
     58+ICON   1       DISCARDABLE     "icons/cr3_os2.ico"
     59\ Kein Zeilenumbruch am Dateiende.
     60diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/icons/cr3_os2.ico trunk/cr3qt/src/icons/cr3_os2.ico
     61--- vendor/current/crengine/cr3qt/src/icons/cr3_os2.ico 1970-01-01 01:00:00.000000000 +0100
     62+++ trunk/cr3qt/src/icons/cr3_os2.ico   2011-06-06 14:37:56.000000000 +0200
     63@@ -0,0 +1 @@
     64+CI"
    7765:
    7866(PÿÿÿCI"
     
    10997ƒqquŽÿÿÿÿÿÿÿÿÿÿÿÿÿpÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ‹öÿÿszÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿørŽÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}ÿÿÿÿÿÿÿŽ~ÿÿÿÿÿÿÿÿÿÿvÿÿuƒÿÿÿÿÿÿÿÿÿÿÿŠvŒÿÿÿÿ÷pöÿÿÿs~ÿÿÿ}~ÿrrÿÿÿÿÿÿÿÿÿÿÿ‡~
    11098÷y†ÿÿÿ‡uŒpsŽÿÿÿÿÿÿÿÿÿÿÿÿw~ÿÿÿÿÿzöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿxrÿÿÿÿÿÿÿÿŽw|öÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷}~ŠÿÿÿÿÿÿÿÿÿÿŒ‡}}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
    111 \ No newline at end of file
    112 diff -Naur -x build -x .git trunk/cr3qt/src/main.cpp vendor\current\crengine/cr3qt/src/main.cpp
    113 --- trunk/cr3qt/src/main.cpp    2012-09-13 16:58:54.000000000 +0200
    114 +++ vendor\current\crengine/cr3qt/src/main.cpp  2012-09-13 14:14:26.000000000 +0200
     99\ Kein Zeilenumbruch am Dateiende.
     100diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/main.cpp trunk/cr3qt/src/main.cpp
     101--- vendor/current/crengine/cr3qt/src/main.cpp  2012-09-13 14:14:26.000000000 +0200
     102+++ trunk/cr3qt/src/main.cpp    2012-09-13 16:58:54.000000000 +0200
    115103@@ -156,7 +156,7 @@
    116104             QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/Contents/Resources/"); //QDir::separator();
    117105             QString translations = exeDir + "i18n";
    118106 #else
    119 -#if defined(_WIN32) || defined(Q_OS_OS2)
    120 +#if defined(_WIN32)
     107-#if defined(_WIN32)
     108+#if defined(_WIN32) || defined(Q_OS_OS2)
    121109             QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/"); //QDir::separator();
    122110             QString translations = exeDir + "i18n";
     
    126114 {
    127115        CRLog::trace("InitCREngine(%s)", exename);
    128 -#if defined(_WIN32) || defined(Q_OS_OS2)
    129 +#ifdef _WIN32
     116-#ifdef _WIN32
     117+#if defined(_WIN32) || defined(Q_OS_OS2)
    130118     lString16 appname( exename );
    131119     int lastSlash=-1;
    132120     lChar16 slashChar = '/';
    133 diff -Naur -x build -x .git trunk/crengine/include/crsetup.h vendor\current\crengine/crengine/include/crsetup.h
    134 --- trunk/crengine/include/crsetup.h    2012-09-13 16:33:48.000000000 +0200
    135 +++ vendor\current\crengine/crengine/include/crsetup.h  2012-09-13 14:14:26.000000000 +0200
     121diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/include/crsetup.h trunk/crengine/include/crsetup.h
     122--- vendor/current/crengine/crengine/include/crsetup.h  2012-09-13 14:14:26.000000000 +0200
     123+++ trunk/crengine/include/crsetup.h    2012-09-13 16:33:48.000000000 +0200
    136124@@ -48,7 +48,7 @@
    137125 #define FILE_STREAM_BUFFER_SIZE              0x40000
    138126 #endif
    139127 
    140 -#elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2)
    141 +#elif defined(_LINUX) || defined (LINUX)
     128-#elif defined(_LINUX) || defined (LINUX)
     129+#elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2)
    142130 
    143131 #ifndef LDOM_USE_OWN_MEM_MAN
    144132 #define LDOM_USE_OWN_MEM_MAN                 1
    145 diff -Naur -x build -x .git trunk/crengine/src/lvstream.cpp vendor\current\crengine/crengine/src/lvstream.cpp
    146 --- trunk/crengine/src/lvstream.cpp     2012-09-13 17:08:32.000000000 +0200
    147 +++ vendor\current\crengine/crengine/src/lvstream.cpp   2012-09-13 14:14:26.000000000 +0200
     133diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/src/lvstream.cpp trunk/crengine/src/lvstream.cpp
     134--- vendor/current/crengine/crengine/src/lvstream.cpp   2012-09-13 14:14:26.000000000 +0200
     135+++ trunk/crengine/src/lvstream.cpp     2012-09-13 17:08:32.000000000 +0200
    148136@@ -54,7 +54,7 @@
    149137 #include <sys/mman.h>
    150138 #endif
    151139 
    152 -#if defined(_LINUX) || defined(_OS2)
    153 +#ifdef _LINUX
     140-#ifdef _LINUX
     141+#if defined(_LINUX) || defined(_OS2)
    154142 #include <sys/types.h>
    155143 #include <sys/stat.h>
     
    159147 
    160148 //#if USE__FILES==1
    161 -#if defined(_LINUX) || defined(_WIN32) || defined(_OS2)
    162 +#if defined(_LINUX) || defined(_WIN32)
     149-#if defined(_LINUX) || defined(_WIN32)
     150+#if defined(_LINUX) || defined(_WIN32) || defined(_OS2)
    163151 
    164152 class LVFileMappedStream : public LVNamedStream
    165153 {
    166 @@ -828,9 +828,7 @@
     154@@ -828,7 +828,9 @@
    167155 
    168156 
    169157 //#ifdef _LINUX
    170 -#ifndef _OS2
     158+#ifndef _OS2
    171159 #undef USE_ANSI_FILES
    172 -#endif
     160+#endif
    173161 //#endif
    174162 
    175163 #if (USE_ANSI_FILES==1)
    176 @@ -3519,7 +3517,7 @@
     164@@ -3517,7 +3519,7 @@
    177165     lChar16 c = pathName[0];
    178166     if ( c=='\\' || c=='/' )
    179167         return true;
    180 -#if defined(_WIN32) || defined(_OS2)
    181 +#ifdef _WIN32
     168-#ifdef _WIN32
     169+#if defined(_WIN32) || defined(_OS2)
    182170     if ( (c>='a' && c<='z') || (c>='A' && c<='Z') ) {
    183171         return (pathName[1]==':');
    184172     }
    185 @@ -3762,7 +3760,7 @@
     173@@ -3760,7 +3762,7 @@
    186174 */
    187175 LVStreamRef LVMapFileStream( const lChar16 * pathname, lvopen_mode_t mode, lvsize_t minSize )
    188176 {
    189 -#if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2)
    190 +#if !defined(_WIN32) && !defined(_LINUX)
     177-#if !defined(_WIN32) && !defined(_LINUX)
     178+#if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2)
    191179         // STUB for systems w/o mmap
    192180     LVFileStream * stream = LVFileStream::CreateFileStream( pathname, mode );
    193181     if ( stream!=NULL )
    194 diff -Naur -x build -x .git trunk/tinydict/tinydict.cpp vendor\current\crengine/tinydict/tinydict.cpp
    195 --- trunk/tinydict/tinydict.cpp 2012-09-13 16:36:54.000000000 +0200
    196 +++ vendor\current\crengine/tinydict/tinydict.cpp       2012-09-13 14:14:36.000000000 +0200
     182diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/src/lvstring.cpp trunk/crengine/src/lvstring.cpp
     183--- vendor/current/crengine/crengine/src/lvstring.cpp   2012-09-13 14:14:26.000000000 +0200
     184+++ trunk/crengine/src/lvstring.cpp     2012-09-13 18:20:00.000000000 +0200
     185@@ -24,7 +24,7 @@
     186 #include <malloc.h>
     187 #endif
     188 #endif
     189-
     190+#include <stddef.h>
     191 #if (USE_ZLIB==1)
     192 #include <zlib.h>
     193 #endif
     194diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/CMakeLists.txt trunk/CMakeLists.txt
     195--- vendor/current/crengine/CMakeLists.txt      2012-09-13 14:14:24.000000000 +0200
     196+++ trunk/CMakeLists.txt        2012-09-13 15:57:06.000000000 +0200
     197@@ -97,6 +97,8 @@
     198   ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 )
     199 elseif ( WIN32 )
     200   ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 )
     201+elseif ( OS2 )
     202+  ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 )
     203 else()
     204   ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 )
     205 endif(MAC)
     206diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/install.os2 trunk/install.os2
     207--- vendor/current/crengine/install.os2 1970-01-01 01:00:00.000000000 +0100
     208+++ trunk/install.os2   2012-12-20 18:11:42.000000000 +0100
     209@@ -0,0 +1,126 @@
     210+CoolReader3 installation
     211+
     212+
     213+
     214+0. CONTENTS OF THIS FILE
     215+========================
     216+
     217+1. INTRODUCTION
     218+
     219+2. REQUIREMENTS
     220+
     221+3. INSTALLATION
     222+
     223+4. BUGREPORTS
     224+
     225+5. CREDITS
     226+
     227+6. SUPPORT AND DONATIONS
     228+
     229+7. HISTORY
     230+
     231+
     232+1. INTRODUCTION
     233+===============
     234+
     235+Welcome to CoolReader3 port for OS/2 and eComStation.
     236+
     237+
     238+2. REQUIREMENTS
     239+===============
     240+
     241+* klibc 0.6.3 or later
     242+
     243+    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
     244+
     245+
     246+* Qt4 dll
     247+
     248+    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
     249+
     250+
     251+3. INSTALLATION
     252+===============
     253+         
     254+To install CoolReader3, do the following:
     255+
     256+klibc
     257+-----
     258+
     259+  1. Download klibc 0.6.3 csd3 or later.
     260+  2. Install the package by double-clicking on the WPI file.
     261+
     262+
     263+
     264+Qt4 dll
     265+-------
     266+
     267+  1. Download the package
     268+  2. Install the package either with rpm or by zip.
     269+
     270+
     271+
     272+CoolReader3
     273+-----------
     274+
     275+  1. Create a directory for CoolReader3.
     276+  2. Extract the ColReader3 package to the new directory.
     277+  3. Create a WPS object for cr3.exe.
     278+  4. Start CoolReader3
     279+  5. Happy reading
     280
     281+
     282+
     283+4. BUGREPORTS
     284+=============
     285+
     286+Please create bugreports at http://svn.netlabs.org/qtapps
     287+Only bug reports with a reproducable bug are accepted. :-)
     288+
     289+
     290+
     291+5. CREDITS
     292+==========
     293+
     294+The port was done by:
     295+
     296+Silvan Scherrer aka _diver
     297+
     298+Thanks go to:
     299+
     300+  * Dmitry A. Kuminov
     301+
     302+They either helped me when I had some nasty questions or did some testing for
     303+me.
     304+
     305+
     306+6. SUPPORT AND DONATIONS
     307+========================
     308+
     309+CoolReader3 port is based on volunteer work. If you would like to support further
     310+development, you can do so in one of the following ways:
     311+
     312+
     313+  * Donate to the Qt4 project: see qt.netlabs.org for more information
     314+
     315+  * Contribute to the project: Besides actual development, this also includes
     316+    maintaining the documentation and the project web site as well as help
     317+    for users.
     318+
     319+
     320+7. HISTORY
     321+==========
     322+
     323+2012-09-13
     324+
     325+  * updated coolreader source to 3.0.55
     326+
     327+2011-09-30
     328+
     329+  * updated coolreader source to 3.0.51
     330+  * updated Qt to 4.7.3
     331+
     332+2011-06-01
     333+
     334+  * initial port
     335+
     336diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/tinydict/tinydict.cpp trunk/tinydict/tinydict.cpp
     337--- vendor/current/crengine/tinydict/tinydict.cpp       2012-09-13 14:14:36.000000000 +0200
     338+++ trunk/tinydict/tinydict.cpp 2012-09-13 16:36:54.000000000 +0200
    197339@@ -994,7 +994,7 @@
    198340                        }
    199341                }
    200342        }
    201 -#ifdef _WIN32 || defined(_OS2)
    202 +#ifdef _WIN32
     343-#ifdef _WIN32
     344+#ifdef _WIN32 || defined(_OS2)
    203345        printf("Press any key...");
    204346        getchar();
Note: See TracChangeset for help on using the changeset viewer.