source: diffs/smtube_1.8_GA.diff@ 158

Last change on this file since 158 was 158, checked in by Silvan Scherrer, 11 years ago

SMTube 1.8 release and QBittorrent 3.1.8 release

File size: 34.0 KB
Line 
1diff -Naur E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd E:\trees\smtube\trunk/build_os2.cmd
2--- E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd 1970-01-01 01:00:00.000000000 +0100
3+++ E:\trees\smtube\trunk/build_os2.cmd 2013-11-28 12:54:50.000000000 +0100
4@@ -0,0 +1,288 @@
5+/* SMTube Build Script */
6+/* root done by Herwig Bauernfeind, enhanced by Silvan Scherrer */
7+
8+/* version history */
9+/* version 0.1.0 from 23.05.2013 Silvan (first edition) */
10+/* version 0.1.1 from 05.06.2013 Silvan renamed readme files (happy birthday Justin) */
11+/* version 0.2.0 from 28.11.2013 Silvan added branding, added diff */
12+
13+/* init the version string (don't forget to change) */
14+version = "0.2.0"
15+version_date = "28.11.2013"
16+'@echo off'
17+
18+parse arg command option
19+parse source . . scriptFile
20+
21+/* init the required vars */
22+qRC = 0
23+mRC = 0
24+buildDir = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
25+sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
26+os2Dir = sourceDir || '\os2'
27+srcDir = sourceDir || '\src'
28+vendorDir = sourceDir || '\..\vendor\current'
29+diffDir = sourceDir || '\..\'
30+installDir = buildDir || '\install'
31+installDirT= installDir || '\translations'
32+qErrorFile = buildDir||'\qmake.err'
33+qOutFile = buildDir||'\qmake.out'
34+mErrorFile = buildDir||'\make.err'
35+mOutFile = buildDir||'\make.out'
36+
37+/* get the SMTube version */
38+SMTube_version = '0.0.0'
39+SMTube_build = ''
40+call version
41+internal_build = translate(SMTube_version, '_', '.')
42+
43+title = "SMTube for eCS (OS/2) build script v" || version || " from " || version_date
44+say title
45+say
46+say "Build directory :" buildDir
47+say "Source directory:" sourceDir
48+say
49+say "SMTube version :" SMTube_version
50+say " build :" SMTube_build
51+say
52+
53+/* translate command to all upercase */
54+command = translate(command)
55+
56+if command = "" then signal help
57+
58+if command = "INSTALL" then do
59+ if option \== "" then do
60+ SMTube_build = option
61+ end
62+ select
63+ when SMTube_build \== "" then do
64+ zipFile = installDir || '\SMTube-' || internal_build || '-' || SMTube_build || '.zip'
65+ end
66+ otherwise do
67+ signal help
68+ end
69+ end
70+end
71+
72+/* now we translate also the options */
73+option = translate(option)
74+
75+if sourceDir \== buildDir then do
76+ say "Shadow build in progress ..."
77+ say
78+end
79+
80+say "Executing command: "command option
81+
82+select
83+ when command = "MAKE" & option = "CLEAN" then do
84+
85+ say "cleaning the tree"
86+ call make 'distclean'
87+
88+ say "please execute this script again with 'make' to build SMTube"
89+
90+ end
91+ when command = "MAKE" then do
92+
93+ say "building svn_revision"
94+ ok = SysMkDir(buildDir||'\src')
95+ address cmd 'sh ' sourceDir||'\get_svn_revision.sh ' sourceDir ' "eCS(OS/2) build"'
96+
97+ say "creating SMTube makefile"
98+ call qmake
99+
100+ if qRC = 0 then do
101+ say "building SMTube"
102+ if option = "" then do
103+ call make
104+ end
105+ else do
106+ call make 'debug'
107+ end
108+ end
109+
110+ end
111+
112+ when command = "INSTALL" then do
113+
114+/* first delete everything */
115+ call deleteall
116+
117+/* create the installDir,and the translation subdir */
118+ ok = SysMkDir(installDir)
119+ ok = SysMkDir(installDirT)
120+
121+/* copy the exe */
122+ ok = SysCopyObject(buildDir||'\src\smtube.exe',installDir)
123+
124+/* copy the readme */
125+ rm.0 = 3
126+ rm.1 = 'smtube_en.txt'
127+ rm.2 = 'smtube_de.txt'
128+ rm.3 = 'smtube_fr.txt'
129+ do i = 1 to rm.0
130+ cmdtorun = 'sed "s;_VERSION_;' || SMTube_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || SMTube_build || ';g" >' || installDir || '\' || rm.i
131+ address cmd cmdtorun
132+ end
133+
134+/* create the qm files from ts files */
135+ ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
136+ do i = 1 to rm.0
137+ fileName = filespec('N',rm.i)
138+ fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
139+ cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDir || '\translations\' || fileName
140+ address cmd cmdtorun
141+ end
142+
143+/* zip all dynamic stuff */
144+ ok = directory(installDir)
145+ cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
146+ address cmd cmdtorun
147+ ok = directory(buildDir)
148+
149+/* zip all icons */
150+ ok = directory(os2Dir)
151+ cmdtorun = 'zip ' || zipFile || ' *.ico'
152+ address cmd cmdtorun
153+ ok = directory(buildDir)
154+
155+ end
156+
157+ when command = "UNINSTALL" then do
158+
159+ call deleteall
160+
161+ end
162+
163+ when command = "DIFF" then do
164+
165+ address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' > ' || diffDir || 'smtube_' || SMTube_version || '_' || SMTube_build || '.diff'
166+
167+ end
168+
169+ otherwise do
170+ say 'Unknown parameter "'command'" - aborting...'
171+ exit 1
172+ end
173+end
174+
175+/* cleanup the mess */
176+error:
177+
178+if qRC = 0 & mRC = 0 then do
179+ ok = SysFileDelete(mOutFile)
180+ ok = SysFileDelete(mErrorFile)
181+ ok = SysFileDelete(qOutFile)
182+ ok = SysFileDelete(qErrorFile)
183+end
184+else do
185+ if mRC <> 0 then do
186+ say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
187+ end
188+ if qRC <> 0 then do
189+ say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
190+ end
191+end
192+
193+exit 0
194+
195+qmake:
196+ address cmd 'qmake ' sourceDir ' "APPLICATION_VERSION='SMTube_version'" 2>'qErrorFile' 1>'qOutFile
197+ qRC = RC
198+ if qRC <> 0 then do
199+ call beep 880, 20
200+ say "Alarm! qmake RC="RC
201+ end
202+return
203+
204+make:
205+ makeparm = arg(1)
206+ address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
207+ mRC = RC
208+ if mRC <> 0 then do
209+ call beep 880, 20
210+ say "Alarm! make RC="RC
211+ end
212+return
213+
214+
215+deleteall: /* delete installDir (including subdirs) except zip files */
216+
217+ say "Delete all files except *zip in " installDir
218+ ok = SysFileTree(installDir||'\*', rm.,'FOS')
219+ do i = 1 to rm.0
220+ if translate(right(rm.i, 3)) \== 'ZIP' then do
221+ ok = SysFileDelete(rm.i)
222+ end
223+ end
224+
225+ say "Delete zip file " zipFile
226+ ok = SysFileDelete(zipFile)
227+
228+ say "Removing subdirs from " || installDir
229+ ok = SysFileTree(installDir||'\*', rm.,'OS')
230+ do i = 1 to rm.0
231+ ok = SysRmDir(rm.i)
232+ end
233+
234+ call SysSleep(5)
235+return
236+
237+/**
238+ * Fixes the directory path by a) converting all slashes to back
239+ * slashes and b) ensuring that the trailing slash is present if
240+ * the directory is the root directory, and absent otherwise.
241+ *
242+ * @param dir the directory path
243+ * @param noslash
244+ * optional argument. If 1, the path returned will not have a
245+ * trailing slash anyway. Useful for concatenating it with a
246+ * file name.
247+ */
248+FixDir: procedure expose (Globals)
249+ parse arg dir, noslash
250+ noslash = (noslash = 1)
251+ dir = translate(dir, '\', '/')
252+ if (right(dir, 1) == '\' &,
253+ (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
254+ dir = substr(dir, 1, length(dir) - 1)
255+ return dir
256+
257+/**
258+ * reads the version.cpp and gets the SMTube version from there
259+ */
260+version: procedure expose SMTube_version SMTube_build srcDir
261+
262+ SMTubeVer = ' '
263+ /* SMTube Version file */
264+ Version = srcDir || "\version.cpp"
265+
266+ do until lines(Version) = 0
267+ verline = linein(Version)
268+ if left(Verline,15) = "#define VERSION" then do
269+ parse var verline . ' '. ' ' SMTubeVer
270+ end
271+ end
272+
273+ ok = stream(Version,'c','close')
274+ if SMTubeVer \== ' ' then do
275+ SMTube_version = strip(SMTubeVer,,'"')
276+ end
277+
278+ if SMTube_build == '' then do
279+ SMTube_build = 'GA'
280+ end
281+
282+ return
283+
284+help:
285+ say "Parameters:"
286+ say " make"
287+ say " make debug"
288+ say " make clean"
289+ say " install build (build overwrites what this script finds)"
290+ say " uninstall"
291+ say " diff (creates a diff from vendor to trunk)"
292+exit 255
293diff -Naur E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh E:\trees\smtube\trunk/get_svn_revision.sh
294--- E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh 2012-02-24 23:23:26.000000000 +0100
295+++ E:\trees\smtube\trunk/get_svn_revision.sh 2013-05-23 18:29:44.000000000 +0200
296@@ -7,10 +7,14 @@
297 test "$1" && extra="-$1"
298
299 svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
300+test $svn_revision || svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
301 test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
302 test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
303 test $svn_revision || svn_revision=0UNKNOWN
304
305+if test "$2"; then
306+extra="-$2"
307+fi
308 NEW_REVISION="#define SVN_REVISION \"SVN-r${svn_revision}${extra}\""
309 OLD_REVISION=`cat src/svn_revision.h 2> /dev/null`
310
311diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt E:\trees\smtube\trunk/os2/smtube_de.txt
312--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt 1970-01-01 01:00:00.000000000 +0100
313+++ E:\trees\smtube\trunk/os2/smtube_de.txt 2014-02-21 15:56:00.000000000 +0100
314@@ -0,0 +1,98 @@
315+SMTube _VERSION_ _BUILD_ README
316+
317+(W) Silvan Scherrer, Mai 27, 2013
318+zuletzt ge„ndert am 27.05.2013
319+
320+0. INHALT DIESER DATEI
321+======================
322+
323+1. ERFORDERNISSE
324+
325+2. INSTALLATION
326+
327+3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS
328+
329+4. KONTAKT
330+
331+5. UNTERSTšTZUNG UND SPENDEN
332+
333+6. ENTWICKLUNGSGESCHICHTE
334+
335+
336+1. ERFORDERNISSE
337+================
338+
339+Folgende Voraussetzungen mssen installiert werden.
340+
341+
342+1.1 SMPlayer
343+------------
344+
345+ 1. Download SMPlayer 0.8.5 oder neuer (unter http://svn.netlabs.org/qtapps
346+ befinden sich weitere Informationen)
347+ 2. Installieren gem„ss Anleitung des SMPlayer
348+
349+
350+2. INSTALLATION
351+===============
352+
353+Zur Installation von SMTube fhren Sie folgende Schritte aus:
354+
355+ 1. Entpacken Sie das SMTube-Paket in das selbe Verzeichnis wie SMPlayer.
356+ 2. Mittels F11 im SMPlayer k”nnen nun YouTube Videos gesucht und abgespielt
357+ werden.
358+
359+3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS
360+===========================================
361+
362+SMTube ist (c) 2012-2014 RVM <rvm@users.sourceforge.net>.
363+
364+Das Urheberrecht der OS/2-Portierung ist (c) 2013,2014 Silvan Scherrer.
365+
366+Dieses Programm ist freie Software; Sie k”nnen es unter den Bedingungen
367+der GNU General Public License, wie in der Datei COPYING im
368+Installationsverzeichnis enthalten, weiterverbreiten und/oder
369+modifizieren.
370+
371+Der Original-Quelltext ist erh„ltlich unter:
372+
373+ http://smplayer.sourceforge.net
374+
375+Dieses Programm wird in der Hoffnung vertrieben, daá es ntzlich ist,
376+aber OHNE JEDWEDE HAFTUNG und ohne implizite Garantie der
377+MARKFŽHIGKEIT oder der BENUTZBARKEIT FšR EINEN BESTIMMTEN ZWECK.
378+
379+Einzelheiten entnehmen Sie bitte der Datei COPYING.
380+
381+
382+4. KONTAKT
383+==========
384+
385+Wenn Sie einen Fehler entdecken, dann erstellen Sie bitte ein Ticket unter
386+http://svn.netlabs.org/qtapps
387+
388+Es werden nur Meldungen reproduzierbarer Fehler akzeptiert. :-)
389+
390+
391+5. UNTERSTšTZUNG UND SPENDEN
392+============================
393+
394+SMTube basiert auf freiwilliger, ehrenamtlicher Arbeit. Wenn Sie die weitere
395+Entwicklung untersttzen m”chten, haben Sie folgende M”glichkeiten:
396+
397+ * Spenden ans QT4 Projekt: meht Informationen unter http://qt.netlabs.org
398+
399+ * Mitarbeit am Projekt: Neben der eigentlichen Entwicklung geh”rt hierzu
400+ auch die Pflege der Dokumentation und der Projekt-Web-Site sowie Hilfe fr
401+ Anwender.
402+
403+
404+6. ENTWICKLUNGSGESCHICHTE
405+=========================
406+
407+2014-02-21
408+ * version 1.8 portiert
409+
410+2013-05-23
411+ * erste Version
412+
413diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt E:\trees\smtube\trunk/os2/smtube_en.txt
414--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt 1970-01-01 01:00:00.000000000 +0100
415+++ E:\trees\smtube\trunk/os2/smtube_en.txt 2014-02-21 15:56:46.000000000 +0100
416@@ -0,0 +1,97 @@
417+SMTube _VERSION_ _BUILD_ README
418+
419+(W) Silvan Scherrer, May 27, 2013
420+last update May 27, 2013
421+
422+
423+0. CONTENTS OF THIS FILE
424+========================
425+
426+1. REQUIREMENTS
427+
428+2. INSTALLATION
429+
430+3. LICENSE, COPYRIGHT, DISCLAIMER
431+
432+4. CONTACT
433+
434+5. SUPPORT AND DONATIONS
435+
436+6. HISTORY
437+
438+
439+1. REQUIREMENTS
440+===============
441+
442+The following requirements need to be installed.
443+
444+
445+1.1 SMPlayer
446+------------
447+
448+ 1. Download SMPlayer 0.8.5 or better (see http://svn.netlabs.org/qtapps for
449+ more information)
450+ 2. Install the files according to the readme
451+
452+
453+2. INSTALLATION
454+===============
455+
456+To install SMTube, do the following:
457+
458+ 1. Extract the SMTube package into the same directory as SMPlayer is.
459+ 2. With F11 in SMPlayer you can play and search for YouTube videos
460+
461+
462+3. LICENSE, COPYRIGHT, DISCLAIMER
463+=================================
464+
465+SMTube is copyright (C) 2012-2014 RVM <rvm@users.sourceforge.net>.
466+
467+The OS/2 port is copyright (c) 2013,2014 Silvan Scherrer.
468+
469+This program is free software; you can redistribute it and/or modify
470+it under the terms of the GNU General Public License as contained in
471+the file COPYING in the installation directory.
472+
473+The original source code is available at:
474+
475+ http://smplayer.sourceforge.net
476+
477+This program is distributed in the hope that it will be useful,
478+but WITHOUT ANY WARRANTY; without even the implied warranty of
479+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
480+
481+For details, refer to the file COPYING.
482+
483+
484+4. CONTACT
485+==========
486+
487+If you find a bug, then add a ticket to the trac at
488+http://svn.netlabs.org/qtapps
489+
490+Only bug reports with a reproducable bug are accepted. :-)
491+
492+
493+5. SUPPORT AND DONATIONS
494+========================
495+
496+SMTube is based on volunteer work. If you would like to support further
497+development, you can do so in one of the following ways:
498+
499+ * Donate to the Qt4 project: see http://qt.netlabs.org for more information
500+
501+ * Contribute to the project: Besides actual development, this also includes
502+ maintaining the documentation and the project web site as well as help
503+ for users.
504+
505+
506+6. HISTORY
507+==========
508+
509+2014-02-21
510+ * updated port to version 1.8
511+
512+2013-05-23
513+ * first version
514diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt E:\trees\smtube\trunk/os2/smtube_fr.txt
515--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt 1970-01-01 01:00:00.000000000 +0100
516+++ E:\trees\smtube\trunk/os2/smtube_fr.txt 2014-02-21 15:58:08.000000000 +0100
517@@ -0,0 +1,104 @@
518+SMTube _VERSION_ _BUILD_ LISEZMOI
519+
520+Document original....: (W) Silvan Scherrer, May 27, 2013
521+DerniŠre mise …
522 jour.: 2013-05-27
523+Traduction fran‡aise.: Guillaume Gay <guillaume.gay@bigfoot.com>
524+Version..............: 2013-05-27
525+
526+
527+0. CONTENU DU FICHIER
528+=====================
529+
530+1. PRREQUIS
531+
532+2. INSTALLATION
533+
534+3. LICENCE, COPYRIGHT, MENTIONS LGALES
535+
536+4. CONTACT
537+
538+5. SOUTIEN ET DONS
539+
540+6. HISTORIQUE DES VERSIONS
541+
542+
543+1. PRREQUIS
544+============
545+
546+Le produit suivant n‚cessite d'ˆtre install‚ au pr‚alable.
547+
548+1.1 SMPlayer
549+------------
550+
551+ 1. T‚l‚charger SMPlayer version 0.8.5 ou ult‚rieure
552+ (voir http://svn.netlabs.org/qtapps pour plus d'information)
553+ 2. Installer les fichiers selon les instructions figurant dans
554+ le fichier lisezmoi
555+
556+
557+2. INSTALLATION
558+===============
559+
560+Pour installer SMTube :
561+
562+ 1. Extrayez le contenu du paquetage dans le mˆme r‚pertoire
563+ que celui de SMPlayer.
564+ 2. En appuyant sur la touche F11 dans SMPlayer, vous pouvez
565+ rechercher et lire les vid‚os YouTube.
566+
567+
568+3. LICENCE, COPYRIGHT, MENTIONS LGALES
569+=======================================
570+
571+SMTube est un copyright (C) 2012-2014 de RVM <rvm@users.sourceforge.net>.
572+
573+Le portage pour OS/2 est un copyright (C) 2013,2014 de Silvan Scherrer.
574+
575+Ce programme est un gratuiciel ; vous pouvez le redistribuer et/ou
576+le modifier selon les termes de la licence Publique G‚n‚rale GNU
577+contenue dans le fichier COPYING situ‚ dans r‚pertoire d'installation.
578+
579+Le code source original est disponible sur :
580+
581+ http://smplayer.sourceforge.net
582+
583+Ce programme est distribu‚ dans l'espoir qu'il sera utile …
584 quelque
585+chose, mais SANS AUCUNE GARANTIE ; sans mˆme la garantie implicite de
586+COMMERCIALISATION ou d'ADQUATION · UN BUT PARTICULIER.
587+
588+Pour plus de d‚tails, veuillez vous r‚f‚rer au fichier COPYING.
589+
590+
591+4. CONTACT
592+==========
593+
594+Si vous rencontrez un problŠme, ouvrez un ticket dans le systŠme
595+trac sur http://svn.netlabs.org/qtapps.
596+
597+Seuls les rapports de bogues reproductibles seront accept‚s, bien
598+entendu ! :-)
599+
600+
601+5. SOUTIEN ET DONS
602+==================
603+
604+SMTube est bas‚ sur le volontariat. Si vous voulez soutenir les
605+d‚veloppements futurs, vous pouvez le faire de l'une des maniŠres
606+suivantes :
607+
608+ * Faites un don pour le projet Qt4 : consultez http://qt.netlabs.org
609+ pour plus d'informations.
610+
611+ * Contribuez au projet : outre le d‚veloppement pur, il y a aussi la
612+ maintenance de la documentation, la maintenance du site web du
613+ projet, ainsi que l'aide aux utilisateurs.
614+
615+
616+6. HISTORIQUE DES VERSIONS
617+==========================
618+
619+2014-02-21
620+ * Mise …
621 jour …
622 la version 1.8 de SMTube
623+
624+2013-05-23
625+ * Version initiale
626diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico E:\trees\smtube\trunk/os2/smtube.ico
627--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico 1970-01-01 01:00:00.000000000 +0100
628+++ E:\trees\smtube\trunk/os2/smtube.ico 2013-05-23 19:53:18.000000000 +0200
629@@ -0,0 +1,62 @@
630+CI :
631@€ÿÿÿCI :
632@@ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ¿ÿÿÿÿÿÿÀ¿ÿÿÿÿ|?ÿÿÿÿøÿÿÿÿÀÿÿÿþ€ÿÿÿþÿÿþÿÿøÿÿøÿÿðÿÿàÿÿÀÿÿÀÿÿ€ÿÿÿÿ?þ?þ?üøìü
633üøüøüøüüüüüþþ?þ?ÿÿÿ€ÿÿ€ÿÿÀÿÿàÿÿðÿÿðÿÿøÿÿüÿÿþ?ÿÿÿ€ÿÿÿÀÿÿÿÿðÿÿÿÿüÿÿÿÿÿ€ÿÿÿÿÿú¯ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ 2X
634}
635o
636H) 2­.îVý[ÿZÿ`ÿbúlè]Ž:`4 H+BÜWÿtÿyÿvÿvÿwÿzÿ|ÿyÿxýtÈb
637„o+zsd‰hZ²•c³¬£¶«Š•w\yqpiVGC9*'
638
639
640
641++p­9ÜZî^úoéXËP~-"2 ÜXÿ{ÿyÿxÿwÿwÿuþwüzþ} þ
642þŽ!ÿ§QÿˊûسÿÞžÿàŸýâÈÿæÊÿäÉÿëÒýèÐôàÉçˬ߷kèŽÿqÿtÿyÿyÿvÿyÿyÿvÖHB ®>ÿwÿyÿwÿvÿyþ|÷‡$ò–;÷Hú€Qü¥QüŸGü±fû̘ùÔ¬úÙ¶üÝŒüàÂýáÅüâÈûäËüæÎýæÌÿà¹ÿʈÿ¬Nÿ!ÿ|ÿyÿxÿwÿwÿxÿzÿvÜH2Kökÿxÿxÿwýuô‡ õŠSð¯nòžvõŒ{öŸ÷ŠøÆüȌüÖ€ýÛ®ýàŽþä»þçÁþéÆþêËþêÏþêÓýéÒýãÃþͅ
643ÿ¬IÿžBÿ¥Qþ£Rþ—>ÿ‰#ÿ}
644+ÿyÿzÿvÿnº4š6ÿvÿwÿwýyõ„(ïžYó­gò°kó¶vöÀúƂýÉÿ́ÿσÿЂÿӅ
645ÿۖÿãŠÿè¯ÿïŒÿïŒÿòÁÿ÷ÏÿñÁÿ؄ÿÐlÿ۞ÿáÁÿáÂþÝ»ÿسÿÍ¢ÿžzþœ<ÿ
646ÿvÿtÿg‹!ÍSÿyÿxþzù…
647"ó˜Kñ¡Zð§dö²jü¶aÿŽTÿ·VÿŒ]ÿŒ]ÿŒ^ÿÀbÿÆlÿ׎ÿà¡ÿç¯ÿêŽÿê²ÿç©ÿތÿÎ^ÿ܂ÿòœÿùÓÿ÷ÖÿñÕþêÒþçÐþæËþãÆýÚŽþµuÿ†
648ÿuÿtëW2<
649ódýwþxüƒõ;ð™Rô£Xü¥Kÿ¡:ÿ¡7ÿªAÿ«Bÿ©=ÿ¬@ÿ°GÿµOÿÄjÿۗÿãšÿç¯ÿè±ÿæ©ÿÊaÿÂHÿفÿë°ÿòÀÿóÅÿõÈÿõÈÿòÈÿìÊþæËüáÅüàÀýÙ¶þ°nÿ‚ÿvÿsrY"ývþ|þ{ö‡,ó•Iû›Eÿ—4ÿ–.ÿ™/ÿ¡7ÿ€7ÿ£5ÿš<ÿ­Cÿ±Iÿ·SÿԌÿæ¯ÿêžÿëºÿè­ÿÏgÿÅQÿهÿà›ÿá›ÿã ÿæ¥ÿå£ÿç©ÿìµÿé±ÿèµÿæÀýàÀüÜžýСüŠUþ€
650ÿ|š:
651ÂmÿŒþü€ø’Aþ“8ÿŒ)ÿ‹$ÿ'ÿ˜0ÿ–(ÿ™)ÿ¡1ÿ©>ÿ±KÿµPÿÁgÿä®ÿìŸÿîÁÿæªÿÍbÿÕxÿޘÿӁÿՄÿ׈ÿًÿېÿߙÿܓÿݕÿܕÿޙÿߝÿá­ýß¹ûÕ­ûÀ„ý“1ÿŠÕU
652šMÿ•;ÿ1þ'ÿƒÿ~ÿyÿyÿÿ%ÿ‹ÿ!ÿš,ÿ¡3ÿ€6ÿ¥7ÿš;ÿ̀ÿê»ÿðÇÿç­ÿÍ`ÿكÿóÉÿé¶ÿҀÿҀÿҀÿӀÿӀÿՅ
653ÿُÿ׋ÿÐ|ÿÎyÿ҃ÿՉÿژýÛ¬ú˛üŠRþŠJï-C"
654•)þw"ÿ„0ÿ‘Aÿ…
655(ÿrÿn
656ÿq
657ÿwÿ…
658 ÿˆ ÿ$ÿ”*ÿ•'ÿ–$ÿœ+ÿ¥9ÿ·Zÿä±ÿòÌÿè®ÿË^ÿڇÿòËÿõÑÿêžÿËtÿÍwÿÐ}ÿÑ~ÿÐ|ÿÍwÿÏ{ÿ҂ÿÎ{ÿÇkÿÃeÿÆmÿÌxÿ҇þәû¶hûžiúºs·€Q
659týYÿqÿy$ÿ|'ÿhÿmÿjÿo
660+ÿ}ÿˆ#ÿ‰"ÿ‰
661ÿŠÿŽ
662ÿšFÿыÿá§ÿí¿ÿöÑÿí¶ÿÐdÿߎÿøÓÿúØÿûÛÿç¯ÿÄcÿÅeÿÇhÿÉlÿËqÿÍuÿÍtÿÐzÿÉmÿÈlÿÁ`ÿŒUÿÁbÿÎÿÎþÀd÷…
663ö‚𜈒i>
664+NñAÿ^ ÿdÿmÿe
665ÿaÿløeÌ`Æo*Çn'ÆiÆkÆo"Æ}5Æšƹ›Æœ¢ÆŸ¥ÅŒ¡ÅŠaŧbÅŸ¥ÅÀ«ÅÀ«ÅÁ¬Å·–Ä™VĕOĖQėRĘRĘSĘUĜ]ÚZÖQÖRÏG˞ZùÊ~ÿЃÿœTü˅
666õˆõÁƒì­tjC$
667Ì(ÿSÿWÿ\
668+ÿZÿa ÿ^ÿkå`
669B.!)(&*'%)'%)&$)&$('&(('''&&&&&&%&%$%$!%%$$$$#####"#""""""!!
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684=7-çœyÿÉtÿ»Sÿ¿dúƂóº|÷žzߖa2
685
686ÿAÿNÿRÿQÿQÿ`
687ÿ^ÿläi:* !!!!
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
70851*æÅ‹ÿËvÿŒTÿ¹[ÿ·[õ¹xó°nõ­lžj7 6ë,ÿFÿIÿLÿIÿNÿXÿe
709ÿoäf:) !!
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
72742,æÎ ÿՆÿÄgÿž]ÿªFý°Yñ«jî£a܎UH)šÿ>ÿAÿEÿDÿGÿKÿSÿfÿoäa 9&
728 !
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
74942,æÕ¬ÿܒÿ҇ÿÃtÿ¥CÿŸ:õŠ[ç–Uè”T­W*6ë#ÿ>ÿ?ÿ?ÿ@ÿFÿNÿ`ÿiÿu
750äg 9'
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
77532.æÞÅÿìºÿá¬ÿ͈ÿ­RÿŸ?ýžCäPæŽKÜx:GŠÿ7ÿ@ÿ<ÿDÿXÿ[ÿ~3ÿCÿœCÿ˜ äx8)
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798222ææåÿÿûÿóÛÿןÿ°\ÿŸBÿ Dñ•JãˆFêŠEšF
799"Û.ÿFÿBÿIÿeÿr"ÿ{
800ÿ“'ÿ•ÿŽÿxä|
8017.
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832222ææçÿÿÿÿõÜÿ҅
833ÿºgÿ”5ÿš@ýšEë‹EñFÌk.$›,ÿUÿTÿKÿUÿj
834+ÿy
835ÿŠÿ–2ÿ§Xÿz,ÿSäh6+
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853777iiiWWW444!!!
854
855
856221ææãÿÿþÿìÄÿÈbÿš*ÿ‰ÿ€ÿ0ö“GóŒ>ñ~3w$#ž5þjÿhÿfÿ[ÿbÿpÿ‡5ÿ—Rÿ¥hÿšnÿbÿJãU6%
857
858
859
860
861
862
863
864###eeeèèèää䯯¯ooo>>>###
865
866
867
868
869
870+
871+
872+1-&æÕ¬ÿñÓÿâ·ÿÙ¥ÿ«Tÿzÿsÿy
873ü6÷‡0ü„ Ü\C>ÎCÿqÿtþpÿiÿTÿ\
874ÿs,ÿŽLÿ˜Wÿ©nÿ·ÿŠLÿO
875+ãK6$
876
877
878
879
880%%%pppñññÿÿÿÿÿÿïïïÁÁÁIII'''
881
882
883
884
885
886
887
888
889
890+0*æÍžÿä»ÿاÿˑÿ“=ÿrÿqÿqÿ{ üþÿwäUc&Ì@ÿuÿwÿvþoüRþEÿ]ÿ}9ÿŒIÿ›]ÿ¬tÿŸÿÍ£ÿ¢nãV5"
891%%%pppñññÿÿÿþþþÿÿÿÿÿÿöööÒÒҔ””VVV---
892
893
894
895
896
897
898
899
900
901
902
903/,(æÎ¬ÿÞ°ÿӟÿćÿ9ÿz
904ÿuÿoÿqÿ‚ÿzþzÿyêSO
905¶:ÿqÿyÿyþpûVûEýIÿe
906ÿ€=ÿ‹Jÿžbÿ°zÿÁ“ÿÒ¬ÿڷ㞘4-($$$oooñññÿÿÿþþþþþþþþþþþþÿÿÿûûûààà§§§eee555
907
908
909
910
911
912
913
914
915
916
917
918
919+
920+
921+ /,(æÍ«ÿÚ¬ÿѝÿŊÿžOÿtÿmÿf
922+ÿlÿ‚,ÿyÿxÿxÿußPÿrÿxÿyÿwü_ø@ø@ýO ÿm)ÿ}:ÿMÿ gÿ²~ÿĘÿÔ°ÿàÁãÔÁ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿþþþëëë¹¹¹ttt444
923
924
925
926
927
928
929+
930+
931+ .,)æÎ®ÿÙ¬ÿўÿÉÿ¯iÿ}(ÿ\ÿ[ÿlÿu ÿrÿuÿxÿwÿwÿxÿyÿzÿqùHó/ö:ý[ÿo,ÿz9ÿQÿ¢jÿ³ÿǝÿ×¶ÿçÌãÙÈ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿêêêsss
932
933
934
935+
936+
937+ -+(æÑŽÿÝŽÿÒ¢ÿˆÿµtÿŸXÿd
938ÿhÿjÿdÿgÿnÿvÿxÿvÿzÿ{ÿ{ýfô4ð)ô4ü_
939ÿn+ÿ{:ÿSÿ£mÿµ„ÿÉ¡ÿÛŒÿí×ãÛÎ220"""oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿðððÂÂÂ}}}777
940+
941+
942+ -+'æÑŽÿÞ¶ÿÕ©ÿŏÿŸ…
943ÿ³tÿ{)ÿb
944ÿ[ÿZÿ\ ÿcÿtÿyÿzÿ|ÿ{ÿ|÷Xí&î(ò5ú]þs2ÿ}>ÿTÿ€nÿ¶ˆÿË¥ÿßÃÿñÜãÞÑ110"""nnnñññÿÿÿþþþþþþþþþþþþÿÿÿýýýåå寯¯lll888
945+
946+
947+ ,+(çÖŸÿåÃÿØ®ÿȗÿ¬mÿ¯qÿv&ÿPÿRÿQÿSÿYÿpÿxÿzÿ{ÿ|ÿ}óPê#ë$ñ7ùZük*ÿ…
948Iÿ‘Wÿ¥pÿž‹ÿ̧ÿáÈÿïÛãÝÑ110!!!nnnñññÿÿÿþþþÿÿÿÿÿÿùùùÙÙٜœœ[[[---
949
950
951+
952+
953+ ,)&æÔŒÿåÄÿÑŠÿ•Oÿ‡;ÿ“KÿbÿIÿGÿJÿLÿPÿlÿyÿyÿÿÿzõOê%é&ð9÷Vúc!þ€CÿšdÿªyÿŸ“ÿЮÿâÉÿïÛãÜÐ00. mmmñññÿÿÿÿÿÿóóóÉÉɈˆˆKKK%%%
954
955
956+
957+
958+ +(%æÓ»ÿÜžÿšZÿ›Yÿ³yÿ¡`ÿbÿDÿCÿEÿGÿLÿiÿzÿ{ÿwÿƒÿ€õ^ê/è(î:õSùg'þ‚Gÿœgÿ³†ÿÀ˜ÿÏ­ÿàÆÿëÕãа0,#
959
960
961bbbëëëééé¶¶¶ttt>>>
962
963
964
965
966
967
968+
969+
970+ *(%æÏµÿº†ÿµÿÁÿ¶}ÿ§iÿŒFÿVÿ@ÿBÿCÿMÿjÿ}ÿzáFÿƒÿ…
971ùsëCæ,ì;õYøl-ü{>ÿ‘Yÿ«{ÿÁ›ÿÓ³ÿàÈÿçÍãœx/(444nnnZZZ222
972
973
974
975
976
977
978
979
980
981+
982+
983+ *$æ€vÿ»ˆÿÏ€ÿÁÿ±yÿŸ^ÿ‰Aÿo%ÿBÿ@ÿDþUÿtÿ|û^rúqÿˆü‚ò]è9ê< óUõ^
984ùt6þ’\ÿ¬}ÿ¿—ÿϯþ¹“ÿȓâ³X/)
985
986
987
988
989
990
991
992
993
994
995+
996+
997+
998+
999+
1000+ *
1001橀ÿײÿʟÿœ‹ÿ­tÿŸ`ÿ‡@ÿk
1002ÿKÿCýIýeÿ{ÿv®.
1003¢0ÿ}þ„ùwîTéAïLó\øs6üVüYû‰Qû}Bûo/ÿ¶bâŒs.,*
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019+
1020+
1021+ +'$æÎ¶ÿÖ±ÿƚÿ¹†ÿ©oÿž`ÿ‰DÿbÿW
1022úEõVõeývÌC& œ7ÿzùuóiìQíIñZ÷s6ù|AóR öYø^úg ÿ²MâÉ¡-,+
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035+
1036+
1037+ ,)&æË±ÿÑ«ÿ”ÿŽ€ÿ€iÿ™[ÿ…
1038Aÿj
1039ÿ_â>ÜEçVÑ_@ €9ölí[êS
1040ëGðW
1041õr4û\õi&öd!÷e$úw$ÿÃjâк/-+
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071 ,(%æÆ«ÿÍ¥ÿœŽÿ®zÿžcÿ•Vÿ:ÿeþY
1072+Î7Ï;Á2I¹+êI
1073æFç;íSôr1ú–eú[öq2÷l-ü/ÿ՘ãÒÄ1/,555}}}ŽŽŽggg
1074
1075
1076fff‘‘‘ŽŽŽsss'''VVV‰‰‰‹‹‹ˆˆ‰–’ŽñαÿǞÿžˆÿ©sÿ™]ÿQÿx1ÿ`õQÄ4Ê7„^ä'å=ä0êGñq.ø”bý¬‚ùŠU÷w4ý'ÿŽ~ñŒŸrhbMMMºººõõõúúúúúúñññ§§§555(((–––ñññÿÿÿÿÿÿúúúœœœMMM
1077
1078
1079
1080
1081
1082'''€€€ÞÞÞ÷÷÷ëçãùÒµÿ˜ÿ²‚ÿ¢kÿ“Vÿ‹Kþp$ÿa
1083áDÄ7Ã-V%Ï
1084å:ã9êV
1085ðl#ôHüš~ûš~øƒ6þ«MÿϯøÖ¿ÔÐͧ§§GGG
1086
1087
1088vvvØØØ÷÷÷÷÷÷ûûûßßßyyyJJJŸŸŸûûûÿÿÿÿÿÿìì쑑‘***
1089
1090
1091>>>§ššãÞÛùÍ®ÿœ’ÿ¬zÿœcÿŒOÿ„Dýo"û]Ê4É:¯/ç3äHæHí]í]
1092õŠQüµû7ýEÿØÂøçÚÓÒÐØØØÐÐЉ‰‰,,,@@@¬¬¬ðððõõõøøøöööœœœLLL
1093
1094
1095###‚‚‚èèèüüüûûûûûûÐÐÐccc$$$rmiñ¿žÿžŒÿŠrÿ—]ÿ‹Mþ„BüjêDÂ3É6ˆ
1096
1097åKã?êVïmøžlýÀžþ±]þčÿàÍ÷ä×ÎÌÊÐÐÐÔÔÔ¥¥¥666
1098
1099
1100 ˆˆˆéééñññóóó÷÷÷ÙÙÙfff
1101
1102
1103+
1104+
1105+
1106
1107
1108WWWÙÙÙúúúùùùûûûèè肂‚TNJíž—ÿ·‹ÿŠrÿ˜`þOûv&÷VÎ4Ç:À&O £ç7ßNâNð{,÷ŸmþÊšÿÆ{ÿÖ³ÿÙÄöÑŒÐÊÇžžžfff
1109
1110
1111MMMžžžíííñññöööííí¡¡¡000)))˜˜˜ïïïþþþþþþùùùžžžHHH
1112
1113
1114
1115
1116
1117
1118
1119
1120%%%‚‚ƒÔÎÊùƧÿ³‡þœfü‰Kû€;øhèFÁ3Ì5¢
1121EÔÚXÐFír3òˆ9ùªkþ¿süÁžýŸœòŒŸ‡~)++'''‰ŠŠÚÚÚêëëëëëëëëÁÁÁTTTgghÔÕÖýþþûüüùùù×××ppp
1122+
1123
1124VWWÀÁÂñòóêãßùŒ˜ÿ«|ü‘Wù<øy+ôXÌ6Ê=à \†ÝAàb äN!ï{
1125õ’$ü·jû£þ˯ꌣdRHJ>7MD>LEAnmlÈÇÆìëêíèäïìéòòñÅÅÅhhhGFDIDAIB=VKD°š£øðéþí×üíãýöñÝÜÛxwuMJHOHDQD;WKCŸ˜”íäÞúïçöéâñÚÌû³‹ü múQø.ömÝ@Ç<Î4–*»ä_ä_'éc)õ— ûž`ü˲ü̱ýÑžúÒŒúÔ¿úÜËúìâþúõÿþúÿúõÿîãÿöîÿÿþúúúøøùúôïúêÞúäÔüÞÊÿãÏÿÝ­ÿ̔ÿϲÿíàûøôøòìúôìúáÏúÊ­úÉ«ÿßÊÿàËÿןÿѵÿÀœû§wù“XøŒDö}"éRÆ8ÑAŒ<BÕ+érçe$ñ‰ù³OûËŽüѺýÕ¿ÿÚÇÿßÍÿçØÿ÷ñÿû÷ÿüùÿü÷ÿóêÿöîÿýúÿÿÿÿúîÿñÕÿòçÿêÜÿäÓÿÛ±ÿØšÿ׿ÿÔºÿãÑÿõíÿúóÿøïÿãÑÿâÏÿåÔÿßÊÿÜÆÿÖœÿ̯ý¶Žù›c÷Š4ö‡+ïhÌ:ÏIÉ$ahæ_îŽ#ñ%ô ;øŒ›ü×ÂýÜÊÿàÏÿçÙÿíãÿ÷òÿüøÿüùÿþûÿúõÿ÷ïÿùóÿûöÿõãÿå©ÿëËÿíâÿâ¿ÿݰÿáÍÿàÍÿßËÿæÕÿìßÿøðÿôëÿîâÿëÝÿèÙÿâÏÿÚÄÿÕœýÅ€ú©x÷“;õ…
1126
1127+òxÓCÏQÐ4‹
1128
1129ªR÷£
1130ø¯5ò—GóŠ…
1131üÕÀþäÕÿçÚÿòéÿ÷òÿùõÿûøÿüúÿþûÿþûÿùôÿùôÿùôÿùôÿïÍÿà•ÿç¶ÿæÃÿéÚÿæ×ÿäÓÿãÒÿèÚÿêÜÿôìÿòéÿïäÿëßÿåÕÿÜÈÿØÁþÑ·ú¶÷IõŒóÛSÒ[×JŠ
1132+
1133YAù¶û¿÷¶Yðœ‡öŒ©ýßÏÿðçÿõïÿ÷òÿùõÿûùÿüûÿýûÿÿüÿþûÿüøÿûöÿûöÿøñÿæ›ÿÞsÿí×ÿîåÿìáÿéÜÿäÕÿäÔÿéÝÿðæÿïåÿìàÿéÛÿâÒþÛÇüϲúŸ–ø©bõ–ñÛ^ÖhÛ\°2:.ñºþÇûÅ>õµ—ò®ž÷Á²ýáÔÿôîÿùôÿúöÿûùÿüúÿþüÿÿýÿÿýÿþüÿüúÿúòÿóÚÿóÛÿêŽÿæ¡ÿñàÿðèÿìáÿèÛÿåÖþå×þçÙþèÛÿêÝÿæØþàÏýÙÁùŒl÷¯fö¥6ñ‡Ý`ÛtÝdŽ2ÖšÿÌþËùÁwõŒªóµªõœ±ûÜÑÿôíÿûøÿüúÿüûÿþüÿÿýÿÿþÿÿþÿûóÿõÜÿ÷éÿú÷ÿ÷ïÿê³ÿç£ÿïÞÿîæÿìáþéÝþæØþçÚýäÕýáÒýÝËûЯø¹[ö«!õš
1134ïx
1135êê”å}¹!4–vÿÍÿÍýÊ÷Átõ¿±ôŸ¶ô»±ùÐÇýìåÿú÷ÿþüÿÿýÿÿÿÿÿýÿúíÿøãÿûôÿüúÿúöÿøôÿõíÿëŽÿç¡ÿíØÿìãþêÞýçÚüäÖüáÑûÖ²ùȄø»Sö§ó†îqîŠ
1136ö²ó¬Ïm7?1ñŒÿÌÿÍýËùÂ\õÀ©öÆ¿õºöÆŸúÚÓýðíÿýúÿýôÿùçÿûíÿþüÿýýÿüúÿûøÿùõÿ÷óÿôìÿë¹ÿæÿëÆÿïèþìâüå×úԜùÅk÷ºoô™Bñz.ï~
1137+ñ˜õ¯ûÂö»iF‰hùÁÿÍÿÎþÍúÅ3÷Ê÷ɹöÌÁöɺøÊµûضüåÎþõîÿüüÿÿþÿÿýÿýüÿüúÿû÷ÿùôÿöñÿóíÿë¹ÿä|ÿæœü߯úÓŸ÷Ÿƒô¡UòŠTñŒSò 'òšõ±üÅþËŒ“^IשÿÍÿÐÿÐÿÌûËIûÎfûҎûÑ«øÍºöÊÂ÷ÌÄúÕÊúÜ×ûãÞüåàüçáüèàýçßüãØûÛÍúÓÂù˕ûÍCûÏM÷Á|ó³ió«oõµ\õº$÷œúÄüËÿΛ}#qY§ƒŒ–ß³÷ÈúËóÅ7áŽqî¿¥÷ÊÁúÍÆùÍÄöÉÄõÉÃõÂŒõÂŒôÁ¹õÅŒõúö÷öÁ°öÀ®ùŝüÎvýÓEýÓ2ûÏ/ûÍ üÎþÐÿÐÿÐÛ D7I<C6'
1138A1!pUN­„vÔ¢™é·¯ï¿¹ôÄœøÇ¿ùÈŸùÈÀùÇœùÄžøÀ­òžœó»vûÈ@ÿÑÿÕÿÔÿÔÿÒÿÑÿÏܬ;.9*#G42`IFuVUzZWy]Xz[WzZVsU:K7 E3
1139+cLsË£âµá¶âŽË¡‰l1&
1140
1141
1142
1143
1144
1145\ No newline at end of file
1146diff -Naur E:\trees\smtube\trunk\..\vendor\current/smtube.pro E:\trees\smtube\trunk/smtube.pro
1147--- E:\trees\smtube\trunk\..\vendor\current/smtube.pro 1970-01-01 01:00:00.000000000 +0100
1148+++ E:\trees\smtube\trunk/smtube.pro 2013-05-23 18:30:40.000000000 +0200
1149@@ -0,0 +1,5 @@
1150+TEMPLATE = subdirs
1151+
1152+SUBDIRS += src
1153+
1154+src.file=src/smtube.pro
1155\ No newline at end of file
1156diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/main.cpp E:\trees\smtube\trunk/src/main.cpp
1157--- E:\trees\smtube\trunk\..\vendor\current/src/main.cpp 2013-07-22 12:09:14.000000000 +0200
1158+++ E:\trees\smtube\trunk/src/main.cpp 2014-02-21 15:42:52.000000000 +0100
1159@@ -63,7 +63,7 @@
1160 #endif // YT_USE_SCRIPT
1161
1162 QString translationsPath() {
1163- QString path = "translations";
1164+ QString path = QString(qApp->applicationDirPath() + "/translations");
1165 #if !defined(Q_OS_WIN)
1166 #ifdef TRANSLATION_PATH
1167 QString s = QString(TRANSLATION_PATH);
1168diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/players.cpp E:\trees\smtube\trunk/src/players.cpp
1169--- E:\trees\smtube\trunk\..\vendor\current/src/players.cpp 2013-01-12 01:03:30.000000000 +0100
1170+++ E:\trees\smtube\trunk/src/players.cpp 2013-05-23 18:40:32.000000000 +0200
1171@@ -25,11 +25,11 @@
1172 if (found) *found = true;
1173
1174 QString bin = qApp->applicationDirPath() + "/" + player_bin;
1175- #ifdef Q_OS_WIN
1176+ #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1177 bin += ".exe";
1178 #endif
1179
1180-#ifndef Q_OS_WIN
1181+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
1182 QFileInfo fi(bin);
1183 if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
1184 qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
1185diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp
1186--- E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp 2012-03-05 14:25:32.000000000 +0100
1187+++ E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp 2013-11-28 13:03:38.000000000 +0100
1188@@ -48,7 +48,7 @@
1189 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
1190 static PProcessIdToSessionId pProcessIdToSessionId = 0;
1191 #endif
1192-#if defined(Q_OS_UNIX)
1193+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
1194 #include <time.h>
1195 #include <unistd.h>
1196 #endif
1197diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc E:\trees\smtube\trunk/src/smtube_os2.rc
1198--- E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc 1970-01-01 01:00:00.000000000 +0100
1199+++ E:\trees\smtube\trunk/src/smtube_os2.rc 2013-05-23 19:46:54.000000000 +0200
1200@@ -0,0 +1 @@
1201+ICON 1 DISCARDABLE "..\os2\smtube.ico"
1202diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro E:\trees\smtube\trunk/src/smtube.pro
1203--- E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro 2013-08-05 23:40:34.000000000 +0200
1204+++ E:\trees\smtube\trunk/src/smtube.pro 2014-02-21 15:32:02.000000000 +0100
1205@@ -107,3 +107,11 @@
1206 win32 {
1207 RC_FILE = smtube.rc
1208 }
1209+
1210+os2 {
1211+ RC_FILE = smtube_os2.rc
1212+ # define the vendor part
1213+ DEF_FILE_VENDOR = bww bitwise works GmbH
1214+ DEF_FILE_VERSION = $$APPLICATION_VERSION
1215+ DEF_FILE_DESCRIPTION = eCS (OS/2) port of SMTube
1216+}
Note: See TracBrowser for help on using the repository browser.