source: diffs/CoolReader_3.0.55.diff@ 179

.gitignore

@@ -1 @@
-*.*~
-qtbuild
-v3build
-v5build
-wxbuild
-qtbuild
-qt-build
-qtcreator-build
-*~

cr3qt/CMakeLists.txt

@@ -48 +48 @@
     ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/" 
           -DUSE_FONTCONFIG=1 
     )
+ELSEIF (OS2)
+    ADD_DEFINITIONS(-DCR3_DATA_DIR=""
+          -DUSE_FONTCONFIG=1
+    )
 ELSE()
     ADD_DEFINITIONS(-DCR3_DATA_DIR=""
           -DUSE_FONTCONFIG=0
@@ -71 +75 @@
   endif(MINGW)
 ENDIF (WIN32)
 
+IF (OS2)
+ # init of the rc compiler
+ set(RES_FILES "src/cr3_os2.rc")
+ ENABLE_LANGUAGE(RC)
+ set(CMAKE_RC_COMPILER_INIT rc)
+    SET(CMAKE_RC_COMPILE_OBJECT
+      "<CMAKE_RC_COMPILER> -n -r -i ${CMAKE_CURRENT_SOURCE_DIR}/src <SOURCE> <OBJECT>")
+
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
+ENDIF (OS2)
 
 SET(LANGUAGES ru uk cs de es pl bg hu)
 message( "Languages: ${LANGUAGES}" )
@@ -158 +172 @@
 #${QT_LIBRARIES} 
 ELSEIF (UNIX)
     SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
+ELSEIF (OS2)
+    SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} intl fontconfig xml2 mmap)
 ELSE()
     SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES})
 ENDIF(MAC)

cr3qt/src/cr3_os2.rc

@@ +1 @@
+ICON    1       DISCARDABLE     "icons/cr3_os2.ico"
+ Kein Zeilenumbruch am Dateiende.

cr3qt/src/icons/cr3_os2.ico

@@ +1 @@
+CI"

cr3qt/src/main.cpp

@@ -156 +156 @@
             QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/Contents/Resources/"); //QDir::separator();
             QString translations = exeDir + "i18n";
 #else
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(Q_OS_OS2)
             QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/"); //QDir::separator();
             QString translations = exeDir + "i18n";
 #else
@@ -308 +308 @@
 bool InitCREngine( const char * exename, lString16Collection & fontDirs )
 {
         CRLog::trace("InitCREngine(%s)", exename);
-#ifdef _WIN32
+#if defined(_WIN32) || defined(Q_OS_OS2)
     lString16 appname( exename );
     int lastSlash=-1;
     lChar16 slashChar = '/';

crengine/include/crsetup.h

@@ -48 +48 @@
 #define FILE_STREAM_BUFFER_SIZE              0x40000
 #endif
 
-#elif defined(_LINUX) || defined (LINUX)
+#elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2)
 
 #ifndef LDOM_USE_OWN_MEM_MAN
 #define LDOM_USE_OWN_MEM_MAN                 1

crengine/src/lvstream.cpp

@@ -54 +54 @@
 #include <sys/mman.h>
 #endif
 
-#ifdef _LINUX
+#if defined(_LINUX) || defined(_OS2)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -302 +302 @@
 
 
 //#if USE__FILES==1
-#if defined(_LINUX) || defined(_WIN32)
+#if defined(_LINUX) || defined(_WIN32) || defined(_OS2)
 
 class LVFileMappedStream : public LVNamedStream
 {
@@ -828 +828 @@
 
 
 //#ifdef _LINUX
+#ifndef _OS2
 #undef USE_ANSI_FILES
+#endif
 //#endif
 
 #if (USE_ANSI_FILES==1)
@@ -3517 +3519 @@
     lChar16 c = pathName[0];
     if ( c=='\\' || c=='/' )
         return true;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_OS2)
     if ( (c>='a' && c<='z') || (c>='A' && c<='Z') ) {
         return (pathName[1]==':');
     }
@@ -3760 +3762 @@
 */
 LVStreamRef LVMapFileStream( const lChar16 * pathname, lvopen_mode_t mode, lvsize_t minSize )
 {
-#if !defined(_WIN32) && !defined(_LINUX)
+#if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2)
         // STUB for systems w/o mmap
     LVFileStream * stream = LVFileStream::CreateFileStream( pathname, mode );
     if ( stream!=NULL )

crengine/src/lvstring.cpp

@@ -24 +24 @@
 #include <malloc.h>
 #endif
 #endif
-
+#include <stddef.h>
 #if (USE_ZLIB==1)
 #include <zlib.h>
 #endif

CMakeLists.txt

@@ -97 +97 @@
   ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 )
 elseif ( WIN32 )
   ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 )
+elseif ( OS2 )
+  ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 )
 else()
   ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 )
 endif(MAC)

install.os2

@@ +1 @@
+CoolReader3 installation
+
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. INTRODUCTION
+
+2. REQUIREMENTS
+
+3. INSTALLATION
+
+4. BUGREPORTS
+
+5. CREDITS
+
+6. SUPPORT AND DONATIONS
+
+7. HISTORY
+
+
+1. INTRODUCTION
+===============
+
+Welcome to CoolReader3 port for OS/2 and eComStation.
+
+
+2. REQUIREMENTS
+===============
+
+* klibc 0.6.3 or later
+
+    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
+
+
+* Qt4 dll
+
+    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+
+
+3. INSTALLATION
+===============
+          
+To install CoolReader3, do the following:
+
+klibc
+-----
+
+  1. Download klibc 0.6.3 csd3 or later.
+  2. Install the package by double-clicking on the WPI file.
+
+
+
+Qt4 dll
+-------
+
+  1. Download the package
+  2. Install the package either with rpm or by zip.
+
+
+
+CoolReader3
+-----------
+
+  1. Create a directory for CoolReader3.
+  2. Extract the ColReader3 package to the new directory.
+  3. Create a WPS object for cr3.exe.
+  4. Start CoolReader3
+  5. Happy reading
+  
+
+
+4. BUGREPORTS
+=============
+
+Please create bugreports at http://svn.netlabs.org/qtapps
+Only bug reports with a reproducable bug are accepted. :-)
+
+
+
+5. CREDITS
+==========
+
+The port was done by:
+
+Silvan Scherrer aka _diver
+
+Thanks go to:
+
+  * Dmitry A. Kuminov
+
+They either helped me when I had some nasty questions or did some testing for
+me.
+
+
+6. SUPPORT AND DONATIONS
+========================
+
+CoolReader3 port is based on volunteer work. If you would like to support further
+development, you can do so in one of the following ways:
+
+
+  * Donate to the Qt4 project: see qt.netlabs.org for more information
+
+  * Contribute to the project: Besides actual development, this also includes
+    maintaining the documentation and the project web site as well as help
+    for users.
+
+
+7. HISTORY
+==========
+
+2012-09-13
+
+  * updated coolreader source to 3.0.55
+
+2011-09-30
+
+  * updated coolreader source to 3.0.51
+  * updated Qt to 4.7.3
+
+2011-06-01
+
+  * initial port
+

tinydict/tinydict.cpp

@@ -994 +994 @@
                         }
                 }
         }
-#ifdef _WIN32
+#ifdef _WIN32 || defined(_OS2)
         printf("Press any key...");
         getchar();
 #endif