# HG changeset patch # User Wolfgang Rosenauer # Date 1433797892 -7200 # Node ID ab297940ae8a5577faab656f86731b8166a52621 # Parent c2e88e5c7aab92261d314c32cadee4ee50e683df rebased to 39.0b3 removed mozilla-prefer_plugin_pref.patch from patchset diff -r c2e88e5c7aab -r ab297940ae8a MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Mon Jun 08 13:58:06 2015 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Mon Jun 08 23:11:32 2015 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jun 8 21:09:06 UTC 2015 - wr@rosenauer.org + +- update to Firefox 39.0b3 +- dropped mozilla-prefer_plugin_pref.patch as this feature is + likely not worth maintaining further +- rebased patches +- require NSS 3.19.1 + +------------------------------------------------------------------- Sun Jun 7 07:09:12 UTC 2015 - wr@rosenauer.org - update to Firefox 38.0.6 diff -r c2e88e5c7aab -r ab297940ae8a MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Jun 08 13:58:06 2015 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Jun 08 23:11:32 2015 +0200 @@ -77,7 +77,7 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.10.8 -BuildRequires: mozilla-nss-devel >= 3.18.1 +BuildRequires: mozilla-nss-devel >= 3.19.1 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -135,7 +135,6 @@ # Gecko/Toolkit Patch1: toolkit-download-folder.patch Patch2: mozilla-nongnome-proxies.patch -Patch3: mozilla-prefer_plugin_pref.patch Patch4: mozilla-shared-nss-db.patch Patch5: mozilla-kde.patch Patch6: mozilla-preferences.patch @@ -250,7 +249,6 @@ cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 diff -r c2e88e5c7aab -r ab297940ae8a MozillaFirefox/mozilla-prefer_plugin_pref.patch --- a/MozillaFirefox/mozilla-prefer_plugin_pref.patch Mon Jun 08 13:58:06 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-prefer_plugin_pref.patch \ No newline at end of file diff -r c2e88e5c7aab -r ab297940ae8a mozilla-prefer_plugin_pref.patch --- a/mozilla-prefer_plugin_pref.patch Mon Jun 08 13:58:06 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -From: Ubuntu -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 -@@ -1334,17 +1334,51 @@ nsPluginHost::FindPluginForType(const ch - if (!aMimeType) { - return nullptr; - } - - LoadPlugins(); - - InfallibleTArray matchingPlugins; - -+ char *preferredPluginPath = nullptr; -+ nsAutoCString mimetypePrefString ("modules.plugins.mimetype."); -+ mimetypePrefString.Append(aMimeType); -+ const char *mimetypePrefChar = mimetypePrefString.get(); -+ nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); -+ preferredPluginPath = (char*) pluginPath.get(); -+ - nsPluginTag *plugin = mPlugins; -+ -+ if(preferredPluginPath) { -+ while (plugin) { -+ if (!aCheckEnabled || plugin->IsEnabled()) { -+ 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 (plugin) { -+ if (!aCheckEnabled || plugin->IsEnabled()) { -+ if (nullptr != PL_strstr(plugin->mFileName.get(), preferredPluginPath) || -+ nullptr != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) { -+ matchingPlugins.AppendElement(plugin); -+ } -+ } -+ plugin = plugin->mNext; -+ } -+ -+ return FindPreferredPlugin(matchingPlugins); -+ } -+ - while (plugin) { - if (!aCheckEnabled || plugin->IsActive()) { - int32_t mimeCount = plugin->mMimeTypes.Length(); - for (int32_t i = 0; i < mimeCount; i++) { - if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) { - matchingPlugins.AppendElement(plugin); - break; - } diff -r c2e88e5c7aab -r ab297940ae8a mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Mon Jun 08 13:58:06 2015 +0200 +++ b/mozilla-shared-nss-db.patch Mon Jun 08 23:11:32 2015 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -42,9 +42,9 @@ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build -@@ -77,16 +77,19 @@ SOURCES += [ - 'nsNSSVersion.cpp', - 'PSMContentListener.cpp', +@@ -74,16 +74,19 @@ UNIFIED_SOURCES += [ + SOURCES += [ + 'nsNSSCertificateDB.cpp', ] LOCAL_INCLUDES += [ @@ -87,7 +87,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" -@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS() +@@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -123,7 +123,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']: +@@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' 'stagefright_omx', ] diff -r c2e88e5c7aab -r ab297940ae8a series --- a/series Mon Jun 08 13:58:06 2015 +0200 +++ b/series Mon Jun 08 23:11:32 2015 +0200 @@ -2,7 +2,6 @@ toolkit-download-folder.patch mozilla-pkgconfig.patch mozilla-nongnome-proxies.patch -mozilla-prefer_plugin_pref.patch mozilla-shared-nss-db.patch mozilla-kde.patch mozilla-preferences.patch