xulrunner: update to 2.0, bump abi_depends.

srcpkgs/xulrunner/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.9.1"
+abi_depends=">=2.0"
 api_depends="${abi_depends}"

srcpkgs/xulrunner/files/mozconfig

@@ -0,0 +1,56 @@
+. $topsrcdir/xulrunner/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
+ac_add_options --with-pthreads
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-extensions=default
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --enable-smil
+ac_add_options --enable-canvas3d
+ac_add_options --enable-places
+ac_add_options --enable-shared-js
+ac_add_options --enable-url-classifier
+
+ac_add_options --enable-optimize
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+ac_add_options --disable-jemalloc
+ac_add_options --enable-xterm-updates
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
+
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-xprint
+ac_add_options --disable-mochitest
+ac_add_options --disable-debug
+ac_add_options --disable-installer
+ac_add_options --disable-pedantic
+
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gconf
+ac_add_options --enable-libnotify
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1

srcpkgs/xulrunner/patches/enable-x86_64-tracemonkey.patch

@@ -1,25 +0,0 @@
---- js/src/configure.in.old	2009-11-08 19:50:54.299642792 -0500
-+++ js/src/configure.in	2009-11-08 19:57:49.235621814 -0500
-@@ -2465,6 +2465,10 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=i386
-     ;;
-+x86_64*-*)
-+    ENABLE_JIT=1
-+    NANOJIT_ARCH=X64
-+    ;;
- arm*-*)
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
-@@ -2488,7 +2492,10 @@
- i?86-*)
-     AC_DEFINE(AVMPLUS_IA32)
-     ;;
--
-+x86_64*-*)
-+    AC_DEFINE(AVMPLUS_AMD64)
-+    AC_DEFINE(AVMPLUS_64BIT)
-+    ;;
- arm*-*)
-     AC_DEFINE(AVMPLUS_ARM)
-     ;;

srcpkgs/xulrunner/patches/mozilla-pkgconfig.patch

@@ -1,14 +1,16 @@
---- xulrunner/installer/libxul-embedding.pc.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in
-+++ xulrunner/installer/libxul-embedding.pc.in	2010-01-21 22:27:17.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in	2011-03-13 03:25:12.350027359 -0700
 @@ -6,5 +6,6 @@
  Name: libxul-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
 +Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
  Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
---- xulrunner/installer/libxul.pc.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in
-+++ xulrunner/installer/libxul.pc.in	2010-01-21 22:27:56.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/libxul.pc.in	2011-03-13 03:25:28.010027359 -0700
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -16,8 +18,9 @@
  includedir=%includedir%
  idldir=%idldir%
  
---- xulrunner/installer/Makefile.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
-+++ xulrunner/installer/Makefile.in	2010-01-21 22:25:04.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/Makefile.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/Makefile.in	2011-03-13 03:25:55.570027359 -0700
 @@ -121,6 +121,7 @@
  	-e "s|%includedir%|$(includedir)|" \
  	-e "s|%idldir%|$(idldir)|" \
@@ -26,8 +29,9 @@
  	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
  	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
  	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
---- xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
-+++ xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2010-01-21 22:28:15.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2011-03-13 03:26:18.676694023 -0700
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -35,8 +39,9 @@
  includedir=%includedir%
  
  Name: mozilla-gtkembedmoz
---- xulrunner/installer/mozilla-gtkmozembed.pc.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in
-+++ xulrunner/installer/mozilla-gtkmozembed.pc.in	2010-01-21 22:28:27.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in	2011-03-13 03:26:41.566694025 -0700
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -44,11 +49,12 @@
  includedir=%includedir%
  
  Name: mozilla-gtkembedmoz
---- xulrunner/installer/mozilla-js.pc.in	2010-01-21 05:31:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in
-+++ xulrunner/installer/mozilla-js.pc.in	2010-01-21 22:29:30.000000000 +0200
+--- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in	2011-03-03 14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in	2011-03-13 03:27:19.680027357 -0700
 @@ -7,4 +7,4 @@
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lmozjs
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
 -Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
 +Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE

srcpkgs/xulrunner/patches/xulrunner-png14.patch

@@ -1,11 +0,0 @@
---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-01-17 00:15:53.979744638 +0100
-+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 00:16:07.855993411 +0100
-@@ -135,7 +135,7 @@
- 
-   // initialize
-   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                 png_voidp_NULL,
-+                                 NULL,
-                                  ErrorCallback,
-                                  ErrorCallback);
-   if (! mPNG)

srcpkgs/xulrunner/patches/xulrunner-version.patch

@@ -1,10 +1,11 @@
---- xulrunner/installer/Makefile.in.ver	2007-12-14 09:51:34.000000000 +0100
+diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
-+++ xulrunner/installer/Makefile.in	2007-12-14 09:52:03.000000000 +0100
+--- mozilla-2.0.orig/xulrunner/installer/Makefile.in	2011-03-03 14:12:04.000000000 -0800
-@@ -44,6 +44,8 @@ VPATH		= @srcdir@
++++ mozilla-2.0/xulrunner/installer/Makefile.in	2011-03-13 01:58:19.663360705 -0800
+@@ -44,6 +44,8 @@
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="1.9.2"
++MOZ_APP_VERSION="2.0"
 +
  NO_PKG_FILES = \
  	xulrunner-config \

