diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/firefox/Makefile | |
parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/firefox/Makefile')
-rw-r--r-- | package/firefox/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index ea88d8837..c774ac51c 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 3.6.15 +PKG_VERSION:= 4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= fcf8042948d91f1f3d9c33599b79cf35 +PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libtiff -PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx dbus +PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify libpng libtiff +PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf -PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 dbus -PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libtiff +PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 MesaLib libtiff +PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_NOPARALLEL:= 1 @@ -23,7 +23,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 -WRKDIST= ${WRKDIR}/mozilla-1.9.2 +WRKDIST= ${WRKDIR}/mozilla-2.0 include $(TOPDIR)/mk/package.mk @@ -47,11 +47,16 @@ CONFIGURE_ENV+= CROSS_COMPILE=1 \ HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ + ac_cv_sqlite_threadsafe=yes \ + ac_cv_sqlite_enable_fts3=yes \ + ac_cv_sqlite_enable_unlock_notify=yes \ ac_cv_thread_keyword=no \ ac_cv_sizeof_int_p=4 CONFIGURE_ARGS+= --enable-application=browser \ --enable-official-branding \ --with-system-zlib \ + --with-system-cairo \ + --with-system-pixman \ --with-system-jpeg \ --with-system-png \ --with-system-nss \ |