[arch-commits] Commit in xulrunner/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Sun Feb 7 11:46:49 UTC 2010
Date: Sunday, February 7, 2010 @ 06:46:49
Author: jgc
Revision: 67493
Enable tracemonkey on x86_64. Fix startup-notification
Added:
xulrunner/trunk/enable-x86_64-tracemonkey.patch
xulrunner/trunk/startup-notification.patch
Modified:
xulrunner/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 21 ++++++--
enable-x86_64-tracemonkey.patch | 25 ++++++++++
startup-notification.patch | 92 ++++++++++++++++++++++++++++++++++++++
3 files changed, 133 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-07 11:19:52 UTC (rev 67492)
+++ PKGBUILD 2010-02-07 11:46:49 UTC (rev 67493)
@@ -4,12 +4,12 @@
pkgname=xulrunner
pkgver=1.9.2
_ffoxver=3.6
-pkgrel=3
+pkgrel=4
pkgdesc="Mozilla Runtime Environment"
arch=(i686 x86_64)
license=('MPL' 'GPL' 'LGPL')
depends=('gtk2>=2.18.6' 'gcc-libs>=4.4.2' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.4' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.82' 'alsa-lib>=1.0.21.a')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui' 'python' 'wireless_tools')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui' 'python' 'wireless_tools' 'autoconf2.13')
optdepends=('libgnomeui: GNOME integration and MIME handling'
'wireless_tools: Location aware browsing'
'python: pyxpcom')
@@ -22,14 +22,18 @@
fix-mozilla-launcher.patch
mozilla-ps-pdf-simplify-operators.patch
xulrunner-version.patch
- xulrunner-png14.patch)
+ xulrunner-png14.patch
+ enable-x86_64-tracemonkey.patch
+ startup-notification.patch)
md5sums=('458051557ff49e6a352c1d56eee5782a'
'c99bced771a39690bd71e5e1c1770e73'
'2d2d7143a4e0bfe71149a51f8dbbab2f'
'63eee2d1da3b43c9d604f2253f242f40'
'13dca58c04e62a8916691c63c5c492a0'
'371303c5bdc4fa0d955d14521b93b69d'
- '3bd0566180ad2daa32743b3ce58b2095')
+ '3bd0566180ad2daa32743b3ce58b2095'
+ 'cbd938cd1fb8210cd8a2c41833489af9'
+ '5876c45f85dc3d8989a9d2d098dc9f15')
build() {
cd "${srcdir}/mozilla-1.9.2"
@@ -50,6 +54,13 @@
#Fix compile with libpng 1.4
patch -Np0 -i "${srcdir}/xulrunner-png14.patch" || return 1
+ #Tracemonkey for x86_64
+ patch -Np0 -i "${srcdir}/enable-x86_64-tracemonkey.patch" || return 1
+
+ #https://bug534845.bugzilla.mozilla.org/attachment.cgi?id=417666
+ #https://bugzilla.mozilla.org/show_bug.cgi?id=534845
+ patch -Np1 -i "${srcdir}/startup-notification.patch" || return 1
+
unset CFLAGS
unset CXXFLAGS
@@ -58,7 +69,7 @@
#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
+ rm -rf "${pkgdir}/usr/lib/xulrunner-1.9.2/dictionaries"
ln -sf /usr/share/myspell "${pkgdir}/usr/lib/xulrunner-1.9.2/dictionaries"
# add xulrunner library path to ld.so.conf
Added: enable-x86_64-tracemonkey.patch
===================================================================
--- enable-x86_64-tracemonkey.patch (rev 0)
+++ enable-x86_64-tracemonkey.patch 2010-02-07 11:46:49 UTC (rev 67493)
@@ -0,0 +1,25 @@
+--- 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)
+ ;;
Added: startup-notification.patch
===================================================================
--- startup-notification.patch (rev 0)
+++ startup-notification.patch 2010-02-07 11:46:49 UTC (rev 67493)
@@ -0,0 +1,92 @@
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3281,23 +3281,16 @@ XRE_main(int argc, char* argv[], const n
+ }
+ dirProvider.DoStartup();
+
+ PRBool shuttingDown = PR_FALSE;
+ appStartup->GetShuttingDown(&shuttingDown);
+
+ nsCOMPtr<nsICommandLineRunner> cmdLine;
+
+-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
+- nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
+- if (toolkit && !desktopStartupID.IsEmpty()) {
+- toolkit->SetDesktopStartupID(desktopStartupID);
+- }
+-#endif
+-
+ nsCOMPtr<nsIFile> workingDir;
+ rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir));
+ NS_ENSURE_SUCCESS(rv, 1);
+
+ if (!shuttingDown) {
+ cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1");
+ NS_ENSURE_TRUE(cmdLine, 1);
+
+@@ -3315,16 +3308,23 @@ XRE_main(int argc, char* argv[], const n
+
+ NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow");
+ rv = appStartup->CreateHiddenWindow();
+ NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow");
+ NS_ENSURE_SUCCESS(rv, 1);
+
+ MOZ_SPLASHSCREEN_UPDATE(50);
+
++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
++ nsRefPtr<nsGTKToolkit> toolkit = GetGTKToolkit();
++ if (toolkit && !desktopStartupID.IsEmpty()) {
++ toolkit->SetDesktopStartupID(desktopStartupID);
++ }
++#endif
++
+ // Extension Compatibility Checking and Startup
+ if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) {
+ nsCOMPtr<nsIExtensionManager> em(do_GetService("@mozilla.org/extensions/manager;1"));
+ NS_ENSURE_TRUE(em, 1);
+
+ if (upgraded) {
+ rv = em->CheckForMismatches(&needsRestart);
+ if (NS_FAILED(rv)) {
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3602,30 +3602,23 @@ XRE_main(int argc, char* argv[], const n
+ #ifdef XP_MACOSX
+ if (gBinaryPath) {
+ static char kEnvVar[MAXPATHLEN];
+ sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath);
+ PR_SetEnv(kEnvVar);
+ }
+ #endif
+
+-// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/?
+-// but the hidden window has been destroyed so toolkit is NULL anyway.
+-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
+- nsGTKToolkit* toolkit = GetGTKToolkit();
+- if (toolkit) {
+- nsCAutoString currentDesktopStartupID;
+- toolkit->GetDesktopStartupID(¤tDesktopStartupID);
+- if (!currentDesktopStartupID.IsEmpty()) {
+- nsCAutoString desktopStartupEnv;
+- desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
+- desktopStartupEnv.Append(currentDesktopStartupID);
+- // Leak it with extreme prejudice!
+- PR_SetEnv(ToNewCString(desktopStartupEnv));
+- }
++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
++ if (!desktopStartupID.IsEmpty()) {
++ nsCAutoString desktopStartupEnv;
++ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
++ desktopStartupEnv.Append(desktopStartupID);
++ // Leak it with extreme prejudice!
++ PR_SetEnv(ToNewCString(desktopStartupEnv));
+ }
+ #endif
+
+ #ifdef MOZ_WIDGET_GTK2
+ MOZ_gdk_display_close(display);
+ #endif
+
+ rv = LaunchChild(nativeApp, appInitiatedRestart);
More information about the arch-commits
mailing list