Hello community,
here is the log from the commit of package mozilla-xulrunner191 for openSUSE:Factory
checked in at Wed Jun 24 10:22:58 CEST 2009.
--------
--- mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-06-18 00:47:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/mozilla-xulrunner191/mozilla-xulrunner191.changes 2009-06-19 20:08:29.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 19 20:06:18 CEST 2009 - wr@rosenauer.org
+
+- removed locale.patch and added the pref to build specific ones
+- added mozilla-prefer_plugin_pref.patch to introduce a new set of
+ prefs to support preferring certain plugins for mime-types
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
locale.patch
New:
----
mozilla-prefer_plugin_pref.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner191.spec ++++++
--- /var/tmp/diff_new_pack.I30525/_old 2009-06-24 10:21:38.000000000 +0200
+++ /var/tmp/diff_new_pack.I30525/_new 2009-06-24 10:21:38.000000000 +0200
@@ -32,9 +32,9 @@
%if %suse_version > 1100
BuildRequires: nss-shared-helper-devel
%endif
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL
Version: 1.9.1.0
-Release: 1
+Release: 2
Summary: Mozilla Runtime Environment 1.9.1
Url: http://www.mozilla.org
Group: Productivity/Other
@@ -49,7 +49,6 @@
Source4: xulrunner-openSUSE-prefs.js
Source5: add-plugins.sh.in
Patch1: toolkit-download-folder.patch
-Patch2: locale.patch
Patch3: mozilla-pkgconfig.patch
Patch4: idldir.patch
Patch5: mozilla-path_len.patch
@@ -59,6 +58,7 @@
Patch9: mozilla-system-hunspell.patch.bz2
Patch10: mozilla-restart-cmd.patch
Patch11: mozilla-milestone4digit.patch
+Patch12: mozilla-prefer_plugin_pref.patch
Patch15: mozilla-pyxpcom.patch
# PATCH-FEATURE-SLED FATE#302023, FATE#302024 - hfiguiere@novell.com
Patch16: gconf-backend.patch.bz2
@@ -109,7 +109,7 @@
Mozilla Foundation
%package devel
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL
Summary: XULRunner/Gecko SDK 1.9.1
Group: Development/Libraries/Other
%if %has_system_nspr
@@ -126,7 +126,7 @@
%package translations
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL
Summary: Translations for XULRunner 1.9.1
Group: System/Localization
PreReq: %{name} = %{version}
@@ -150,7 +150,7 @@
Mozilla Foundation
%package gnomevfs
-License: GPL v2 or later ; LGPL v2.1 or later ; MPL ..
+License: GPL v2 or later ; LGPL v2.1 or later ; MPL
Summary: XULRunner components depending on gnome-vfs
Group: Productivity/Other
PreReq: %{name} = %{version}-%{release}
@@ -189,7 +189,6 @@
%prep
%setup -n mozilla -q -b 1
%patch1 -p1
-%patch2
%patch3 -p1
%patch4
%patch5 -p1
@@ -201,6 +200,7 @@
popd
%patch10
%patch11
+%patch12 -p1
%patch15
%patch16 -p1
%patch17
@@ -483,36 +483,4 @@
%files translations -f %{_tmppath}/translations.list
%defattr(-,root,root)
%endif
-
%changelog
-* Thu Jun 18 2009 wr@rosenauer.org
-- update to 1.9.1rc2 (20090617)
- * added or locale
-* Wed Jun 10 2009 wr@rosenauer.org
-- removed outdated mozilla-deprecated-gtk-macros.patch for now
- to fix build
-* Sat Jun 06 2009 wr@rosenauer.org
-- update to 1.9.1b99 (20090604)
-- adapted supported locale list
-- added mozilla-sysplugin-biarch.patch to use
- /usr/$LIB/mozilla/plugins as system plugin dir (bmo#496708)
-- added mozilla-deprecated-gtk-macros.patch to change GTK_macros
- to G_TYPE (bmo#461277)
-* Fri May 08 2009 wr@rosenauer.org
-- fixing rpath linker flags (part of bnc#501174)
-- improved pkgconfig files
-- use non-localized Downloads folder (bnc#501724)
-* Mon Apr 27 2009 wr@rosenauer.org
-- update to 1.9.1b4
-- removed obsolete pango and gcc4.4 patches
-- added newly supported locales
-* Tue Mar 24 2009 wr@rosenauer.org
-- add patch to compile with gcc 4.4 (bmo#483956)
-* Tue Mar 17 2009 wr@rosenauer.org
-- update to 1.9.1b3
-- added Pango patch needed for API change (bmo#481193)
-- make mozjs consumers using rpath to the correct location
- to find the library at runtime (bnc#479505)
-- don't use system sqlite (missing FTS3 support)
-* Mon Aug 25 2008 wr@rosenauer.org
-- initial package
++++++ mozilla-prefer_plugin_pref.patch ++++++
From: Ubuntu
Subject: introduce a pref to prefer certain plugins for mime-types
diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp
--- a/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -4228,14 +4228,47 @@ nsPluginHostImpl::FindPluginForType(cons
LoadPlugins();
// if we have a mimetype passed in, search the mPlugins
// linked list for a match
if (nsnull != aMimeType) {
+ 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;
+
plugins = mPlugins;
-
+ if(preferredPluginPath) {
+ while (nsnull != plugins) {
+ if (0 == PL_strcasecmp(plugins->mFileName.get(), preferredPluginPath) ||
+ 0 == PL_strcasecmp(plugins->mFullPath.get(), preferredPluginPath)) {
+ return plugins;
+ }
+ plugins = plugins->mNext;
+ }
+
+ // now lets search for substrings
+ plugins=mPlugins;
+ while (nsnull != plugins) {
+ if (nsnull != PL_strstr(plugins->mFileName.get(), preferredPluginPath) ||
+ nsnull != PL_strstr(plugins->mFullPath.get(), preferredPluginPath)) {
+ return plugins;
+ }
+ plugins = plugins->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
+ plugins = mPlugins;
while (nsnull != plugins) {
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++) {
if ((!aCheckEnabled || plugins->IsEnabled()) &&
plugins->mMimeTypeArray[cnt] &&
(0 == PL_strcasecmp(plugins->mMimeTypeArray[cnt], aMimeType))) {
++++++ xulrunner-openSUSE-prefs.js ++++++
--- /var/tmp/diff_new_pack.I30525/_old 2009-06-24 10:21:39.000000000 +0200
+++ /var/tmp/diff_new_pack.I30525/_new 2009-06-24 10:21:39.000000000 +0200
@@ -1,2 +1,3 @@
// openSUSE overrides for default settings
pref("layout.word_select.stop_at_punctuation", false);
+pref("intl.locale.matchOS", true);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org