1 |
volkmar 09/10/30 08:29:52 |
2 |
|
3 |
Added: miro-2.5.3-remove-unittest-option.patch |
4 |
miro-2.5.3-dont-install-test-files.patch |
5 |
miro-2.5.3-disable-xine-hack.patch |
6 |
miro-2.5.3-fix-locale.patch |
7 |
miro-2.5.3-fix-debug.patch |
8 |
Log: |
9 |
Initial commit. |
10 |
Fix bug 131527. |
11 |
Thanks to wayne work on the bug. |
12 |
(Portage version: 14478-svn/cvs/Linux ppc) |
13 |
|
14 |
Revision Changes Path |
15 |
1.1 media-video/miro/files/miro-2.5.3-remove-unittest-option.patch |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-remove-unittest-option.patch?rev=1.1&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-remove-unittest-option.patch?rev=1.1&content-type=text/plain |
19 |
|
20 |
Index: miro-2.5.3-remove-unittest-option.patch |
21 |
=================================================================== |
22 |
--- miro.real.old 2009-10-29 12:33:29.000000000 +0100 |
23 |
+++ miro.real 2009-10-29 12:33:43.000000000 +0100 |
24 |
@@ -81,9 +81,6 @@ |
25 |
group.add_option('--debug', |
26 |
action="store_true", |
27 |
help='Starts Miro in a gdb session for better debugging.') |
28 |
-group.add_option('--unittest', |
29 |
- dest='unittest', action='store_true', |
30 |
- help='Run unittests instead of launching the program.') |
31 |
parser.set_defaults(unittest=False) |
32 |
group.add_option('--profile', |
33 |
metavar='<FILE>', |
34 |
|
35 |
|
36 |
|
37 |
1.1 media-video/miro/files/miro-2.5.3-dont-install-test-files.patch |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-dont-install-test-files.patch?rev=1.1&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-dont-install-test-files.patch?rev=1.1&content-type=text/plain |
41 |
|
42 |
Index: miro-2.5.3-dont-install-test-files.patch |
43 |
=================================================================== |
44 |
--- setup.py.old 2009-10-29 12:36:58.000000000 +0100 |
45 |
+++ setup.py 2009-10-29 12:37:56.000000000 +0100 |
46 |
@@ -175,7 +175,6 @@ |
47 |
portable_xpcom_dir = os.path.join(portable_frontend_dir, 'widgets', 'gtk', |
48 |
'xpcom') |
49 |
dl_daemon_dir = os.path.join(portable_dir, 'dl_daemon') |
50 |
-test_dir = os.path.join(portable_dir, 'test') |
51 |
resource_dir = os.path.join(root_dir, 'resources') |
52 |
platform_dir = os.path.join(root_dir, 'platform', 'gtk-x11') |
53 |
platform_package_dir = os.path.join(platform_dir, 'plat') |
54 |
@@ -645,9 +644,7 @@ |
55 |
if os.path.basename(f) != 'app.config.template'] |
56 |
data_files.append(('/usr/share/miro/resources/', files)) |
57 |
# handle the sub directories. |
58 |
-for dir in ('searchengines', 'images', 'testdata', |
59 |
- os.path.join('testdata', 'stripperdata'), |
60 |
- os.path.join('testdata', 'locale', 'fr', 'LC_MESSAGES')): |
61 |
+for dir in ('searchengines', 'images'): |
62 |
source_dir = os.path.join(resource_dir, dir) |
63 |
dest_dir = os.path.join('/usr/share/miro/resources/', dir) |
64 |
data_files.append((dest_dir, listfiles(source_dir))) |
65 |
@@ -867,7 +864,6 @@ |
66 |
packages = [ |
67 |
'miro', |
68 |
'miro.dl_daemon', |
69 |
- 'miro.test', |
70 |
'miro.dl_daemon.private', |
71 |
'miro.frontends', |
72 |
'miro.frontends.cli', |
73 |
@@ -881,7 +877,6 @@ |
74 |
], |
75 |
package_dir = { |
76 |
'miro': portable_dir, |
77 |
- 'miro.test': test_dir, |
78 |
'miro.plat': platform_package_dir, |
79 |
}, |
80 |
cmdclass = { |
81 |
|
82 |
|
83 |
|
84 |
1.1 media-video/miro/files/miro-2.5.3-disable-xine-hack.patch |
85 |
|
86 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-disable-xine-hack.patch?rev=1.1&view=markup |
87 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-disable-xine-hack.patch?rev=1.1&content-type=text/plain |
88 |
|
89 |
Index: miro-2.5.3-disable-xine-hack.patch |
90 |
=================================================================== |
91 |
# This patch comes from Debian |
92 |
# This seems to cause segfaults with newer libxine (?) releases, so disable it. |
93 |
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512719 |
94 |
# http://bugzilla.pculture.org/show_bug.cgi?id=11263 |
95 |
|
96 |
--- platform/gtk-x11/plat/options.py.orig 2009-07-24 15:11:34.000000000 +0200 |
97 |
+++ platform/gtk-x11/plat/options.py 2009-07-24 15:11:42.000000000 +0200 |
98 |
@@ -51,7 +51,7 @@ |
99 |
help="Which renderer to use. (gstreamer, xine)" ) |
100 |
|
101 |
USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack", |
102 |
- default=True, |
103 |
+ default=False, |
104 |
alias="xine-xvhack", |
105 |
help="Whether or not to use the Xine xv hack. (true, false)" ) |
106 |
|
107 |
|
108 |
|
109 |
|
110 |
1.1 media-video/miro/files/miro-2.5.3-fix-locale.patch |
111 |
|
112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-fix-locale.patch?rev=1.1&view=markup |
113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-fix-locale.patch?rev=1.1&content-type=text/plain |
114 |
|
115 |
Index: miro-2.5.3-fix-locale.patch |
116 |
=================================================================== |
117 |
--- setup.py.old 2009-10-28 11:06:02.000000000 +0100 |
118 |
+++ setup.py 2009-10-29 09:15:35.000000000 +0100 |
119 |
@@ -736,6 +736,8 @@ |
120 |
|
121 |
for source in glob (os.path.join (locale_dir, "*.mo")): |
122 |
lang = os.path.basename(source)[:-3] |
123 |
+ if 'LINGUAS' in os.environ and lang not in os.environ['LINGUAS']: |
124 |
+ continue |
125 |
dest = '/usr/share/locale/%s/LC_MESSAGES/miro.mo' % lang |
126 |
if self.root: |
127 |
dest = change_root(self.root, dest) |
128 |
|
129 |
|
130 |
|
131 |
1.1 media-video/miro/files/miro-2.5.3-fix-debug.patch |
132 |
|
133 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-fix-debug.patch?rev=1.1&view=markup |
134 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/miro/files/miro-2.5.3-fix-debug.patch?rev=1.1&content-type=text/plain |
135 |
|
136 |
Index: miro-2.5.3-fix-debug.patch |
137 |
=================================================================== |
138 |
This patch comes from Debian |
139 |
--- platform/gtk-x11/setup.py.orig 2009-02-28 17:29:13.000000000 +0100 |
140 |
+++ platform/gtk-x11/setup.py 2009-02-28 17:29:26.000000000 +0100 |
141 |
@@ -330,7 +330,7 @@ |
142 |
exit; |
143 |
fi |
144 |
|
145 |
- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@" |
146 |
+ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON /usr/bin/miro.real --sync "$@" |
147 |
else |
148 |
%(runtimelib)smiro.real "$@" |
149 |
fi |