CoolReader_3.0.55.diff in diffs – Qt Applications for OS/2 and OS/2-based systems

.gitignore

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/.gitignore trunk/.gitignore

-              old
+              new
-*.*~
-qtbuild
-v3build
-v5build
-wxbuild
-qtbuild
-qt-build
-qtcreator-build
-*~

cr3qt/CMakeLists.txt

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/CMakeLists.txt trunk/cr3qt/CMakeLists.txt

-              old
+              new
     ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/"
           -DUSE_FONTCONFIG=1
+    )
 ELSE()
     ADD_DEFINITIONS(-DCR3_DATA_DIR=""
           -DUSE_FONTCONFIG=0
 …
   endif(MINGW)
 ENDIF (WIN32)
 SET(LANGUAGES ru uk cs de es pl bg hu)
 message( "Languages: ${LANGUAGES}" )
 …
 #${QT_LIBRARIES}
 ELSEIF (UNIX)
     SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
 ELSE()
     SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES})
 ENDIF(MAC)

cr3qt/src/cr3_os2.rc

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/cr3_os2.rc trunk/cr3qt/src/cr3_os2.rc

old	new
	1
	2

cr3qt/src/icons/cr3_os2.ico

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/icons/cr3_os2.ico trunk/cr3qt/src/icons/cr3_os2.ico

old	new
	1

cr3qt/src/main.cpp

