diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/config/archival/Config.in | 1 | ||||
| -rw-r--r-- | package/ccid/patches/patch-configure | 21 | ||||
| -rw-r--r-- | package/firefox/Makefile | 12 | ||||
| -rw-r--r-- | package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp | 11 |
4 files changed, 29 insertions, 16 deletions
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index edeec98db..33ba719ca 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -227,7 +227,6 @@ config BUSYBOX_RPM config BUSYBOX_TAR bool "tar" - depends on !ADK_PACKAGE_TAR default y help tar is an archiving program. It's commonly used with gzip to diff --git a/package/ccid/patches/patch-configure b/package/ccid/patches/patch-configure new file mode 100644 index 000000000..7235e9ef8 --- /dev/null +++ b/package/ccid/patches/patch-configure @@ -0,0 +1,21 @@ +--- ccid-1.4.4.orig/configure 2011-05-13 11:19:09.000000000 +0200 ++++ ccid-1.4.4/configure 2011-07-28 10:54:49.000000000 +0200 +@@ -12207,17 +12207,8 @@ done + # Select OS specific versions of source files. + + +-BUNDLE_HOST=`uname | sed -e s,/,_,` ++BUNDLE_HOST=Linux + DYN_LIB_EXT="so" +-case "$BUNDLE_HOST" in +-Darwin) +- BUNDLE_HOST=MacOS +- DYN_LIB_EXT="dylib" +- ;; +-SunOS) +- BUNDLE_HOST=Solaris +- ;; +- esac + + # --disable-libusb + # Check whether --enable-libusb was given. diff --git a/package/firefox/Makefile b/package/firefox/Makefile index a0d6e9eaa..51a2e0047 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 4.0 +PKG_VERSION:= 5.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30 +PKG_MD5SUM:= 6d1f43e402cec84459a3d7f950bd5192 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libpng libtiff @@ -23,12 +23,15 @@ PKG_ARCH_DEPENDS:= x86 x86_64 mips64 mips64el native PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 -WRKDIST= ${WRKDIR}/mozilla-2.0 +WRKDIST= ${WRKDIR}/mozilla-release include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +# disable honour cflags stuff +XAKE_FLAGS+= GCC_HONOUR_COPTS=s + ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --disable-ipc else ifeq (${ADK_TARGET_LIB_UCLIBC},y) @@ -84,7 +87,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-svg \ --disable-mathml \ --disable-jemalloc \ - --disable-crashreporter + --disable-crashreporter \ + --disable-elf-hack XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD) XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" diff --git a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp b/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp deleted file mode 100644 index 9a49b3cd6..000000000 --- a/package/firefox/patches/patch-content_canvas_src_nsCanvasRenderingContext2D_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-2.0.orig/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-03-19 00:33:34.000000000 +0100 -+++ mozilla-2.0/content/canvas/src/nsCanvasRenderingContext2D.cpp 2011-06-15 20:26:00.226952311 +0200 -@@ -159,7 +159,7 @@ DoubleIsFinite(double d) - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(d); - #else -- return finite(d); -+ return isfinite(d); - #endif - } - |