fixes
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=210
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
7e6a6b6202
commit
0fa430da42
@ -1,6 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 1 06:45:08 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- create upstream branding package again (supposedly empty)
|
||||
(bnc#703401)
|
||||
- fix build on SLE11 (changes do not affect/are not applied for
|
||||
later versions)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 22 06:41:17 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- enable startup notification (bnc#701465)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 19:37:01 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- update to 5.0 final
|
||||
- included fixes for security issues: (bnc#701296, bnc#700578)
|
||||
* MFSA 2011-19/CVE-2011-2374 CVE-2011-2375
|
||||
@ -21,7 +34,6 @@ Wed Jun 22 06:41:17 UTC 2011 - wr@rosenauer.org
|
||||
XSS encoding hazard with inline SVG
|
||||
* MFSA 2011-28/CVE-2011-2370 (bmo#645699)
|
||||
Non-whitelisted site can trigger xpinstall
|
||||
- enable startup notification (bnc#701465)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 09:17:42 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
@ -74,6 +74,7 @@ Patch10: mozilla-ntlm-full-path.patch
|
||||
Patch11: mozilla-ppc-ipc.patch
|
||||
Patch12: mozilla-repo.patch
|
||||
Patch13: mozilla-dump_syms-static.patch
|
||||
Patch14: mozilla-sle11.patch
|
||||
# Firefox/browser
|
||||
Patch30: firefox-linkorder.patch
|
||||
Patch31: firefox-browser-css.patch
|
||||
@ -206,6 +207,9 @@ cd $RPM_BUILD_DIR/mozilla
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%if %suse_version < 1120
|
||||
%patch14 -p1
|
||||
%endif
|
||||
#
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
@ -491,7 +495,6 @@ exit 0
|
||||
%dir %{progdir}/distribution/
|
||||
%{progdir}/chrome/icons
|
||||
%{progdir}/components/
|
||||
#%exclude %{progdir}/defaults/profile/bookmarks.html
|
||||
%{progdir}/defaults/
|
||||
%{progdir}/dictionaries/
|
||||
%dir %{progdir}/extensions/
|
||||
@ -505,7 +508,6 @@ exit 0
|
||||
%{progdir}/application.ini
|
||||
%{progdir}/blocklist.xml
|
||||
%{progdir}/dependentlibs.list
|
||||
#%{progdir}/greprefs.js
|
||||
%{progdir}/*.so
|
||||
%{progdir}/mozilla-xremote-client
|
||||
%{progdir}/omni.jar
|
||||
@ -548,11 +550,11 @@ exit 0
|
||||
%dir %{progdir}/extensions/
|
||||
%endif
|
||||
|
||||
#%files branding-upstream
|
||||
#%defattr(-,root,root)
|
||||
#%dir %{progdir}
|
||||
#%dir %{progdir}/defaults/
|
||||
#%{progdir}/defaults/profile/bookmarks.html
|
||||
# this package does not need to provide files but is needed to fulfill
|
||||
# requirements if no other branding package is to be installed
|
||||
%files branding-upstream
|
||||
%defattr(-,root,root)
|
||||
%dir %{progdir}
|
||||
|
||||
%if %crashreporter
|
||||
%files buildsymbols
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a
|
||||
# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b
|
||||
Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
|
||||
|
||||
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
|
||||
|
||||
@ -2135,6 +2135,41 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
|
||||
|
||||
#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
|
||||
{ 0x0fa3158c, 0xd5a7, 0x43de, \
|
||||
@@ -437,8 +443,34 @@ static const mozilla::Module::ContractID
|
||||
|
||||
static const mozilla::Module kUnixProxyModule = {
|
||||
mozilla::Module::kVersion,
|
||||
kUnixProxyCIDs,
|
||||
kUnixProxyContracts
|
||||
};
|
||||
|
||||
NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
|
||||
+
|
||||
+nsresult
|
||||
+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
|
||||
+ const nsACString& aHost,
|
||||
+ PRInt32 aPort,
|
||||
+ nsACString& aResult)
|
||||
+{
|
||||
+ nsCAutoString url;
|
||||
+ url = aScheme;
|
||||
+ url += "://";
|
||||
+ url += aHost;
|
||||
+ if( aPort >= 0 )
|
||||
+ {
|
||||
+ url += ":";
|
||||
+ url += nsPrintfCString("%d", aPort);
|
||||
+ }
|
||||
+ nsCStringArray command;
|
||||
+ command.AppendCString( NS_LITERAL_CSTRING( "GETPROXY" ));
|
||||
+ command.AppendCString( url );
|
||||
+ nsCStringArray result;
|
||||
+ if( !nsKDEUtils::command( command, &result ) || result.Count() != 1 )
|
||||
+ return NS_ERROR_FAILURE;
|
||||
+ aResult = *result[ 0 ];
|
||||
+ return NS_OK;
|
||||
+}
|
||||
+
|
||||
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
|
||||
--- a/toolkit/xre/Makefile.in
|
||||
+++ b/toolkit/xre/Makefile.in
|
||||
|
||||
112
mozilla-sle11.patch
Normal file
112
mozilla-sle11.patch
Normal file
@ -0,0 +1,112 @@
|
||||
Subject: Patches needed to build on SLE11/11.1
|
||||
References:
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=513422
|
||||
|
||||
diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
||||
--- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
||||
+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
|
||||
@@ -4041,17 +4041,19 @@ _cairo_xlib_surface_add_glyph (Display *
|
||||
new = malloc (4 * c);
|
||||
if (unlikely (new == NULL)) {
|
||||
status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
|
||||
goto BAIL;
|
||||
}
|
||||
n = new;
|
||||
d = (uint32_t *) data;
|
||||
do {
|
||||
- *n++ = bswap_32 (*d++);
|
||||
+ *n = bswap_32 (*d);
|
||||
+ *n++;
|
||||
+ *d++;
|
||||
} while (--c);
|
||||
data = (uint8_t *) new;
|
||||
}
|
||||
break;
|
||||
case CAIRO_FORMAT_RGB24:
|
||||
default:
|
||||
ASSERT_NOT_REACHED;
|
||||
break;
|
||||
diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
|
||||
--- a/xpcom/glue/SSE.cpp
|
||||
+++ b/xpcom/glue/SSE.cpp
|
||||
@@ -44,26 +44,77 @@ namespace {
|
||||
// SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
|
||||
// We can't declare these functions in the header file, however, because
|
||||
// <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to
|
||||
// include both SSE.h and <windows.h>.
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && (defined(__i386__) || defined(__x86_64__))
|
||||
|
||||
// cpuid.h is available on gcc 4.3 and higher on i386 and x86_64
|
||||
-#include <cpuid.h>
|
||||
+//#include <cpuid.h>
|
||||
|
||||
enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
|
||||
|
||||
+#ifdef __i386__
|
||||
+#define _my_cpuid(level, a, b, c, d) \
|
||||
+ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
|
||||
+ "cpuid\n\t" \
|
||||
+ "xchg{l}\t{%%}ebx, %1\n\t" \
|
||||
+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
|
||||
+ : "0" (level))
|
||||
+#else
|
||||
+#define _my_cpuid(level, a, b, c, d) \
|
||||
+ __asm__ ("cpuid\n\t" \
|
||||
+ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
|
||||
+ : "0" (level))
|
||||
+#endif
|
||||
+
|
||||
+static __inline unsigned int
|
||||
+my_cpuid_max (unsigned int __ext, unsigned int *__sig)
|
||||
+{
|
||||
+ unsigned int __eax, __ebx, __ecx, __edx;
|
||||
+
|
||||
+#ifdef __i386__
|
||||
+ __asm__ ("pushf{l|d}\n\t"
|
||||
+ "pushf{l|d}\n\t"
|
||||
+ "pop{l}\t%0\n\t"
|
||||
+ "mov{l}\t{%0, %1|%1, %0}\n\t"
|
||||
+ "xor{l}\t{%2, %0|%0, %2}\n\t"
|
||||
+ "push{l}\t%0\n\t"
|
||||
+ "popf{l|d}\n\t"
|
||||
+ "pushf{l|d}\n\t"
|
||||
+ "pop{l}\t%0\n\t"
|
||||
+ "popf{l|d}\n\t"
|
||||
+ : "=&r" (__eax), "=&r" (__ebx)
|
||||
+ : "i" (0x00200000));
|
||||
+
|
||||
+ if (!((__eax ^ __ebx) & 0x00200000))
|
||||
+ return 0;
|
||||
+#endif
|
||||
+
|
||||
+ /* Host supports cpuid. Return highest supported cpuid input value. */
|
||||
+ _my_cpuid (__ext, __eax, __ebx, __ecx, __edx);
|
||||
+
|
||||
+ if (__sig)
|
||||
+ *__sig = __ebx;
|
||||
+
|
||||
+ return __eax;
|
||||
+}
|
||||
+
|
||||
static bool
|
||||
has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit)
|
||||
{
|
||||
unsigned int regs[4];
|
||||
- return __get_cpuid(level, ®s[0], ®s[1], ®s[2], ®s[3]) &&
|
||||
- (regs[reg] & bit);
|
||||
+
|
||||
+ unsigned int __ext = level & 0x80000000;
|
||||
+ if (my_cpuid_max(__ext, 0) < level)
|
||||
+ return false;
|
||||
+
|
||||
+ _my_cpuid(level, regs[0], regs[1], regs[2], regs[3]);
|
||||
+ return !!(unsigned(regs[reg]) & bit);
|
||||
}
|
||||
|
||||
#elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_IX86) || defined(_M_AMD64))
|
||||
|
||||
// MSVC 2005 or newer on x86-32 or x86-64
|
||||
#include <intrin.h>
|
||||
|
||||
enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 };
|
||||
Loading…
Reference in New Issue
Block a user