added fix for bmo1088588 firefox33
author<josua.mayer97@gmail.com>
Thu, 30 Oct 2014 11:42:24 +0100
branchfirefox33
changeset 786 f721a3dea219
parent 785 56f82b5e7ce7
child 787 f4578fb6fcc3
child 788 af4f96c38fd9
added fix for bmo1088588
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/mozilla-bmo1088588.patch
mozilla-bmo1088588.patch
series
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Oct 28 21:57:42 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Oct 30 11:42:24 2014 +0100
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
-Sun Oct 26 21:06:12 UTC 2014 - wr@rosenauer.org
-
-- update to Firefox 33.0.1
+Tue Oct 28 15:23:09 UTC 2014 - josua.mayer97@gmail.com
+
+- added mozilla-bmo1088588.patch to fix build with EGL (bmo#1088588)
 
 -------------------------------------------------------------------
 Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Oct 28 21:57:42 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Oct 30 11:42:24 2014 +0100
@@ -150,6 +150,7 @@
 Patch10:        mozilla-sle11.patch
 Patch11:        mozilla-icu-strncat.patch
 Patch12:        mozilla-arm-disable-edsp.patch
+Patch13:        mozilla-bmo1088588.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-kde-114.patch
@@ -261,6 +262,7 @@
 %endif
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 # Firefox
 %patch101 -p1
 %if 0%{?suse_version} >= 1140
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-bmo1088588.patch	Thu Oct 30 11:42:24 2014 +0100
@@ -0,0 +1,1 @@
+../mozilla-bmo1088588.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-bmo1088588.patch	Thu Oct 30 11:42:24 2014 +0100
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Dirk Mueller <dmueller@suse.com>
+# Date 1414618964 0
+#      Wed Oct 29 21:42:44 2014 +0000
+# Node ID 8e3825b2d12a9f295b6ff9a972340b9d84fce068
+# Parent  262e4847ad6cca40d7375e40a0d6ebe8b372e3d3
+Bug 1088588 - fix ifdef in X11TextureSourceOGL.cpp, r?nical
+
+diff --git a/gfx/layers/opengl/X11TextureSourceOGL.cpp b/gfx/layers/opengl/X11TextureSourceOGL.cpp
+--- a/gfx/layers/opengl/X11TextureSourceOGL.cpp
++++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp
+@@ -94,14 +94,14 @@ X11TextureSourceOGL::ContentTypeToSurfac
+   switch (aType) {
+     case gfxContentType::COLOR:
+       return SurfaceFormat::R8G8B8X8;
+     case gfxContentType::COLOR_ALPHA:
+       return SurfaceFormat::R8G8B8A8;
+     default:
+       return SurfaceFormat::UNKNOWN;
+   }
+ }
+ 
++}
++}
++
+ #endif
+-
+-}
+-}
--- a/series	Tue Oct 28 21:57:42 2014 +0100
+++ b/series	Thu Oct 30 11:42:24 2014 +0100
@@ -13,6 +13,7 @@
 mozilla-icu-strncat.patch
 mozilla-arm-disable-edsp.patch
 mozilla-idldir.patch
+mozilla-bmo1088588.patch
 
 # Firefox patches
 firefox-kde.patch