From 74fcd5ec0c12b0b8efce9a9b7d74d41490b07f01 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Jan 2011 18:49:32 +0100 Subject: clean --- firefox-dev.spec | 2 +- firefox-remi.patch | 30 ------------------------------ firefox4.sh.in | 6 ++++++ mozilla-plugin.patch | 10 ---------- nspr-build.patch | 35 ----------------------------------- 5 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 firefox-remi.patch delete mode 100644 mozilla-plugin.patch delete mode 100644 nspr-build.patch diff --git a/firefox-dev.spec b/firefox-dev.spec index 0a68c5e..ac54ebc 100644 --- a/firefox-dev.spec +++ b/firefox-dev.spec @@ -3,7 +3,7 @@ %define cairo_version 1.10 %define freetype_version 2.1.9 %define lcms_version 1.18 -%define sqlite_version 3.6.23.1 +%define sqlite_version 3.7.1 %define homepage http://start.fedoraproject.org/ %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html diff --git a/firefox-remi.patch b/firefox-remi.patch deleted file mode 100644 index 038058e..0000000 --- a/firefox-remi.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- mozilla-1.9.2/layout/generic/nsFrame.h.orig 2009-11-06 19:29:14.000000000 +0100 -+++ mozilla-1.9.2/layout/generic/nsFrame.h 2009-11-06 19:30:54.000000000 +0100 -@@ -153,23 +153,14 @@ - friend nsIFrame* NS_NewEmptyFrame(nsIPresShell* aShell, - nsStyleContext* aContext); - -+ -+ // Set this public as in 1.9.1 ! -+ void operator delete(void* aPtr, size_t sz); -+ - private: - // Left undefined; nsFrame objects are never allocated from the heap. - void* operator new(size_t sz) CPP_THROW_NEW; - --protected: -- // Overridden to prevent the global delete from being called, since -- // the memory came out of an arena instead of the heap. -- // -- // Ideally this would be private and undefined, like the normal -- // operator new. Unfortunately, the C++ standard requires an -- // overridden operator delete to be accessible to any subclass that -- // defines a virtual destructor, so we can only make it protected; -- // worse, some C++ compilers will synthesize calls to this function -- // from the "deleting destructors" that they emit in case of -- // delete-expressions, so it can't even be undefined. -- void operator delete(void* aPtr, size_t sz); -- - public: - - // nsQueryFrame diff --git a/firefox4.sh.in b/firefox4.sh.in index 5a72c6b..d7f38cb 100644 --- a/firefox4.sh.in +++ b/firefox4.sh.in @@ -251,6 +251,12 @@ do esac done +## +## Enable WebGL +## +MOZ_GLX_IGNORE_BLACKLIST=1 +export MOZ_GLX_IGNORE_BLACKLIST + # Run the browser debugging=0 if [ $debugging = 1 ] diff --git a/mozilla-plugin.patch b/mozilla-plugin.patch deleted file mode 100644 index 75eac7e..0000000 --- a/mozilla-plugin.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old 2009-11-25 05:13:11.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2009-12-03 10:14:41.000000000 +0100 -@@ -5,5 +5,5 @@ includedir=%includedir% - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% - diff --git a/nspr-build.patch b/nspr-build.patch deleted file mode 100644 index fe7cc1b..0000000 --- a/nspr-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h ---- a/ipc/chromium/src/base/basictypes.h -+++ b/ipc/chromium/src/base/basictypes.h -@@ -14,29 +14,29 @@ - #error You_must_include_basictypes.h_before_prtypes.h! - #endif - - #ifndef NO_NSPR_10_SUPPORT - #define NO_NSPR_10_SUPPORT - #define NO_NSPR_10_SUPPORT_SAVE - #endif - --#include "nspr/prtypes.h" -+#include "prtypes.h" - - #ifdef NO_NSPR_10_SUPPORT_SAVE - #undef NO_NSPR_10_SUPPORT_SAVE - #undef NO_NSPR_10_SUPPORT - #endif - - #ifdef _WIN32 - #undef _WIN32 - #define _WIN32_SAVE - #endif - --#include "nspr/obsolete/protypes.h" -+#include "obsolete/protypes.h" - - #define _INT32 - #define _UINT32 - - #ifdef _WIN32_SAVE - #undef _WIN32_SAVE - #define _WIN32 - #endif -- cgit