From f4c9d98a29d7df4369c39d44139771c7809ac1dd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <andre@pc-01.localdomain>
Date: Sat, 28 Apr 2012 19:41:10 -0300
Subject: iceweasel-libre-12.0-3: disable system cairo

---
 libre/iceweasel-libre/PKGBUILD    |  4 ++--
 libre/iceweasel-libre/gcc47.patch | 12 ------------
 libre/iceweasel-libre/mozconfig   |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'libre/iceweasel-libre')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index fb20609c1..66e441d75 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -53,14 +53,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
 md5sums=('b45f57bfe21b0e6db4f0683e794917cb'
          '2b66fb2e51631ef3b07de89ef9d17d0c'
          '552adcf5da3b07757e7fe29c8bd2ec2d'
-         'eab149c1994ab14392e55af3abb08e80'
+         '34786fca48963a7bea5d55d17a406c35'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '64be2fab525189c285ee04495d628035'
          'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
          '0d053487907de4376d67d8f499c5502b'
-         '7bd09833d59b5768c224d7d1575a69b8')
+         '79e471e0bd03b1d4e84fd3a6776bd619')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
diff --git a/libre/iceweasel-libre/gcc47.patch b/libre/iceweasel-libre/gcc47.patch
index e99a05dfc..829d59510 100644
--- a/libre/iceweasel-libre/gcc47.patch
+++ b/libre/iceweasel-libre/gcc47.patch
@@ -73,15 +73,3 @@ diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_po
  #include "base/logging.h"
 
  namespace base {
-
-diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -39,6 +39,7 @@
- #define FORCE_PR_LOG /* Allow logging in the release build */
- #endif
- #include "prlog.h"
-+#include <unistd.h>
- 
- #include "gfxPlatform.h"
- 
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..77690ba6b 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -15,7 +15,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-- 
cgit v1.2.3