Attachment #98592 for bug #137534

View | Details | Raw Unified | Return to bug 137534
Collapse All | Expand All

Lines 6-12 Link Here

(-)multimedia/miro/Makefile (-1 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= Miro	8	PORTNAME= Miro
9	PORTVERSION= 2.0.5	9	PORTVERSION= 2.5.2
10	CATEGORIES= multimedia	10	CATEGORIES= multimedia
11	MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \	11	MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
12	http://ftp.osuosl.org/pub/pculture.org/miro/src/	12	http://ftp.osuosl.org/pub/pculture.org/miro/src/
Lines 37-42 Link Here
37	USE_PYDISTUTILS= yes	37	USE_PYDISTUTILS= yes
38	PYDISTUTILS_PKGNAME= ${PORTNAME:L}	38	PYDISTUTILS_PKGNAME= ${PORTNAME:L}
39	MAKE_ENV= CPPFLAGS="${CPPFLAGS}"	39	MAKE_ENV= CPPFLAGS="${CPPFLAGS}"
		40	INSTALLS_ICONS= yes
40	INSTALLS_EGGINFO= yes	41	INSTALLS_EGGINFO= yes
41		42
42	MANCOMPRESSED= yes	43	MANCOMPRESSED= yes

Lines 1-3 Link Here

(-)multimedia/miro/distinfo (-3 / +3 lines)
1	MD5 (Miro-2.0.5.tar.gz) = bb589058844b441c8f0bd0b79532ca87	1	MD5 (Miro-2.5.2.tar.gz) = e4e6a6979949c001ab06e813db7da06f
2	SHA256 (Miro-2.0.5.tar.gz) = 1857a6606e4a9c5d3e51a71de525df9f4e6c41fdce8d874fc8d9f67b8844c78d	2	SHA256 (Miro-2.5.2.tar.gz) = 3564f934140e7a6d79654d391a1fcb7311ad7a3fdb3149d0554444bc56d289dd
3	SIZE (Miro-2.0.5.tar.gz) = 7333786	3	SIZE (Miro-2.5.2.tar.gz) = 9734697




--- platform/gtk-x11/plat/options.py.orig	2009-07-25 12:41:11.000000000 +0900
+++ platform/gtk-x11/plat/options.py	2009-07-30 15:45:34.000000000 +0900
@@ -46,12 +46,12 @@
         self.help = help
 
 USE_RENDERER = GTKPref(key="useRenderer",
-                       default=u"gstreamer",
+                       default=u"xine",
                        alias="renderer",
                        help="Which renderer to use.  (gstreamer, xine)" )
 
 USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
-                           default=True,
+                           default=False,
                            alias="xine-xvhack",
                            help="Whether or not to use the Xine xv hack.  (true, false)" )
 
 USE_XINE_XV_HACK = Pref(key="UseXineXVHack",
-                        default=True,
+                        default=False,
                         platformSpecific=False,
                         alias="xine-xvhack",
                         help="Whether or not to use the Xine xv hack.  (true, false)" )




--- platform/gtk-x11/plat/resources.py.orig	2009-07-25 12:41:11.000000000 +0900
+++ platform/gtk-x11/plat/resources.py	2009-07-30 15:48:04.000000000 +0900
@@ -44,8 +44,8 @@
 import platform
 import urllib
 
 resource_root = os.path.abspath(os.environ.get('MIRO_RESOURCE_ROOT',
-                                               '/usr/share/miro/resources/'))
-share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '/usr/share/'))
+                                               '%%PREFIX%%/share/miro/resources/'))
+share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/'))
 
 def root():
     return resource_root
@@ -71,7 +71,7 @@
 
 # Note: some of these functions are probably not absolutely correct in
@@ -63,7 +63,7 @@
     return u"file://%s" % urllib.quote(absolute_path)
 
 def theme_path(theme, relative_path):




--- platform/gtk-x11/setup.py.orig	2009-07-25 12:41:12.000000000 +0900
+++ platform/gtk-x11/setup.py	2009-07-30 15:52:08.000000000 +0900
@@ -112,14 +112,15 @@
 # XPCOM_LIB = "firefox-xpcom"
 # GTKMOZEMBED_LIB = "firefox-gtkmozembed"
 # XULRUNNER_19 = False

 
 
 ###############################################################################
@@ -285,6 +286,9 @@
             options_dict['library_dirs'].append(rest)
         elif prefix == '-l':
             options_dict['libraries'].append(rest)

         else:
             options_dict['extra_compile_args'].append(comp)
 
