source: diffs/smtube_14.8.0_GA.diff@ 183

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

SMTube 14.8.0 diff

File size: 34.7 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-05-16 12:41:50.000000000 +0200
314@@ -0,0 +1,101 @@
315+SMTube _VERSION_ _BUILD_ README
316+
317+(W) Silvan Scherrer, Mai 27, 2013
318+zuletzt ge„ndert am 16.05.2016
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 14.3.0 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-05-15
408+ * version 2.1 portiert
409+
410+2014-02-21
411+ * version 1.8 portiert
412+
413+2013-05-23
414+ * erste Version
415+
416diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt E:\trees\smtube\trunk/os2/smtube_en.txt
417--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt 1970-01-01 01:00:00.000000000 +0100
418+++ E:\trees\smtube\trunk/os2/smtube_en.txt 2014-05-16 12:42:18.000000000 +0200
419@@ -0,0 +1,100 @@
420+SMTube _VERSION_ _BUILD_ README
421+
422+(W) Silvan Scherrer, May 27, 2013
423+last update May 16, 2014
424+
425+
426+0. CONTENTS OF THIS FILE
427+========================
428+
429+1. REQUIREMENTS
430+
431+2. INSTALLATION
432+
433+3. LICENSE, COPYRIGHT, DISCLAIMER
434+
435+4. CONTACT
436+
437+5. SUPPORT AND DONATIONS
438+
439+6. HISTORY
440+
441+
442+1. REQUIREMENTS
443+===============
444+
445+The following requirements need to be installed.
446+
447+
448+1.1 SMPlayer
449+------------
450+
451+ 1. Download SMPlayer 14.3.0 or better (see http://svn.netlabs.org/qtapps for
452+ more information)
453+ 2. Install the files according to the readme
454+
455+
456+2. INSTALLATION
457+===============
458+
459+To install SMTube, do the following:
460+
461+ 1. Extract the SMTube package into the same directory as SMPlayer is.
462+ 2. With F11 in SMPlayer you can play and search for YouTube videos
463+
464+
465+3. LICENSE, COPYRIGHT, DISCLAIMER
466+=================================
467+
468+SMTube is copyright (C) 2012-2014 RVM <rvm@users.sourceforge.net>.
469+
470+The OS/2 port is copyright (c) 2013,2014 Silvan Scherrer.
471+
472+This program is free software; you can redistribute it and/or modify
473+it under the terms of the GNU General Public License as contained in
474+the file COPYING in the installation directory.
475+
476+The original source code is available at:
477+
478+ http://smplayer.sourceforge.net
479+
480+This program is distributed in the hope that it will be useful,
481+but WITHOUT ANY WARRANTY; without even the implied warranty of
482+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
483+
484+For details, refer to the file COPYING.
485+
486+
487+4. CONTACT
488+==========
489+
490+If you find a bug, then add a ticket to the trac at
491+http://svn.netlabs.org/qtapps
492+
493+Only bug reports with a reproducable bug are accepted. :-)
494+
495+
496+5. SUPPORT AND DONATIONS
497+========================
498+
499+SMTube is based on volunteer work. If you would like to support further
500+development, you can do so in one of the following ways:
501+
502+ * Donate to the Qt4 project: see http://qt.netlabs.org for more information
503+
504+ * Contribute to the project: Besides actual development, this also includes
505+ maintaining the documentation and the project web site as well as help
506+ for users.
507+
508+
509+6. HISTORY
510+==========
511+
512+2014-05-15
513+ * updated port to version 2.1
514+
515+2014-02-21
516+ * updated port to version 1.8
517+
518+2013-05-23
519+ * first version
520diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt E:\trees\smtube\trunk/os2/smtube_fr.txt
521--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt 1970-01-01 01:00:00.000000000 +0100
522+++ E:\trees\smtube\trunk/os2/smtube_fr.txt 2014-05-16 12:42:46.000000000 +0200
523@@ -0,0 +1,107 @@
524+SMTube _VERSION_ _BUILD_ LISEZMOI
525+
526+Document original....: (W) Silvan Scherrer, May 27, 2013
527+DerniŠre mise …
528 jour.: 2013-05-27
529+Traduction fran‡aise.: Guillaume Gay <guillaume.gay@bigfoot.com>
530+Version..............: 2014-05-16
531+
532+
533+0. CONTENU DU FICHIER
534+=====================
535+
536+1. PRREQUIS
537+
538+2. INSTALLATION
539+
540+3. LICENCE, COPYRIGHT, MENTIONS LGALES
541+
542+4. CONTACT
543+
544+5. SOUTIEN ET DONS
545+
546+6. HISTORIQUE DES VERSIONS
547+
548+
549+1. PRREQUIS
550+============
551+
552+Le produit suivant n‚cessite d'ˆtre install‚ au pr‚alable.
553+
554+1.1 SMPlayer
555+------------
556+
557+ 1. T‚l‚charger SMPlayer version 14.3.0 ou ult‚rieure
558+ (voir http://svn.netlabs.org/qtapps pour plus d'information)
559+ 2. Installer les fichiers selon les instructions figurant dans
560+ le fichier lisezmoi
561+
562+
563+2. INSTALLATION
564+===============
565+
566+Pour installer SMTube :
567+
568+ 1. Extrayez le contenu du paquetage dans le mˆme r‚pertoire
569+ que celui de SMPlayer.
570+ 2. En appuyant sur la touche F11 dans SMPlayer, vous pouvez
571+ rechercher et lire les vid‚os YouTube.
572+
573+
574+3. LICENCE, COPYRIGHT, MENTIONS LGALES
575+=======================================
576+
577+SMTube est un copyright (C) 2012-2014 de RVM <rvm@users.sourceforge.net>.
578+
579+Le portage pour OS/2 est un copyright (C) 2013,2014 de Silvan Scherrer.
580+
581+Ce programme est un gratuiciel ; vous pouvez le redistribuer et/ou
582+le modifier selon les termes de la licence Publique G‚n‚rale GNU
583+contenue dans le fichier COPYING situ‚ dans r‚pertoire d'installation.
584+
585+Le code source original est disponible sur :
586+
587+ http://smplayer.sourceforge.net
588+
589+Ce programme est distribu‚ dans l'espoir qu'il sera utile …
590 quelque
591+chose, mais SANS AUCUNE GARANTIE ; sans mˆme la garantie implicite de
592+COMMERCIALISATION ou d'ADQUATION · UN BUT PARTICULIER.
593+
594+Pour plus de d‚tails, veuillez vous r‚f‚rer au fichier COPYING.
595+
596+
597+4. CONTACT
598+==========
599+
600+Si vous rencontrez un problŠme, ouvrez un ticket dans le systŠme
601+trac sur http://svn.netlabs.org/qtapps.
602+
603+Seuls les rapports de bogues reproductibles seront accept‚s, bien
604+entendu ! :-)
605+
606+
607+5. SOUTIEN ET DONS
608+==================
609+
610+SMTube est bas‚ sur le volontariat. Si vous voulez soutenir les
611+d‚veloppements futurs, vous pouvez le faire de l'une des maniŠres
612+suivantes :
613+
614+ * Faites un don pour le projet Qt4 : consultez http://qt.netlabs.org
615+ pour plus d'informations.
616+
617+ * Contribuez au projet : outre le d‚veloppement pur, il y a aussi la
618+ maintenance de la documentation, la maintenance du site web du
619+ projet, ainsi que l'aide aux utilisateurs.
620+
621+
622+6. HISTORIQUE DES VERSIONS
623+==========================
624+
625+2014-05-15
626+ * Mise …
627 jour …
628 la version 2.1 de SMTube
629+
630+2014-02-21
631+ * Mise …
632 jour …
633 la version 1.8 de SMTube
634+
635+2013-05-23
636+ * Version initiale
637diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico E:\trees\smtube\trunk/os2/smtube.ico
638--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico 1970-01-01 01:00:00.000000000 +0100
639+++ E:\trees\smtube\trunk/os2/smtube.ico 2013-05-23 19:53:18.000000000 +0200
640@@ -0,0 +1,62 @@
641+CI :
642@€ÿÿÿCI :
643@@ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ¿ÿÿÿÿÿÿÀ¿ÿÿÿÿ|?ÿÿÿÿøÿÿÿÿÀÿÿÿþ€ÿÿÿþÿÿþÿÿøÿÿøÿÿðÿÿàÿÿÀÿÿÀÿÿ€ÿÿÿÿ?þ?þ?üøìü
644üøüøüøüüüüüþþ?þ?ÿÿÿ€ÿÿ€ÿÿÀÿÿàÿÿðÿÿðÿÿøÿÿüÿÿþ?ÿÿÿ€ÿÿÿÀÿÿÿÿðÿÿÿÿüÿÿÿÿÿ€ÿÿÿÿÿú¯ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ 2X
645}
646o
647H) 2­.îVý[ÿZÿ`ÿbúlè]Ž:`4 H+BÜWÿtÿyÿvÿvÿwÿzÿ|ÿyÿxýtÈb
648„o+zsd‰hZ²•c³¬£¶«Š•w\yqpiVGC9*'
649
650
651
652++p­9ÜZî^úoéXËP~-"2 ÜXÿ{ÿyÿxÿwÿwÿuþwüzþ} þ
653þŽ!ÿ§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õŒ{öŸ÷ŠøÆüȌüÖ€ýÛ®ýàŽþä»þçÁþéÆþêËþêÏþêÓýéÒýãÃþͅ
654ÿ¬IÿžBÿ¥Qþ£Rþ—>ÿ‰#ÿ}
655+ÿyÿzÿvÿnº4š6ÿvÿwÿwýyõ„(ïžYó­gò°kó¶vöÀúƂýÉÿ́ÿσÿЂÿӅ
656ÿۖÿãŠÿè¯ÿïŒÿïŒÿòÁÿ÷ÏÿñÁÿ؄ÿÐlÿ۞ÿáÁÿáÂþÝ»ÿسÿÍ¢ÿžzþœ<ÿ
657ÿvÿtÿg‹!ÍSÿyÿxþzù…
658"ó˜Kñ¡Zð§dö²jü¶aÿŽTÿ·VÿŒ]ÿŒ]ÿŒ^ÿÀbÿÆlÿ׎ÿà¡ÿç¯ÿêŽÿê²ÿç©ÿތÿÎ^ÿ܂ÿòœÿùÓÿ÷ÖÿñÕþêÒþçÐþæËþãÆýÚŽþµuÿ†
659ÿuÿtëW2<
660ó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þ€
661ÿ|š:
662ÂmÿŒþü€ø’Aþ“8ÿŒ)ÿ‹$ÿ'ÿ˜0ÿ–(ÿ™)ÿ¡1ÿ©>ÿ±KÿµPÿÁgÿä®ÿìŸÿîÁÿæªÿÍbÿÕxÿޘÿӁÿՄÿ׈ÿًÿېÿߙÿܓÿݕÿܕÿޙÿߝÿá­ýß¹ûÕ­ûÀ„ý“1ÿŠÕU
663šMÿ•;ÿ1þ'ÿƒÿ~ÿyÿyÿÿ%ÿ‹ÿ!ÿš,ÿ¡3ÿ€6ÿ¥7ÿš;ÿ̀ÿê»ÿðÇÿç­ÿÍ`ÿكÿóÉÿé¶ÿҀÿҀÿҀÿӀÿӀÿՅ
664ÿُÿ׋ÿÐ|ÿÎyÿ҃ÿՉÿژýÛ¬ú˛üŠRþŠJï-C"
665•)þw"ÿ„0ÿ‘Aÿ…
666(ÿrÿn
667ÿq
668ÿwÿ…
669 ÿˆ ÿ$ÿ”*ÿ•'ÿ–$ÿœ+ÿ¥9ÿ·Zÿä±ÿòÌÿè®ÿË^ÿڇÿòËÿõÑÿêžÿËtÿÍwÿÐ}ÿÑ~ÿÐ|ÿÍwÿÏ{ÿ҂ÿÎ{ÿÇkÿÃeÿÆmÿÌxÿ҇þәû¶hûžiúºs·€Q
670týYÿqÿy$ÿ|'ÿhÿmÿjÿo
671+ÿ}ÿˆ#ÿ‰"ÿ‰
672ÿŠÿŽ
673ÿšFÿыÿá§ÿí¿ÿöÑÿí¶ÿÐdÿߎÿøÓÿúØÿûÛÿç¯ÿÄcÿÅeÿÇhÿÉlÿËqÿÍuÿÍtÿÐzÿÉmÿÈlÿÁ`ÿŒUÿÁbÿÎÿÎþÀd÷…
674ö‚𜈒i>
675+NñAÿ^ ÿdÿmÿe
676ÿaÿløeÌ`Æo*Çn'ÆiÆkÆo"Æ}5Æšƹ›Æœ¢ÆŸ¥ÅŒ¡ÅŠaŧbÅŸ¥ÅÀ«ÅÀ«ÅÁ¬Å·–Ä™VĕOĖQėRĘRĘSĘUĜ]ÚZÖQÖRÏG˞ZùÊ~ÿЃÿœTü˅
677õˆõÁƒì­tjC$
678Ì(ÿSÿWÿ\
679+ÿZÿa ÿ^ÿkå`
680B.!)(&*'%)'%)&$)&$('&(('''&&&&&&%&%$%$!%%$$$$#####"#""""""!!
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695=7-çœyÿÉtÿ»Sÿ¿dúƂóº|÷žzߖa2
696
697ÿAÿNÿRÿQÿQÿ`
698ÿ^ÿläi:* !!!!
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
71951*æÅ‹ÿËvÿŒTÿ¹[ÿ·[õ¹xó°nõ­lžj7 6ë,ÿFÿIÿLÿIÿNÿXÿe
720ÿoäf:) !!
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
73842,æÎ ÿՆÿÄgÿž]ÿªFý°Yñ«jî£a܎UH)šÿ>ÿAÿEÿDÿGÿKÿSÿfÿoäa 9&
739 !
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
76042,æÕ¬ÿܒÿ҇ÿÃtÿ¥CÿŸ:õŠ[ç–Uè”T­W*6ë#ÿ>ÿ?ÿ?ÿ@ÿFÿNÿ`ÿiÿu
761äg 9'
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
78632.æÞÅÿìºÿá¬ÿ͈ÿ­RÿŸ?ýžCäPæŽKÜx:GŠÿ7ÿ@ÿ<ÿDÿXÿ[ÿ~3ÿCÿœCÿ˜ äx8)
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809222ææåÿÿûÿóÛÿןÿ°\ÿŸBÿ Dñ•JãˆFêŠEšF
810"Û.ÿFÿBÿIÿeÿr"ÿ{
811ÿ“'ÿ•ÿŽÿxä|
8127.
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843222ææçÿÿÿÿõÜÿ҅
844ÿºgÿ”5ÿš@ýšEë‹EñFÌk.$›,ÿUÿTÿKÿUÿj
845+ÿy
846ÿŠÿ–2ÿ§Xÿz,ÿSäh6+
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864777iiiWWW444!!!
865
866
867221ææãÿÿþÿìÄÿÈbÿš*ÿ‰ÿ€ÿ0ö“GóŒ>ñ~3w$#ž5þjÿhÿfÿ[ÿbÿpÿ‡5ÿ—Rÿ¥hÿšnÿbÿJãU6%
868
869
870
871
872
873
874
875###eeeèèèää䯯¯ooo>>>###
876
877
878
879
880
881+
882+
883+1-&æÕ¬ÿñÓÿâ·ÿÙ¥ÿ«Tÿzÿsÿy
884ü6÷‡0ü„ Ü\C>ÎCÿqÿtþpÿiÿTÿ\
885ÿs,ÿŽLÿ˜Wÿ©nÿ·ÿŠLÿO
886+ãK6$
887
888
889
890
891%%%pppñññÿÿÿÿÿÿïïïÁÁÁIII'''
892
893
894
895
896
897
898
899
900
901+0*æÍžÿä»ÿاÿˑÿ“=ÿrÿqÿqÿ{ üþÿwäUc&Ì@ÿuÿwÿvþoüRþEÿ]ÿ}9ÿŒIÿ›]ÿ¬tÿŸÿÍ£ÿ¢nãV5"
902%%%pppñññÿÿÿþþþÿÿÿÿÿÿöööÒÒҔ””VVV---
903
904
905
906
907
908
909
910
911
912
913
914/,(æÎ¬ÿÞ°ÿӟÿćÿ9ÿz
915ÿuÿoÿqÿ‚ÿzþzÿyêSO
916¶:ÿqÿyÿyþpûVûEýIÿe
917ÿ€=ÿ‹Jÿžbÿ°zÿÁ“ÿÒ¬ÿڷ㞘4-($$$oooñññÿÿÿþþþþþþþþþþþþÿÿÿûûûààà§§§eee555
918
919
920
921
922
923
924
925
926
927
928
929
930+
931+
932+ /,(æÍ«ÿÚ¬ÿѝÿŊÿžOÿtÿmÿf
933+ÿlÿ‚,ÿyÿxÿxÿußPÿrÿxÿyÿwü_ø@ø@ýO ÿm)ÿ}:ÿMÿ gÿ²~ÿĘÿÔ°ÿàÁãÔÁ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿþþþëëë¹¹¹ttt444
934
935
936
937
938
939
940+
941+
942+ .,)æÎ®ÿÙ¬ÿўÿÉÿ¯iÿ}(ÿ\ÿ[ÿlÿu ÿrÿuÿxÿwÿwÿxÿyÿzÿqùHó/ö:ý[ÿo,ÿz9ÿQÿ¢jÿ³ÿǝÿ×¶ÿçÌãÙÈ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿêêêsss
943
944
945
946+
947+
948+ -+(æÑŽÿÝŽÿÒ¢ÿˆÿµtÿŸXÿd
949ÿhÿjÿdÿgÿnÿvÿxÿvÿzÿ{ÿ{ýfô4ð)ô4ü_
950ÿn+ÿ{:ÿSÿ£mÿµ„ÿÉ¡ÿÛŒÿí×ãÛÎ220"""oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿðððÂÂÂ}}}777
951+
952+
953+ -+'æÑŽÿÞ¶ÿÕ©ÿŏÿŸ…
954ÿ³tÿ{)ÿb
955ÿ[ÿZÿ\ ÿcÿtÿyÿzÿ|ÿ{ÿ|÷Xí&î(ò5ú]þs2ÿ}>ÿTÿ€nÿ¶ˆÿË¥ÿßÃÿñÜãÞÑ110"""nnnñññÿÿÿþþþþþþþþþþþþÿÿÿýýýåå寯¯lll888
956+
957+
958+ ,+(çÖŸÿåÃÿØ®ÿȗÿ¬mÿ¯qÿv&ÿPÿRÿQÿSÿYÿpÿxÿzÿ{ÿ|ÿ}óPê#ë$ñ7ùZük*ÿ…
959Iÿ‘Wÿ¥pÿž‹ÿ̧ÿáÈÿïÛãÝÑ110!!!nnnñññÿÿÿþþþÿÿÿÿÿÿùùùÙÙٜœœ[[[---
960
961
962+
963+
964+ ,)&æÔŒÿåÄÿÑŠÿ•Oÿ‡;ÿ“KÿbÿIÿGÿJÿLÿPÿlÿyÿyÿÿÿzõOê%é&ð9÷Vúc!þ€CÿšdÿªyÿŸ“ÿЮÿâÉÿïÛãÜÐ00. mmmñññÿÿÿÿÿÿóóóÉÉɈˆˆKKK%%%
965
966
967+
968+
969+ +(%æÓ»ÿÜžÿšZÿ›Yÿ³yÿ¡`ÿbÿDÿCÿEÿGÿLÿiÿzÿ{ÿwÿƒÿ€õ^ê/è(î:õSùg'þ‚Gÿœgÿ³†ÿÀ˜ÿÏ­ÿàÆÿëÕãа0,#
970
971
972bbbëëëééé¶¶¶ttt>>>
973
974
975
976
977
978
979+
980+
981+ *(%æÏµÿº†ÿµÿÁÿ¶}ÿ§iÿŒFÿVÿ@ÿBÿCÿMÿjÿ}ÿzáFÿƒÿ…
982ùsëCæ,ì;õYøl-ü{>ÿ‘Yÿ«{ÿÁ›ÿÓ³ÿàÈÿçÍãœx/(444nnnZZZ222
983
984
985
986
987
988
989
990
991
992+
993+
994+ *$æ€vÿ»ˆÿÏ€ÿÁÿ±yÿŸ^ÿ‰Aÿo%ÿBÿ@ÿDþUÿtÿ|û^rúqÿˆü‚ò]è9ê< óUõ^
995ùt6þ’\ÿ¬}ÿ¿—ÿϯþ¹“ÿȓâ³X/)
996
997
998
999
1000
1001
1002
1003
1004
1005
1006+
1007+
1008+
1009+
1010+
1011+ *
1012橀ÿײÿʟÿœ‹ÿ­tÿŸ`ÿ‡@ÿk
1013ÿKÿCýIýeÿ{ÿv®.
1014¢0ÿ}þ„ùwîTéAïLó\øs6üVüYû‰Qû}Bûo/ÿ¶bâŒs.,*
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030+
1031+
1032+ +'$æÎ¶ÿÖ±ÿƚÿ¹†ÿ©oÿž`ÿ‰DÿbÿW
1033úEõVõeývÌC& œ7ÿzùuóiìQíIñZ÷s6ù|AóR öYø^úg ÿ²MâÉ¡-,+
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046+
1047+
1048+ ,)&æË±ÿÑ«ÿ”ÿŽ€ÿ€iÿ™[ÿ…
1049Aÿj
1050ÿ_â>ÜEçVÑ_@ €9ölí[êS
1051ëGðW
1052õr4û\õi&öd!÷e$úw$ÿÃjâк/-+
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082 ,(%æÆ«ÿÍ¥ÿœŽÿ®zÿžcÿ•Vÿ:ÿeþY
1083+Î7Ï;Á2I¹+êI
1084æFç;íSôr1ú–eú[öq2÷l-ü/ÿ՘ãÒÄ1/,555}}}ŽŽŽggg
1085
1086
1087fff‘‘‘ŽŽŽsss'''VVV‰‰‰‹‹‹ˆˆ‰–’ŽñαÿǞÿžˆÿ©sÿ™]ÿQÿx1ÿ`õQÄ4Ê7„^ä'å=ä0êGñq.ø”bý¬‚ùŠU÷w4ý'ÿŽ~ñŒŸrhbMMMºººõõõúúúúúúñññ§§§555(((–––ñññÿÿÿÿÿÿúúúœœœMMM
1088
1089
1090
1091
1092
1093'''€€€ÞÞÞ÷÷÷ëçãùÒµÿ˜ÿ²‚ÿ¢kÿ“Vÿ‹Kþp$ÿa
1094áDÄ7Ã-V%Ï
1095å:ã9êV
1096ðl#ôHüš~ûš~øƒ6þ«MÿϯøÖ¿ÔÐͧ§§GGG
1097
1098
1099vvvØØØ÷÷÷÷÷÷ûûûßßßyyyJJJŸŸŸûûûÿÿÿÿÿÿìì쑑‘***
1100
1101
1102>>>§ššãÞÛùÍ®ÿœ’ÿ¬zÿœcÿŒOÿ„Dýo"û]Ê4É:¯/ç3äHæHí]í]
1103õŠQüµû7ýEÿØÂøçÚÓÒÐØØØÐÐЉ‰‰,,,@@@¬¬¬ðððõõõøøøöööœœœLLL
1104
1105
1106###‚‚‚èèèüüüûûûûûûÐÐÐccc$$$rmiñ¿žÿžŒÿŠrÿ—]ÿ‹Mþ„BüjêDÂ3É6ˆ
1107
1108åKã?êVïmøžlýÀžþ±]þčÿàÍ÷ä×ÎÌÊÐÐÐÔÔÔ¥¥¥666
1109
1110
1111 ˆˆˆéééñññóóó÷÷÷ÙÙÙfff
1112
1113
1114+
1115+
1116+
1117
1118
1119WWWÙÙÙúúúùùùûûûèè肂‚TNJíž—ÿ·‹ÿŠrÿ˜`þOûv&÷VÎ4Ç:À&O £ç7ßNâNð{,÷ŸmþÊšÿÆ{ÿÖ³ÿÙÄöÑŒÐÊÇžžžfff
1120
1121
1122MMMžžžíííñññöööííí¡¡¡000)))˜˜˜ïïïþþþþþþùùùžžžHHH
1123
1124
1125
1126
1127
1128
1129
1130
1131%%%‚‚ƒÔÎÊùƧÿ³‡þœfü‰Kû€;øhèFÁ3Ì5¢
1132EÔÚXÐFír3òˆ9ùªkþ¿süÁžýŸœòŒŸ‡~)++'''‰ŠŠÚÚÚêëëëëëëëëÁÁÁTTTgghÔÕÖýþþûüüùùù×××ppp
1133+
1134
1135VWWÀÁÂñòóêãßùŒ˜ÿ«|ü‘Wù<øy+ôXÌ6Ê=à \†ÝAàb äN!ï{
1136õ’$ü·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÷“;õ…
1137
1138+òxÓCÏQÐ4‹
1139
1140ªR÷£
1141ø¯5ò—GóŠ…
1142üÕÀþäÕÿçÚÿòéÿ÷òÿùõÿûøÿüúÿþûÿþûÿùôÿùôÿùôÿùôÿïÍÿà•ÿç¶ÿæÃÿéÚÿæ×ÿäÓÿãÒÿèÚÿêÜÿôìÿòéÿïäÿëßÿåÕÿÜÈÿØÁþÑ·ú¶÷IõŒóÛSÒ[×JŠ
1143+
1144YAù¶û¿÷¶Yðœ‡öŒ©ýßÏÿðçÿõïÿ÷òÿùõÿûùÿüûÿýûÿÿüÿþûÿüøÿûöÿûöÿøñÿæ›ÿÞsÿí×ÿîåÿìáÿéÜÿäÕÿäÔÿéÝÿðæÿïåÿìàÿéÛÿâÒþÛÇüϲúŸ–ø©bõ–ñÛ^ÖhÛ\°2:.ñºþÇûÅ>õµ—ò®ž÷Á²ýáÔÿôîÿùôÿúöÿûùÿüúÿþüÿÿýÿÿýÿþüÿüúÿúòÿóÚÿóÛÿêŽÿæ¡ÿñàÿðèÿìáÿèÛÿåÖþå×þçÙþèÛÿêÝÿæØþàÏýÙÁùŒl÷¯fö¥6ñ‡Ý`ÛtÝdŽ2ÖšÿÌþËùÁwõŒªóµªõœ±ûÜÑÿôíÿûøÿüúÿüûÿþüÿÿýÿÿþÿÿþÿûóÿõÜÿ÷éÿú÷ÿ÷ïÿê³ÿç£ÿïÞÿîæÿìáþéÝþæØþçÚýäÕýáÒýÝËûЯø¹[ö«!õš
1145ïx
1146êê”å}¹!4–vÿÍÿÍýÊ÷Átõ¿±ôŸ¶ô»±ùÐÇýìåÿú÷ÿþüÿÿýÿÿÿÿÿýÿúíÿøãÿûôÿüúÿúöÿøôÿõíÿëŽÿç¡ÿíØÿìãþêÞýçÚüäÖüáÑûÖ²ùȄø»Sö§ó†îqîŠ
1147ö²ó¬Ïm7?1ñŒÿÌÿÍýËùÂ\õÀ©öÆ¿õºöÆŸúÚÓýðíÿýúÿýôÿùçÿûíÿþüÿýýÿüúÿûøÿùõÿ÷óÿôìÿë¹ÿæÿëÆÿïèþìâüå×úԜùÅk÷ºoô™Bñz.ï~
1148+ñ˜õ¯ûÂö»iF‰hùÁÿÍÿÎþÍúÅ3÷Ê÷ɹöÌÁöɺøÊµûضüåÎþõîÿüüÿÿþÿÿýÿýüÿüúÿû÷ÿùôÿöñÿóíÿë¹ÿä|ÿæœü߯úÓŸ÷Ÿƒô¡UòŠTñŒSò 'òšõ±üÅþËŒ“^IשÿÍÿÐÿÐÿÌûËIûÎfûҎûÑ«øÍºöÊÂ÷ÌÄúÕÊúÜ×ûãÞüåàüçáüèàýçßüãØûÛÍúÓÂù˕ûÍCûÏM÷Á|ó³ió«oõµ\õº$÷œúÄüËÿΛ}#qY§ƒŒ–ß³÷ÈúËóÅ7áŽqî¿¥÷ÊÁúÍÆùÍÄöÉÄõÉÃõÂŒõÂŒôÁ¹õÅŒõúö÷öÁ°öÀ®ùŝüÎvýÓEýÓ2ûÏ/ûÍ üÎþÐÿÐÿÐÛ D7I<C6'
1149A1!pUN­„vÔ¢™é·¯ï¿¹ôÄœøÇ¿ùÈŸùÈÀùÇœùÄžøÀ­òžœó»vûÈ@ÿÑÿÕÿÔÿÔÿÒÿÑÿÏܬ;.9*#G42`IFuVUzZWy]Xz[WzZVsU:K7 E3
1150+cLsË£âµá¶âŽË¡‰l1&
1151
1152
1153
1154
1155
1156\ No newline at end of file
1157diff -Naur E:\trees\smtube\trunk\..\vendor\current/smtube.pro E:\trees\smtube\trunk/smtube.pro
1158--- E:\trees\smtube\trunk\..\vendor\current/smtube.pro 1970-01-01 01:00:00.000000000 +0100
1159+++ E:\trees\smtube\trunk/smtube.pro 2013-05-23 18:30:40.000000000 +0200
1160@@ -0,0 +1,5 @@
1161+TEMPLATE = subdirs
1162+
1163+SUBDIRS += src
1164+
1165+src.file=src/smtube.pro
1166\ No newline at end of file
1167diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/hcplayer.h E:\trees\smtube\trunk/src/hcplayer.h
1168--- E:\trees\smtube\trunk\..\vendor\current/src/hcplayer.h 2014-01-25 22:51:20.000000000 +0100
1169+++ E:\trees\smtube\trunk/src/hcplayer.h 2014-05-15 17:55:02.000000000 +0200
1170@@ -19,7 +19,7 @@
1171 #ifndef HCPLAYERS_H
1172 #define HCPLAYERS_H
1173
1174-#ifdef Q_OS_WIN
1175+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1176
1177 #define HCPLAYER_EXECUTABLE qApp->applicationDirPath() + "/smplayer.exe"
1178 #define HCPLAYER_DIRECTPLAY true
1179diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/main.cpp E:\trees\smtube\trunk/src/main.cpp
1180--- E:\trees\smtube\trunk\..\vendor\current/src/main.cpp 2014-07-24 23:12:26.000000000 +0200
1181+++ E:\trees\smtube\trunk/src/main.cpp 2014-10-09 15:32:10.000000000 +0200
1182@@ -72,11 +72,15 @@
1183 #endif // YT_USE_SCRIPT
1184
1185 QString translationsPath() {
1186+#ifdef Q_OS_OS2
1187+ QString path = QString(qApp->applicationDirPath() + "/translations");
1188+#else
1189 #ifdef Q_WS_AMIGA // zzd10h
1190 QDir::setCurrent(qApp->applicationDirPath());
1191 #endif
1192
1193 QString path = "translations";
1194+#endif
1195 #if !defined(Q_OS_WIN)
1196 #ifdef TRANSLATION_PATH
1197 QString s = QString(TRANSLATION_PATH);
1198diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/players.cpp E:\trees\smtube\trunk/src/players.cpp
1199--- E:\trees\smtube\trunk\..\vendor\current/src/players.cpp 2014-01-25 22:51:20.000000000 +0100
1200+++ E:\trees\smtube\trunk/src/players.cpp 2014-05-15 18:18:28.000000000 +0200
1201@@ -26,11 +26,11 @@
1202 if (found) *found = true;
1203
1204 QString bin = qApp->applicationDirPath() + "/" + player_bin;
1205- #ifdef Q_OS_WIN
1206+ #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1207 bin += ".exe";
1208 #endif
1209
1210-#ifndef Q_OS_WIN
1211+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
1212 QFileInfo fi(bin);
1213 if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
1214 qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
1215diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp
1216--- E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp 2013-08-30 02:29:16.000000000 +0200
1217+++ E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp 2014-05-15 18:04:30.000000000 +0200
1218@@ -49,7 +49,7 @@
1219 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
1220 static PProcessIdToSessionId pProcessIdToSessionId = 0;
1221 #endif
1222-#if defined(Q_OS_UNIX)
1223+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
1224 #include <sys/types.h>
1225 #include <time.h>
1226 #include <unistd.h>
1227diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc E:\trees\smtube\trunk/src/smtube_os2.rc
1228--- E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc 1970-01-01 01:00:00.000000000 +0100
1229+++ E:\trees\smtube\trunk/src/smtube_os2.rc 2013-05-23 19:46:54.000000000 +0200
1230@@ -0,0 +1 @@
1231+ICON 1 DISCARDABLE "..\os2\smtube.ico"
1232diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro E:\trees\smtube\trunk/src/smtube.pro
1233--- E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro 2014-07-24 23:23:22.000000000 +0200
1234+++ E:\trees\smtube\trunk/src/smtube.pro 2014-10-09 15:37:14.000000000 +0200
1235@@ -125,6 +125,15 @@
1236 RC_FILE = smtube.rc
1237 }
1238
1239+os2 {
1240+ RC_FILE = smtube_os2.rc
1241+ DEFINES += USE_PLAYERS
1242+ # define the vendor part
1243+ DEF_FILE_VENDOR = bww bitwise works GmbH
1244+ DEF_FILE_VERSION = $$APPLICATION_VERSION
1245+ DEF_FILE_DESCRIPTION = eCS (OS/2) port of SMTube
1246+}
1247+
1248 amiga {
1249 DEFINES -= USE_PLAYERS
1250 DEFINES += QT_NO_DEBUG_OUTPUT
Note: See TracBrowser for help on using the repository browser.