--- a/mozilla-esd.patch	Wed Sep 15 08:08:53 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent a93100d87cc9841c6e3e4b29a47bb7b91f23415f
-Bug 579877 - sound output via libesd broken if no esound daemon running. r=karlt
-
-diff --git a/widget/src/gtk2/nsSound.cpp b/widget/src/gtk2/nsSound.cpp
---- a/widget/src/gtk2/nsSound.cpp
-+++ b/widget/src/gtk2/nsSound.cpp
-@@ -52,36 +52,31 @@
- #include "nsCOMPtr.h"
- #include "nsAutoPtr.h"
- #include "nsString.h"
- 
- #include <stdio.h>
- #include <unistd.h>
- 
- #include <gtk/gtk.h>
--/* used with esd_open_sound */
--static int esdref = -1;
- static PRLibrary *elib = nsnull;
- static PRLibrary *libcanberra = nsnull;
- static PRLibrary* libasound = nsnull;
- 
- // the following from esd.h
- 
- #define ESD_BITS8  (0x0000)
- #define ESD_BITS16 (0x0001) 
- #define ESD_MONO (0x0010)
- #define ESD_STEREO (0x0020) 
- #define ESD_STREAM (0x0000)
- #define ESD_PLAY (0x1000)
- 
- #define WAV_MIN_LENGTH 44
- 
--typedef int (*EsdOpenSoundType)(const char *host);
--typedef int (*EsdCloseType)(int);
--
- /* used to play the sounds from the find symbol call */
- typedef int  (*EsdPlayStreamType) (int, int, const char *, const char *);
- typedef int  (*EsdAudioOpenType)  (void);
- typedef int  (*EsdAudioWriteType) (const void *, int);
- typedef void (*EsdAudioCloseType) (void);
- 
- /* used to find and play common system event sounds.
-    this interfaces with libcanberra.
-@@ -126,50 +121,30 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, ns
- ////////////////////////////////////////////////////////////////////////
- nsSound::nsSound()
- {
-     mInited = PR_FALSE;
- }
- 
- nsSound::~nsSound()
- {
--    if (esdref >= 0) {
--        EsdCloseType EsdClose = (EsdCloseType) PR_FindFunctionSymbol(elib, "esd_close");
--        if (EsdClose)
--            (*EsdClose)(esdref);
--        esdref = -1;
--    }
- }
- 
- NS_IMETHODIMP
- nsSound::Init()
- {
-     // This function is designed so that no library is compulsory, and
-     // one library missing doesn't cause the other(s) to not be used.
-     if (mInited) 
-         return NS_OK;
- 
-     mInited = PR_TRUE;
- 
-     if (!elib) {
-         elib = PR_LoadLibrary("libesd.so.0");
--        if (elib) {
--            EsdOpenSoundType EsdOpenSound =
--                (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");
--            if (!EsdOpenSound) {
--                PR_UnloadLibrary(elib);
--                elib = nsnull;
--            } else {
--                esdref = (*EsdOpenSound)("localhost");
--                if (esdref < 0) {
--                    PR_UnloadLibrary(elib);
--                    elib = nsnull;
--                }
--            }
--        }
-     }
- 
-     if (!libasound) {
-         PRFuncPtr func = PR_FindFunctionSymbolAndLibrary("snd_lib_error_set_handler",
-                                                          &libasound);
-         if (libasound) {
-             snd_lib_error_set_handler_fn snd_lib_error_set_handler =
-                  (snd_lib_error_set_handler_fn) func;

--- a/mozilla-gconf-backend.patch	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-gconf-backend.patch	Tue Sep 28 13:18:32 2010 +0200
@@ -3472,7 +3472,7 @@
  endif
  
  ifdef MOZ_ENABLE_DBUS
- EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
+ EXTRA_DSO_LDOPTS += $(MOZ_DBUS_LIBS)
  endif
  
 +ifdef MOZ_ENABLE_GCONF
@@ -3490,7 +3490,7 @@
 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
 --- a/toolkit/toolkit-tiers.mk
 +++ b/toolkit/toolkit-tiers.mk
-@@ -254,16 +254,23 @@ endif
+@@ -258,16 +258,23 @@ endif
  ifdef MOZ_ENABLE_LIBXUL
  tier_toolkit_dirs += xpcom/stub
  endif

--- a/mozilla-helper-app.patch	Wed Sep 15 08:08:53 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-From: Wolfgang Rosenauer <wr@rosenauer.org>
-Subject: no helper app for application/octet-stream but recognized extensions
-References:
-https://bugzilla.novell.com/show_bug.cgi?id=406979
-https://bugzilla.mozilla.org/show_bug.cgi?id=327323
-
-diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
---- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -47,6 +47,7 @@
- #include "nsMIMEInfoUnix.h"
- #include "nsGNOMERegistry.h"
- #include "nsIGnomeVFSService.h"
-+#include "nsAutoPtr.h"
- #ifdef MOZ_ENABLE_DBUS
- #include "nsDBusHandlerApp.h"
- #endif
-@@ -74,13 +75,16 @@ NS_IMETHODIMP
- nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
- {
-   *_retval = PR_FALSE;
--  nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
--  if (vfs) {
--    nsCOMPtr<nsIGnomeVFSMimeApp> app;
--    if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
--      *_retval = PR_TRUE;
-+  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType);
-+  if (!mimeInfo) {
-+    nsCAutoString ext;
-+    GetPrimaryExtension(ext);
-+    mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
-   }
- 
-+  if (mimeInfo)
-+    *_retval = PR_TRUE;
-+
-   if (*_retval)
-     return NS_OK;
- 
-@@ -113,6 +117,16 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-     nsCOMPtr<nsIGnomeVFSMimeApp> app;
-     if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
-       return app->Launch(nativePath);
-+
-+    // If we haven't got an app we try to get a valid one by searching for the
-+    // extension mapped type
-+    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
-+    if (mimeInfo) {
-+      nsCAutoString type;
-+      mimeInfo->GetType(type);
-+      if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-+        return app->Launch(nativePath);
-+    }
-   }
- 
-   if (!mDefaultApplication)
-diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
---- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-@@ -1580,8 +1580,16 @@ nsOSHelperAppService::GetMIMEInfoFromOS(
-       return retval;
-     }
- 
--    // Copy the attributes of retval onto miByExt, to return it
-+    // Copy the attributes of retval (mimeinfo from type) onto miByExt, to
-+    // return it 
-+    // but reset to just collected mDefaultAppDescription (from ext)
-+    // and preserve the primary extension as well
-+    nsAutoString byExtDefault;
-+    miByExt->GetDefaultDescription(byExtDefault);
-+    retval->SetDefaultDescription(byExtDefault);
-     retval->CopyBasicDataTo(miByExt);
-+    if (!aFileExt.IsEmpty())
-+      miByExt->SetPrimaryExtension(aFileExt);
- 
-     miByExt.swap(retval);
-   }

--- a/mozilla-kde.patch	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-kde.patch	Tue Sep 28 13:18:32 2010 +0200
@@ -3453,14 +3453,14 @@
 -    mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
 +    mimeInfo = nsCommonRegistry::GetFromExtension(ext);
    }
- 
    if (mimeInfo)
      *_retval = PR_TRUE;
  
    if (*_retval)
      return NS_OK;
  
-@@ -107,25 +110,42 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+@@ -106,26 +109,43 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
    nsCAutoString nativePath;
    aFile->GetNativePath(nativePath);
  
@@ -3491,19 +3491,20 @@
      nsCOMPtr<nsIGnomeVFSMimeApp> app;
      if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
        return app->Launch(nativePath);
+   }
  
-     // If we haven't got an app we try to get a valid one by searching for the
-     // extension mapped type
--    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
-+    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
-     if (mimeInfo) {
-       nsCAutoString type;
-       mimeInfo->GetType(type);
+   // If we haven't got an app we try to get a valid one by searching for the
+   // extension mapped type
+-  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
++  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
+   if (mimeInfo) {
+     nsCAutoString type;
+     mimeInfo->GetType(type);
+     if (vfs) {
+       nsCOMPtr<nsIGnomeVFSMimeApp> app;
        if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
          return app->Launch(nativePath);
      }
-   }
- 
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -3962,8 +3963,8 @@
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
  
  ifeq ($(MOZ_PLATFORM_MAEMO), 5)
- CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
- CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
+ CFLAGS          += $(MOZ_DBUS_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
+ CXXFLAGS        += $(MOZ_DBUS_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
  endif
  
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp

--- a/mozilla-libproxy.patch	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-libproxy.patch	Tue Sep 28 13:18:32 2010 +0200
@@ -6,7 +6,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -542,16 +542,20 @@ FT2_CFLAGS             = @FT2_CFLAGS@
+@@ -545,16 +545,20 @@ FT2_CFLAGS             = @FT2_CFLAGS@
  FT2_LIBS               = @FT2_LIBS@
  
  MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
@@ -48,15 +48,15 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -5325,16 +5325,39 @@ then
-         AC_DEFINE(MOZ_ENABLE_DBUS)
+@@ -5327,16 +5327,38 @@ then
      fi
  fi
  AC_SUBST(MOZ_ENABLE_DBUS)
+ AC_SUBST(MOZ_DBUS_CFLAGS)
+ AC_SUBST(MOZ_DBUS_LIBS)
  AC_SUBST(MOZ_DBUS_GLIB_CFLAGS)
  AC_SUBST(MOZ_DBUS_GLIB_LIBS)
  
- dnl ========================================================
 +dnl = libproxy support
 +dnl ========================================================
 +
@@ -79,7 +79,7 @@
 +AC_SUBST(MOZ_LIBPROXY_CFLAGS)
 +AC_SUBST(MOZ_LIBPROXY_LIBS)
 +
-+dnl ========================================================
+ dnl ========================================================
  dnl = libnotify support
  dnl ========================================================
  
@@ -87,7 +87,6 @@
  then
      MOZ_ENABLE_LIBNOTIFY=1
  
-     MOZ_ARG_DISABLE_BOOL(libnotify,
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in

--- a/mozilla-xulrunner192/create-tar.sh	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-xulrunner192/create-tar.sh	Tue Sep 28 13:18:32 2010 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-RELEASE_TAG="FIREFOX_3_6_10_RELEASE"
-VERSION="1.9.2.10"
+RELEASE_TAG="FIREFOX_3_6_11_RELEASE"
+VERSION="1.9.2.11"
 
 # mozilla
 hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla

--- a/mozilla-xulrunner192/mozilla-esd.patch	Wed Sep 15 08:08:53 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-esd.patch
\ No newline at end of file

--- a/mozilla-xulrunner192/mozilla-helper-app.patch	Wed Sep 15 08:08:53 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-helper-app.patch
\ No newline at end of file

--- a/mozilla-xulrunner192/mozilla-xulrunner192.changes	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes	Tue Sep 28 13:18:32 2010 +0200
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep 28 13:16:20 CEST 2010 - wr@rosenauer.org
+
+- security update to 1.9.2.11
+- removed upstreamed patches:
+  * mozilla-esd.patch
+  * mozilla-helper-app.patch
+
 -------------------------------------------------------------------
 Wed Sep 15 07:39:22 CEST 2010 - wr@rosenauer.org
 

--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Wed Sep 15 08:08:53 2010 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Tue Sep 28 13:18:32 2010 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package mozilla-xulrunner192 (Version 1.9.2.10)
+# spec file for package mozilla-xulrunner192 (Version 1.9.2.11)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2010 Wolfgang Rosenauer
@@ -39,12 +39,12 @@
 BuildRequires:  wireless-tools
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        1.9.2.10
+Version:        1.9.2.11
 Release:        1
-%define         releasedate 2010091400
-%define         version_internal 1.9.2.10
+%define         releasedate 2010092700
+%define         version_internal 1.9.2.11
 %define         apiversion 1.9.2
-%define         uaweight 192100
+%define         uaweight 192110
 Summary:        Mozilla Runtime Environment 1.9.2
 Url:            http://www.mozilla.org
 Group:          Productivity/Other
@@ -72,10 +72,8 @@
 Patch3:         mozilla-pkgconfig.patch
 Patch4:         idldir.patch
 Patch5:         mozilla-nongnome-proxies.patch
-Patch6:         mozilla-helper-app.patch
 Patch7:         mozilla-prefer_plugin_pref.patch
 Patch8:         mozilla-shared-nss-db.patch
-Patch9:         mozilla-esd.patch
 Patch10:        mozilla-kde.patch
 # PATCH-FEATURE-SLED FATE#302023, FATE#302024
 Patch11:        mozilla-gconf-backend.patch
@@ -222,10 +220,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %if %suse_version >= 1110
 %patch10 -p1
 %endif

--- a/series	Wed Sep 15 08:08:53 2010 +0200
+++ b/series	Tue Sep 28 13:18:32 2010 +0200
@@ -4,7 +4,6 @@
 mozilla-pkgconfig.patch
 idldir.patch
 mozilla-nongnome-proxies.patch
-mozilla-helper-app.patch
 mozilla-prefer_plugin_pref.patch
 mozilla-shared-nss-db.patch
 mozilla-kde.patch
@@ -12,7 +11,6 @@
 gecko-lockdown.patch
 toolkit-ui-lockdown.patch
 mozilla-ua-locale-pref.patch
-mozilla-esd.patch
 mozilla-cairo-lcd.patch
 mozilla-locale.patch
 mozilla-gdk-pixbuf.patch