source: diffs/smtube_16.3.0_GA.diff@ 184

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

Qt4: add some diffs to the repo, so nothing is lost

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