srcpkgs/xulrunner/template

@@ -1,31 +1,23 @@
 # Template build file for 'xulrunner'.
 pkgname=xulrunner
-_xulver=1.9.2
+_xulver=2.0
-_xulpatchver=15
+#_xulpatchver=0
-_ffver=3.6.${_xulpatchver}
+_ffver=4.0
 # Current xulrunner version is available at $wrksrc/config/milestone.txt
 if [ -n "${_xulpatchver}" ]; then
 	version=${_xulver}.${_xulpatchver}
 else
 	version=${_xulver}
 fi
+patch_args="-Np1"
+stow_copy=yes
 #revision=1
 wrksrc=mozilla-${_xulver}
 distfiles="${MOZILLA_SITE}/firefox/releases/${_ffver}/source/firefox-${_ffver}.source.tar.bz2"
-build_style=gnu_configure
+build_style=custom-install
-configure_args="--enable-application=xulrunner --enable-libxul
---disable-crashreporter --disable-tests --disable-debug --enable-dbus
---enable-startup-notification --enable-canvas --enable-svg
---disable-mochitest --enable-strip --enable-pango --enable-optimize
---disable-embedding-tests --disable-installer --disable-oji
---disable-javaxpcom --disable-necko-wifi --disable-updater
---disable-gnomevfs --disable-gnomeui --disable-dbm --with-pthreads
---with-system-zlib --with-system-bz2 --enable-system-cairo
---with-system-png --with-system-jpeg --with-system-sqlite
---with-system-nspr --with-system-nss --enable-safe-browsing"
 short_desc="XML User Interface Language runtime environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f
+checksum=78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
 long_desc="
  XULRunner is a runtime environment for applications using the
  XML User Interface Language, XUL. It is the successor of the Gecko
@@ -37,7 +29,7 @@ Add_dependency run glibc
 Add_dependency run libstdc++
 Add_dependency run jpeg
 Add_dependency run libpng
-Add_dependency run cairo
+Add_dependency run cairo	">=1.10.2_3"	# tee support
 Add_dependency run freetype
 Add_dependency run fontconfig
 Add_dependency run libXrender
@@ -59,13 +51,18 @@ Add_dependency run nss
 Add_dependency run dbus-glib
 Add_dependency run startup-notification
 Add_dependency run pixman
+Add_dependency run hunspell
+Add_dependency run libevent
+Add_dependency run libXext
+Add_dependency run GConf
+Add_dependency run libnotify
 
 Add_dependency build zip
 Add_dependency build python
 Add_dependency build bison
 Add_dependency build jpeg-devel
 Add_dependency build libpng-devel
-Add_dependency build cairo-devel
+Add_dependency build cairo-devel	">=1.10.2_3"
 Add_dependency build freetype-devel
 Add_dependency build fontconfig-devel
 Add_dependency build libXrender-devel
@@ -87,16 +84,26 @@ Add_dependency build libIDL-devel
 Add_dependency build nss-devel
 Add_dependency build dbus-glib-devel
 Add_dependency build startup-notification-devel
+Add_dependency build hunspell-devel
+Add_dependency build libevent-devel
+Add_dependency build libXext-devel
+Add_dependency build GConf-devel
+Add_dependency build libnotify-devel
 
-pre_configure()
+do_build()
 {
-	# Detect python-2.7
+	cp -f ${FILESDIR}/mozconfig .mozconfig 
-	sed -i -e "s|python2.5|python2.7|g" ${wrksrc}/configure
+	make ${makejobs} -f client.mk build
 }
 
-post_install()
+do_install()
 {
+	make -f client.mk DESTDIR="${DESTDIR}" install
 	# Remove libsqlite3, provided by sqlite.
 	rm -f ${DESTDIR}/usr/lib/${pkgname}-${_xulver}/libsqlite3.so
 	rm -f ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc
+	# Add xulrunner library path to ld.so.conf
+	install -d ${DESTDIR}/etc/ld.so.conf.d
+	echo "/usr/lib/xulrunner-2.0" > \
+		${DESTDIR}/etc/ld.so.conf.d/xulrunner.conf
 }

srcpkgs/xulrunner/xulrunner-devel.template

@@ -29,6 +29,9 @@ Add_dependency run gdk-pixbuf
 Add_dependency run libXt
 Add_dependency run startup-notification
 Add_dependency run alsa-lib
+Add_dependency run hunspell
+Add_dependency run libevent
+Add_dependency run libXext
 
 Add_dependency run jpeg-devel
 Add_dependency run libpng-devel
@@ -52,6 +55,9 @@ Add_dependency run nss-devel
 Add_dependency run libnotify-devel
 Add_dependency run dbus-glib-devel
 Add_dependency run startup-notification-devel
+Add_dependency build hunspell-devel
+Add_dependency build libevent-devel
+Add_dependency build libXext-devel
 Add_dependency run xulrunner
 
 do_install()