:
(PÿÿÿCI"
º
((ªªÁÁÁÌÌÌÿÛªªIÿImUmªmÿm$Uª$ÿ¶U¶ª¶ÿ¶ÛUÛªÛÿÛªÛÿUÿªÿªÿÿ+U+ª+ÿ+$+U$+ª$+ÿ$+I+UI+ªI+ÿI+m+Um+ªm+ÿm++U+ª+ÿ+¶+U¶+ª¶+ÿ¶+Û+UÛ+ªÛ+ÿÛ+ÿ+Uÿ+ªÿ+ÿÿ+UUUªUÿU$UU$Uª$Uÿ$UIUUIUªIUÿIUmUUmUªmUÿmUUUUªUÿU¶UU¶Uª¶Uÿ¶UÛUUÛUªÛUÿÛUÿUUÿUªÿUÿÿUUUU$ÿ$U$ª$ÿ$IUIªIÿImUmªmÿm'''...666>>>FFFMMMUUU]]]dddlllttt|||Ûÿÿ¶ÿªªª²²²¹¹¹ÿ$IÑÑÑØØØàààèèèðððª¶ÿÿÛÿUªÿ¶U¶ª¶ÿ¶ÛUÛªÛÿÛÿUÿªÿÿÿªUªªªÿª$ªU$ªª$ªÿ$ªIªUIªªIªÿIªmªUmªªmªÿmªªUªªªÿª¶ªU¶ªª¶ªÿ¶ªÛªUÛªªÛªUIÿªUÿªªÿªÿÿªÕUÕªÕÿÕ$ÕU$Õª$Õÿ$ÕIÕUIÕªIÕÿIÕmÕUmÕªmÕÿmÕÕUÕªÕÿÕ¶ÕU¶Õª¶Õÿ¶ÕÛÕUÛÕªÛÕÿÛÕÿÕUÿÕªÿÕÿÿÕUÛÿUÿªÿUÿÿ$ÿU$ÿª$ÿÿ$ÿIÿUIÿªIÿÿIÿmÿUmÿªmÿÿmÿÿUÿªÿÿÿ¶ÿU¶ÿ÷÷÷¢¢¢ÿÿÿÿÿÿÿÿÿÿÿÿÁÿÛªmmÿU¶¶ÿUÛªÛÿªU++$$+ÿUI++mm+ÿU++¶¶+ÿUÛ++ÿÿ+ÿUUU$$UÿUIUUmmUÿUUU¶¶UÿUÛUUÿÿUÿU$$ÿUIm''66>MMM]ddtt|ÿ¶²²¹IØààððªU¶¶ÿUÛÿÿÿUªª$$ªÿUIªªmmªÿUªª¶¶ªÿUÛªÿÿªÿUÕÕ$$ÕÿUIÕÕmmÕÿUÕÕ¶¶Õÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöÿÿÿÿÿÿÿÿÿÿÿÿÿÿööÿÿÿÿÿÿÿÿÿÿÿÿÿÿy÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿööÿÿÿÿÿÿÿÿÿÿÿÿÿö~÷øöÿÿÿÿÿÿ
ÿÿÿöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöz
÷
yÿÿÿÿÿ

ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ


÷}}ÿÿ÷z{r
öÿÿÿÿÿÿÿÿÿÿÿÿÿz÷~÷


ppuuz{x÷öÿÿÿÿÿÿÿÿÿÿ÷øzz
q|ttyyzøy|ÿÿÿÿÿÿÿÿ|~~ø~øzvwv~~}y~~÷÷~|}ÿÿÿz~
z~~|÷{vyxvt|{{~øwøÿÿöø~{x~~{|zpywwy}ø{z

öÿÿ||xy|ty}zypy{||øø÷÷~ÿÿÿzywwruxq{~~÷ÿÿö{x
øurwrsr~
ÿÿÿö÷}~uuvvqqtxøÿÿÿ÷øøtwwyw|rqyzyyxz÷
ÿÿö
ö}uxwzzz~øwyy{
ÿÿ÷ÿÿÿÿÿÿÿÿÿÿxvzz|~øÿ

öÿö÷ÿuÿ~ÿøÿ~ÿÿÿÿÿqwÿ~ÿpÿÿÿÿÿöqpvy|}q~ÿÿwÿÿÿÿÿÿÿÿyø|yuxxvqz
qvö
÷ÿÿÿÿÿÿÿÿÿÿ{uøywz|wrÿ÷öÿÿÿÿÿÿÿÿÿÿ
÷ø|xvÿ}|z}~~øÿÿ
ÿÿÿÿÿÿÿÿÿÿÿÿöÿ|tøöÿÿö|øøxpqÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿø~y÷ÿÿÿÿÿ

qquÿÿÿÿÿÿÿÿÿÿÿÿÿpÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöÿÿszÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿørÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}ÿÿÿÿÿÿÿ~ÿÿÿÿÿÿÿÿÿÿvÿÿuÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿ÷pöÿÿÿs~ÿÿÿ}~ÿrrÿÿÿÿÿÿÿÿÿÿÿ~
÷yÿÿÿupsÿÿÿÿÿÿÿÿÿÿÿÿw~ÿÿÿÿÿzöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿxrÿÿÿÿÿÿÿÿw|öÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷}~ÿÿÿÿÿÿÿÿÿÿ}}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ Kein Zeilenumbruch am Dateiende.
diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/cr3qt/src/main.cpp trunk/cr3qt/src/main.cpp

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

crengine/include/crsetup.h

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/include/crsetup.h trunk/crengine/include/crsetup.h

-              old
+              new
 #define FILE_STREAM_BUFFER_SIZE              0x40000
 #endif
 #elif defined(_LINUX) || defined (LINUX)
+#elif defined(_LINUX) || defined (LINUX)
 #ifndef LDOM_USE_OWN_MEM_MAN
 #define LDOM_USE_OWN_MEM_MAN                 1

crengine/src/lvstream.cpp

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/src/lvstream.cpp trunk/crengine/src/lvstream.cpp

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

crengine/src/lvstring.cpp

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/crengine/src/lvstring.cpp trunk/crengine/src/lvstring.cpp

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

CMakeLists.txt

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/CMakeLists.txt trunk/CMakeLists.txt

-              old
+              new
   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 )
 else()
   ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 )
 endif(MAC)

install.os2

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/install.os2 trunk/install.os2

old	new
	1
	2
	3
	4
	5
	6
	7
	8
	9
	10
	11
	12
	13
	14
	15
	16
	17
	18
	19
	20
	21
	22
	23
	24
	25
	26
	27
	28
	29
	30
	31
	32
	33
	34
	35
	36
	37
	38
	39
	40
	41
	42
	43
	44
	45
	46
	47
	48
	49
	50
	51
	52
	53
	54
	55
	56
	57
	58
	59
	60
	61
	62
	63
	64
	65
	66
	67
	68
	69
	70
	71
	72
	73
	74
	75
	76
	77
	78
	79
	80
	81
	82
	83
	84
	85
	86
	87
	88
	89
	90
	91
	92
	93
	94
	95
	96
	97
	98
	99
	100
	101
	102
	103
	104
	105
	106
	107
	108
	109
	110
	111
	112
	113
	114
	115
	116
	117
	118
	119
	120
	121
	122
	123
	124
	125
	126

tinydict/tinydict.cpp

diff -Naur -x build -x .git -x '*.ts' vendor/current/crengine/tinydict/tinydict.cpp trunk/tinydict/tinydict.cpp

old	new
994	994	}
995	995	}
996	996	}
997		#ifdef _WIN32
	997	#ifdef _WIN32
998	998	printf("Press any key...");
999	999	getchar();
1000	1000	#endif

Context Navigation

source: diffs/CoolReader_3.0.55.diff@ 164

.gitignore

cr3qt/CMakeLists.txt

cr3qt/src/cr3_os2.rc

cr3qt/src/icons/cr3_os2.ico

cr3qt/src/main.cpp

crengine/include/crsetup.h

crengine/src/lvstream.cpp

crengine/src/lvstring.cpp

CMakeLists.txt

install.os2

tinydict/tinydict.cpp

Download in other formats:

old	new
	1
	2
	3
	4
	5
	6
	7
	8
	9
	10
	11
	12
	13
	14
	15
	16
	17
	18
	19
	20
	21
	22
	23
	24
	25
	26
	27
	28
	29
	30
	31
	32
	33
	34
	35
	36
	37
	38
	39
	40
	41
	42
	43
	44
	45
	46
	47
	48
	49
	50
	51
	52
	53
	54
	55
	56
	57
	58
	59
	60
	61
	62
	63
	64
	65
	66
	67
	68
	69
	70
	71
	72
	73
	74
	75
	76
	77
	78
	79
	80
	81
	82
	83
	84
	85
	86
	87
	88
	89
	90
	91
	92
	93
	94
	95
	96
	97
	98
	99
	100
	101
	102
	103
	104
	105
	106
	107
	108
	109
	110
	111
	112
	113
	114
	115
	116
	117
	118
	119
	120
	121
	122
	123
	124
	125
	126

Last change on this file since 164 was 159, checked in by Silvan Scherrer, 12 years ago
new qbit version
File size: 12.1 KB

old	new
	1
	2
	3
	4
	5
	6
	7
	8
	9
	10
	11
	12
	13
	14
	15
	16
	17
	18
	19
	20
	21
	22
	23
	24
	25
	26
	27
	28
	29
	30
	31
	32
	33
	34
	35
	36
	37
	38
	39
	40
	41
	42
	43
	44
	45
	46
	47
	48
	49
	50
	51
	52
	53
	54
	55
	56
	57
	58
	59
	60
	61
	62
	63
	64
	65
	66
	67
	68
	69
	70
	71
	72
	73
	74
	75
	76
	77
	78
	79
	80
	81
	82
	83
	84
	85
	86
	87
	88
	89
	90
	91
	92
	93
	94
	95
	96
	97
	98
	99
	100
	101
	102
	103
	104
	105
	106
	107
	108
	109
	110
	111
	112
	113
	114
	115
	116
	117
	118
	119
	120
	121
	122
	123
	124
	125
	126

old	new
	1
	2
	3
	4
	5
	6
	7
	8
	9
	10
	11
	12
	13
	14
	15
	16
	17
	18
	19
	20
	21
	22
	23
	24
	25
	26
	27
	28
	29
	30
	31
	32
	33
	34
	35
	36
	37
	38
	39
	40
	41
	42
	43
	44
	45
	46
	47
	48
	49
	50
	51
	52
	53
	54
	55
	56
	57
	58
	59
	60
	61
	62
	63
	64
	65
	66
	67
	68
	69
	70
	71
	72
	73
	74
	75
	76
	77
	78
	79
	80
	81
	82
	83
	84
	85
	86
	87
	88
	89
	90
	91
	92
	93
	94
	95
	96
	97
	98
	99
	100
	101
	102
	103
	104
	105
	106
	107
	108
	109
	110
	111
	112
	113
	114
	115
	116
	117
	118
	119
	120
	121
	122
	123
	124
	125
	126