[arch-commits] Commit in xulrunner/trunk (9 files)
Ionut Biru
ibiru at archlinux.org
Sun Mar 13 15:50:16 UTC 2011
Date: Sunday, March 13, 2011 @ 11:50:15
Author: ibiru
Revision: 114430
upgpkg: xulrunner 2.0rc1-1
update to 2.0rc1
Modified:
xulrunner/trunk/PKGBUILD
xulrunner/trunk/mozconfig
xulrunner/trunk/mozilla-pkgconfig.patch
xulrunner/trunk/xulrunner-version.patch
Deleted:
xulrunner/trunk/enable-x86_64-tracemonkey.patch
xulrunner/trunk/fix-mozilla-launcher.patch
xulrunner/trunk/mozilla-notify.patch
xulrunner/trunk/python2.7.patch
xulrunner/trunk/xulrunner-png14.patch
---------------------------------+
PKGBUILD | 57 +++++++++++---------------------------
enable-x86_64-tracemonkey.patch | 25 ----------------
fix-mozilla-launcher.patch | 23 ---------------
mozconfig | 24 ++++++++++++++--
mozilla-notify.patch | 12 --------
mozilla-pkgconfig.patch | 40 +++++++++++++-------------
python2.7.patch | 11 -------
xulrunner-png14.patch | 11 -------
xulrunner-version.patch | 11 +++----
9 files changed, 64 insertions(+), 150 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-13 14:08:11 UTC (rev 114429)
+++ PKGBUILD 2011-03-13 15:50:15 UTC (rev 114430)
@@ -2,59 +2,36 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
# Contributor: Alexander Baldeck <alexander at archlinux.org>
pkgname=xulrunner
-pkgver=1.9.2.15
-_ffoxver=3.6.15
-pkgrel=2
+pkgver=2.0rc1
+_ffoxver=4.0rc1
+pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4')
-makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'wireless_tools' 'autoconf2.13')
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'wireless_tools' 'yasm' 'mesa')
optdepends=('libgnomeui: GNOME integration and MIME handling'
'wireless_tools: Location aware browsing')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
mozconfig
mozilla-pkgconfig.patch
- fix-mozilla-launcher.patch
- xulrunner-version.patch
- xulrunner-png14.patch
- enable-x86_64-tracemonkey.patch
- python2.7.patch
- mozilla-notify.patch)
-md5sums=('fcf8042948d91f1f3d9c33599b79cf35'
- '01b1b13ac37122fbcb3b3c9198867a46'
- 'd839d1c4ef736e6d89ccf91b23b965a4'
- '63eee2d1da3b43c9d604f2253f242f40'
- '371303c5bdc4fa0d955d14521b93b69d'
- '3bd0566180ad2daa32743b3ce58b2095'
- 'cbd938cd1fb8210cd8a2c41833489af9'
- 'ab3dc9aecae7f08b9492fb3c00a5fd28'
- '7d411e5c7476e73d2a4419e41dad9f44')
-
+ xulrunner-version.patch)
+options=('!emptydirs')
+md5sums=('511828dcc226f38602c6c67bd192ef40'
+ '55717581ed6d7c35b3c21cd0b4af5c32'
+ '639ea80e823543dd415b90c0ee804186'
+ 'a0236f6c3e55f60b7888d8cf137ff209')
build() {
- cd "${srcdir}/mozilla-1.9.2"
+ cd "${srcdir}/mozilla-2.0"
cp "${srcdir}/mozconfig" .mozconfig
#fix libdir/sdkdir - fedora
patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
- #Fix stub launcher - archlinux
- patch -Np0 -i "${srcdir}/fix-mozilla-launcher.patch"
-
#Force installation to the same path for every version
patch -Np1 -i "${srcdir}/xulrunner-version.patch"
- #Fix compile with libpng 1.4
- patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
-
- #Tracemonkey for x86_64
- patch -Np0 -i "${srcdir}/enable-x86_64-tracemonkey.patch"
-
- #python2.7
- patch -Np0 -i "${srcdir}/python2.7.patch"
- patch -Np2 -i "${srcdir}/mozilla-notify.patch"
-
unset CFLAGS
unset CXXFLAGS
@@ -62,15 +39,15 @@
}
package() {
- cd "${srcdir}/mozilla-1.9.2"
- make -j1 DESTDIR="${pkgdir}" install
+ cd "${srcdir}/mozilla-2.0"
+ make -j1 -f client.mk DESTDIR="${pkgdir}" install
#Remove included dictionaries, add symlink to system myspell path.
#Note: this will cause file conflicts when users have installed dictionaries in the old location
- rm -rf "${pkgdir}/usr/lib/xulrunner-1.9.2/dictionaries"
- ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-1.9.2/dictionaries"
+ rm -rf "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries"
+ ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries"
# add xulrunner library path to ld.so.conf
install -d ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-1.9.2" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+ echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
}
Deleted: enable-x86_64-tracemonkey.patch
===================================================================
--- enable-x86_64-tracemonkey.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ enable-x86_64-tracemonkey.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -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)
- ;;
Deleted: fix-mozilla-launcher.patch
===================================================================
--- fix-mozilla-launcher.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ fix-mozilla-launcher.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,23 +0,0 @@
---- xulrunner/stub/nsXULStub.cpp 2008-07-17 21:43:11.000000000 +0200
-+++ xulrunner/stub/nsXULStub.cpp 2008-07-17 21:47:04.000000000 +0200
-@@ -208,8 +208,10 @@
- // 3) give up
-
- struct stat fileStat;
-+ char *testp;
-
-- if (!realpath(argv[0], iniPath) || stat(iniPath, &fileStat)) {
-+ testp = realpath(argv[0], iniPath);
-+ if (!(testp != NULL && stat(iniPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode) && fileStat.st_mode & S_IXUSR) || (testp != NULL && stat(iniPath, &fileStat))) {
- const char *path = getenv("PATH");
- if (!path)
- return 1;
-@@ -222,7 +224,7 @@
- char *token = strtok(pathdup, ":");
- while (token) {
- sprintf(tmpPath, "%s/%s", token, argv[0]);
-- if (realpath(tmpPath, iniPath) && stat(iniPath, &fileStat) == 0) {
-+ if (realpath(tmpPath, iniPath) && stat(iniPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode) && fileStat.st_mode & S_IXUSR) {
- found = PR_TRUE;
- break;
- }
Modified: mozconfig
===================================================================
--- mozconfig 2011-03-13 14:08:11 UTC (rev 114429)
+++ mozconfig 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,4 +1,5 @@
. $topsrcdir/xulrunner/config/mozconfig
+
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
ac_add_options --with-system-nspr
@@ -10,25 +11,44 @@
ac_add_options --with-system-libevent
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-#disabled: mozilla is broken with cairo 1.10
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
+
ac_add_options --with-pthreads
ac_add_options --enable-strip
+ac_add_options --enable-install-strip
ac_add_options --disable-tests
ac_add_options --disable-mochitest
ac_add_options --disable-installer
+ac_add_options --disable-pedantic
+ac_add_options --enable-jemalloc
+ac_add_options --enable-xterm-updates
ac_add_options --disable-debug
ac_add_options --enable-optimize
+ac_add_options --enable-printing
+ac_add_options --enable-xinerama
+ac_add_options --enable-places
ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-xprint
ac_add_options --enable-pango
ac_add_options --enable-svg
ac_add_options --enable-canvas
+ac_add_options --enable-startup-notification
ac_add_options --disable-javaxpcom
ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
ac_add_options --enable-safe-browsing
ac_add_options --enable-startup-notification
ac_add_options --enable-extensions=default
+ac_add_options --enable-smil
+ac_add_options --enable-canvas3d
+ac_add_options --enable-url-classifier
+ac_add_options --enable-gio
+ac_add_options --enable-gnomevfs
+ac_add_options --enable-gnomeui
+ac_add_options --enable-gconf
+ac_add_options --enable-libnotify
+
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
Deleted: mozilla-notify.patch
===================================================================
--- mozilla-notify.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ mozilla-notify.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,12 +0,0 @@
-diff -up comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
---- comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify 2010-10-27 09:05:36.000000000 +0200
-+++ comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp 2010-11-08 13:28:04.564002379 +0100
-@@ -204,7 +204,7 @@ nsAlertsIconListener::ShowAlert(GdkPixbu
- {
- NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
- mAlertText.get(),
-- NULL, NULL);
-+ NULL);
- if (!notify)
- return NS_ERROR_OUT_OF_MEMORY;
-
Modified: mozilla-pkgconfig.patch
===================================================================
--- mozilla-pkgconfig.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ mozilla-pkgconfig.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,16 +1,16 @@
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in
+--- 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%
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in
+--- 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%
@@ -18,9 +18,9 @@
includedir=%includedir%
idldir=%idldir%
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/Makefile.in mozilla-1.9.2/xulrunner/installer/Makefile.in
---- mozilla-1.9.2.orig/xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
+--- 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)|" \
@@ -29,9 +29,9 @@
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.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
+--- 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%
@@ -39,9 +39,9 @@
includedir=%includedir%
Name: mozilla-gtkembedmoz
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- 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%
@@ -49,12 +49,12 @@
includedir=%includedir%
Name: mozilla-gtkembedmoz
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200
+diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in
+--- 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
Deleted: python2.7.patch
===================================================================
--- python2.7.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ python2.7.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,11 +0,0 @@
---- configure.in 2010-10-12 10:44:37.000000000 -0700
-+++ configure.in~ 2010-10-19 09:51:49.660019364 -0700
-@@ -811,7 +811,7 @@
- AC_MSG_RESULT([yes])
- fi
-
--MOZ_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
-+MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
- if test -z "$PYTHON"; then
- AC_MSG_ERROR([python was not found in \$PATH])
- fi
Deleted: xulrunner-png14.patch
===================================================================
--- xulrunner-png14.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ xulrunner-png14.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -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)
Modified: xulrunner-version.patch
===================================================================
--- xulrunner-version.patch 2011-03-13 14:08:11 UTC (rev 114429)
+++ xulrunner-version.patch 2011-03-13 15:50:15 UTC (rev 114430)
@@ -1,12 +1,11 @@
-diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module
-diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100
-@@ -44,6 +44,8 @@ VPATH = @srcdir@
+diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
+--- 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 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 \
More information about the arch-commits
mailing list