diff --git a/srcpkgs/xulrunner/patches/enable-x86_64-tracemonkey.patch b/srcpkgs/xulrunner/patches/enable-x86_64-tracemonkey.patch new file mode 100644 index 00000000000..b72ad76b450 --- /dev/null +++ b/srcpkgs/xulrunner/patches/enable-x86_64-tracemonkey.patch @@ -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) + ;; diff --git a/srcpkgs/xulrunner/patches/mozilla-pkgconfig.patch b/srcpkgs/xulrunner/patches/mozilla-pkgconfig.patch new file mode 100644 index 00000000000..5e4ab38e55a --- /dev/null +++ b/srcpkgs/xulrunner/patches/mozilla-pkgconfig.patch @@ -0,0 +1,63 @@ +--- xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200 +@@ -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 + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +--- xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +--- xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200 +@@ -121,6 +121,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -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 ++++ xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + + Name: mozilla-gtkembedmoz +--- xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + + Name: mozilla-gtkembedmoz +--- xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lmozjs +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE +--- xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 22:29:58.000000000 +0200 +@@ -5,5 +5,5 @@ + Name: Mozilla Plug-In API + Description: Mozilla Plug-In API + Version: %MOZILLA_VERSION% +-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% ++Cflags: -I${includedir} -DXP_UNIX %ojidef% + diff --git a/srcpkgs/xulrunner/patches/mozilla-ps-pdf-simplify-operators.patch b/srcpkgs/xulrunner/patches/mozilla-ps-pdf-simplify-operators.patch new file mode 100644 index 00000000000..23739f76fe9 --- /dev/null +++ b/srcpkgs/xulrunner/patches/mozilla-ps-pdf-simplify-operators.patch @@ -0,0 +1,42 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=435313 + +Index: mozilla/gfx/thebes/public/gfxPDFSurface.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v +retrieving revision 1.13 +diff -d -u -p -r1.13 gfxPDFSurface.h +--- gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 ++++ gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 +@@ -63,7 +63,11 @@ public: + // this is in points! + const gfxSize& GetSize() const { return mSize; } + +- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } ++ virtual PRInt32 GetDefaultContextFlags() const ++ { ++ return gfxContext::FLAG_SIMPLIFY_OPERATORS | ++ gfxContext::FLAG_DISABLE_SNAPPING; ++ } + + private: + nsCOMPtr mStream; +Index: mozilla/gfx/thebes/public/gfxPSSurface.h +=================================================================== +RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v +retrieving revision 1.13 +diff -d -u -p -r1.13 gfxPSSurface.h +--- gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 ++++ gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 +@@ -63,7 +63,11 @@ public: + // this is in points! + const gfxSize& GetSize() const { return mSize; } + +- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } ++ virtual PRInt32 GetDefaultContextFlags() const ++ { ++ return gfxContext::FLAG_SIMPLIFY_OPERATORS | ++ gfxContext::FLAG_DISABLE_SNAPPING; ++ } + + private: + nsCOMPtr mStream; diff --git a/srcpkgs/xulrunner/patches/startup-notification.patch b/srcpkgs/xulrunner/patches/startup-notification.patch new file mode 100644 index 00000000000..d4afccb7fcd --- /dev/null +++ b/srcpkgs/xulrunner/patches/startup-notification.patch @@ -0,0 +1,90 @@ +--- toolkit/xre/nsAppRunner.cpp ++++ 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 cmdLine; + +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) +- nsRefPtr toolkit = GetGTKToolkit(); +- if (toolkit && !desktopStartupID.IsEmpty()) { +- toolkit->SetDesktopStartupID(desktopStartupID); +- } +-#endif +- + nsCOMPtr 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 toolkit = GetGTKToolkit(); ++ if (toolkit && !desktopStartupID.IsEmpty()) { ++ toolkit->SetDesktopStartupID(desktopStartupID); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); + NS_ENSURE_TRUE(em, 1); + + if (upgraded) { + rv = em->CheckForMismatches(&needsRestart); + if (NS_FAILED(rv)) { +--- toolkit/xre/nsAppRunner.cpp ++++ 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); diff --git a/srcpkgs/xulrunner/patches/xulrunner-version.patch b/srcpkgs/xulrunner/patches/xulrunner-version.patch index 0a7e0970467..aabcc5df723 100644 --- a/srcpkgs/xulrunner/patches/xulrunner-version.patch +++ b/srcpkgs/xulrunner/patches/xulrunner-version.patch @@ -4,7 +4,7 @@ include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="1.9.1" ++MOZ_APP_VERSION="1.9.2" + NO_PKG_FILES = \ xulrunner-config \ diff --git a/srcpkgs/xulrunner/template b/srcpkgs/xulrunner/template index c994fc5c852..1b733ed9ad2 100644 --- a/srcpkgs/xulrunner/template +++ b/srcpkgs/xulrunner/template @@ -1,8 +1,8 @@ # Template build file for 'xulrunner'. pkgname=xulrunner _xulver=1.9.2 -_xulpatchver=2 -_ffver=3.6.2 +_xulpatchver=3 +_ffver=3.6.3 # Current xulrunner version is available at $wrksrc/config/milestone.txt if [ -n "${_xulpatchver}" ]; then version=${_xulver}.${_xulpatchver} @@ -25,7 +25,7 @@ configure_args="--enable-application=xulrunner --enable-libxul --with-system-nspr --with-system-nss --enable-safe-browsing" short_desc="XML User Interface Language runtime environment" maintainer="Juan RP " -checksum=0f8398efabb14da83e14c7fbabdff99a619752cadb43348b27adf302382046f0 +checksum=35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0 long_desc=" XULRunner is a runtime environment for applications using the XML User Interface Language, XUL. It is the successor of the Gecko @@ -89,4 +89,5 @@ post_install() { # Remove libsqlite3, provided by sqlite. rm -f ${DESTDIR}/usr/lib/${pkgname}-${_xulver}/libsqlite3.so + rm -f ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc }