summaryrefslogtreecommitdiff
path: root/package/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'package/firefox')
-rw-r--r--package/firefox/Makefile13
-rw-r--r--package/firefox/patches/patch-configure23
2 files changed, 18 insertions, 18 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 35fea912d..b5a195c6f 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 3.6.12
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a
+PKG_VERSION:= 3.6.13
+PKG_RELEASE:= 1
+PKG_MD5SUM:= d7c90aed8209beefa74badf02e8eeae1
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify
@@ -18,7 +18,7 @@ PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
PKG_TARGET_DEPENDS:= alix x86 x86_64 mips mipsel mips64 mips64el
-PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin !darwin
+PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
WRKDIST= ${WRKDIR}/mozilla-1.9.2
@@ -37,7 +37,8 @@ endif
CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
- HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \
+ HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \
+ HOST_RANLIB="ranlib" HOST_AR="ar" \
CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \
ac_cv_sqlite_secure_delete=yes \
ac_cv_thread_keyword=no \
@@ -64,6 +65,8 @@ CONFIGURE_ARGS+= --enable-application=browser \
--disable-mathml \
--disable-crashreporter
+XAKE_FLAGS+= OS_RELEASE="2.6"
+
post-install:
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index bb6138223..a5f6df0b9 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,5 +1,5 @@
--- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200
-+++ mozilla-1.9.2/configure 2010-11-25 20:36:24.969435934 +0100
++++ mozilla-1.9.2/configure 2010-12-12 12:03:54.000000000 +0100
@@ -3970,7 +3970,7 @@ else
echo "$ac_t""yes" 1>&6
fi
@@ -9,7 +9,15 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -17895,7 +17895,7 @@ echo "configure:17889: checking for SQLI
+@@ -5625,7 +5625,6 @@ DIRENT_INO=d_ino
+ CYGWIN_WRAPPER=
+ WIN_TOP_SRC=
+ MOZ_USER_DIR=".mozilla"
+-HOST_AR='$(AR)'
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+
+ MOZ_JPEG_CFLAGS=
+@@ -17895,7 +17894,7 @@ echo "configure:17889: checking for SQLI
else
if test "$cross_compiling" = yes; then
@@ -18,14 +26,3 @@
else
cat > conftest.$ac_ext <<EOF
-@@ -21465,8 +21465,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
-- HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
-- HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
-+ HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
-+ HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
- else
- HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
- HOST_LIBIDL_LIBS="$LIBIDL_LIBS"