aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSardem FF7 <sardemff7.pub@gmail.com>2011-02-08 16:59:33 +0100
committerSardem FF7 <sardemff7.pub@gmail.com>2011-02-08 16:59:33 +0100
commitf8fd45e4d9d66b6a6587b3864f7dc9015e0b7ed8 (patch)
tree78beecc653f4815dd40fe94bf4ab8958d946baf5
parentUpdate Gnome-Shell themes (diff)
downloadsardemff7-f8fd45e4d9d66b6a6587b3864f7dc9015e0b7ed8.tar.gz
sardemff7-f8fd45e4d9d66b6a6587b3864f7dc9015e0b7ed8.tar.bz2
sardemff7-f8fd45e4d9d66b6a6587b3864f7dc9015e0b7ed8.zip
Merged upstream
-rw-r--r--net-libs/xulrunner/Manifest5
-rw-r--r--net-libs/xulrunner/files/system-cairo-fixup.patch133
-rw-r--r--net-libs/xulrunner/xulrunner-9999.ebuild4
3 files changed, 2 insertions, 140 deletions
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 859355c..0404070 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,4 @@
+AUX default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
AUX gentoo-specific.patch 2957 RMD160 684dc2176769a56c2b1c206b59f999cd44d99c45 SHA1 35ff8e325e45b5384a404a4f99b12fdba9d5e0f3 SHA256 23d981e48a5308dd11ce2fc831071d138d54717bff9cb546dfc5467b0f4204c7
AUX libnotify-0.7-fix.patch 1209 RMD160 07615cde8fb0dbd9876635d0b437943df3f4879c SHA1 16caf17a571b4ede370fc20ffffc87179afd3cd3 SHA256 80dbd0906b45cd42b0fda0ec6fa48daf04cb5f85a14e164287565ffa4e486642
-AUX system-cairo-fixup.patch 3300 RMD160 3e6888863f990787f7e59eb8c9afcef546fe1e78 SHA1 1208120150b5bfbaf7c77d4521bab89e34a0dc97 SHA256 f6e47cc92dd032f2bfbd830953e55697c875e0361c08c2575b18694c7f8202ae
-AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
-EBUILD xulrunner-9999.ebuild 7363 RMD160 3d7db55a93c59f50f4ef9a978accfbce61449984 SHA1 a39a74fc4704acce0cd341b3f7d6cffda1d61ce4 SHA256 8ef4f523eabb64f9d026920181a37599942dc157b75ce08f9e2eb37a7dc2416f
+EBUILD xulrunner-9999.ebuild 5714 RMD160 1a24c3b87bfb47f7acabd4fa5fb47363e480871c SHA1 e70048e06c014217dac5ac9f4eda8229edb0b166 SHA256 7badc1b3155e53c8592126a17d7702800b96c8b1a49d1ea164e20bf8be8f4087
diff --git a/net-libs/xulrunner/files/system-cairo-fixup.patch b/net-libs/xulrunner/files/system-cairo-fixup.patch
deleted file mode 100644
index ac43a3f..0000000
--- a/net-libs/xulrunner/files/system-cairo-fixup.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-work around new features that are not avaliable in system-cairo on linux
-(romaxa's original patch with modifications to use cairo-tee)
-
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -81,16 +81,17 @@ pixman.h
- cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
-+cairo-tee.h
- cairo-quartz.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
-diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
---- a/gfx/thebes/gfxASurface.cpp
-+++ b/gfx/thebes/gfxASurface.cpp
-@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
-
- mSurface = surface;
- mSurfaceValid = PR_TRUE;
-
- if (existingSurface) {
- mFloatingRefs = 0;
- } else {
- mFloatingRefs = 1;
-+#ifdef MOZ_TREE_CAIRO
- if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) {
- cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
- }
-+#endif
- }
- }
-
- gfxASurface::gfxSurfaceType
- gfxASurface::GetType() const
- {
- if (!mSurfaceValid)
- return (gfxSurfaceType)-1;
-@@ -430,28 +432,34 @@ gfxASurface::FormatFromContent(gfxASurfa
- default:
- return ImageFormatRGB24;
- }
- }
-
- void
- gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
- {
-+#ifdef MOZ_TREE_CAIRO
- if (!mSurfaceValid)
- return;
- cairo_surface_set_subpixel_antialiasing(mSurface,
- aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-+#endif
- }
-
- PRBool
- gfxASurface::GetSubpixelAntialiasingEnabled()
- {
- if (!mSurfaceValid)
- return PR_FALSE;
-+#ifdef MOZ_TREE_CAIRO
- return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
-+#else
-+ return PR_TRUE;
-+#endif
- }
-
- PRInt32
- gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
- {
- switch (format) {
- case ImageFormatARGB32:
- case ImageFormatRGB24:
-diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
---- a/gfx/thebes/gfxTeeSurface.cpp
-+++ b/gfx/thebes/gfxTeeSurface.cpp
-@@ -32,17 +32,24 @@
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
- #include "gfxTeeSurface.h"
-
-+/* Once cairo in tree is update ensure we remove the ifdef
-+ and just include cairo-tee.h
-+*/
-+#ifdef MOZ_TREE_CAIRO
- #include "cairo.h"
-+#else
-+#include "cairo-tee.h"
-+#endif
-
- gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
- {
- Init(csurf, PR_TRUE);
- }
-
- gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
- {
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
---- a/js/src/config/system-headers
-+++ b/js/src/config/system-headers
-@@ -82,16 +82,17 @@ cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
- cairo-quartz.h
-+cairo-tee.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
- exception
diff --git a/net-libs/xulrunner/xulrunner-9999.ebuild b/net-libs/xulrunner/xulrunner-9999.ebuild
index 49e229d..09d6f92 100644
--- a/net-libs/xulrunner/xulrunner-9999.ebuild
+++ b/net-libs/xulrunner/xulrunner-9999.ebuild
@@ -42,10 +42,6 @@ src_prepare() {
# Up-to-date geek stuff
epatch "${FILESDIR}"/libnotify-0.7-fix.patch
- # Thanks to Mozilla overlay
- # Ensure we can use system cairo
- epatch "${FILESDIR}/system-cairo-fixup.patch"
-
# fix double symbols due to double -ljemalloc
sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
xulrunner/stub/Makefile.in || die