rpms/Miro/devel sources, 1.7, 1.8 Miro.spec, 1.23, 1.24 Miro-xulrunner.patch, 1.2, 1.3 .cvsignore, 1.7, 1.8

Alex Lancaster (alexlan) fedora-extras-commits at redhat.com
Tue Mar 25 08:46:37 UTC 2008 

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18995

Modified Files:
	sources Miro.spec Miro-xulrunner.patch .cvsignore 
Log Message:
- Update to latest upstream (1.2)
- Remove much of xulrunner patch, keep modifications to setup.py to look
  for libxul rather than xulrunner-xpcom



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Feb 2008 10:17:32 -0000	1.7
+++ sources	25 Mar 2008 08:45:54 -0000	1.8
@@ -1 +1 @@
-747dc21841ba1ce21b6eb7cd41d57afb  Miro-1.1.2.tar.gz
+614d9d42bba3c5d25868ead6ba95d898  Miro-1.2.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Miro.spec	11 Mar 2008 12:44:29 -0000	1.23
+++ Miro.spec	25 Mar 2008 08:45:54 -0000	1.24
@@ -4,8 +4,8 @@
 %define gecko_ver 1.9
 
 Name:           Miro
-Version:        1.1.2
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -79,6 +79,11 @@
 
 
 %changelog
