--- a/MozillaFirefox/MozillaFirefox.changes Tue Jun 19 10:13:07 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Mon Jun 25 22:15:54 2012 +0200
@@ -1,9 +1,28 @@
-------------------------------------------------------------------
-Sun Jun 10 22:17:04 UTC 2012 - wr@rosenauer.org
-
-- update to Aurora 15 (20120610)
+Mon Jun 25 20:13:06 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 15 (20120625)
- fix crashreporter restart option (bmo#762780)
- fix HTML5 video crash with GStreamer enabled (bmo#761030)
+- updated filelist
+
+-------------------------------------------------------------------
+Mon Jun 25 19:16:07 UTC 2012 - wr@rosenauer.org
+
+- update to 14.0b9
+- license change from tri license to MPL-2.0
+- fix crashreporter restart option (bmo#762780)
+- reenabled mozilla-yarr-pcre.patch to fix build for PPC
+- require NSS 3.13.5
+- remove mozjs pacrunner obsoletes again for now
+- adopted mozilla-prefer_plugin_pref.patch
+
+-------------------------------------------------------------------
+Fri Jun 15 12:37:09 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 13.0.1
+ * bugfix release
+- obsolete libproxy's mozjs pacrunner (bnc#759123)
-------------------------------------------------------------------
Sat Jun 2 08:22:51 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Tue Jun 19 10:13:07 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Mon Jun 25 22:15:54 2012 +0200
@@ -54,7 +54,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2012061500
+%define releasedate 2012062500
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -111,8 +111,6 @@
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
Recommends: libcanberra0
-# libproxy's mozjs pacrunner crashes FF (bnc#759123)
-Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE4}
--- a/firefox-kde.patch Tue Jun 19 10:13:07 2012 +0200
+++ b/firefox-kde.patch Mon Jun 25 22:15:54 2012 +0200
@@ -1055,7 +1055,7 @@
+ hidden="true"
+ command="Tools:Inspect"/>
+ <toolbarbutton id="developer-toolbar-responsiveui"
-+ label="&responsiveUI.label;"
++ label="&responsiveDesignTool.label;"
+ class="devtools-toolbarbutton"
+ hidden="true"
+ command="Tools:ResponsiveUI"/>
--- a/mozilla-prefer_plugin_pref.patch Tue Jun 19 10:13:07 2012 +0200
+++ b/mozilla-prefer_plugin_pref.patch Mon Jun 25 22:15:54 2012 +0200
@@ -1,15 +1,10 @@
From: Ubuntu
-Introduce a pref to prefer certain plugins for mime-types
-
-For example:
- pref ("modules.plugins.mimetype.application/x-shockwave-flash", "/usr/lib/firefox-3.0.1/plugins/libflashplayer.so")
-
- would make the flashplyer installed in that location the preferred one to use.
+Subject: introduce a pref to prefer certain plugins for mime-types
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1556,17 +1556,45 @@ nsPluginHost::FindPluginForType(const ch
+@@ -1513,19 +1513,51 @@ nsPluginHost::FindPluginForType(const ch
bool aCheckEnabled)
{
if (!aMimeType) {
@@ -18,40 +13,46 @@
LoadPlugins();
-+ nsCAutoString mimetypePref("modules.plugins.mimetype.");
-+ mimetypePref.Append(aMimeType);
-+
-+ nsAdoptingCString preferred = Preferences::GetCString(mimetypePref.get());
++ nsresult res;
++ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService));
+
++ char *preferredPluginPath = NULL;
++ nsCAutoString mimetypePrefString ("modules.plugins.mimetype.");
++ mimetypePrefString.Append(aMimeType);
++ const char *mimetypePrefChar = mimetypePrefString.get();
++ res = prefB->GetCharPref(mimetypePrefChar, &preferredPluginPath);
++
++ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL;
++
+ InfallibleTArray<nsPluginTag*> matchingPlugins;
+
nsPluginTag *plugin = mPlugins;
-+ if(!preferred.IsEmpty()) {
-+ nsCOMPtr<nsILocalFile> file;
-+ nsresult rv = NS_NewNativeLocalFile(preferred, false, getter_AddRefs(file));
-+ bool isAbsolute = NS_SUCCEEDED(rv);
+
-+ while (plugin) {
-+ if (((!isAbsolute && 0 == PL_strcasecmp(plugin->mFileName.get(), preferred.get())) ||
-+ (isAbsolute && 0 == PL_strcasecmp(plugin->mFullPath.get(), preferred.get()))) &&
-+ (!aCheckEnabled || plugin->IsEnabled())) {
-+ PRInt32 mimeCount = plugin->mMimeTypes.Length();
-+ for (PRInt32 i = 0; i < mimeCount; i++) {
-+ if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
-+ return plugin;
-+ }
-+ }
++ if(preferredPluginPath) {
++ while (nsnull != plugin) {
++ if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) ||
++ 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) {
++ matchingPlugins.AppendElement(plugin);
++ }
++ plugin = plugin->mNext;
++ }
++
++ // now lets search for substrings
++ plugin = mPlugins;
++ while (nsnull != plugin) {
++ if (nsnull != PL_strstr(plugin->mFileName.get(), preferredPluginPath) ||
++ nsnull != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) {
++ matchingPlugins.AppendElement(plugin);
+ }
+ plugin = plugin->mNext;
+ }
+ }
+
-+ // if there is no pref for this mime-type, or if the plugin named in pref
-+ // isn't found, we pick the first that matches for this mime-type
-+ plugin = mPlugins;
while (plugin) {
if (!aCheckEnabled || plugin->IsEnabled()) {
PRInt32 mimeCount = plugin->mMimeTypes.Length();
for (PRInt32 i = 0; i < mimeCount; i++) {
if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
- return plugin;
+ matchingPlugins.AppendElement(plugin);
+ break;
}
- }
--- a/xulrunner/xulrunner.changes Tue Jun 19 10:13:07 2012 +0200
+++ b/xulrunner/xulrunner.changes Mon Jun 25 22:15:54 2012 +0200
@@ -1,8 +1,13 @@
-------------------------------------------------------------------
-Fri Jun 8 04:53:17 UTC 2012 - wr@rosenauer.org
+Mon Jun 25 20:14:50 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 15 (20120625)
-- update to 14.0 (20120605)
-- license change from tri license to MPL-2.0
+-------------------------------------------------------------------
+Fri Jun 15 12:40:23 UTC 2012 - wr@rosenauer.org
+
+- update to 13.0.1
+ * bugfix release
-------------------------------------------------------------------
Sat Jun 2 09:16:34 UTC 2012 - wr@rosenauer.org
--- a/xulrunner/xulrunner.spec Tue Jun 19 10:13:07 2012 +0200
+++ b/xulrunner/xulrunner.spec Mon Jun 25 22:15:54 2012 +0200
@@ -46,7 +46,7 @@
BuildRequires: mozilla-nss-devel >= 3.13.5
Version: 14.98
Release: 0
-%define releasedate 2012060800
+%define releasedate 2012062500
%define version_internal 15.0
%define apiversion 15
%define uaweight 1500000