[arch-commits] Commit in xulrunner/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sun Feb 7 13:20:11 UTC 2010
Date: Sunday, February 7, 2010 @ 08:20:11
Author: jgc
Revision: 67503
Merged revisions 66556,66774,67449,67478,67493 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xulrunner/trunk
........
r66556 | andyrtr | 2010-01-31 20:18:19 +0100 (Sun, 31 Jan 2010) | 2 lines
upgpkg: xulrunner 1.9.2-3
add xulrunner library path to ld.so.conf.d dir
........
r66774 | ibiru | 2010-02-01 13:50:56 +0100 (Mon, 01 Feb 2010) | 1 line
fix plugin pc FS#17779
........
r67449 | jgc | 2010-02-07 10:54:23 +0100 (Sun, 07 Feb 2010) | 1 line
Clarify optdepends (FS#17807)
........
r67478 | jgc | 2010-02-07 11:49:06 +0100 (Sun, 07 Feb 2010) | 1 line
Fix dictionary lookup by just symlinking /usr/share/myspell (FS#18134)
........
r67493 | jgc | 2010-02-07 12:46:49 +0100 (Sun, 07 Feb 2010) | 1 line
Enable tracemonkey on x86_64. Fix startup-notification
........
Added:
xulrunner/repos/extra-x86_64/enable-x86_64-tracemonkey.patch
(from rev 67493, xulrunner/trunk/enable-x86_64-tracemonkey.patch)
xulrunner/repos/extra-x86_64/startup-notification.patch
(from rev 67493, xulrunner/trunk/startup-notification.patch)
Modified:
xulrunner/repos/extra-x86_64/ (properties)
xulrunner/repos/extra-x86_64/PKGBUILD
xulrunner/repos/extra-x86_64/mozilla-pkgconfig.patch
Deleted:
xulrunner/repos/extra-x86_64/100-system-hunspell-corrections.patch
---------------------------------------+
100-system-hunspell-corrections.patch | 116 --------------------------------
PKGBUILD | 36 ++++++++-
enable-x86_64-tracemonkey.patch | 25 ++++++
mozilla-pkgconfig.patch | 2
startup-notification.patch | 92 +++++++++++++++++++++++++
5 files changed, 147 insertions(+), 124 deletions(-)
Property changes on: xulrunner/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /xulrunner/trunk:1-64697
+ /xulrunner/trunk:1-67502
Deleted: extra-x86_64/100-system-hunspell-corrections.patch
===================================================================
--- extra-x86_64/100-system-hunspell-corrections.patch 2010-02-07 13:18:10 UTC (rev 67502)
+++ extra-x86_64/100-system-hunspell-corrections.patch 2010-02-07 13:20:11 UTC (rev 67503)
@@ -1,116 +0,0 @@
---- ./extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2008-02-15 19:21:21.000000000 +0000
-+++ ./extensions/spellcheck/hunspell/src/mozHunspell.cpp 2008-02-15 19:23:20.000000000 +0000
-@@ -63,6 +63,9 @@
- #include "nsISimpleEnumerator.h"
- #include "nsIDirectoryEnumerator.h"
- #include "nsIFile.h"
-+#ifdef MOZ_NATIVE_HUNSPELL
-+#include "nsILocalFile.h"
-+#endif
- #include "nsDirectoryServiceUtils.h"
- #include "nsDirectoryServiceDefs.h"
- #include "mozISpellI18NManager.h"
-@@ -307,7 +310,16 @@
- return;
-
- nsCOMPtr<nsIFile> dictDir;
-- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
-+ #ifdef MOZ_NATIVE_HUNSPELL
-+ nsCOMPtr<nsILocalFile> localFile;
-+ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile));
-+ if (localFile && NS_SUCCEEDED(rv)) {
-+ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
-+ LoadDictionariesFromDir(dictDir);
-+ }
-+ else {
-+ #endif
-+ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
- NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
- if (NS_SUCCEEDED(rv)) {
- LoadDictionariesFromDir(dictDir);
-@@ -332,6 +344,9 @@
- LoadDictionariesFromDir(appDir);
- }
- }
-+#ifdef MOZ_NATIVE_HUNSPELL
-+ }
-+#endif
-
- nsCOMPtr<nsISimpleEnumerator> dictDirs;
- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
---- ./extensions/spellcheck/src/Makefile.in.orig 2008-02-15 19:25:58.000000000 +0000
-+++ ./extensions/spellcheck/src/Makefile.in 2008-02-15 19:28:36.000000000 +0000
-@@ -63,9 +63,16 @@
- txtsvc \
- uconv \
- unicharutil \
-+ xulapp \
- $(NULL)
-
--CPPSRCS = \
-+ifdef MOZ_NATIVE_HUNSPELL
-+CPPSRCS += mozHunspell.cpp
-+ifdef MOZ_XUL_APP
-+CPPSRCS += mozHunspellDirProvider.cpp
-+endif
-+endif
-+CPPSRCS += \
- mozSpellCheckerFactory.cpp \
- mozSpellChecker.cpp \
- mozPersonalDictionary.cpp \
-@@ -80,8 +87,14 @@
- SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
- LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
- else
-+ifndef MOZ_NATIVE_HUNSPELL
- SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
- LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
-+else
-+LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \
-+ -DMOZ_NATIVE_HUNSPELL \
-+ $(NULL)
-+endif
- endif
-
- EXTRA_DSO_LDOPTS = \
-@@ -96,3 +112,18 @@
- LOCAL_INCLUDES += \
- -I$(topsrcdir)/xpcom/io \
- $(NULL)
-+
-+ifdef MOZ_NATIVE_HUNSPELL
-+export:: $(srcdir)/../hunspell/src/mozHunspell.cpp
-+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* .
-+GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp
-+clean::
-+ rm -f mozHunspell.*
-+ifdef MOZ_XUL_APP
-+export:: $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp
-+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspellDirProvider.* .
-+GARBAGE += mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp
-+clean::
-+ rm -f mozHunspellDirProvider.*
-+endif
-+endif
---- ./extensions/spellcheck/Makefile.in.orig 2008-02-15 19:23:39.000000000 +0000
-+++ ./extensions/spellcheck/Makefile.in 2008-02-15 19:24:34.000000000 +0000
-@@ -42,13 +42,19 @@
- include $(DEPTH)/config/autoconf.mk
-
- MODULE = spellchecker
--DIRS = idl locales
-+ifndef MOZ_NATIVE_HUNSPELL
-+DIRS = idl locales
-+else
-+DIRS = idl
-+endif
-
- ifeq (camino,$(MOZ_BUILD_APP))
- DIRS += osxspell
- else
-+ifndef MOZ_NATIVE_HUNSPELL
- DIRS += hunspell
- endif
-+endif
-
- DIRS += src
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2010-02-07 13:18:10 UTC (rev 67502)
+++ extra-x86_64/PKGBUILD 2010-02-07 13:20:11 UTC (rev 67503)
@@ -4,13 +4,15 @@
pkgname=xulrunner
pkgver=1.9.2
_ffoxver=3.6
-pkgrel=2
+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')
-optdepends=('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')
provides=(gecko-sdk)
replaces=(gecko-sdk)
url="http://wiki.mozilla.org/XUL:Xul_Runner"
@@ -20,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'
- 'd92adb0f23e724c1667baecb4cdaea80'
+ '2d2d7143a4e0bfe71149a51f8dbbab2f'
'63eee2d1da3b43c9d604f2253f242f40'
'13dca58c04e62a8916691c63c5c492a0'
'371303c5bdc4fa0d955d14521b93b69d'
- '3bd0566180ad2daa32743b3ce58b2095')
+ '3bd0566180ad2daa32743b3ce58b2095'
+ 'cbd938cd1fb8210cd8a2c41833489af9'
+ '5876c45f85dc3d8989a9d2d098dc9f15')
build() {
cd "${srcdir}/mozilla-1.9.2"
@@ -45,12 +51,28 @@
#Force installation to the same path for every version
patch -Np1 -i "${srcdir}/xulrunner-version.patch" || return 1
+ #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
- export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.2"
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
make -j1 DESTDIR="${pkgdir}" install || return 1
+
+ #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 "${pkgdir}/usr/lib/xulrunner-1.9.2/dictionaries"
+
+ # add xulrunner library path to ld.so.conf
+ install -d ${pkgdir}/etc/ld.so.conf.d
+ echo "/usr/lib/xulrunner-$pkgver" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
}
Copied: xulrunner/repos/extra-x86_64/enable-x86_64-tracemonkey.patch (from rev 67493, xulrunner/trunk/enable-x86_64-tracemonkey.patch)
===================================================================
--- extra-x86_64/enable-x86_64-tracemonkey.patch (rev 0)
+++ extra-x86_64/enable-x86_64-tracemonkey.patch 2010-02-07 13:20:11 UTC (rev 67503)
@@ -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)
+ ;;
Modified: extra-x86_64/mozilla-pkgconfig.patch
===================================================================
--- extra-x86_64/mozilla-pkgconfig.patch 2010-02-07 13:18:10 UTC (rev 67502)
+++ extra-x86_64/mozilla-pkgconfig.patch 2010-02-07 13:20:11 UTC (rev 67503)
@@ -66,5 +66,5 @@
Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin
++Cflags: -I${includedir} -DXP_UNIX %ojidef%
Copied: xulrunner/repos/extra-x86_64/startup-notification.patch (from rev 67493, xulrunner/trunk/startup-notification.patch)
===================================================================
--- extra-x86_64/startup-notification.patch (rev 0)
+++ extra-x86_64/startup-notification.patch 2010-02-07 13:20:11 UTC (rev 67503)
@@ -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