+* Mon Mar 24 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2-1
+- Update to latest upstream (1.2)
+- Remove much of xulrunner patch, keep modifications to setup.py to look
+  for libxul rather than xulrunner-xpcom
+
 * Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
 - Update GCC 4.3 patch by Christopher Aillon (#434480)
 

Miro-xulrunner.patch:

Index: Miro-xulrunner.patch
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro-xulrunner.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Miro-xulrunner.patch	9 Jan 2008 06:19:56 -0000	1.2
+++ Miro-xulrunner.patch	25 Mar 2008 08:45:54 -0000	1.3
@@ -62,158 +62,3 @@
  
  nsI = True
  for dir in mozilla_browser_options['include_dirs']:
-diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc
---- Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc	2008-01-07 13:28:24.000000000 +0100
-@@ -17,13 +17,12 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
- 
--#define MOZILLA_INTERNAL_API
- #include "XPCOMUtil.h"
- #include <nsCOMPtr.h>
- #include <nsIDOMEventTarget.h>
- #include <nsIDOMElement.h>
- #include <nsIDOMNode.h>
--#include <nsString.h>
-+#include <nsStringAPI.h>
- 
- //////////////////////////////////////////////////////////////////////////////
- // XPCOMUtil.cc
-diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc
---- Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc	2008-01-07 13:28:24.000000000 +0100
-@@ -17,7 +17,6 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
- 
--#define MOZILLA_INTERNAL_API
- #include "MozillaBrowserXPCOM.h"
- #include "XPCOMUtil.h"
- #include <gtkmozembed.h>
-@@ -37,7 +36,9 @@
- #include <nsIDOMWindow.h>
- #include <nsIURIContentListener.h>
- #include <nsIWebBrowser.h>
--#include <nsString.h>
-+#include <nsStringAPI.h>
-+#include <nsMemory.h>
-+#include <nsCRTGlue.h>
- #include <stdio.h>
- 
- //////////////////////////////////////////////////////////////////////////////
-@@ -303,7 +304,7 @@ char* getContextMenu(void* domEvent)
-     nsString value;
-     result = element->GetAttribute(contextMenuString, value);
-     if(NS_FAILED(result)) return NULL;
--    return ToNewCString(value);
-+    return ToNewUTF8String(value);
- }
- 
- void freeString(char* str)
-diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc
---- Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc	2008-01-07 13:28:24.000000000 +0100
-@@ -26,7 +26,6 @@
- // NOTE: we could have code to register the class with XPCOM, but since we
- // only construct it from inside miro, there's no need.
- 
--#define MOZILLA_INTERNAL_API
- #include "HttpObserver.h"
- #include <nscore.h>
- #include <nsCOMPtr.h>
-@@ -38,7 +37,7 @@
- #include <nsIHttpChannel.h>
- #include <nsIObserver.h>
- #include <nsIObserverService.h>
--#include <nsString.h>
-+#include <nsStringAPI.h>
- #include <locale.h>
- 
- class HttpObserver: public nsIObserver {     
-@@ -65,18 +64,17 @@ nsresult HttpObserver::Observe(nsISuppor
- {
-     if(strcmp(topic, "http-on-modify-request") == 0) {
-         nsresult rv;
--        nsDependentCString locale, currentLanguages;
--        nsDependentCString language = nsDependentCString("");
-+        nsDependentCString currentLanguages;
-         PRUint32 sep;
-         nsCOMPtr<nsIHttpChannel> channel(do_QueryInterface(subject, &rv));
-         if(NS_FAILED(rv)) return rv;
-         channel->GetRequestHeader(nsDependentCString("Accept-Language"), currentLanguages);
--        locale = nsDependentCString(setlocale(LC_ALL, NULL));
-+        const nsDependentCString locale = nsDependentCString(setlocale(LC_ALL, NULL));
-         sep = locale.FindChar('.');
--        locale.Left(language, sep);
--        language.ReplaceChar('_', '-');
--        channel->SetRequestHeader(nsDependentCString("Accept-Language"),
--                language, false);
-+        //const nsDependentCString language = StringHead(locale,sep);
-+        //language.ReplaceChar('_', '-');
-+        //channel->SetRequestHeader(nsDependentCString("Accept-Language"),
-+        //         language, false);
-         channel->SetRequestHeader(nsDependentCString("Accept-Language"),
-                 currentLanguages, true);
-         channel->SetRequestHeader(nsDependentCString("X-Miro"), 
-diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h.xl Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h
---- Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h	2008-01-07 13:28:24.000000000 +0100
-@@ -21,7 +21,7 @@
- #define XPCOM_UTIL_H
- 
- #include <nscore.h>
--#include <nsString.h>
-+#include <nsStringAPI.h>
- #include <nsIDOMEvent.h>
- #include <nsIDOMElement.h>
- 
-diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc
---- Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc	2008-01-07 13:28:24.000000000 +0100
-@@ -17,13 +17,11 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
- 
--#define MOZILLA_INTERNAL_API
- #include "DragAndDrop.h"
- #include "XPCOMUtil.h"
- #include <nsICommandManager.h>
- #include <gtkmozembed.h>
- #include <gtkmozembed_internal.h>
--#include <nsEscape.h>
- #include <nsIDragService.h>
- #include <nsIDragSession.h>
- #include <nsIDOMEvent.h>
-@@ -34,13 +32,15 @@
- #include <nsILocalFile.h>
- #include <nsIComponentRegistrar.h>
- #include <nsIWebBrowser.h>
--#include <nsString.h>
-+#include <nsStringAPI.h>
- #include <nsIClipboardDragDropHooks.h>
- #include <nsIDragSession.h>
- #include <nsISupportsPrimitives.h>
- #include <nsITransferable.h>
- #include <nsISupportsArray.h>
- #include <nsICollection.h>
-+#include <nsComponentManagerUtils.h>
-+#include <nsServiceManagerUtils.h>
- #include <stdio.h>
- #include <string.h>
- 
-@@ -444,12 +444,14 @@ public:   
-                 for(int i = 0; i < urlCount; i++) {
-                     rv = extractDragData(kURLMime, data, i);
-                     if(NS_FAILED(rv)) return rv;
-+/*
-                     utf8Data = NS_ConvertUTF16toUTF8(data);
-                     NS_EscapeURL(PromiseFlatCString(utf8Data).get(),
-                             utf8Data.Length(), 
-                             esc_Query | esc_Forced | esc_AlwaysCopy,
-                             escapedData);
-                     url.Append(escapedData);
-+*/
-                     url.Append("%0A"); // "\n" 
-                 }
-                 gtk_moz_embed_load_url(this->embed,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Feb 2008 10:17:32 -0000	1.7
+++ .cvsignore	25 Mar 2008 08:45:54 -0000	1.8
@@ -1 +1 @@
-Miro-1.1.2.tar.gz
+Miro-1.2.tar.gz

More information about the fedora-extras-commits mailing list