add xulrunner
This commit is contained in:
14
net-libs/xulrunner/files/arm-bug-644136.patch
Normal file
14
net-libs/xulrunner/files/arm-bug-644136.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
diff -r 4e4c7457e8f7 js/src/ctypes/libffi/src/arm/sysv.S
|
||||
--- a/js/src/ctypes/libffi/src/arm/sysv.S Sat Apr 02 11:48:22 2011 -0400
|
||||
+++ b/js/src/ctypes/libffi/src/arm/sysv.S Sun Apr 03 04:55:15 2011 +0300
|
||||
@@ -229,6 +229,10 @@
|
||||
.size CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
|
||||
|
||||
|
||||
+/* Below are VFP hard-float ABI call and closure implementations.
|
||||
+ Add VFP FPU directive here. */
|
||||
+ .fpu vfp
|
||||
+
|
||||
@ r0: fn
|
||||
@ r1: &ecif
|
||||
@ r2: cif->bytes
|
||||
11
net-libs/xulrunner/files/bug-270163.patch
Normal file
11
net-libs/xulrunner/files/bug-270163.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/mozilla/gfx/ots/src/os2.cc
|
||||
+++ b/mozilla/gfx/ots/src/os2.cc
|
||||
@@ -2,6 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <cstddef>
|
||||
+
|
||||
#include "os2.h"
|
||||
|
||||
#include "head.h"
|
||||
48
net-libs/xulrunner/files/bug-606109.patch
Normal file
48
net-libs/xulrunner/files/bug-606109.patch
Normal file
@@ -0,0 +1,48 @@
|
||||
# HG changeset patch
|
||||
# User Jory A. Pratt <anarchy@gentoo.org>
|
||||
# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c
|
||||
Add missing ifde MOZ_MEDIA
|
||||
|
||||
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
|
||||
--- a/content/base/src/nsContentSink.cpp
|
||||
+++ b/content/base/src/nsContentSink.cpp
|
||||
@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] =
|
||||
&nsGkAtoms::nobr,
|
||||
&nsGkAtoms::noscript,
|
||||
&nsGkAtoms::ol,
|
||||
&nsGkAtoms::optgroup,
|
||||
&nsGkAtoms::option,
|
||||
&nsGkAtoms::output,
|
||||
&nsGkAtoms::p,
|
||||
&nsGkAtoms::pre,
|
||||
+#ifdef MOZ_MEDIA
|
||||
&nsGkAtoms::progress,
|
||||
+#endif
|
||||
&nsGkAtoms::q,
|
||||
&nsGkAtoms::rp,
|
||||
&nsGkAtoms::rt,
|
||||
&nsGkAtoms::ruby,
|
||||
&nsGkAtoms::s,
|
||||
&nsGkAtoms::samp,
|
||||
&nsGkAtoms::section,
|
||||
&nsGkAtoms::select,
|
||||
@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute
|
||||
&nsGkAtoms::itemref,
|
||||
&nsGkAtoms::itemscope,
|
||||
&nsGkAtoms::itemtype,
|
||||
&nsGkAtoms::kind,
|
||||
&nsGkAtoms::label,
|
||||
&nsGkAtoms::lang,
|
||||
&nsGkAtoms::list,
|
||||
&nsGkAtoms::longdesc,
|
||||
+#ifdef MOZ_MEDIA
|
||||
&nsGkAtoms::loop,
|
||||
+#endif
|
||||
&nsGkAtoms::low,
|
||||
&nsGkAtoms::max,
|
||||
&nsGkAtoms::maxlength,
|
||||
&nsGkAtoms::media,
|
||||
&nsGkAtoms::min,
|
||||
&nsGkAtoms::mozdonotsend,
|
||||
&nsGkAtoms::method,
|
||||
&nsGkAtoms::multiple,
|
||||
177
net-libs/xulrunner/files/bug-626229.patch
Normal file
177
net-libs/xulrunner/files/bug-626229.patch
Normal file
@@ -0,0 +1,177 @@
|
||||
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
||||
--- a/dom/ipc/ContentChild.cpp
|
||||
+++ b/dom/ipc/ContentChild.cpp
|
||||
@@ -43,27 +43,31 @@
|
||||
|
||||
#ifdef MOZ_WIDGET_QT
|
||||
#include "nsQAppInstance.h"
|
||||
#endif
|
||||
|
||||
#include "ContentChild.h"
|
||||
#include "CrashReporterChild.h"
|
||||
#include "TabChild.h"
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
#include "AudioChild.h"
|
||||
+#endif
|
||||
|
||||
#include "mozilla/ipc/TestShellChild.h"
|
||||
#include "mozilla/net/NeckoChild.h"
|
||||
#include "mozilla/ipc/XPCShellEnvironment.h"
|
||||
#include "mozilla/jsipc/PContextWrapperChild.h"
|
||||
#include "mozilla/dom/ExternalHelperAppChild.h"
|
||||
#include "mozilla/dom/StorageChild.h"
|
||||
#include "mozilla/dom/PCrashReporterChild.h"
|
||||
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
#include "nsAudioStream.h"
|
||||
+#endif
|
||||
#include "nsIMemoryReporter.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsTObserverArray.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsIPrefService.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsXULAppAPI.h"
|
||||
#include "nsWeakReference.h"
|
||||
@@ -379,26 +383,32 @@ ContentChild::RecvPTestShellConstructor(
|
||||
return true;
|
||||
}
|
||||
|
||||
PAudioChild*
|
||||
ContentChild::AllocPAudio(const PRInt32& numChannels,
|
||||
const PRInt32& rate,
|
||||
const PRInt32& format)
|
||||
{
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
AudioChild *child = new AudioChild();
|
||||
NS_ADDREF(child);
|
||||
return child;
|
||||
+#else
|
||||
+ return nsnull;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool
|
||||
ContentChild::DeallocPAudio(PAudioChild* doomed)
|
||||
{
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
AudioChild *child = static_cast<AudioChild*>(doomed);
|
||||
NS_RELEASE(child);
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
PNeckoChild*
|
||||
ContentChild::AllocPNecko()
|
||||
{
|
||||
return new NeckoChild();
|
||||
}
|
||||
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
|
||||
--- a/dom/ipc/ContentParent.cpp
|
||||
+++ b/dom/ipc/ContentParent.cpp
|
||||
@@ -63,17 +63,19 @@
|
||||
#include "nsCExternalHandlerService.h"
|
||||
#include "nsFrameMessageManager.h"
|
||||
#include "nsIAlertsService.h"
|
||||
#include "nsToolkitCompsCID.h"
|
||||
#include "nsIDOMGeoGeolocation.h"
|
||||
#include "nsIConsoleService.h"
|
||||
#include "nsIScriptError.h"
|
||||
#include "nsConsoleMessage.h"
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
#include "AudioParent.h"
|
||||
+#endif
|
||||
|
||||
#if defined(ANDROID) || defined(LINUX)
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_PERMISSIONS
|
||||
#include "nsPermissionManager.h"
|
||||
@@ -682,26 +684,32 @@ ContentParent::DeallocPTestShell(PTestSh
|
||||
return true;
|
||||
}
|
||||
|
||||
PAudioParent*
|
||||
ContentParent::AllocPAudio(const PRInt32& numChannels,
|
||||
const PRInt32& rate,
|
||||
const PRInt32& format)
|
||||
{
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
AudioParent *parent = new AudioParent(numChannels, rate, format);
|
||||
NS_ADDREF(parent);
|
||||
return parent;
|
||||
+#else
|
||||
+ return nsnull;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool
|
||||
ContentParent::DeallocPAudio(PAudioParent* doomed)
|
||||
{
|
||||
+#if defined(MOZ_SYDNEYAUDIO)
|
||||
AudioParent *parent = static_cast<AudioParent*>(doomed);
|
||||
NS_RELEASE(parent);
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
PNeckoParent*
|
||||
ContentParent::AllocPNecko()
|
||||
{
|
||||
return new NeckoParent();
|
||||
}
|
||||
diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
|
||||
--- a/dom/ipc/Makefile.in
|
||||
+++ b/dom/ipc/Makefile.in
|
||||
@@ -51,38 +51,45 @@ DIRS = tests
|
||||
DIRS = tests
|
||||
endif
|
||||
|
||||
EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h
|
||||
|
||||
EXPORTS_NAMESPACES = mozilla/dom
|
||||
|
||||
EXPORTS_mozilla/dom = \
|
||||
- AudioChild.h \
|
||||
- AudioParent.h \
|
||||
ContentChild.h \
|
||||
ContentParent.h \
|
||||
ContentProcess.h \
|
||||
CrashReporterChild.h \
|
||||
CrashReporterParent.h \
|
||||
TabParent.h \
|
||||
TabChild.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
- AudioChild.cpp \
|
||||
- AudioParent.cpp \
|
||||
ContentProcess.cpp \
|
||||
ContentParent.cpp \
|
||||
ContentChild.cpp \
|
||||
CrashReporterParent.cpp \
|
||||
TabParent.cpp \
|
||||
TabChild.cpp \
|
||||
TabMessageUtils.cpp \
|
||||
$(NULL)
|
||||
+
|
||||
+ifdef MOZ_SYDNEYAUDIO
|
||||
+EXPORTS_mozilla/dom += \
|
||||
+ AudioChild.h \
|
||||
+ AudioParent.h \
|
||||
+ $(NULL)
|
||||
+CPPSRCS += \
|
||||
+ AudioChild.cpp \
|
||||
+ AudioParent.cpp \
|
||||
+ $(NULL)
|
||||
+endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/ipc/chromium/chromium-config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../../content/base/src \
|
||||
-I$(srcdir)/../../content/events/src \
|
||||
246
net-libs/xulrunner/files/fix-animated-gifs.patch
Normal file
246
net-libs/xulrunner/files/fix-animated-gifs.patch
Normal file
@@ -0,0 +1,246 @@
|
||||
# HG changeset patch
|
||||
# User Rafał Mużyło <galtgendo@o2.pl>
|
||||
# Parent 69e253891ca3839b6d4b8f5cb7c0e6950bb66902
|
||||
Fix animated gif flickering bug 597174
|
||||
|
||||
diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
|
||||
--- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
|
||||
+++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
|
||||
@@ -197,30 +197,29 @@ static NS_METHOD ReadDataOut(nsIInputStr
|
||||
}
|
||||
|
||||
// Push any new rows according to mCurrentPass/mLastFlushedPass and
|
||||
// mCurrentRow/mLastFlushedRow. Note: caller is responsible for
|
||||
// updating mlastFlushed{Row,Pass}.
|
||||
nsresult
|
||||
nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint32 rows)
|
||||
{
|
||||
- nsIntRect r(0, fromRow, mGIFStruct.width, rows);
|
||||
+ nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow, mGIFStruct.width, rows);
|
||||
|
||||
// Update image
|
||||
nsresult rv = mImageContainer->FrameUpdated(mGIFStruct.images_decoded, r);
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
// Offset to the frame position
|
||||
// Only notify observer(s) for first frame
|
||||
if (!mGIFStruct.images_decoded && mObserver) {
|
||||
PRUint32 imgCurFrame;
|
||||
mImageContainer->GetCurrentFrameIndex(&imgCurFrame);
|
||||
- r.y += mGIFStruct.y_offset;
|
||||
mObserver->OnDataAvailable(nsnull, imgCurFrame == PRUint32(mGIFStruct.images_decoded), &r);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsGIFDecoder2::FlushImageData()
|
||||
{
|
||||
diff --git a/modules/libpr0n/src/imgContainer.cpp b/modules/libpr0n/src/imgContainer.cpp
|
||||
--- a/modules/libpr0n/src/imgContainer.cpp
|
||||
+++ b/modules/libpr0n/src/imgContainer.cpp
|
||||
@@ -415,16 +415,18 @@ nsresult imgContainer::InternalAddFrameH
|
||||
|
||||
nsAutoPtr<imgFrame> frame(aFrame);
|
||||
|
||||
if (paletteData && paletteLength)
|
||||
frame->GetPaletteData(paletteData, paletteLength);
|
||||
|
||||
frame->GetImageData(imageData, imageLength);
|
||||
|
||||
+ frame->LockImageData();
|
||||
+
|
||||
mFrames.InsertElementAt(framenum, frame.forget());
|
||||
mNumFrames++;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult imgContainer::InternalAddFrame(PRUint32 framenum,
|
||||
PRInt32 aX, PRInt32 aY,
|
||||
@@ -440,16 +442,21 @@ nsresult imgContainer::InternalAddFrame(
|
||||
return NS_ERROR_INVALID_ARG;
|
||||
|
||||
nsAutoPtr<imgFrame> frame(new imgFrame());
|
||||
NS_ENSURE_TRUE(frame, NS_ERROR_OUT_OF_MEMORY);
|
||||
|
||||
nsresult rv = frame->Init(aX, aY, aWidth, aHeight, aFormat, aPaletteDepth);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
+ if (mFrames.Length() > 0) {
|
||||
+ imgFrame *prevframe = mFrames.ElementAt(mFrames.Length() - 1);
|
||||
+ prevframe->UnlockImageData();
|
||||
+ }
|
||||
+
|
||||
if (mFrames.Length() == 0) {
|
||||
return InternalAddFrameHelper(framenum, frame.forget(), imageData, imageLength,
|
||||
paletteData, paletteLength);
|
||||
}
|
||||
|
||||
if (mFrames.Length() == 1) {
|
||||
// Since we're about to add our second frame, initialize animation stuff
|
||||
if (!ensureAnimExists())
|
||||
diff --git a/modules/libpr0n/src/imgFrame.cpp b/modules/libpr0n/src/imgFrame.cpp
|
||||
--- a/modules/libpr0n/src/imgFrame.cpp
|
||||
+++ b/modules/libpr0n/src/imgFrame.cpp
|
||||
@@ -152,16 +152,17 @@ imgFrame::imgFrame() :
|
||||
mBlendMethod(1), /* imgIContainer::kBlendOver */
|
||||
mSinglePixel(PR_FALSE),
|
||||
mNeverUseDeviceSurface(PR_FALSE),
|
||||
mFormatChanged(PR_FALSE),
|
||||
mCompositingFailed(PR_FALSE)
|
||||
#ifdef USE_WIN_SURFACE
|
||||
, mIsDDBSurface(PR_FALSE)
|
||||
#endif
|
||||
+ , mLocked(PR_FALSE)
|
||||
{
|
||||
static PRBool hasCheckedOptimize = PR_FALSE;
|
||||
if (!hasCheckedOptimize) {
|
||||
if (PR_GetEnv("MOZ_DISABLE_IMAGE_OPTIMIZE")) {
|
||||
gDisableOptimize = PR_TRUE;
|
||||
}
|
||||
hasCheckedOptimize = PR_TRUE;
|
||||
}
|
||||
@@ -413,18 +414,17 @@ void imgFrame::Draw(gfxContext *aContext
|
||||
nsRefPtr<gfxASurface> surface;
|
||||
gfxImageSurface::gfxImageFormat format;
|
||||
|
||||
NS_ASSERTION(!sourceRect.Intersect(subimage).IsEmpty(),
|
||||
"We must be allowed to sample *some* source pixels!");
|
||||
|
||||
PRBool doTile = !imageRect.Contains(sourceRect);
|
||||
if (doPadding || doPartialDecode) {
|
||||
- gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height) +
|
||||
- gfxPoint(aPadding.left, aPadding.top);
|
||||
+ gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height);
|
||||
|
||||
if (!doTile && !mSinglePixel) {
|
||||
// Not tiling, and we have a surface, so we can account for
|
||||
// padding and/or a partial decode just by twiddling parameters.
|
||||
// First, update our user-space fill rect.
|
||||
sourceRect = sourceRect.Intersect(available);
|
||||
gfxMatrix imageSpaceToUserSpace = userSpaceToImageSpace;
|
||||
imageSpaceToUserSpace.Invert();
|
||||
@@ -708,17 +708,17 @@ nsresult imgFrame::ImageUpdated(const ns
|
||||
mem->IsLowMemory(&lowMemory);
|
||||
if (lowMemory)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
mDecoded.UnionRect(mDecoded, aUpdateRect);
|
||||
|
||||
// clamp to bounds, in case someone sends a bogus updateRect (I'm looking at
|
||||
// you, gif decoder)
|
||||
- nsIntRect boundsRect(0, 0, mSize.width, mSize.height);
|
||||
+ nsIntRect boundsRect(mOffset, mSize);
|
||||
mDecoded.IntersectRect(mDecoded, boundsRect);
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
if (mQuartzSurface)
|
||||
mQuartzSurface->Flush();
|
||||
#endif
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -806,17 +806,23 @@ void imgFrame::GetPaletteData(PRUint32 *
|
||||
*aPalette = (PRUint32 *) mPalettedImageData;
|
||||
*length = PaletteDataLength();
|
||||
}
|
||||
}
|
||||
|
||||
nsresult imgFrame::LockImageData()
|
||||
{
|
||||
if (mPalettedImageData)
|
||||
- return NS_OK;
|
||||
+ return NS_ERROR_NOT_AVAILABLE;
|
||||
+
|
||||
+ NS_ABORT_IF_FALSE(!mLocked, "Trying to lock already locked image data.");
|
||||
+ if (mLocked) {
|
||||
+ return NS_ERROR_FAILURE;
|
||||
+ }
|
||||
+ mLocked = PR_TRUE;
|
||||
|
||||
if ((mOptSurface || mSinglePixel) && !mImageSurface) {
|
||||
// Recover the pixels
|
||||
mImageSurface = new gfxImageSurface(gfxIntSize(mSize.width, mSize.height),
|
||||
gfxImageSurface::ImageFormatARGB32);
|
||||
if (!mImageSurface || mImageSurface->CairoStatus())
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
@@ -832,23 +838,35 @@ nsresult imgFrame::LockImageData()
|
||||
#ifdef USE_WIN_SURFACE
|
||||
mWinSurface = nsnull;
|
||||
#endif
|
||||
#ifdef XP_MACOSX
|
||||
mQuartzSurface = nsnull;
|
||||
#endif
|
||||
}
|
||||
|
||||
+ if (mImageSurface)
|
||||
+ mImageSurface->Flush();
|
||||
+
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult imgFrame::UnlockImageData()
|
||||
{
|
||||
if (mPalettedImageData)
|
||||
- return NS_OK;
|
||||
+ return NS_ERROR_NOT_AVAILABLE;
|
||||
+
|
||||
+ NS_ABORT_IF_FALSE(mLocked, "Unlocking an unlocked image!");
|
||||
+ if (!mLocked) {
|
||||
+ return NS_ERROR_FAILURE;
|
||||
+ }
|
||||
+ mLocked = PR_FALSE;
|
||||
+
|
||||
+ if (mImageSurface)
|
||||
+ mImageSurface->MarkDirty();
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
if (mQuartzSurface)
|
||||
mQuartzSurface->Flush();
|
||||
#endif
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -895,17 +913,17 @@ PRInt32 imgFrame::GetBlendMethod() const
|
||||
|
||||
void imgFrame::SetBlendMethod(PRInt32 aBlendMethod)
|
||||
{
|
||||
mBlendMethod = (PRInt8)aBlendMethod;
|
||||
}
|
||||
|
||||
PRBool imgFrame::ImageComplete() const
|
||||
{
|
||||
- return mDecoded == nsIntRect(0, 0, mSize.width, mSize.height);
|
||||
+ return mDecoded == nsIntRect(mOffset, mSize);
|
||||
}
|
||||
|
||||
// A hint from the image decoders that this image has no alpha, even
|
||||
// though we created is ARGB32. This changes our format to RGB24,
|
||||
// which in turn will cause us to Optimize() to RGB24. Has no effect
|
||||
// after Optimize() is called, though in all cases it will be just a
|
||||
// performance win -- the pixels are still correct and have the A byte
|
||||
// set to 0xff.
|
||||
diff --git a/modules/libpr0n/src/imgFrame.h b/modules/libpr0n/src/imgFrame.h
|
||||
--- a/modules/libpr0n/src/imgFrame.h
|
||||
+++ b/modules/libpr0n/src/imgFrame.h
|
||||
@@ -167,16 +167,17 @@ private: // data
|
||||
|
||||
gfxASurface::gfxImageFormat mFormat;
|
||||
PRInt8 mPaletteDepth;
|
||||
PRInt8 mBlendMethod;
|
||||
PRPackedBool mSinglePixel;
|
||||
PRPackedBool mNeverUseDeviceSurface;
|
||||
PRPackedBool mFormatChanged;
|
||||
PRPackedBool mCompositingFailed;
|
||||
+ PRPackedBool mLocked;
|
||||
|
||||
#ifdef XP_WIN
|
||||
PRPackedBool mIsDDBSurface;
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
#endif /* imgFrame_h */
|
||||
56
net-libs/xulrunner/files/libnotify-0.7.patch
Normal file
56
net-libs/xulrunner/files/libnotify-0.7.patch
Normal file
@@ -0,0 +1,56 @@
|
||||
# HG changeset patch
|
||||
# User Priit Laes <plaes@plaes.org>
|
||||
# Parent 194dd9a57615185c998a87148fac65df51600758
|
||||
Bug 628222 - Add support for libnotify-0.7+. r=karlt
|
||||
|
||||
diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
|
||||
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
|
||||
+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
|
||||
@@ -42,16 +42,21 @@
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsIImageToPixbuf.h"
|
||||
#include "nsIStringBundle.h"
|
||||
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include <libnotify/notify.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
+// Compatibility macro for <libnotify-0.7
|
||||
+#ifndef NOTIFY_CHECK_VERSION
|
||||
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
|
||||
+#endif
|
||||
+
|
||||
static PRBool gHasActions = PR_FALSE;
|
||||
|
||||
static void notify_action_cb(NotifyNotification *notification,
|
||||
gchar *action, gpointer user_data)
|
||||
{
|
||||
nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
|
||||
alert->SendCallback();
|
||||
}
|
||||
@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
|
||||
{
|
||||
NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
|
||||
mAlertText.get(),
|
||||
- NULL, NULL);
|
||||
+ NULL
|
||||
+// >=libnotify-0.7.0 has no support for attaching to widgets
|
||||
+#if !NOTIFY_CHECK_VERSION(0,7,0)
|
||||
+ , NULL
|
||||
+#endif
|
||||
+ );
|
||||
+
|
||||
if (!notify)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
if (aPixbuf)
|
||||
notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
|
||||
|
||||
NS_ADDREF(this);
|
||||
if (mAlertHasAction) {
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
diff -ur mozilla-release.orig//configure.in mozilla-release/configure.in
|
||||
--- mozilla-release.orig//configure.in 2011-07-17 13:44:12.000000000 +0200
|
||||
+++ mozilla-release/configure.in 2011-07-17 13:46:50.000000000 +0200
|
||||
@@ -7165,9 +7165,6 @@
|
||||
if test "$GNU_CC"; then
|
||||
AC_DEFINE(MOZ_THUMB2)
|
||||
AC_DEFINE(MOZ_ARM_ARCH)
|
||||
- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
else
|
||||
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
||||
fi
|
||||
@@ -7181,9 +7178,6 @@
|
||||
arm*)
|
||||
if test "$GNU_CC"; then
|
||||
AC_DEFINE(MOZ_ARM_ARCH)
|
||||
- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
else
|
||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
||||
fi
|
||||
@@ -7192,16 +7186,6 @@
|
||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
|
||||
;;
|
||||
esac
|
||||
-else
|
||||
- case "$target_cpu" in
|
||||
- arm*)
|
||||
- if test "$GNU_CC"; then
|
||||
- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_THUMB2)
|
||||
diff -ur mozilla-release.orig//js/src/configure.in mozilla-release/js/src/configure.in
|
||||
--- mozilla-release.orig//js/src/configure.in 2011-07-17 13:43:42.000000000 +0200
|
||||
+++ mozilla-release/js/src/configure.in 2011-07-17 13:47:39.000000000 +0200
|
||||
@@ -4607,9 +4607,6 @@
|
||||
if test "$GNU_CC"; then
|
||||
AC_DEFINE(MOZ_THUMB2)
|
||||
AC_DEFINE(MOZ_ARM_ARCH)
|
||||
- CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
else
|
||||
AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
|
||||
fi
|
||||
@@ -4623,9 +4620,6 @@
|
||||
arm*)
|
||||
if test "$GNU_CC"; then
|
||||
AC_DEFINE(MOZ_ARM_ARCH)
|
||||
- CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
- ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
|
||||
else
|
||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
|
||||
fi
|
||||
@@ -4634,16 +4628,6 @@
|
||||
AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
|
||||
;;
|
||||
esac
|
||||
-else
|
||||
- case "$target_cpu" in
|
||||
- arm*)
|
||||
- if test "$GNU_CC"; then
|
||||
- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_THUMB2)
|
||||
@@ -0,0 +1,60 @@
|
||||
# HG changeset patch
|
||||
# User Mike Hommey <mh+mozilla@glandium.org>
|
||||
# Date 1303461188 -7200
|
||||
# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
|
||||
# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
|
||||
Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
|
||||
|
||||
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
|
||||
--- a/js/src/Makefile.in
|
||||
+++ b/js/src/Makefile.in
|
||||
@@ -383,17 +383,17 @@ CPPSRCS += checks.cc \
|
||||
platform.cc \
|
||||
utils.cc \
|
||||
$(NONE)
|
||||
|
||||
#
|
||||
# END enclude sources for V8 dtoa
|
||||
#############################################
|
||||
|
||||
-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
|
||||
+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
|
||||
|
||||
VPATH += $(srcdir)/assembler \
|
||||
$(srcdir)/assembler/wtf \
|
||||
$(srcdir)/yarr/pcre \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS += pcre_compile.cpp \
|
||||
pcre_exec.cpp \
|
||||
|
||||
# HG changeset patch
|
||||
# User Luke Wagner <lw@mozilla.com>
|
||||
# Date 1299520258 28800
|
||||
# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
|
||||
# Parent 27e5814815491ebb68e474e453aff6c2ea908c43
|
||||
Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
|
||||
|
||||
diff --git a/js/src/jsval.h b/js/src/jsval.h
|
||||
--- a/js/src/jsval.h
|
||||
+++ b/js/src/jsval.h
|
||||
@@ -342,16 +342,17 @@ typedef union jsval_layout
|
||||
JSValueTag tag : 17;
|
||||
uint64 payload47 : 47;
|
||||
} debugView;
|
||||
struct {
|
||||
union {
|
||||
int32 i32;
|
||||
uint32 u32;
|
||||
JSWhyMagic why;
|
||||
+ jsuword word;
|
||||
} payload;
|
||||
} s;
|
||||
double asDouble;
|
||||
void *asPtr;
|
||||
} jsval_layout;
|
||||
# endif /* JS_BITS_PER_WORD */
|
||||
#endif /* defined(IS_LITTLE_ENDIAN) */
|
||||
|
||||
|
||||
|
||||
23
net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
Normal file
23
net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
# HG changeset patch
|
||||
# User Jonathan Callen <abcd@gentoo.org>
|
||||
# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
|
||||
pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
|
||||
|
||||
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
|
||||
--- a/toolkit/system/gnome/Makefile.in
|
||||
+++ b/toolkit/system/gnome/Makefile.in
|
||||
@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_LIBNOTIFY_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += \
|
||||
+ $(MOZ_GTK2_CFLAGS) \
|
||||
$(MOZ_GCONF_CFLAGS) \
|
||||
$(MOZ_GNOMEVFS_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(MOZ_LIBNOTIFY_CFLAGS) \
|
||||
$(NULL)
|
||||
14
net-libs/xulrunner/files/xulrunner-default-prefs.js
Normal file
14
net-libs/xulrunner/files/xulrunner-default-prefs.js
Normal file
@@ -0,0 +1,14 @@
|
||||
pref("app.update.enabled", false);
|
||||
pref("app.update.autoInstallEnabled", false);
|
||||
pref("browser.display.use_system_colors", true);
|
||||
pref("browser.link.open_external", 3);
|
||||
pref("general.smoothScroll", true);
|
||||
pref("general.autoScroll", false);
|
||||
pref("browser.tabs.tabMinWidth", 15);
|
||||
pref("browser.backspace_action", 0);
|
||||
pref("browser.urlbar.hideGoButton", true);
|
||||
pref("accessibility.typeaheadfind", true);
|
||||
pref("browser.shell.checkDefaultBrowser", false);
|
||||
pref("browser.EULA.override", true);
|
||||
pref("general.useragent.vendor", "Gentoo");
|
||||
pref("intl.locale.matchOS", true);
|
||||
Reference in New Issue
Block a user