diff options
46 files changed, 1097 insertions, 686 deletions
diff --git a/jtools/Makefile b/jtools/Makefile index 23c90534f..5106df2e6 100644 --- a/jtools/Makefile +++ b/jtools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk TARGETS:= ifneq ($(ADK_PACKAGE_OPENJDK),) -TARGETS+=fastjar gcj classpath ecj +TARGETS+=fastjar gcj ecj jikes jamvm classpath ant openjdk endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile new file mode 100644 index 000000000..666e1e8cb --- /dev/null +++ b/jtools/ant/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ant +PKG_VERSION:= 1.8.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_SITES:= http://www.apache.org/dist/ant/source/ + +DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 +WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) + +include ../rules.mk + +install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar + cp $(STAGING_JAVA_HOST_DIR)/usr/share/ecj.jar $(WRKBUILD)/lib/optional + cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ + BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ + LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ + JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ + $(BASH) build.sh + touch $@ + +${STAGING_JAVA_HOST_DIR}/usr/bin/ant: $(WRKBUILD)/.compiled + cd $(WRKBUILD)/dist; \ + $(CP) bin/* $(STAGING_JAVA_HOST_DIR)/usr/bin ; \ + $(CP) lib/* $(STAGING_JAVA_HOST_DIR)/usr/lib + +include $(TOPDIR)/mk/tools.mk diff --git a/jtools/ant/junit-4.9b2.jar b/jtools/ant/junit-4.9b2.jar Binary files differnew file mode 100644 index 000000000..aec30a07f --- /dev/null +++ b/jtools/ant/junit-4.9b2.jar diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index a67e9ebd8..c4ab831e4 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ecj PKG_VERSION:= 1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa include ../rules.mk @@ -26,8 +26,12 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj # put a wrapper for java here - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \ + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \"\$$@\"" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/java chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java + rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index 7ccd03c15..ea41ca671 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -26,9 +26,9 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --enable-java-home \ --enable-languages=java \ --with-ffi \ - --with-mpc=$(STAGING_HOST_DIR)/usr \ - --with-mpfr=$(STAGING_HOST_DIR)/usr \ - --with-gmp=$(STAGING_HOST_DIR)/usr \ + --with-mpc=$(STAGING_HOST_DIR) \ + --with-mpfr=$(STAGING_HOST_DIR) \ + --with-gmp=$(STAGING_HOST_DIR) \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile new file mode 100644 index 000000000..defdbd713 --- /dev/null +++ b/jtools/jamvm/Makefile @@ -0,0 +1,39 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= jamvm +PKG_VERSION:= 1.5.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} + +ifeq (Darwin,${OStype}) +CC_FOR_BUILD:=${CC_FOR_BUILD} -m32 +CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32 +endif + +include ../rules.mk + +install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm + +$(WRKBUILD)/.configured: ${WRKDIST}/.prepared + cd $(WRKBUILD); env \ + CC='${CC_FOR_BUILD}' \ + CXX='${CXX_FOR_BUILD}' \ + ./configure \ + --prefix=/usr \ + --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr + touch $@ + +$(WRKBUILD)/.compiled: ${WRKDIST}/.configured + ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) + touch $@ + +${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled + ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) + $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + +include $(TOPDIR)/mk/tools.mk diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile new file mode 100644 index 000000000..c26a0f45b --- /dev/null +++ b/jtools/jikes/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= jikes +PKG_VERSION:= 1.22 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include ../rules.mk + +install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes + +$(WRKBUILD)/.configured: ${WRKDIST}/.prepared + (cd $(WRKBUILD); ./configure --prefix=/usr); + touch $@ + +$(WRKBUILD)/.compiled: ${WRKDIST}/.configured + ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) + touch $@ + +${STAGING_JAVA_HOST_DIR}/usr/bin/jikes: $(WRKBUILD)/.compiled + ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) + $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac + $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac + +include $(TOPDIR)/mk/tools.mk diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile new file mode 100644 index 000000000..17fe6bbf8 --- /dev/null +++ b/jtools/openjdk/Makefile @@ -0,0 +1,90 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= openjdk +PKG_VERSION:= 6 +PKG_EXTRAVER:= b22-28_feb_2011 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \ + fd3f35e8a8a2ef9a64c035ed66cea06d \ + ef7a8b3624ea904bf584bc46d79b5e75 \ + bc95c133620bd68c161cac9891592901 \ + 91adfd41e6f001add4f92ae31216b1e3 \ + d526d0848c88607ce4e3a0a4edb75d50 +PKG_DESCR:= OpenJDK Java VM +PKG_SECTION:= lang +PKG_URL:= http://openjdk.org/ +PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ + http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \ + http://icedtea.classpath.org/download/drops/ \ + http://icedtea.classpath.org/download/source/ + +# autotools infrastructure for OpenJDK +ICEDTEA_NAME:= icedtea6 +ICEDTEA_VERSION:= 1.10 + +# bootstrap JARs +XALAN_NAME= xalan-j +XALAN_VERSION= 2_7_0 + +# override generic extraction +EXTRACT_OVERRIDE:= 1 +DISTFILES:= openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \ + $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \ + jaxp144_01.zip \ + jdk6-jaf-b20.zip \ + jdk6-jaxws-b20.zip \ + ${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz + +WRKDIST= ${WRKDIR} +WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} + +include ../rules.mk + +OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" +OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin + +install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java + +$(WRKDIST)/.extract: $(WRKDIST)/.extract_done + cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \ + tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION) + cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz + cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz + mkdir -p ${WRKBUILD}/drops + cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch + touch $@ + +$(WRKDIST)/.configured: ${WRKDIST}/.extract + cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + export ${OPENJDK_NATIVE_ENV}; ./configure \ + --enable-bootstrap \ + --enable-zero \ + --disable-openjdk-cross-compilation \ + --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ + --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \ + --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \ + --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ + --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ + --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \ + --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ + --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \ + --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \ + --without-rhino \ + --disable-docs + touch $@ + +$(WRKBUILD)/.compiled: ${WRKDIST}/.configured + export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) + touch $@ + +${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled + $(CP) $(WRKSRC)/openjdk.build/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk + touch $@ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/openjdk/do-extract b/jtools/openjdk/do-extract new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/jtools/openjdk/do-extract diff --git a/jtools/openjdk/patches/openjdk.patch b/jtools/openjdk/patches/openjdk.patch new file mode 100644 index 000000000..1ef7e195f --- /dev/null +++ b/jtools/openjdk/patches/openjdk.patch @@ -0,0 +1,54 @@ +diff -Nur openjdk-6.orig/Makefile openjdk-6/Makefile +--- openjdk-6.orig/Makefile 2011-02-28 17:02:07.000000000 +0100 ++++ openjdk-6/Makefile 2011-04-06 19:47:19.261818496 +0200 +@@ -25,9 +25,7 @@ + + BUILD_PARENT_DIRECTORY=. + +-ifndef TOPDIR +- TOPDIR:=. +-endif ++TOPDIR:=. + + ifndef JDK_TOPDIR + JDK_TOPDIR=$(TOPDIR)/jdk +diff -Nur icedtea6-1.10.orig/Makefile.in icedtea6-1.10/Makefile.in +--- icedtea6-1.10.orig/Makefile.in 2011-03-02 20:48:45.161291458 +0100 ++++ icedtea6-1.10/Makefile.in 2011-04-06 20:10:40.581819545 +0200 +@@ -1329,7 +1329,7 @@ + @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \ + @OPENJDK_SRC_DIR_FOUND_TRUE@ fi + @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \ +-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \ ++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \ + @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi + @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \ + @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \ +@@ -1576,7 +1576,7 @@ + # FIXME (missing): Rename to clone-ecj. + stamps/extract-ecj.stamp: $(OPENJDK_TREE) + if ! test -d openjdk-ecj ; then \ +- cp -pPRl openjdk openjdk-ecj ; \ ++ cp -pPR openjdk openjdk-ecj ; \ + fi + mkdir -p stamps + touch stamps/extract-ecj.stamp +@@ -1643,10 +1643,14 @@ + + stamps/native-ecj.stamp: + mkdir -p stamps ; \ +- if test "x$(GCJ)" != "xno"; then \ +- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ +- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ +- fi ; \ ++ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \ ++ ln -s "${ADK_ECJ}" native-ecj; \ ++ else \ ++ if test "x$(GCJ)" != "xno"; then \ ++ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ ++ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ ++ fi ; \ ++ fi; \ + touch stamps/native-ecj.stamp + + clean-native-ecj: diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 479ad854d..caf9fe384 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm -PKG_BUILDDEP+= dri2proto glproto expat +PKG_BUILDDEP+= dri2proto glproto expat libXext PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.2/ PKG_NEED_CXX:= 1 diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 13ed514d4..1218e6493 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman -PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 +PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h deleted file mode 100644 index 6466deec7..000000000 --- a/package/cairo/patches/patch-src_cairo-features_h +++ /dev/null @@ -1,15 +0,0 @@ ---- cairo-1.8.10.orig/src/cairo-features.h 2010-02-19 22:34:38.000000000 +0100 -+++ cairo-1.8.10/src/cairo-features.h 2011-01-14 20:12:28.000000000 +0100 -@@ -10,11 +10,11 @@ - #define CAIRO_HAS_SVG_SURFACE 1 - #define CAIRO_HAS_USER_FONT 1 - #define CAIRO_HAS_XLIB_SURFACE 1 --#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1 - - /*#undef CAIRO_HAS_QUARTZ_FONT */ - /*#undef CAIRO_HAS_QUARTZ_SURFACE */ - /*#undef CAIRO_HAS_WIN32_FONT */ - /*#undef CAIRO_HAS_WIN32_SURFACE */ -+/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */ - - #endif diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 338821492..12c513504 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:= 3.6.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3468a2c463b4fc2788ba621e4b511c30 +PKG_MD5SUM:= fcf8042948d91f1f3d9c33599b79cf35 PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libnotify @@ -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-2.0 +WRKDIST= ${WRKDIR}/mozilla-1.9.2 include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 733e4aa4c..6ab49e7f0 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,45 +1,52 @@ ---- mozilla-2.0.orig/configure 2011-03-19 00:48:56.000000000 +0100 -+++ mozilla-2.0/configure 2011-04-07 18:48:49.000000000 +0200 -@@ -1588,7 +1588,7 @@ test -n "$HOST_CXX" || HOST_CXX="""" - HOST_CXXFLAGS="$CXXFLAGS" - fi - if test -z "$HOST_LDFLAGS"; then -- HOST_LDFLAGS="$LDFLAGS" -+ HOST_LDFLAGS="$LDFLAGS_FOR_BUILD" - fi - if test -z "$HOST_AR_FLAGS"; then - HOST_AR_FLAGS="$AR_FLAGS" -@@ -22573,15 +22573,6 @@ if test "${with_libIDL+set}" = set; then +--- mozilla-1.9.2.orig/configure 2010-12-03 16:57:11.000000000 +0100 ++++ mozilla-1.9.2/configure 2010-12-29 21:52:34.000000000 +0100 +@@ -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 +@@ -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 +- ac_cv_sqlite_secure_delete=no ++ ac_cv_sqlite_secure_delete=yes + + else + cat > conftest.$ac_ext <<EOF +@@ -21460,18 +21459,11 @@ fi + fi + fi --if test -z "$CROSS_COMPILE"; then -- if test -z "$HOST_LIBIDL_CONFIG"; then +-if test -n "$CROSS_COMPILE"; then +- if test -z "$HOST_LIBIDL_CONFIG"; then - HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" - fi -- if test -z "$HOST_LIBIDL_PREFIX"; then -- HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX" +- 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` +- else +- HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" +- HOST_LIBIDL_LIBS="$LIBIDL_LIBS" - fi -fi -- - if test "$SKIP_IDL_CHECK" = "no" - then - _LIBIDL_FOUND= -@@ -22788,6 +22779,7 @@ fi - fi - fi - -+ - # Check whether --with-glib-prefix or --without-glib-prefix was given. - if test "${with_glib_prefix+set}" = set; then - withval="$with_glib_prefix" -@@ -23542,6 +23534,9 @@ else - LIBIDL_LIBS="$HOST_LIBIDL_LIBS" - fi - +HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags` +HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs` + ++echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}" ++echo "host libidl libs: ${HOST_LIBIDL_LIBS}" + if test -z "$SKIP_PATH_CHECKS"; then - if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then - if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then + if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then diff --git a/package/firefox/patches/patch-content_base_public_nsContentUtils_h b/package/firefox/patches/patch-content_base_public_nsContentUtils_h deleted file mode 100644 index 0d5d389a4..000000000 --- a/package/firefox/patches/patch-content_base_public_nsContentUtils_h +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-2.0.orig/content/base/public/nsContentUtils.h 2011-03-19 00:33:33.000000000 +0100 -+++ mozilla-2.0/content/base/public/nsContentUtils.h 2011-03-27 21:49:48.303361341 +0200 -@@ -1942,7 +1942,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini - #ifdef WIN32 - return _finite(f); - #else -- return finite(f); -+ return isfinite(f); - #endif - } - diff --git a/package/firefox/patches/patch-content_base_src_nsContentSink_cpp b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp new file mode 100644 index 000000000..a97306351 --- /dev/null +++ b/package/firefox/patches/patch-content_base_src_nsContentSink_cpp @@ -0,0 +1,10 @@ +--- mozilla-1.9.2.orig/content/base/src/nsContentSink.cpp 2010-10-27 05:01:11.000000000 +0200 ++++ mozilla-1.9.2/content/base/src/nsContentSink.cpp 2010-11-11 22:40:48.404995720 +0100 +@@ -1973,7 +1973,6 @@ nsIAtom** const kDefaultAllowedAttribute + &nsGkAtoms::nowrap, + &nsGkAtoms::open, + &nsGkAtoms::optimum, +- &nsGkAtoms::pattern, + &nsGkAtoms::placeholder, + &nsGkAtoms::pointSize, + &nsGkAtoms::prompt, 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 bd9eacb42..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-03-27 22:36:34.953370738 +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 - } - diff --git a/package/firefox/patches/patch-content_media_nsAudioStream_cpp b/package/firefox/patches/patch-content_media_nsAudioStream_cpp new file mode 100644 index 000000000..1452b9b6b --- /dev/null +++ b/package/firefox/patches/patch-content_media_nsAudioStream_cpp @@ -0,0 +1,11 @@ +--- mozilla-1.9.2.orig/content/media/nsAudioStream.cpp 2010-04-02 18:02:19.000000000 +0200 ++++ mozilla-1.9.2/content/media/nsAudioStream.cpp 2010-06-11 21:28:33.522214080 +0200 +@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition() + #if defined(XP_WIN) + positionType = SA_POSITION_WRITE_HARDWARE; + #endif +- PRInt64 position = 0; ++ int64_t position = 0; + if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle), + positionType, &position) == SA_SUCCESS) { + return (position / float(mRate) / mChannels / sizeof(short)); 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 new file mode 100644 index 000000000..80f68661a --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -0,0 +1,26 @@ +--- 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-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 +-typedef PRInt8 int8_t; +-typedef PRUint8 uint8_t; +-typedef PRInt16 int16_t; +-typedef PRUint16 uint16_t; +-typedef PRInt32 int32_t; +-typedef PRUint32 uint32_t; +-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> + #elif defined(__FreeBSD__) + /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */ +-#else +-typedef PRUptrdiff uintptr_t; + #endif + #endif + diff --git a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc index cc75305d9..833e94185 100644 --- a/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc +++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc @@ -1,24 +1,29 @@ ---- mozilla-2.0.orig/ipc/chromium/src/base/debug_util_posix.cc 2011-03-19 00:33:46.000000000 +0100 -+++ mozilla-2.0/ipc/chromium/src/base/debug_util_posix.cc 2011-04-07 20:17:31.000000000 +0200 -@@ -119,11 +119,7 @@ StackTrace::StackTrace() { +--- mozilla-1.9.2.orig/ipc/chromium/src/base/debug_util_posix.cc 2010-10-27 05:01:17.000000000 +0200 ++++ mozilla-1.9.2/ipc/chromium/src/base/debug_util_posix.cc 2010-11-12 11:53:10.614327269 +0100 +@@ -114,6 +114,9 @@ void DebugUtil::BreakDebugger() { + } + + StackTrace::Stac |