diff options
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 9 | ||||
| -rw-r--r-- | package/firefox/patches/patch-configure | 15 |
2 files changed, 19 insertions, 5 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 47686883a..54e62d6b1 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.6 +PKG_VERSION:= 3.6.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= c9a071b31bb90d05edfb93117d0a7537 +PKG_MD5SUM:= 0ee5f14fd8be07513d16131027ebcb61 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify @@ -21,6 +21,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote +PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin include $(TOPDIR)/mk/package.mk @@ -28,6 +29,8 @@ $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P ifeq (${ADK_LINUX_MIPS64_LEMOTE},y) CONFIGURE_ARGS+= --disable-ipc +else ifeq (${ADK_TARGET_LIB_UCLIBC},y) +CONFIGURE_ARGS+= --disable-ipc else CONFIGURE_ARGS+= --enable-ipc endif @@ -42,6 +45,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-png \ --with-system-nss \ --with-system-nspr \ + --with-libIDL-prefix=${STAGING_DIR}/usr \ + --with-glib-prefix=${STAGING_DIR}/usr \ --enable-libxul \ --disable-tests \ --disable-static \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index f424b3787..28035c66a 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,6 +1,15 @@ ---- mozilla-1.9.2.orig/configure 2010-04-02 18:07:41.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-04-11 14:38:39.000000000 +0200 -@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then +--- mozilla-1.9.2.orig/configure 2010-07-23 00:00:19.000000000 +0200 ++++ mozilla-1.9.2/configure 2010-07-30 09:52:43.000000000 +0200 +@@ -3970,7 +3970,7 @@ else + echo "$ac_t""yes" 1>&6 + fi + +- for ac_prog in $PYTHON python2.5 python2.4 python ++ for ac_prog in $PYTHON python2.6 python2.5 python2.4 python + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then |