rpms/Miro/F-9 Miro.spec,1.30,1.31 Miro-xulrunner.patch,1.3,1.4

Alex Lancaster (alexlan) fedora-extras-commits at redhat.com
Mon Apr 28 12:52:19 UTC 2008 

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11985

Modified Files:
	Miro.spec Miro-xulrunner.patch 
Log Message:
- Update and re-enable xulrunner patch from Martin Stransky (#393521)



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Miro.spec	28 Apr 2008 07:59:51 -0000	1.30
+++ Miro.spec	28 Apr 2008 12:51:44 -0000	1.31
@@ -5,14 +5,14 @@
 
 Name:           Miro
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
 Source0:	http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
 Patch0:         %{name}-1.1-utf8.patch
-#Patch1:		%{name}-xulrunner.patch
+Patch1:		%{name}-xulrunner.patch
 Patch2:		%{name}-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -33,7 +33,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-2
+- Update and re-enable xulrunner patch from Martin Stransky (#393521)
+
 * Mon Apr 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.3-1
 - Update to official 1.2.3 upstream release (includes the previous
   xulrunner fixes in test release).

Miro-xulrunner.patch:

Index: Miro-xulrunner.patch
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro-xulrunner.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Miro-xulrunner.patch	25 Mar 2008 08:45:54 -0000	1.3
+++ Miro-xulrunner.patch	28 Apr 2008 12:51:44 -0000	1.4
@@ -1,64 +1,64 @@
-diff -up Miro-1.0/platform/gtk-x11/setup.py.xl Miro-1.0/platform/gtk-x11/setup.py
---- Miro-1.0/platform/gtk-x11/setup.py.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/setup.py	2008-01-07 13:30:47.000000000 +0100
-@@ -168,7 +168,7 @@ def getCommandOutput(cmd, warnOnStderr =
-                 (cmd, p.returncode))
-     return stdout
- 
--def parsePkgConfig(command, components, options_dict = None):
-+def parsePkgConfig(command, components, options_dict = None, pkg_config_options = None):
-     """Helper function to parse compiler/linker arguments from 
-     pkg-config/mozilla-config and update include_dirs, library_dirs, etc.
- 
-@@ -190,7 +190,11 @@ def parsePkgConfig(command, components, 
+diff -up Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py
+--- Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old	2008-04-22 17:17:01.000000000 +0200
++++ Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py	2008-04-28 12:51:46.000000000 +0200
+@@ -106,8 +106,8 @@ def setupMozillaEnvironment():
+         set_profile_path = gtkmozembed.gtk_moz_embed_set_profile_path
+         
+     set_profile_path(config.get(prefs.SUPPORT_DIRECTORY), 'mozilla')
+-    if hasattr(gtkmozembed, 'set_comp_path'):
+-        set_comp_path = gtkmozembed.set_comp_path
++    if hasattr(gtkmozembed, 'set_path'):
++        set_comp_path = gtkmozembed.set_path
+     elif hasattr(gtkmozembed, 'set_path'):
+         set_comp_path = gtkmozembed.set_path
+     else:
+diff -up Miro-1.2.3/platform/gtk-x11/setup.py.old Miro-1.2.3/platform/gtk-x11/setup.py
+--- Miro-1.2.3/platform/gtk-x11/setup.py.old	2008-04-22 17:17:01.000000000 +0200
++++ Miro-1.2.3/platform/gtk-x11/setup.py	2008-04-28 13:14:27.000000000 +0200
+@@ -209,6 +209,7 @@ def parsePkgConfig(command, components, 
+         options_dict = {
+             'include_dirs' : [],
+             'library_dirs' : [],
++            'runtime_dirs' : [],
              'libraries' : [],
              'extra_compile_args' : []
          }
--    commandLine = "%s --cflags --libs %s" % (command, components)
-+    commandLine = []
-+    if pkg_config_options is not None:
-+	commandLine = "%s --cflags --libs %s %s" % (command, components, pkg_config_options)
-+    else:
-+	commandLine = "%s --cflags --libs %s" % (command, components)
-     output = getCommandOutput(commandLine).strip()
-     for comp in output.split():
-         prefix, rest = comp[:2], comp[2:]
-@@ -216,9 +220,9 @@ try:
-     packages = getCommandOutput("pkg-config --list-all")
- except RuntimeError, error:
-     sys.exit("Package config error:\n%s" % (error,))
--if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
--    xpcom = 'xulrunner-xpcom'
--    gtkmozembed = 'xulrunner-gtkmozembed'
-+if re.search("^libxul", packages, re.MULTILINE):
-+    xpcom = 'libxul'
-+    gtkmozembed = 'mozilla-gtkmozembed'
- elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
-     xpcom = 'mozilla-xpcom'
-     gtkmozembed = 'mozilla-gtkmozembed'
-@@ -250,21 +254,10 @@ def allInDir(directory, subdirs):
-         if not os.path.exists(os.path.join(directory, subdir)):
-             return False
-     return True
--xpcom_includes = parsePkgConfig("pkg-config", xpcom)
--mozIncludeBase = None
--for dir in xpcom_includes['include_dirs']:
--    if allInDir(dir, ['dom', 'gfx', 'widget']):
--        # we can be pretty confident that dir is the mozilla/firefox/xulrunner
--        # base include directory
--        mozIncludeBase = dir
--        break
--if mozIncludeBase is None:
--    raise ValueError("Can't find mozilla include base directory")
--for subdir in ['dom', 'gfx', 'widget', 'commandhandler', 'uriloader',
--            'webbrwsr', 'necko', 'windowwatcher']:
--    path = os.path.join(mozIncludeBase, subdir)
--    mozilla_browser_options['include_dirs'].append(path)
--
-+for subdir in [ 'stable', 'dom', 'gfx', 'commandhandler', 'uriloader',
-+            'webbrwsr', 'necko', 'windowwatcher', 'widget', 'unstable' ]:
-+    xpcom_includes = parsePkgConfig("pkg-config", xpcom, None, "--define-variable=includetype=%s" % subdir)
-+    mozilla_browser_options['include_dirs'].append(xpcom_includes['include_dirs'][0])
+@@ -224,6 +225,11 @@ def parsePkgConfig(command, components, 
+             options_dict['libraries'].append(rest)
+         else:
+             options_dict['extra_compile_args'].append(comp)
++            
++    commandLine = "%s --variable=libdir %s" % (command, components)
++    output = getCommandOutput(commandLine).strip()
++    options_dict['runtime_dirs'].append(output)
++    
+     return options_dict
+ 
+ #### The fasttypes extension ####
+@@ -279,6 +285,8 @@ mozilla_browser_options = parsePkgConfig
+         "gtk+-2.0 glib-2.0 pygtk-2.0 --define-variable=includetype=unstable %s %s" % (gtkmozembed, xpcom))
+ mozilla_lib_path = parsePkgConfig('pkg-config', 
+         '%s' % gtkmozembed)['library_dirs']
++runtime_lib_path = parsePkgConfig('pkg-config', 
++        '%s' % gtkmozembed)['runtime_dirs']
+ # Find the base mozilla directory, and add the subdirs we need.
+ def allInDir(directory, subdirs):
+     for subdir in subdirs:
+@@ -334,7 +342,7 @@ mozilla_browser_ext = Extension("miro.pl
+           os.path.join(platform_html_frontend_dir,'DragAndDrop.cc'),
+           os.path.join(platform_html_frontend_dir,'XPCOMUtil.cc'),
+         ],
+-        runtime_library_dirs=mozilla_lib_path,
++        runtime_library_dirs=runtime_lib_path,
+         **mozilla_browser_options)
+ #### Xlib Extension ####
+ xlib_ext = \
+@@ -434,7 +442,7 @@ class install_data (distutils.command.in
+                              BUILD_MACHINE="%s@%s" % (getlogin(),
+                                                       os.uname()[1]),
+                              BUILD_TIME=str(time.time()),
+-                             MOZILLA_LIB_PATH=mozilla_lib_path[0])
++                             MOZILLA_LIB_PATH=runtime_lib_path[0])
+         self.outfiles.append(dest)
  
- nsI = True
- for dir in mozilla_browser_options['include_dirs']:
+         locale_dir = os.path.join (resource_dir, "locale")

More information about the fedora-extras-commits mailing list