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