@@ -315,7 +319,7 @@
     print "Using %s" % BOOST_LIB
 
 def compile_xine_extractor():

                    (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
     if rv != 0:
         raise RuntimeError("xine_extractor compilation failed.  Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
@@ -353,7 +357,7 @@
         exit;
     fi
 

 else
     %(runtimelib)smiro.real "$@"
 fi
@@ -366,6 +370,7 @@
     Extension("miro.fasttypes",
         sources = [os.path.join(portable_dir, 'fasttypes.cpp')],
         libraries = [BOOST_LIB],

     )
 
 
@@ -402,12 +407,12 @@
                           "-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
                           "-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
                           "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",

 
     # get mt or non-mt versions of the boost libraries
     libraries += [mt_or_not("boost_python"),
@@ -432,6 +437,7 @@
     return Extension("miro.libtorrent",
                      include_dirs=include_dirs,
                      libraries=libraries,

                      extra_compile_args=extra_compile_args,
                      sources=sources)
 
@@ -558,7 +564,7 @@
 xlib_ext = \
     Extension("miro.plat.xlibhelper",
         [ os.path.join(platform_package_dir,'xlibhelper.pyx') ],

         libraries = ['X11'],
     )
 
@@ -644,36 +650,36 @@
 # filter out app.config.template (which is handled specially)
 files = [f for f in listfiles(resource_dir) \
         if os.path.basename(f) != 'app.config.template']

+    dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir)
     data_files.append((dest_dir, listfiles(source_dir)))
 
 for mem in ["24", "48", "72", "128"]:
     d = os.path.join("icons", "hicolor", "%sx%s" % (mem, mem), "apps")
     source = os.path.join(platform_dir, d, "miro.png")
-    dest = os.path.join("/usr/share/", d)
+    dest = os.path.join("%%PREFIX%%/share/", d)
     data_files.append((dest, [source]))
 
 # add ADOPTERS file, the desktop file, mime data, and man page
 data_files += [
-    ('/usr/share/miro/resources',
+    ('%%PREFIX%%/share/miro/resources',
      [os.path.join(root_dir, 'ADOPTERS')]),
-    ('/usr/share/pixmaps',
+    ('%%PREFIX%%/share/pixmaps',
      glob(os.path.join(platform_dir, 'miro.xpm'))),

      [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 
@@ -697,7 +703,7 @@
 
     def install_app_config(self):
         source = os.path.join(resource_dir, 'app.config.template')

 
         config_file = util.read_simple_config_file(source)
         print "Trying to figure out the svn revision...."
@@ -737,7 +743,7 @@
 
         for source in glob (os.path.join (locale_dir, "*.mo")):
             lang = os.path.basename(source)[:-3]

             if self.root:
                 dest = change_root(self.root, dest)
             self.mkpath(os.path.dirname(dest))
@@ -766,7 +772,7 @@
 
 #### install_theme installs a specified theme .zip
 class install_theme(Command):

     user_options = [("theme=", None, 'ZIP file containing the theme')]
 
     def initialize_options(self):
@@ -794,7 +800,7 @@
             raise DistutilsOptionError, "invalid theme file"
         self.zipfile = zf
         self.theme_name = themeName




--- portable/util.py.orig	2009-06-26 13:15:52.000000000 +0900
+++ portable/util.py	2009-07-06 02:26:25.000000000 +0900
@@ -752,7 +752,11 @@
         self.__add(data)
 
     def handle_charref(self, ref):
-        self.__add(unichr(int(ref)))
+        if ref.startswith('x'):
+            charnum = int(ref[1:], 16)
+        else:
+            charnum = int(ref)
+        self.__add(unichr(charnum))
 
     def start_p(self, attributes):
         self.__add("\n")

Lines 12-17 Link Here

(-)multimedia/miro/pkg-plist (-24 / +78 lines)
12	%%PYTHON_SITELIBDIR%%/miro/appconfig.py	12	%%PYTHON_SITELIBDIR%%/miro/appconfig.py
13	%%PYTHON_SITELIBDIR%%/miro/appconfig.pyc	13	%%PYTHON_SITELIBDIR%%/miro/appconfig.pyc
14	%%PYTHON_SITELIBDIR%%/miro/appconfig.pyo	14	%%PYTHON_SITELIBDIR%%/miro/appconfig.pyo
		15	%%PYTHON_SITELIBDIR%%/miro/autodiscover.py
		16	%%PYTHON_SITELIBDIR%%/miro/autodiscover.pyc
		17	%%PYTHON_SITELIBDIR%%/miro/autodiscover.pyo
15	%%PYTHON_SITELIBDIR%%/miro/autodler.py	18	%%PYTHON_SITELIBDIR%%/miro/autodler.py
16	%%PYTHON_SITELIBDIR%%/miro/autodler.pyc	19	%%PYTHON_SITELIBDIR%%/miro/autodler.pyc
17	%%PYTHON_SITELIBDIR%%/miro/autodler.pyo	20	%%PYTHON_SITELIBDIR%%/miro/autodler.pyo
Lines 21-33 Link Here
21	%%PYTHON_SITELIBDIR%%/miro/clock.py	24	%%PYTHON_SITELIBDIR%%/miro/clock.py
22	%%PYTHON_SITELIBDIR%%/miro/clock.pyc	25	%%PYTHON_SITELIBDIR%%/miro/clock.pyc
23	%%PYTHON_SITELIBDIR%%/miro/clock.pyo	26	%%PYTHON_SITELIBDIR%%/miro/clock.pyo
		27	%%PYTHON_SITELIBDIR%%/miro/commandline.py
		28	%%PYTHON_SITELIBDIR%%/miro/commandline.pyc
		29	%%PYTHON_SITELIBDIR%%/miro/commandline.pyo
24	%%PYTHON_SITELIBDIR%%/miro/config.py	30	%%PYTHON_SITELIBDIR%%/miro/config.py
25	%%PYTHON_SITELIBDIR%%/miro/config.pyc	31	%%PYTHON_SITELIBDIR%%/miro/config.pyc
26	%%PYTHON_SITELIBDIR%%/miro/config.pyo	32	%%PYTHON_SITELIBDIR%%/miro/config.pyo
27	%%PYTHON_SITELIBDIR%%/miro/controller.py	33	%%PYTHON_SITELIBDIR%%/miro/controller.py
28	%%PYTHON_SITELIBDIR%%/miro/controller.pyc	34	%%PYTHON_SITELIBDIR%%/miro/controller.pyc
29	%%PYTHON_SITELIBDIR%%/miro/controller.pyo	35	%%PYTHON_SITELIBDIR%%/miro/controller.pyo
30	%%PYTHON_SITELIBDIR%%/miro/database.so	36	%%PYTHON_SITELIBDIR%%/miro/convert20database.py
		37	%%PYTHON_SITELIBDIR%%/miro/convert20database.pyc
		38	%%PYTHON_SITELIBDIR%%/miro/convert20database.pyo
		39	%%PYTHON_SITELIBDIR%%/miro/database.py
		40	%%PYTHON_SITELIBDIR%%/miro/database.pyc
		41	%%PYTHON_SITELIBDIR%%/miro/database.pyo
31	%%PYTHON_SITELIBDIR%%/miro/databasehelper.py	42	%%PYTHON_SITELIBDIR%%/miro/databasehelper.py
32	%%PYTHON_SITELIBDIR%%/miro/databasehelper.pyc	43	%%PYTHON_SITELIBDIR%%/miro/databasehelper.pyc
33	%%PYTHON_SITELIBDIR%%/miro/databasehelper.pyo	44	%%PYTHON_SITELIBDIR%%/miro/databasehelper.pyo
Lines 37-42 Link Here
37	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.py	48	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.py
38	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyc	49	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyc
39	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyo	50	%%PYTHON_SITELIBDIR%%/miro/databaseupgrade.pyo
		51	%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.py
		52	%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyc
		53	%%PYTHON_SITELIBDIR%%/miro/dbupgradeprogress.pyo
40	%%PYTHON_SITELIBDIR%%/miro/dialogs.py	54	%%PYTHON_SITELIBDIR%%/miro/dialogs.py
41	%%PYTHON_SITELIBDIR%%/miro/dialogs.pyc	55	%%PYTHON_SITELIBDIR%%/miro/dialogs.pyc
42	%%PYTHON_SITELIBDIR%%/miro/dialogs.pyo	56	%%PYTHON_SITELIBDIR%%/miro/dialogs.pyo
Lines 86-91 Link Here
86	%%PYTHON_SITELIBDIR%%/miro/feedparser.py	100	%%PYTHON_SITELIBDIR%%/miro/feedparser.py
87	%%PYTHON_SITELIBDIR%%/miro/feedparser.pyc	101	%%PYTHON_SITELIBDIR%%/miro/feedparser.pyc
88	%%PYTHON_SITELIBDIR%%/miro/feedparser.pyo	102	%%PYTHON_SITELIBDIR%%/miro/feedparser.pyo
		103	%%PYTHON_SITELIBDIR%%/miro/feedparserutil.py
		104	%%PYTHON_SITELIBDIR%%/miro/feedparserutil.pyc
		105	%%PYTHON_SITELIBDIR%%/miro/feedparserutil.pyo
89	%%PYTHON_SITELIBDIR%%/miro/feedupdate.py	106	%%PYTHON_SITELIBDIR%%/miro/feedupdate.py
90	%%PYTHON_SITELIBDIR%%/miro/feedupdate.pyc	107	%%PYTHON_SITELIBDIR%%/miro/feedupdate.pyc
91	%%PYTHON_SITELIBDIR%%/miro/feedupdate.pyo	108	%%PYTHON_SITELIBDIR%%/miro/feedupdate.pyo
Lines 95-103 Link Here
95	%%PYTHON_SITELIBDIR%%/miro/fileutil.py	112	%%PYTHON_SITELIBDIR%%/miro/fileutil.py
96	%%PYTHON_SITELIBDIR%%/miro/fileutil.pyc	113	%%PYTHON_SITELIBDIR%%/miro/fileutil.pyc
97	%%PYTHON_SITELIBDIR%%/miro/fileutil.pyo	114	%%PYTHON_SITELIBDIR%%/miro/fileutil.pyo
98	%%PYTHON_SITELIBDIR%%/miro/filters.py
99	%%PYTHON_SITELIBDIR%%/miro/filters.pyc
100	%%PYTHON_SITELIBDIR%%/miro/filters.pyo
101	%%PYTHON_SITELIBDIR%%/miro/flashscraper.py	115	%%PYTHON_SITELIBDIR%%/miro/flashscraper.py
102	%%PYTHON_SITELIBDIR%%/miro/flashscraper.pyc	116	%%PYTHON_SITELIBDIR%%/miro/flashscraper.pyc
103	%%PYTHON_SITELIBDIR%%/miro/flashscraper.pyo	117	%%PYTHON_SITELIBDIR%%/miro/flashscraper.pyo
Lines 176-181 Link Here
176	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.py	190	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.py
177	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyc	191	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyc
178	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyo	192	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/__init__.pyo
		193	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.py
		194	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.pyc
		195	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/audio.pyo
179	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.py	196	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.py
180	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyc	197	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyc
181	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyo	198	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/base.pyo
Lines 216-221 Link Here
216	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.py	233	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.py
217	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyc	234	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyc
218	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyo	235	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/simple.pyo
		236	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.py
		237	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.pyc
		238	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/sniffer.pyo
219	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.py	239	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.py
220	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyc	240	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyc
221	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyo	241	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk/tableview.pyo
Lines 306-311 Link Here
306	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.py	326	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.py
307	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyc	327	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyc
308	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyo	328	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/searchbox.pyo
		329	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.py
		330	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.pyc
		331	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/segmented.pyo
309	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.py	332	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.py
310	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyc	333	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyc
311	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyo	334	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/separator.pyo
Lines 357-372 Link Here
357	%%PYTHON_SITELIBDIR%%/miro/iconcache.py	380	%%PYTHON_SITELIBDIR%%/miro/iconcache.py
358	%%PYTHON_SITELIBDIR%%/miro/iconcache.pyc	381	%%PYTHON_SITELIBDIR%%/miro/iconcache.pyc
359	%%PYTHON_SITELIBDIR%%/miro/iconcache.pyo	382	%%PYTHON_SITELIBDIR%%/miro/iconcache.pyo
360	%%PYTHON_SITELIBDIR%%/miro/indexes.py
361	%%PYTHON_SITELIBDIR%%/miro/indexes.pyc
362	%%PYTHON_SITELIBDIR%%/miro/indexes.pyo
363	%%PYTHON_SITELIBDIR%%/miro/item.py	383	%%PYTHON_SITELIBDIR%%/miro/item.py
364	%%PYTHON_SITELIBDIR%%/miro/item.pyc	384	%%PYTHON_SITELIBDIR%%/miro/item.pyc
365	%%PYTHON_SITELIBDIR%%/miro/item.pyo	385	%%PYTHON_SITELIBDIR%%/miro/item.pyo
366	%%PYTHON_SITELIBDIR%%/miro/libtorrent.so	386	%%PYTHON_SITELIBDIR%%/miro/libtorrent.so
367	%%PYTHON_SITELIBDIR%%/miro/maps.py
368	%%PYTHON_SITELIBDIR%%/miro/maps.pyc
369	%%PYTHON_SITELIBDIR%%/miro/maps.pyo
370	%%PYTHON_SITELIBDIR%%/miro/menubar.py	387	%%PYTHON_SITELIBDIR%%/miro/menubar.py
371	%%PYTHON_SITELIBDIR%%/miro/menubar.pyc	388	%%PYTHON_SITELIBDIR%%/miro/menubar.pyc
372	%%PYTHON_SITELIBDIR%%/miro/menubar.pyo	389	%%PYTHON_SITELIBDIR%%/miro/menubar.pyo
Lines 376-381 Link Here
376	%%PYTHON_SITELIBDIR%%/miro/messages.py	393	%%PYTHON_SITELIBDIR%%/miro/messages.py
377	%%PYTHON_SITELIBDIR%%/miro/messages.pyc	394	%%PYTHON_SITELIBDIR%%/miro/messages.pyc
378	%%PYTHON_SITELIBDIR%%/miro/messages.pyo	395	%%PYTHON_SITELIBDIR%%/miro/messages.pyo
		396	%%PYTHON_SITELIBDIR%%/miro/models.py
		397	%%PYTHON_SITELIBDIR%%/miro/models.pyc
		398	%%PYTHON_SITELIBDIR%%/miro/models.pyo
379	%%PYTHON_SITELIBDIR%%/miro/moviedata.py	399	%%PYTHON_SITELIBDIR%%/miro/moviedata.py
380	%%PYTHON_SITELIBDIR%%/miro/moviedata.pyc	400	%%PYTHON_SITELIBDIR%%/miro/moviedata.pyc
381	%%PYTHON_SITELIBDIR%%/miro/moviedata.pyo	401	%%PYTHON_SITELIBDIR%%/miro/moviedata.pyo
Lines 453-458 Link Here
453	%%PYTHON_SITELIBDIR%%/miro/plat/utils.pyc	473	%%PYTHON_SITELIBDIR%%/miro/plat/utils.pyc
454	%%PYTHON_SITELIBDIR%%/miro/plat/utils.pyo	474	%%PYTHON_SITELIBDIR%%/miro/plat/utils.pyo
455	%%PYTHON_SITELIBDIR%%/miro/plat/xlibhelper.so	475	%%PYTHON_SITELIBDIR%%/miro/plat/xlibhelper.so
		476	%%PYTHON_SITELIBDIR%%/miro/player.py
		477	%%PYTHON_SITELIBDIR%%/miro/player.pyc
		478	%%PYTHON_SITELIBDIR%%/miro/player.pyo
456	%%PYTHON_SITELIBDIR%%/miro/playlist.py	479	%%PYTHON_SITELIBDIR%%/miro/playlist.py
457	%%PYTHON_SITELIBDIR%%/miro/playlist.pyc	480	%%PYTHON_SITELIBDIR%%/miro/playlist.pyc
458	%%PYTHON_SITELIBDIR%%/miro/playlist.pyo	481	%%PYTHON_SITELIBDIR%%/miro/playlist.pyo
Lines 462-467 Link Here
462	%%PYTHON_SITELIBDIR%%/miro/schema.py	485	%%PYTHON_SITELIBDIR%%/miro/schema.py
463	%%PYTHON_SITELIBDIR%%/miro/schema.pyc	486	%%PYTHON_SITELIBDIR%%/miro/schema.pyc
464	%%PYTHON_SITELIBDIR%%/miro/schema.pyo	487	%%PYTHON_SITELIBDIR%%/miro/schema.pyo
		488	%%PYTHON_SITELIBDIR%%/miro/schemav79.py
		489	%%PYTHON_SITELIBDIR%%/miro/schemav79.pyc
		490	%%PYTHON_SITELIBDIR%%/miro/schemav79.pyo
465	%%PYTHON_SITELIBDIR%%/miro/search.py	491	%%PYTHON_SITELIBDIR%%/miro/search.py
466	%%PYTHON_SITELIBDIR%%/miro/search.pyc	492	%%PYTHON_SITELIBDIR%%/miro/search.pyc
467	%%PYTHON_SITELIBDIR%%/miro/search.pyo	493	%%PYTHON_SITELIBDIR%%/miro/search.pyo
Lines 499-507 Link Here
499	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.py	525	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.py
500	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyc	526	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyc
501	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyo	527	%%PYTHON_SITELIBDIR%%/miro/test/databasetest.pyo
502	%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.py
503	%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.pyc
504	%%PYTHON_SITELIBDIR%%/miro/test/databaseupgradetest.pyo
505	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.py	528	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.py
506	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyc	529	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyc
507	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyo	530	%%PYTHON_SITELIBDIR%%/miro/test/fasttypestest.pyo
Lines 526-531 Link Here
526	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.py	549	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.py
527	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyc	550	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyc
528	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyo	551	%%PYTHON_SITELIBDIR%%/miro/test/httpdownloadertest.pyo
		552	%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.py
		553	%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.pyc
		554	%%PYTHON_SITELIBDIR%%/miro/test/iconcachetest.pyo
		555	%%PYTHON_SITELIBDIR%%/miro/test/itemtest.py
		556	%%PYTHON_SITELIBDIR%%/miro/test/itemtest.pyc
		557	%%PYTHON_SITELIBDIR%%/miro/test/itemtest.pyo
529	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.py	558	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.py
530	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyc	559	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyc
531	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyo	560	%%PYTHON_SITELIBDIR%%/miro/test/messagetest.pyo
Lines 577-592 Link Here
577	%%PYTHON_SITELIBDIR%%/miro/util.py	606	%%PYTHON_SITELIBDIR%%/miro/util.py
578	%%PYTHON_SITELIBDIR%%/miro/util.pyc	607	%%PYTHON_SITELIBDIR%%/miro/util.pyc
579	%%PYTHON_SITELIBDIR%%/miro/util.pyo	608	%%PYTHON_SITELIBDIR%%/miro/util.pyo
580	%%PYTHON_SITELIBDIR%%/miro/views.py
581	%%PYTHON_SITELIBDIR%%/miro/views.pyc
582	%%PYTHON_SITELIBDIR%%/miro/views.pyo
583	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.py	609	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.py
584	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyc	610	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyc
585	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyo	611	%%PYTHON_SITELIBDIR%%/miro/xhtmltools.pyo
586	%%PYTHON_SITELIBDIR%%/miro/xine.so	612	%%PYTHON_SITELIBDIR%%/miro/xine.so
587	libexec/miro/xine_extractor	613	libexec/miro/xine_extractor
588	share/applications/miro.desktop	614	share/applications/miro.desktop
		615	share/icons/hicolor/128x128/apps/miro.png
		616	share/icons/hicolor/24x24/apps/miro.png
		617	share/icons/hicolor/48x48/apps/miro.png
		618	share/icons/hicolor/72x72/apps/miro.png
589	share/locale/ar/LC_MESSAGES/miro.mo	619	share/locale/ar/LC_MESSAGES/miro.mo
		620	share/locale/be/LC_MESSAGES/miro.mo
590	share/locale/bg/LC_MESSAGES/miro.mo	621	share/locale/bg/LC_MESSAGES/miro.mo
591	share/locale/bn/LC_MESSAGES/miro.mo	622	share/locale/bn/LC_MESSAGES/miro.mo
592	share/locale/br/LC_MESSAGES/miro.mo	623	share/locale/br/LC_MESSAGES/miro.mo
Lines 625-630 Link Here
625	share/locale/ja/LC_MESSAGES/miro.mo	656	share/locale/ja/LC_MESSAGES/miro.mo
626	share/locale/ka/LC_MESSAGES/miro.mo	657	share/locale/ka/LC_MESSAGES/miro.mo
627	share/locale/kk/LC_MESSAGES/miro.mo	658	share/locale/kk/LC_MESSAGES/miro.mo
		659	share/locale/km/LC_MESSAGES/miro.mo
		660	share/locale/kn/LC_MESSAGES/miro.mo
628	share/locale/ko/LC_MESSAGES/miro.mo	661	share/locale/ko/LC_MESSAGES/miro.mo
629	share/locale/ku/LC_MESSAGES/miro.mo	662	share/locale/ku/LC_MESSAGES/miro.mo
630	share/locale/lt/LC_MESSAGES/miro.mo	663	share/locale/lt/LC_MESSAGES/miro.mo
Lines 664-669 Link Here
664	share/locale/zh_TW/LC_MESSAGES/miro.mo	697	share/locale/zh_TW/LC_MESSAGES/miro.mo
665	share/locale/zu/LC_MESSAGES/miro.mo	698	share/locale/zu/LC_MESSAGES/miro.mo
666	share/mime/packages/miro.xml	699	share/mime/packages/miro.xml
		700	%%DATADIR%%/resources/ADOPTERS
667	%%DATADIR%%/resources/app.config	701	%%DATADIR%%/resources/app.config
668	%%DATADIR%%/resources/images/broken-image.gif	702	%%DATADIR%%/resources/images/broken-image.gif
669	%%DATADIR%%/resources/images/cancel-button.png	703	%%DATADIR%%/resources/images/cancel-button.png
Lines 675-680 Link Here
675	%%DATADIR%%/resources/images/feedicon.png	709	%%DATADIR%%/resources/images/feedicon.png
676	%%DATADIR%%/resources/images/folder-icon-tablist.png	710	%%DATADIR%%/resources/images/folder-icon-tablist.png
677	%%DATADIR%%/resources/images/folder-icon.png	711	%%DATADIR%%/resources/images/folder-icon.png
		712	%%DATADIR%%/resources/images/icon-audio.png
		713	%%DATADIR%%/resources/images/icon-audio_large.png
678	%%DATADIR%%/resources/images/icon-channel-title.png	714	%%DATADIR%%/resources/images/icon-channel-title.png
679	%%DATADIR%%/resources/images/icon-downloading.png	715	%%DATADIR%%/resources/images/icon-downloading.png
680	%%DATADIR%%/resources/images/icon-downloading_large.png	716	%%DATADIR%%/resources/images/icon-downloading_large.png
Lines 687-692 Link Here
687	%%DATADIR%%/resources/images/icon-library_large.png	723	%%DATADIR%%/resources/images/icon-library_large.png
688	%%DATADIR%%/resources/images/icon-new.png	724	%%DATADIR%%/resources/images/icon-new.png
689	%%DATADIR%%/resources/images/icon-new_large.png	725	%%DATADIR%%/resources/images/icon-new_large.png
		726	%%DATADIR%%/resources/images/icon-other.png
		727	%%DATADIR%%/resources/images/icon-other_large.png
690	%%DATADIR%%/resources/images/icon-playlist.png	728	%%DATADIR%%/resources/images/icon-playlist.png
691	%%DATADIR%%/resources/images/icon-rss.png	729	%%DATADIR%%/resources/images/icon-rss.png
692	%%DATADIR%%/resources/images/icon-search.png	730	%%DATADIR%%/resources/images/icon-search.png
Lines 695-703 Link Here
695	%%DATADIR%%/resources/images/icon-streaming.png	733	%%DATADIR%%/resources/images/icon-streaming.png
696	%%DATADIR%%/resources/images/icon-streaming_large.png	734	%%DATADIR%%/resources/images/icon-streaming_large.png
697	%%DATADIR%%/resources/images/icon-updating.png	735	%%DATADIR%%/resources/images/icon-updating.png
698	%%DATADIR%%/resources/images/list-view-button.png	736	%%DATADIR%%/resources/images/icon-video.png
699	%%DATADIR%%/resources/images/list-view-button_active.png	737	%%DATADIR%%/resources/images/icon-video_large.png
		738	%%DATADIR%%/resources/images/list-view-button-icon.png
700	%%DATADIR%%/resources/images/load-indicator.gif	739	%%DATADIR%%/resources/images/load-indicator.gif
		740	%%DATADIR%%/resources/images/mini-icon-audio.png
		741	%%DATADIR%%/resources/images/mini-icon-video.png
701	%%DATADIR%%/resources/images/navback.png	742	%%DATADIR%%/resources/images/navback.png
702	%%DATADIR%%/resources/images/navback_active.png	743	%%DATADIR%%/resources/images/navback_active.png
703	%%DATADIR%%/resources/images/navback_disabled.png	744	%%DATADIR%%/resources/images/navback_disabled.png
Lines 713-720 Link Here
713	%%DATADIR%%/resources/images/navstop.png	754	%%DATADIR%%/resources/images/navstop.png
714	%%DATADIR%%/resources/images/navstop_active.png	755	%%DATADIR%%/resources/images/navstop_active.png
715	%%DATADIR%%/resources/images/navstop_disabled.png	756	%%DATADIR%%/resources/images/navstop_disabled.png
716	%%DATADIR%%/resources/images/normal-view-button.png	757	%%DATADIR%%/resources/images/normal-view-button-icon.png
717	%%DATADIR%%/resources/images/normal-view-button_active.png
718	%%DATADIR%%/resources/images/pause-button.png	758	%%DATADIR%%/resources/images/pause-button.png
719	%%DATADIR%%/resources/images/pause.png	759	%%DATADIR%%/resources/images/pause.png
720	%%DATADIR%%/resources/images/pause_active.png	760	%%DATADIR%%/resources/images/pause_active.png
Lines 749-760 Link Here
749	%%DATADIR%%/resources/images/search_icon_google.png	789	%%DATADIR%%/resources/images/search_icon_google.png
750	%%DATADIR%%/resources/images/search_icon_mefeedia.png	790	%%DATADIR%%/resources/images/search_icon_mefeedia.png
751	%%DATADIR%%/resources/images/search_icon_metavid.png	791	%%DATADIR%%/resources/images/search_icon_metavid.png
		792	%%DATADIR%%/resources/images/search_icon_mininova.png
752	%%DATADIR%%/resources/images/search_icon_revver.png	793	%%DATADIR%%/resources/images/search_icon_revver.png
753	%%DATADIR%%/resources/images/search_icon_veoh.png	794	%%DATADIR%%/resources/images/search_icon_veoh.png
754	%%DATADIR%%/resources/images/search_icon_yahoosearch.png	795	%%DATADIR%%/resources/images/search_icon_yahoosearch.png
755	%%DATADIR%%/resources/images/search_icon_yahoovideo.png	796	%%DATADIR%%/resources/images/search_icon_yahoovideo.png
756	%%DATADIR%%/resources/images/search_icon_youtube.png	797	%%DATADIR%%/resources/images/search_icon_youtube.png
757	%%DATADIR%%/resources/images/search_icon_youtubeuser.png	798	%%DATADIR%%/resources/images/search_icon_youtubeuser.png
		799	%%DATADIR%%/resources/images/segmented-off-center.png
		800	%%DATADIR%%/resources/images/segmented-off-far-left.png
		801	%%DATADIR%%/resources/images/segmented-off-far-right.png
		802	%%DATADIR%%/resources/images/segmented-off-middle-left.png
		803	%%DATADIR%%/resources/images/segmented-off-middle-right.png
		804	%%DATADIR%%/resources/images/segmented-on-center.png
		805	%%DATADIR%%/resources/images/segmented-on-far-left.png
		806	%%DATADIR%%/resources/images/segmented-on-far-right.png
		807	%%DATADIR%%/resources/images/segmented-on-middle-left.png
		808	%%DATADIR%%/resources/images/segmented-on-middle-right.png
758	%%DATADIR%%/resources/images/separator.png	809	%%DATADIR%%/resources/images/separator.png
759	%%DATADIR%%/resources/images/share-delicious.png	810	%%DATADIR%%/resources/images/share-delicious.png
760	%%DATADIR%%/resources/images/share-digg.png	811	%%DATADIR%%/resources/images/share-digg.png
Lines 774-779 Link Here
774	%%DATADIR%%/resources/images/stop.png	825	%%DATADIR%%/resources/images/stop.png
775	%%DATADIR%%/resources/images/stop_active.png	826	%%DATADIR%%/resources/images/stop_active.png
776	%%DATADIR%%/resources/images/thumb-default-audio.png	827	%%DATADIR%%/resources/images/thumb-default-audio.png
		828	%%DATADIR%%/resources/images/thumb-default-folder.png
777	%%DATADIR%%/resources/images/thumb-default-video.png	829	%%DATADIR%%/resources/images/thumb-default-video.png
778	%%DATADIR%%/resources/images/thumb-overlay.png	830	%%DATADIR%%/resources/images/thumb-overlay.png
779	%%DATADIR%%/resources/images/video-download-cancel.png	831	%%DATADIR%%/resources/images/video-download-cancel.png
Lines 792-803 Link Here
792	%%DATADIR%%/resources/searchengines/everyzing.xml	844	%%DATADIR%%/resources/searchengines/everyzing.xml
793	%%DATADIR%%/resources/searchengines/google.xml	845	%%DATADIR%%/resources/searchengines/google.xml
794	%%DATADIR%%/resources/searchengines/metavid.xml	846	%%DATADIR%%/resources/searchengines/metavid.xml
		847	%%DATADIR%%/resources/searchengines/mininova.xml
795	%%DATADIR%%/resources/searchengines/revver.xml	848	%%DATADIR%%/resources/searchengines/revver.xml
796	%%DATADIR%%/resources/searchengines/veoh.xml.disabled	849	%%DATADIR%%/resources/searchengines/veoh.xml.disabled
797	%%DATADIR%%/resources/searchengines/yahoosearch.xml	850	%%DATADIR%%/resources/searchengines/yahoosearch.xml
798	%%DATADIR%%/resources/searchengines/yahoovideo.xml
799	%%DATADIR%%/resources/searchengines/youtube.xml	851	%%DATADIR%%/resources/searchengines/youtube.xml
800	%%DATADIR%%/resources/searchengines/youtubeuser.xml	852	%%DATADIR%%/resources/searchengines/youtubeuser.xml
		853	%%DATADIR%%/resources/testdata/dean.jpg
801	%%DATADIR%%/resources/testdata/democracy-now-unicode-bug.xml	854	%%DATADIR%%/resources/testdata/democracy-now-unicode-bug.xml
802	%%DATADIR%%/resources/testdata/hide-result	855	%%DATADIR%%/resources/testdata/hide-result
803	%%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/messages.pot	856	%%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES/messages.pot
Lines 813-818 Link Here
813	%%DATADIR%%/resources/testdata/olddatabase.bug.3163	866	%%DATADIR%%/resources/testdata/olddatabase.bug.3163
814	%%DATADIR%%/resources/testdata/olddatabase.bug.4039	867	%%DATADIR%%/resources/testdata/olddatabase.bug.4039
815	%%DATADIR%%/resources/testdata/olddatabase.bug.4039.part2	868	%%DATADIR%%/resources/testdata/olddatabase.bug.4039.part2
		869	%%DATADIR%%/resources/testdata/olddatabase.predbupgrade88
		870	%%DATADIR%%/resources/testdata/olddatabase.v71
		871	%%DATADIR%%/resources/testdata/olddatabase.v78
		872	%%DATADIR%%/resources/testdata/olddatabase.v79
816	%%DATADIR%%/resources/testdata/replace-result	873	%%DATADIR%%/resources/testdata/replace-result
817	%%DATADIR%%/resources/testdata/stripperdata/README	874	%%DATADIR%%/resources/testdata/stripperdata/README
818	%%DATADIR%%/resources/testdata/stripperdata/test1.expected	875	%%DATADIR%%/resources/testdata/stripperdata/test1.expected
Lines 836-844 Link Here
836	%%DATADIR%%/resources/testdata/stripperdata/testburma.expected	893	%%DATADIR%%/resources/testdata/stripperdata/testburma.expected
837	%%DATADIR%%/resources/testdata/stripperdata/testburma.in	894	%%DATADIR%%/resources/testdata/stripperdata/testburma.in
838	%%DATADIR%%/resources/testdata/translation-result	895	%%DATADIR%%/resources/testdata/translation-result
839	share/pixmaps/miro-128x128.png
840	share/pixmaps/miro-24x24.png
841	share/pixmaps/miro-72x72.png
842	share/pixmaps/miro.xpm	896	share/pixmaps/miro.xpm
843	@dirrm %%DATADIR%%/resources/testdata/stripperdata	897	@dirrm %%DATADIR%%/resources/testdata/stripperdata
844	@dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES	898	@dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES

Return to bug 137534

Lines 1-20 Link Here

(-)multimedia/miro/files/patch-platform__gtk-x11__plat__options.py (-18 / +15 lines)
1	--- platform/gtk-x11/plat/options.py.orig 2009-02-12 06:37:07.000000000 +0900	1	--- platform/gtk-x11/plat/options.py.orig 2009-07-25 12:41:11.000000000 +0900
2	+++ platform/gtk-x11/plat/options.py 2009-02-12 18:24:15.000000000 +0900	2	+++ platform/gtk-x11/plat/options.py 2009-07-30 15:45:34.000000000 +0900
3	@@ -39,7 +39,7 @@	3	@@ -46,12 +46,12 @@
4	from miro.prefs import Pref	4	self.help = help
5		5
6	USE_RENDERER = Pref(key="useRenderer",	6	USE_RENDERER = GTKPref(key="useRenderer",
7	- default=u"gstreamer",	7	- default=u"gstreamer",
8	+ default=u"xine",	8	+ default=u"xine",
9	platformSpecific=False,	9	alias="renderer",
10	alias="renderer",	10	help="Which renderer to use. (gstreamer, xine)" )
11	help="Which renderer to use. (gstreamer, xine)" )	11
12	@@ -51,7 +51,7 @@	12	USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
13	help="Which visualization plugin to use for audio files. (goom or none)" )	13	- default=True,
		14	+ default=False,
		15	alias="xine-xvhack",
		16	help="Whether or not to use the Xine xv hack. (true, false)" )
14		17
15	USE_XINE_XV_HACK = Pref(key="UseXineXVHack",
16	- default=True,
17	+ default=False,
18	platformSpecific=False,
19	alias="xine-xvhack",
20	help="Whether or not to use the Xine xv hack. (true, false)" )

Lines 1-19 Link Here

(-)multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py (-14 / +12 lines)
1	--- platform/gtk-x11/plat/resources.py.orig 2009-02-12 06:37:07.000000000 +0900	1	--- platform/gtk-x11/plat/resources.py.orig 2009-07-25 12:41:11.000000000 +0900
2	+++ platform/gtk-x11/plat/resources.py 2009-02-13 01:56:28.000000000 +0900	2	+++ platform/gtk-x11/plat/resources.py 2009-07-30 15:48:04.000000000 +0900
3	@@ -29,10 +29,10 @@	3	@@ -44,8 +44,8 @@
4	import os	4	import platform
5	import urllib
6		5
7	-resource_root = os.environ.get('MIRO_RESOURCE_ROOT', '/usr/share/miro/resources/')	6	resource_root = os.path.abspath(os.environ.get('MIRO_RESOURCE_ROOT',
8	+resource_root = os.environ.get('MIRO_RESOURCE_ROOT', '%%PREFIX%%/share/miro/resources/')	7	- '/usr/share/miro/resources/'))
9	resource_root = os.path.abspath(resource_root)	8	-share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '/usr/share/'))
		9	+ '%%PREFIX%%/share/miro/resources/'))
		10	+share_root = os.path.abspath(os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/'))
10		11
11	-share_root = os.environ.get('MIRO_SHARE_ROOT', '/usr/share/')	12	def root():
12	+share_root = os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/')	13	return resource_root
13	share_root = os.path.abspath(share_root)	14	@@ -71,7 +71,7 @@
14
15	# Note: some of these functions are probably not absolutely correct in
16	@@ -63,7 +63,7 @@
17	return u"file://%s" % urllib.quote(absolute_path)	15	return u"file://%s" % urllib.quote(absolute_path)
18		16
19	def theme_path(theme, relative_path):	17	def theme_path(theme, relative_path):

Lines 1-6 Link Here

(-)multimedia/miro/files/patch-platform_gtk-x11_setup.py (-19 / +25 lines)
1	--- platform/gtk-x11/setup.py.orig 2009-06-26 13:15:47.000000000 +0900	1	--- platform/gtk-x11/setup.py.orig 2009-07-25 12:41:12.000000000 +0900
2	+++ platform/gtk-x11/setup.py 2009-07-05 22:35:44.000000000 +0900	2	+++ platform/gtk-x11/setup.py 2009-07-30 15:52:08.000000000 +0900
3	@@ -111,14 +111,15 @@	3	@@ -112,14 +112,15 @@
4	# XPCOM_LIB = "firefox-xpcom"	4	# XPCOM_LIB = "firefox-xpcom"
5	# GTKMOZEMBED_LIB = "firefox-gtkmozembed"	5	# GTKMOZEMBED_LIB = "firefox-gtkmozembed"
6	# XULRUNNER_19 = False	6	# XULRUNNER_19 = False
Lines 20-26 Link Here
20		20
21		21
22	###############################################################################	22	###############################################################################
23	@@ -284,6 +285,9 @@	23	@@ -285,6 +286,9 @@
24	options_dict['library_dirs'].append(rest)	24	options_dict['library_dirs'].append(rest)
25	elif prefix == '-l':	25	elif prefix == '-l':
26	options_dict['libraries'].append(rest)	26	options_dict['libraries'].append(rest)
Lines 30-36 Link Here
30	else:	30	else:
31	options_dict['extra_compile_args'].append(comp)	31	options_dict['extra_compile_args'].append(comp)
32		32
33	@@ -314,7 +318,7 @@	33	@@ -315,7 +319,7 @@
34	print "Using %s" % BOOST_LIB	34	print "Using %s" % BOOST_LIB
35		35
36	def compile_xine_extractor():	36	def compile_xine_extractor():
Lines 39-45 Link Here
39	(os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))	39	(os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
40	if rv != 0:	40	if rv != 0:
41	raise RuntimeError("xine_extractor compilation failed. Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")	41	raise RuntimeError("xine_extractor compilation failed. Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
42	@@ -352,7 +356,7 @@	42	@@ -353,7 +357,7 @@
43	exit;	43	exit;
44	fi	44	fi
45		45
Lines 48-54 Link Here
48	else	48	else
49	%(runtimelib)smiro.real "$@"	49	%(runtimelib)smiro.real "$@"
50	fi	50	fi
51	@@ -365,6 +369,7 @@	51	@@ -366,6 +370,7 @@
52	Extension("miro.fasttypes",	52	Extension("miro.fasttypes",
53	sources = [os.path.join(portable_dir, 'fasttypes.cpp')],	53	sources = [os.path.join(portable_dir, 'fasttypes.cpp')],
54	libraries = [BOOST_LIB],	54	libraries = [BOOST_LIB],
Lines 56-62 Link Here
56	)	56	)
57		57
58		58
59	@@ -401,12 +406,12 @@	59	@@ -402,12 +407,12 @@
60	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",	60	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
61	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",	61	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
62	"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",	62	"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",
Lines 71-77 Link Here
71		71
72	# get mt or non-mt versions of the boost libraries	72	# get mt or non-mt versions of the boost libraries
73	libraries += [mt_or_not("boost_python"),	73	libraries += [mt_or_not("boost_python"),
74	@@ -431,6 +436,7 @@	74	@@ -432,6 +437,7 @@
75	return Extension("miro.libtorrent",	75	return Extension("miro.libtorrent",
76	include_dirs=include_dirs,	76	include_dirs=include_dirs,
77	libraries=libraries,	77	libraries=libraries,
Lines 79-85 Link Here
79	extra_compile_args=extra_compile_args,	79	extra_compile_args=extra_compile_args,
80	sources=sources)	80	sources=sources)
81		81
82	@@ -557,7 +563,7 @@	82	@@ -558,7 +564,7 @@
83	xlib_ext = \	83	xlib_ext = \
84	Extension("miro.plat.xlibhelper",	84	Extension("miro.plat.xlibhelper",
85	[ os.path.join(platform_package_dir,'xlibhelper.pyx') ],	85	[ os.path.join(platform_package_dir,'xlibhelper.pyx') ],
Lines 88-94 Link Here
88	libraries = ['X11'],	88	libraries = ['X11'],
89	)	89	)
90		90
91	@@ -643,31 +649,31 @@	91	@@ -644,36 +650,36 @@
92	# filter out app.config.template (which is handled specially)	92	# filter out app.config.template (which is handled specially)
93	files = [f for f in listfiles(resource_dir) \	93	files = [f for f in listfiles(resource_dir) \
94	if os.path.basename(f) != 'app.config.template']	94	if os.path.basename(f) != 'app.config.template']
Lines 103-114 Link Here
103	+ dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir)	103	+ dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir)
104	data_files.append((dest_dir, listfiles(source_dir)))	104	data_files.append((dest_dir, listfiles(source_dir)))
105		105
		106	for mem in ["24", "48", "72", "128"]:
		107	d = os.path.join("icons", "hicolor", "%sx%s" % (mem, mem), "apps")
		108	source = os.path.join(platform_dir, d, "miro.png")
		109	- dest = os.path.join("/usr/share/", d)
		110	+ dest = os.path.join("%%PREFIX%%/share/", d)
		111	data_files.append((dest, [source]))
106		112
107	# add the desktop file, icons, mime data, and man page.	113	# add ADOPTERS file, the desktop file, mime data, and man page
108	data_files += [	114	data_files += [
109	- ('/usr/share/pixmaps',	115	- ('/usr/share/miro/resources',
110	+ ('%%PREFIX%%/share/pixmaps',	116	+ ('%%PREFIX%%/share/miro/resources',
111	glob(os.path.join(platform_dir, 'miro-*.png'))),	117	[os.path.join(root_dir, 'ADOPTERS')]),
112	- ('/usr/share/pixmaps',	118	- ('/usr/share/pixmaps',
113	+ ('%%PREFIX%%/share/pixmaps',	119	+ ('%%PREFIX%%/share/pixmaps',
114	glob(os.path.join(platform_dir, 'miro.xpm'))),	120	glob(os.path.join(platform_dir, 'miro.xpm'))),
Lines 129-135 Link Here
129	[os.path.join(platform_dir, 'xine/xine_extractor')]),	135	[os.path.join(platform_dir, 'xine/xine_extractor')]),
130	]	136	]
131		137
132	@@ -691,7 +697,7 @@	138	@@ -697,7 +703,7 @@
133		139
134	def install_app_config(self):	140	def install_app_config(self):
135	source = os.path.join(resource_dir, 'app.config.template')	141	source = os.path.join(resource_dir, 'app.config.template')
Lines 138-144 Link Here
138		144
139	config_file = util.read_simple_config_file(source)	145	config_file = util.read_simple_config_file(source)
140	print "Trying to figure out the svn revision...."	146	print "Trying to figure out the svn revision...."
141	@@ -731,7 +737,7 @@	147	@@ -737,7 +743,7 @@
142		148
143	for source in glob (os.path.join (locale_dir, "*.mo")):	149	for source in glob (os.path.join (locale_dir, "*.mo")):
144	lang = os.path.basename(source)[:-3]	150	lang = os.path.basename(source)[:-3]
Lines 147-153 Link Here
147	if self.root:	153	if self.root:
148	dest = change_root(self.root, dest)	154	dest = change_root(self.root, dest)
149	self.mkpath(os.path.dirname(dest))	155	self.mkpath(os.path.dirname(dest))
150	@@ -760,7 +766,7 @@	156	@@ -766,7 +772,7 @@
151		157
152	#### install_theme installs a specified theme .zip	158	#### install_theme installs a specified theme .zip
153	class install_theme(Command):	159	class install_theme(Command):
Lines 156-162 Link Here
156	user_options = [("theme=", None, 'ZIP file containing the theme')]	162	user_options = [("theme=", None, 'ZIP file containing the theme')]
157		163
158	def initialize_options(self):	164	def initialize_options(self):
159	@@ -788,7 +794,7 @@	165	@@ -794,7 +800,7 @@
160	raise DistutilsOptionError, "invalid theme file"	166	raise DistutilsOptionError, "invalid theme file"
161	self.zipfile = zf	167	self.zipfile = zf
162	self.theme_name = themeName	168	self.theme_name = themeName

Lines 1-15 Link Here

(-)multimedia/miro/files/patch-portable__util.py (-15 lines)
1	--- portable/util.py.orig 2009-06-26 13:15:52.000000000 +0900
2	+++ portable/util.py 2009-07-06 02:26:25.000000000 +0900
3	@@ -752,7 +752,11 @@
4	self.__add(data)
5
6	def handle_charref(self, ref):
7	- self.__add(unichr(int(ref)))
8	+ if ref.startswith('x'):
9	+ charnum = int(ref[1:], 16)
10	+ else:
11	+ charnum = int(ref)
12	+ self.__add(unichr(charnum))
13
14	def start_p(self, attributes):
15	self.__add("\n")