Merge branch 'master' of git+ssh://openadk.org/git/openadk

8 files changed, 73 insertions, 31 deletions

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 39667bdd9..b15efd5e2 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.8.10
+PKG_VERSION:=		1.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b60a82f405f9400bbfdcf850b1728d25
+PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
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 c774ac51c..338821492 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,11 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		3468a2c463b4fc2788ba621e4b511c30
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libnotify libpng libtiff
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libnotify
 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 MesaLib libtiff
-PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
+PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
+PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme libnotify
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -39,7 +39,9 @@ endif
 
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
+			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
 			HOST_CFLAGS="${CFLAGS_FOR_BUILD}" \
+			HOST_LDFLAGS="${LDLAGS_FOR_BUILD}" \
 			HOST_CXX="${CXX_FOR_BUILD}" \
 			HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
 			BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \
@@ -65,6 +67,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
 			--enable-libxul \
+			--enable-libnotify \
 			--enable-dbus \
 			--disable-tests \
 			--disable-libconic \
@@ -78,7 +81,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-jemalloc \
 			--disable-crashreporter
 
-XAKE_FLAGS+=		OS_RELEASE="2.6"
+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}"
 
 firefox-install:
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 42b39365b..733e4aa4c 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,5 +1,14 @@
 --- mozilla-2.0.orig/configure	2011-03-19 00:48:56.000000000 +0100
-+++ mozilla-2.0/configure	2011-03-28 12:25:19.041814743 +0200
++++ 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
  fi
  
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
new file mode 100644
index 000000000..cc75305d9
--- /dev/null
+++ b/package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc
@@ -0,0 +1,24 @@
+--- 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() {
+   const int kMaxCallers = 256;
+ 
+   void* callers[kMaxCallers];
+-#ifndef ANDROID
+-  int count = backtrace(callers, kMaxCallers);
+-#else
+   int count = 0;
+-#endif
+ 
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we still still exclude them because they would break the
+@@ -138,9 +134,6 @@ StackTrace::StackTrace() {
+ 
+ void StackTrace::PrintBacktrace() {
+   fflush(stderr);
+-#ifndef ANDROID
+-  backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
+-#endif
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) {
diff --git a/package/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h b/package/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h
new file mode 100644
index 000000000..0b2443c1e
--- /dev/null
+++ b/package/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h
@@ -0,0 +1,20 @@
+--- mozilla-2.0.orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2011-03-19 00:34:13.000000000 +0100
++++ mozilla-2.0/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2011-04-07 19:02:44.000000000 +0200
+@@ -67,6 +67,9 @@
+ *
+ */
+ 
++#define CFRONT_STYLE_THIS_ADJUST
++
++#if 0
+ #if defined(LINUX) || (defined(__GLIBC__) && (defined(__FreeBSD_kernel__) || defined(__GNU__)))
+ 
+ #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
+@@ -159,6 +162,7 @@
+ #else
+ #error "need a platform define if using unixish x86 code"
+ #endif
++#endif
+ 
+ /***************************************************************************/
+ 
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 939353eaf..2b136ec07 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -4,11 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pixman
-PKG_VERSION:=		0.16.2
+PKG_VERSION:=		0.20.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		02bd3669f53c404c19980d5efb6f86fb
+PKG_MD5SUM:=		a923c20af88e469ac29ba42cfedb88c2
 PKG_DESCR:=		Pixel manipulation library
 PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		libpng
 PKG_SITES:=		http://www.cairographics.org/releases/
 
 PKG_SUBPKGS:=		PIXMAN PIXMAN_DEV
diff --git a/package/pixman/patches/patch-ltmain_sh b/package/pixman/patches/patch-ltmain_sh
index b38645c65..73aa1dfdd 100644
--- a/package/pixman/patches/patch-ltmain_sh
+++ b/package/pixman/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- pixman-0.16.2.orig/ltmain.sh	2009-04-23 02:27:43.000000000 +0200
-+++ pixman-0.16.2/ltmain.sh	2011-01-14 20:10:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
+--- pixman-0.20.2.orig/ltmain.sh	2010-10-30 23:18:32.000000000 +0200
++++ pixman-0.20.2/ltmain.sh	2011-04-07 15:05:45.000000000 +0200
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"