source: diffs/qpdfview_0.4.14_GA.diff

Last change on this file was 173, checked in by Silvan Scherrer, 10 years ago

add qpdfview 0.4.14 and 0.4.15 diff

File size: 20.3 KB
RevLine 
[173]1diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd E:\trees\qpdfview\trunk/build_os2.cmd
2--- E:\trees\qpdfview\trunk\..\vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100
3+++ E:\trees\qpdfview\trunk/build_os2.cmd 2014-09-29 16:05:56.000000000 +0200
4@@ -0,0 +1,341 @@
5+/* qpdfview Build Script */
6+/* version history */
7+/* version 0.1.0 from 25.03.2013 Silvan (first edition) */
8+/* version 0.1.1 from 25.04.2013 Silvan (new poppler lib) */
9+/* version 0.1.2 from 29.05.2013 Silvan (application version from qpdfview.pri) */
10+/* version 0.1.3 from 17.06.2013 Silvan (added .ps support) */
11+/* version 0.1.4 from 08.08.2013 Silvan (new poppler lib) */
12+/* version 0.1.5 from 20.08.2013 Silvan (added diff option) */
13+/* version 0.1.6 from 15.10.2013 Silvan (copy all help*.html) */
14+/* version 0.2.0 from 16.10.2013 Silvan (get some info form qpdfview_os2.pri) */
15+/* version 0.2.1 from 03.12.2013 Silvan (help files now in help dir) */
16+/* version 0.2.2 from 26.09.2014 Silvan (don't copy the tiff.dll) */
17+/* version 0.2.3 from 29.09.2014 Silvan (don't copy the poppler*.dll) */
18+
19+/* init the version string (don't forget to change) */
20+version = "0.2.3"
21+version_date = "29.09.2014"
22+'@echo off'
23+
24+parse arg command option
25+parse source . . scriptFile
26+
27+/* init the required vars */
28+qRC = 0
29+mRC = 0
30+buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
31+sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
32+vendorDir = sourceDir || '\..\vendor\current'
33+diffDir = sourceDir || '\..\'
34+srcDir = sourceDir
35+OS2Dir = sourceDir
36+installDir = buildDir || '\install'
37+installDirT= installDir || '\data'
38+qErrorFile = buildDir||'\qmake.err'
39+qOutFile = buildDir||'\qmake.out'
40+mErrorFile = buildDir||'\make.err'
41+mOutFile = buildDir||'\make.out'
42+
43+/* get the Qpdfview version */
44+Qpdfview_version = '0.0.0'
45+Qpdfview_build = ' '
46+call version
47+internal_build = translate(Qpdfview_version, '_', '.')
48+
49+/* get some info from qpdfview_os2.pri */
50+psDir = ' '
51+djvuDir = ' '
52+call getpri
53+
54+title = "Qpdfview for eCS (OS/2) build script v" || version || " from " || version_date
55+say title
56+say
57+say "Build directory :" buildDir
58+say "Source directory :" sourceDir
59+say
60+say "Qpdfview version :" Qpdfview_version
61+say " build :" Qpdfview_build
62+say
63+say "Using non rpm libs:"
64+say " djvu from :" djvuDir
65+say " ps from :" psDir
66+say
67+
68+/* translate command to all upercase */
69+command = translate(command)
70+
71+if command = "" then signal help
72+
73+
74+if command = "INSTALL" then do
75+ if option \== "" then do
76+ Qpdfview_build = option
77+ end
78+ select
79+ when Qpdfview_build \== "" then do
80+ zipFile = installDir || '\qpdfview-' || internal_build || '-' || Qpdfview_build || '.zip'
81+ end
82+ otherwise do
83+ signal help
84+ end
85+ end
86+end
87+
88+/* now we translate also the option */
89+option = translate(option)
90+
91+if sourceDir \== buildDir then do
92+ say "Shadow build in progress ..."
93+ say
94+end
95+
96+say "Executing command: "command option
97+
98+select
99+ when command = "MAKE" & option = "CLEAN" then do
100+
101+ say "cleaning the tree"
102+ call make 'distclean'
103+
104+ say "please execute this script again with 'make' to build Qpdfview"
105+
106+ end
107+ when command = "MAKE" then do
108+
109+ say "creating Qpdfview makefile"
110+ call qmake
111+
112+ if qRC = 0 then do
113+ say "building Qpdfview"
114+ if option = "" then do
115+ call make
116+ end
117+ else do
118+ call make 'debug'
119+ end
120+ end
121+
122+ end
123+
124+ when command = "INSTALL" then do
125+
126+/* first delete everything */
127+ call deleteall
128+
129+/* create the installDir,and the translation subdir */
130+ ok = SysMkDir(installDir)
131+ ok = SysMkDir(installDirT)
132+
133+/* copy the exe */
134+ ok = SysCopyObject(buildDir||'\Qpdfview.exe',installDir)
135+
136+/* copy all dll */
137+ ok = SysFileTree(buildDir||'\*.dll', rm.,'FOS')
138+ do i = 1 to rm.0
139+ ok = SysCopyObject(rm.i, installDir)
140+ end
141+
142+/* copy the readme */
143+ rm.0 = 1
144+ rm.1 = 'install.os2'
145+ do i = 1 to rm.0
146+ cmdtorun = 'sed "s;_VERSION_;' || Qpdfview_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || Qpdfview_build || ';g" >' || installDir || '\' || rm.i
147+ address cmd cmdtorun
148+ end
149+
150+/* copy different stuff */
151+ rm.0 = 2
152+ rm.1 = 'CHANGES'
153+ frmDir.1 = os2Dir
154+ toDir.1 = installDir
155+ rm.2 = 'help*.html'
156+ frmDir.2 = os2Dir || '\help'
157+ toDir.2 = installDirT
158+ do i = 1 to rm.0
159+ cmdtorun = 'copy ' || frmDir.i || '\' || rm.i || ' ' || toDir.i
160+ address cmd cmdtorun
161+ end
162+
163+/* create the qm files from ts files */
164+ ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
165+ do i = 1 to rm.0
166+ fileName = filespec('N',rm.i)
167+ fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
168+ cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDirT || '\' || fileName
169+ address cmd cmdtorun
170+ end
171+
172+/* zip all dynamic stuff */
173+ ok = directory(installDir)
174+ cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
175+ address cmd cmdtorun
176+ ok = directory(buildDir)
177+
178+/* zip all icons */
179+
180+ end
181+
182+ when command = "UNINSTALL" then do
183+
184+ call deleteall
185+
186+ end
187+
188+ when command = "DIFF" then do
189+
190+ address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' -x qpdfview.desktop >' || diffDir || 'qpdfview_' || Qpdfview_version || '_' || Qpdfview_build || '.diff'
191+
192+ end
193+
194+ otherwise do
195+ say 'Unknown parameter "'command'" - aborting...'
196+ exit 1
197+ end
198+end
199+
200+/* cleanup the mess */
201+error:
202+
203+if qRC = 0 & mRC = 0 then do
204+ ok = SysFileDelete(mOutFile)
205+ ok = SysFileDelete(mErrorFile)
206+ ok = SysFileDelete(qOutFile)
207+ ok = SysFileDelete(qErrorFile)
208+end
209+else do
210+ if mRC <> 0 then do
211+ say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
212+ end
213+ if qRC <> 0 then do
214+ say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
215+ end
216+end
217+
218+exit 0
219+
220+qmake:
221+ sourceFile = sourceDir || '/qpdfview.pro'
222+ address cmd 'qmake "CONFIG+=without_pkgconfig" "CONFIG+=without_dbus" "CONFIG+=without_magic" ' sourceFile ' 2>'qErrorFile' 1>'qOutFile
223+
224+ qRC = RC
225+ if qRC <> 0 then do
226+ call beep 880, 20
227+ say "Alarm! qmake RC="RC
228+ end
229+return
230+
231+make:
232+ makeparm = arg(1)
233+ address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
234+ mRC = RC
235+ if mRC <> 0 then do
236+ call beep 880, 20
237+ say "Alarm! make RC="RC
238+ end
239+return
240+
241+
242+deleteall: /* delete installDir (including subdirs) except zip files */
243+
244+ say "Delete all files except *zip in " installDir
245+ ok = SysFileTree(installDir||'\*', rm.,'FOS')
246+ do i = 1 to rm.0
247+ if translate(right(rm.i, 3)) \== 'ZIP' then do
248+ ok = SysFileDelete(rm.i)
249+ end
250+ end
251+
252+ say "Delete zip file " zipFile
253+ ok = SysFileDelete(zipFile)
254+
255+ say "Removing subdirs from " || installDir
256+ ok = SysFileTree(installDir||'\*', rm.,'OS')
257+ do i = 1 to rm.0
258+ ok = SysRmDir(rm.i)
259+ end
260+
261+ call SysSleep(5)
262+return
263+
264+/**
265+ * Fixes the directory path by a) converting all slashes to back
266+ * slashes and b) ensuring that the trailing slash is present if
267+ * the directory is the root directory, and absent otherwise.
268+ *
269+ * @param dir the directory path
270+ * @param noslash
271+ * optional argument. If 1, the path returned will not have a
272+ * trailing slash anyway. Useful for concatenating it with a
273+ * file name.
274+ */
275+FixDir: procedure expose (Globals)
276+ parse arg dir, noslash
277+ noslash = (noslash = 1)
278+ dir = translate(dir, '\', '/')
279+ if (right(dir, 1) == '\' &,
280+ (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
281+ dir = substr(dir, 1, length(dir) - 1)
282+ return dir
283+
284+/**
285+ * reads the version.cpp and gets the Qpdfview version from there
286+ */
287+version: procedure expose Qpdfview_version Qpdfview_build srcDir
288+
289+ QpdfviewVer = ' '
290+ /* Qpdfview Version file */
291+ Version = srcDir || "\qpdfview.pri"
292+
293+ do until lines(Version) = 0
294+ verline = linein(Version)
295+ if substr(Verline,30,19) = "APPLICATION_VERSION" then do
296+ parse var verline . ' '. ' ' QpdfviewVer
297+ end
298+ end
299+
300+ ok = stream(Version,'c','close')
301+ if QpdfviewVer \== ' ' then do
302+ QpdfviewVer = strip(QpdfviewVer,,'"')
303+ parse var QpdfviewVer ver '.' maj '.' min '.' Qpdfview_build
304+ Qpdfview_version = ver || '.'|| maj || '.' || min
305+ end
306+
307+ if Qpdfview_build == '' then do
308+ Qpdfview_build = 'GA'
309+ end
310+
311+ return
312+
313+/**
314+ * reads the qpdfview_os2.pri and some values from there
315+ */
316+getpri: procedure expose djvuDir psDir srcDir
317+
318+ /* Qpdfview_os2.pri file */
319+ priFile = srcDir || "\qpdfview_os2.pri"
320+
321+ do until lines(priFile) = 0
322+ verline = linein(priFile)
323+ verline = strip(verline,,' ')
324+ if substr(Verline,1,9) = "DJVU_ROOT" then do
325+ parse var verline . ' '. ' ' djvuDir
326+ end
327+ if substr(Verline,1,7) = "PS_ROOT" then do
328+ parse var verline . ' '. ' ' psDir
329+ end
330+ end
331+
332+ ok = stream(priFile,'c','close')
333+ djvuDir = FixDir(djvuDir)
334+ psDir = FixDir(psDir)
335+ return
336+
337+help:
338+ say "Parameters:"
339+ say " make"
340+ say " make debug"
341+ say " make clean"
342+ say " install build (build overwrites what this script finds)"
343+ say " uninstall"
344+ say " diff (creates a diff from vendor to trunk)"
345+exit 255
346diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/install.os2 E:\trees\qpdfview\trunk/install.os2
347--- E:\trees\qpdfview\trunk\..\vendor\current/install.os2 1970-01-01 01:00:00.000000000 +0100
348+++ E:\trees\qpdfview\trunk/install.os2 2015-02-24 17:04:42.000000000 +0100
349@@ -0,0 +1,319 @@
350+Qpdfview _VERSION_ _BUILD_ installation
351+
352+
353+0. CONTENTS OF THIS FILE
354+========================
355+
356+1. INTRODUCTION
357+
358+2. REQUIREMENTS
359+
360+3. INSTALLATION
361+
362+4. BUGREPORTS
363+
364+5. CREDITS
365+
366+6. SUPPORT AND DONATIONS
367+
368+7. HISTORY
369+
370+
371+1. INTRODUCTION
372+===============
373+
374+Welcome to Qpdfview _VERSION_ _BUILD_ port for OS/2 and eComStation.
375+
376+
377+2. REQUIREMENTS
378+===============
379+
380+The following requirements need to be installed.
381+
382+
383+2.1 kLIBC, GCC4Core, Qt4, Zlib, cups
384+------------------------------------
385+
386+The installation of these products can be done either by RPM or ZIP files.
387+
388+2.1.a RPM installation
389+----------------------
390+
391+kLIBC
392+-----
393+
394+ 1. yum install libc
395+
396+GCC4Core
397+--------
398+
399+ 1. yum install libgcc1 libgcc-fwd
400+ 2. yum install libssp
401+ 3. yum install libstdc++ libstdc++6
402+ 4. yum install libsupc++ libsupc++6
403+
404+Qt4 dll
405+-------
406+
407+ 1. yum install libqt4
408+
409+Zlib
410+----
411+
412+ 1. yum install zlib
413+
414+Jpeg, Tiff, Png
415+---------------
416+
417+ 1. yum install libjpeg libtiff libpng
418+
419+poppler
420+-------
421+
422+ 1. yum install poppler-qt
423+
424+djvulibre
425+---------
426+
427+ not available as a rpm at this time of writing
428+
429+cups
430+----
431+
432+ not available as a rpm at this time of writing
433+
434+freetype/fontconfig
435+-------------------
436+
437+ yum install freetype fontconfig
438+
439+ghostscript
440+-----------
441+
442+ not available as a rpm at this time of writing
443+
444+pthread
445+-------
446+
447+ 1. yum install pthread
448+
449+
450+2.1.b ZIP Installation
451+----------------------
452+
453+kLIBC
454+-----
455+
456+ 1. Download kLIBC 0.6.6 or better (see http://svn.netlabs.org/libc for more
457+ information)
458+ 2. Install the files to your libpath eg x:\ecs\dll
459+
460+GCC4Core
461+--------
462+
463+ 1. Download GCC4Core 1.3.0 or better from http://ftp.netlabs.org/pub/gcc
464+ 2. Install the files to your libpath eg. x:\ecs\dll
465+
466+Qt4 dll
467+-------
468+
469+ 1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more
470+ information)
471+ 2. Install the files according to the readme
472+
473+Zlib
474+----
475+
476+ 1. Download zlib from http://rpm.netlabs.org/release/00/zip
477+ 2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
478+
479+Jpeg, Tiff, Png
480+---------------
481+
482+ 1. Download libjpeg, libtiff and libpng from http://rpm.netlabs.org/release/00/zip
483+ 2. Unpack and install the dll to your libpath eg. x:\ecs\dll
484+
485+poppler
486+-------
487+
488+ 1. Download poppler and poppler-qt from http://rpm.netlabs.org/release/00/zip
489+ 2. Unpack and install the dll to your libpath eg. x:\ecs\dll
490+
491+djvulibre
492+---------
493+
494+ 1. Download djvulibre from ftp://ftp.netlabs.org/pub/unixos2/djvulibre-3_5_25.zip
495+ 2. Unpack and install djvu.dll to your libpath eg. x:\ecs\dll
496+
497+cups
498+----
499+
500+ 1. Go to eCUPS wiki to see how to install eCUPS (http://svn.netlabs.org/ecups)
501+ 2. Install eCUPS according to the above wiki
502+
503+freetype/fontconfig
504+-------------------
505+
506+ 1. Download freetype and fontconfig from http://rpm.netlabs.org/release/00/zip
507+ 2. Unpack and install freetyp6.dll and fntcfg2.dll to your libpath eg. x:\ecs\dll
508+
509+ghostscript
510+-----------
511+
512+ 1. Download ghostscript as zip from ftp://ftp.netlabs.org/pub/unixos2/gs910os2.zip
513+ 2. Unpack and install the gsdll2.dll to your libpath eg. x:\ecs\dll
514+ (note this ghostscript should be compatible with P. Smedley's 9.10 port, but his ports lack
515+ some features needed for qpdfview)
516+
517+pthread
518+-------
519+
520+ 1. Download pthread from http://rpm.netlabs.org/release/00/zip
521+ 2. Unpack and install pthr01.dll to your libpath eg. x:\ecs\dll
522+
523+
524+3. INSTALLATION
525+===============
526+
527+To install qpdfview, do the following:
528+
529+ 1. Create a directory for qpdfview.
530+ 2. Extract the qpdfview package to the new directory.
531+ 3. Create a WPS object for qdpfview.exe.
532+ 4. Start qdpfview
533+ 5. Happy using it
534+
535+If you have tried to open a file and not all requirements have been there at
536+this try, Qt screwed his plugin cache.
537+To overcome that delete %HOME%/.config/Trolltech.ini. It will be created again
538+when a Qt app starts.
539+
540+Optional: to have special fonts working you need poppler-data pack.
541+(this poppler-data is already installed when you installed poppler with rpm)
542+
543+ - extract the 4 directories from the package found on http://poppler.freedesktop.org
544+ to your %unixroot%/usr/share/poppler or to the dir where qpdfview.exe is installed
545+ - if you also want japanese fonts working, take care that the "Times New Roman WT J" font
546+ is installed. This font is used as a fallback
547+
548+
549+4. BUGREPORTS
550+=============
551+
552+Please create bugreports at http://svn.netlabs.org/qtapps
553+Only bug reports with a reproducable bug are accepted. :-)
554+
555+
556+5. CREDITS
557+==========
558+
559+The port was done by:
560+
561+Silvan Scherrer aka _diver
562+
563+Thanks go to:
564+
565+ * Dmitriy Kuminov
566+
567+They either helped me when I had some nasty questions or did some testing for
568+me.
569+
570+
571+6. SUPPORT AND DONATIONS
572+========================
573+
574+qpdfview port is based on volunteer work. If you would like to support further
575+development, you can do so in one of the following ways:
576+
577+
578+ * Donate to the Qt4 project: see qt.netlabs.org for more information
579+
580+ * Contribute to the project: Besides actual development, this also includes
581+ maintaining the documentation and the project web site as well as help
582+ for users.
583+
584+
585+7. HISTORY
586+==========
587+
588+2015-02-24
589+ * updated to latest qpdfview 0.4.14 source
590+
591+2014-12-16
592+ * updated to latest qpdfview 0.4.13 source
593+ * updated install.os2 (poppler-data as rpm available)
594+
595+2014-10-10
596+ * updated install.os2 (some more dll as rpm available)
597+ * updated to latest qpdfview 0.4.12 source
598+
599+2014-05-15
600+ * updated to latest qpdfview 0.4.10 source
601+
602+2014-04-30
603+ * updated to latest poppler 0.26.0
604+
605+2014-04-02
606+ * updated to latest qpdfview 0.4.9 source
607+
608+2014-02-18
609+ * updated to latest qpdfview 0.4.8 source
610+
611+2013-12-03
612+ * updated to latest qpdfview 0.4.7 source
613+
614+2013-11-29
615+ * updated to latest poppler 0.24.4
616+
617+2013-10-15
618+ * updated to latest qpdfview 0.4.6 source
619+
620+2013-08-14
621+ * updated to latest qpdfview 0.4.4.99 source
622+ * updated to latest poppler 0.24.0
623+
624+2013-06-17
625+ * added .ps and .eps file support
626+
627+2013-05-27
628+ * updated to latest qpdfview 0.4.3 source
629+
630+2013-05-14
631+ * updated to latest qpdfview 0.4.3 beta source
632+
633+2013-04-25
634+ * updated to latest poppler 0.22.3
635+
636+2013-04-19
637+ * updated to latest qpdfview 0.4.2 beta source
638+
639+2013-03-25
640+ * updated to latest qpdfview 0.4.1 source
641+
642+2013-03-20
643+ * updated to latest qpdfview 0.4.1 beta source
644+
645+2013-02-19
646+ * updated to latest qpdfview 0.4.0 source
647+
648+2013-02-12
649+ * updated to latest qpdfview 0.4.0 beta1 source
650+
651+2013-02-06
652+ * updated to latest qpdfview 0.3.7 source
653+
654+2013-01-14
655+ * updated to latest poppler 0.22.0
656+
657+2012-12-13
658+ * updated to latest qpdfview 0.3.7 beta 1 source
659+
660+2012-11-27
661+ * updated to latest qpdfview source
662+
663+2012-10-29
664+ * created install.os2
665+ * updated qpdfview to contain a icon (thx Herwig)
666+
667+2012-10-24
668+ * first public port
669diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri E:\trees\qpdfview\trunk/qpdfview_os2.pri
670--- E:\trees\qpdfview\trunk\..\vendor\current/qpdfview_os2.pri 1970-01-01 01:00:00.000000000 +0100
671+++ E:\trees\qpdfview\trunk/qpdfview_os2.pri 2015-02-11 18:14:34.000000000 +0100
672@@ -0,0 +1,39 @@
673+# define destdir
674+PLUGIN_DESTDIR = lib
675+
676+# define the djvu part
677+DJVU_ROOT = e:/trees/djvulibre/trunk
678+DJVU_PLUGIN_LIBS += -L$$DJVU_ROOT/libdjvu/.libs
679+DJVU_PLUGIN_LIBS += djvulibre
680+DJVU_PLUGIN_INCLUDEPATH += $$DJVU_ROOT
681+DJVU_PLUGIN = qpdfdjvu
682+DJVU_PLUGIN_NAME = $$DJVU_PLUGIN".dll"
683+DJVULIBRE_VERSION=3.5.25
684+
685+# define the poppler part
686+PDF_ROOT = e:/trees/poppler/trunk
687+PDF_PLUGIN_DEFINES += HAS_POPPLER_14 HAS_POPPLER_18 HAS_POPPLER_20 HAS_POPPLER_22 HAS_POPPLER_24 HAS_POPPLER_26 HAS_POPPLER_31
688+PDF_PLUGIN_LIBS += -L$$PDF_ROOT/qt4/src/.libs
689+PDF_PLUGIN_LIBS += poppler-qt4
690+PDF_PLUGIN_INCLUDEPATH += $$PDF_ROOT/qt4/src
691+PDF_PLUGIN = qpdfpdf
692+PDF_PLUGIN_NAME = $$PDF_PLUGIN".dll"
693+POPPLER_VERSION=0.31.0
694+
695+# define the ps part
696+PS_ROOT = e:/trees/libspectre/trunk
697+PS_PLUGIN_LIBS += -L$$PS_ROOT/libspectre/.libs -Le:/trees/ghostscript/trunk/obj
698+PS_PLUGIN_LIBS += spectre.a gs
699+PS_PLUGIN_INCLUDEPATH += $$PS_ROOT
700+PS_PLUGIN = qpdfps
701+PS_PLUGIN_NAME = $$PS_PLUGIN".dll"
702+LIBSPECTRE_VERSION=0.2.7
703+
704+# define the cups part
705+CUPS_LIBS += cups
706+CUPS_VERSION=1.4.8
707+
708+# define the vendor part
709+DEF_FILE_VENDOR = bww bitwise works GmbH
710+DEF_FILE_VERSION = $$APPLICATION_VERSION
711+DEF_FILE_DESCRIPTION = eCS (OS/2) port of qpdfview by Adam Reichold
712diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.c
713--- E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.c 2013-03-24 14:30:12.000000000 +0100
714+++ E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.c 2013-03-20 17:08:22.000000000 +0100
715@@ -57,6 +57,10 @@
716 #define SYNCTEX_WINDOWS 1
717 #endif
718
719+#if defined(__OS2__)
720+#define SYNCTEX_OS2 1
721+#endif
722+
723 #ifdef _WIN32_WINNT_WINXP
724 #define SYNCTEX_RECENT_WINDOWS 1
725 #endif
726@@ -121,7 +125,7 @@
727 last_component = next+1;
728 }
729 }
730-# ifdef SYNCTEX_WINDOWS
731+# if defined(SYNCTEX_WINDOWS) || defined (SYNCTEX_OS2)
732 /* On Windows, the '\' is also a path separator. */
733 while((next = strstr(last_component,"\\"))){
734 last_component = next+1;
735@@ -207,7 +211,7 @@
736 if(!strlen(name)) {
737 return synctex_NO;
738 }
739-# if SYNCTEX_WINDOWS
740+# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2)
741 if(strlen(name)>2) {
742 return (name[1]==':' && SYNCTEX_IS_PATH_SEPARATOR(name[2]))?synctex_YES:synctex_NO;
743 }
744diff -Naur -x qpdfview.desktop E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.h E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.h
745--- E:\trees\qpdfview\trunk\..\vendor\current/synctex/synctex_parser_utils.h 2013-03-24 14:30:12.000000000 +0100
746+++ E:\trees\qpdfview\trunk/synctex/synctex_parser_utils.h 2013-03-20 17:11:20.000000000 +0100
747@@ -64,7 +64,7 @@
748 #define FALSE 0
749 #define TRUE !FALSE
750
751-# if _WIN32
752+# if defined(_WIN32) || defined(__OS2__)
753 # define SYNCTEX_CASE_SENSITIVE_PATH FALSE
754 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c)
755 # else
756@@ -72,7 +72,7 @@
757 # define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
758 # endif
759
760-# if _WIN32
761+# if defined(_WIN32) || defined(__OS2__)
762 # define SYNCTEX_IS_DOT(c) ('.' == c)
763 # else
764 # define SYNCTEX_IS_DOT(c) ('.' == c)
Note: See TracBrowser for help on using the repository browser.