summaryrefslogtreecommitdiff
path: root/package/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'package/firefox')
-rw-r--r--package/firefox/Makefile3
-rw-r--r--package/firefox/patches/patch-gfx_qcms_iccread_c18
-rw-r--r--package/firefox/patches/patch-gfx_qcms_qcmstypes_h5
3 files changed, 23 insertions, 3 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 8c6db24be..0009c48e2 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
+PKG_DEPENDS+= libxdamage libxfixes
PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt
PKG_BUILDDEP+= nspr nss jpeg
PKG_URL:= http://www.mozilla.org/
@@ -19,7 +20,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
WRKDIST= ${WRKDIR}/mozilla-1.9.2
-PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle
+PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40
include $(TOPDIR)/mk/package.mk
diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c
new file mode 100644
index 000000000..ea9ab6234
--- /dev/null
+++ b/package/firefox/patches/patch-gfx_qcms_iccread_c
@@ -0,0 +1,18 @@
+--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200
+@@ -23,6 +23,7 @@
+ #include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include "qcmsint.h"
+
+ //XXX: use a better typename
+@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile *
+ qcms_profile_fini(profile);
+ }
+
+-#include <stdio.h>
+ qcms_profile* qcms_profile_from_file(FILE *file)
+ {
+ uint32_t length, remaining_length;
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
index 436b1a452..80f68661a 100644
--- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
+++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h
@@ -1,6 +1,6 @@
--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200
-+++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:57:54.000000000 +0200
-@@ -11,22 +11,11 @@
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200
+@@ -11,22 +11,12 @@
/* int_types.h gets included somehow, so avoid redefining the types differently */
#include <sys/int_types.h>
#else
@@ -13,6 +13,7 @@
-typedef PRInt64 int64_t;
-typedef PRUint64 uint64_t;
-
++#include <stdint.h>
#ifdef __OS2__
/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
#include <stdlib.h>