packages: xulrunner/xulrunner.spec, xulrunner/idl-parser.patch (NEW)=?UTF-8?Q?=20?=- fix ...

[wiget]

Author: wiget                        Date: Thu Feb  9 15:35:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix --cachedir in idl-parser
- rel. 3

---- Files affected:
packages/xulrunner:
   xulrunner.spec (1.215 -> 1.216) , idl-parser.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.215 packages/xulrunner/xulrunner.spec:1.216
--- packages/xulrunner/xulrunner.spec:1.215	Wed Feb  8 21:55:26 2012
+++ packages/xulrunner/xulrunner.spec	Thu Feb  9 16:35:11 2012
@@ -26,7 +26,7 @@
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	10.0
-Release:	2
+Release:	3
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
@@ -44,6 +44,7 @@
 # http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree
 Patch9:		%{name}-gtkmozembed.patch
 Patch10:	%{name}-linux3.patch
+Patch11:	idl-parser.patch
 URL:		https://developer.mozilla.org/en/XULRunner
 %{!?with_qt:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -189,6 +190,7 @@
 %patch8 -p1
 %patch9 -p2
 %patch10 -p1
+%patch11 -p1
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
@@ -419,6 +421,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.216  2012/02/09 15:35:11  wiget
+- fix --cachedir in idl-parser
+- rel. 3
+
 Revision 1.215  2012/02/08 20:55:26  adamg
 - release 2 (rebuild against libpng-1.5)
 

================================================================
Index: packages/xulrunner/idl-parser.patch
diff -u /dev/null packages/xulrunner/idl-parser.patch:1.1
--- /dev/null	Thu Feb  9 16:35:16 2012
+++ packages/xulrunner/idl-parser.patch	Thu Feb  9 16:35:11 2012
@@ -0,0 +1,56 @@
+--- xulrunner-10.0/mozilla/xpcom/idl-parser/header.py.wiget	2012-02-09 16:26:27.074098583 +0100
++++ xulrunner-10.0/mozilla/xpcom/idl-parser/header.py	2012-02-09 16:28:01.250436455 +0100
+@@ -477,7 +477,7 @@ if __name__ == '__main__':
+     o = OptionParser()
+     o.add_option('-I', action='append', dest='incdirs', default=['.'],
+                  help="Directory to search for imported files")
+-    o.add_option('--cachedir', dest='cachedir', default=None,
++    o.add_option('--cachedir', dest='cachedir', default='',
+                  help="Directory in which to cache lex/parse tables.")
+     o.add_option('-o', dest='outfile', default=None,
+                  help="Output file (default is stdout)")
+@@ -488,7 +488,7 @@ if __name__ == '__main__':
+     options, args = o.parse_args()
+     file = args[0] if args else None
+ 
+-    if options.cachedir is not None:
++    if options.cachedir != '':
+         if not os.path.isdir(options.cachedir):
+             os.mkdir(options.cachedir)
+         sys.path.append(options.cachedir)
+@@ -498,7 +498,7 @@ if __name__ == '__main__':
+ 
+     # The only thing special about a regen is that there are no input files.
+     if options.regen:
+-        if options.cachedir is None:
++        if options.cachedir == '':
+             print >>sys.stderr, "--regen useless without --cachedir"
+         sys.exit(0)
+ 
+--- xulrunner-10.0/mozilla/xpcom/idl-parser/typelib.py.wiget	2012-02-09 16:31:01.826758036 +0100
++++ xulrunner-10.0/mozilla/xpcom/idl-parser/typelib.py	2012-02-09 16:32:26.473475659 +0100
+@@ -276,7 +276,7 @@ if __name__ == '__main__':
+     o = OptionParser()
+     o.add_option('-I', action='append', dest='incdirs', default=['.'],
+                  help="Directory to search for imported files")
+-    o.add_option('--cachedir', dest='cachedir', default=None,
++    o.add_option('--cachedir', dest='cachedir', default='',
+                  help="Directory in which to cache lex/parse tables.")
+     o.add_option('-o', dest='outfile', default=None,
+                  help="Output file")
+@@ -287,13 +287,13 @@ if __name__ == '__main__':
+     options, args = o.parse_args()
+     file = args[0] if args else None
+ 
+-    if options.cachedir is not None:
++    if options.cachedir != '':
+         if not os.path.isdir(options.cachedir):
+             os.mkdir(options.cachedir)
+         sys.path.append(options.cachedir)
+ 
+     if options.regen:
+-        if options.cachedir is None:
++        if options.cachedir == '':
+             print >>sys.stderr, "--regen requires --cachedir"
+             sys.exit(1)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.215&r2=1.216&f=u