From 286bac8b3fc9f3f3f1166ded94a69336a8792707 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Jun 2010 10:41:30 +0200 Subject: [PATCH] firefox: update to 3.6.4. --- srcpkgs/firefox/template | 4 +- .../patches/startup-notification.patch | 90 ------------------- srcpkgs/xulrunner/template | 11 ++- 3 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 srcpkgs/xulrunner/patches/startup-notification.patch diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index ea2c8a96b2..a2d99c4c55 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,6 +1,6 @@ # Template build file for 'firefox'. pkgname=firefox -version=3.6.3 +version=3.6.4 _libxul_sdkver=1.9.2 wrksrc=mozilla-${_libxul_sdkver} distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" @@ -16,7 +16,7 @@ configure_args="--enable-application=browser --enable-default-toolkit=cairo-gtk2 --with-libxul-sdk=/usr/lib/xulrunner-devel-${_libxul_sdkver}" short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " -checksum=35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0 +checksum=fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8 long_desc=" Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is diff --git a/srcpkgs/xulrunner/patches/startup-notification.patch b/srcpkgs/xulrunner/patches/startup-notification.patch deleted file mode 100644 index d4afccb7fc..0000000000 --- a/srcpkgs/xulrunner/patches/startup-notification.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- 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/template b/srcpkgs/xulrunner/template index b6c2e48a46..66a3fea095 100644 --- a/srcpkgs/xulrunner/template +++ b/srcpkgs/xulrunner/template @@ -1,15 +1,15 @@ # Template build file for 'xulrunner'. pkgname=xulrunner _xulver=1.9.2 -_xulpatchver=3 -_ffver=3.6.3 +_xulpatchver=4 +_ffver=3.6.4 # Current xulrunner version is available at $wrksrc/config/milestone.txt if [ -n "${_xulpatchver}" ]; then version=${_xulver}.${_xulpatchver} else version=${_xulver} fi -revision=1 +#revision=1 wrksrc=mozilla-${_xulver} distfiles="${MOZILLA_SITE}/firefox/releases/${_ffver}/source/firefox-${_ffver}.source.tar.bz2" build_style=gnu_configure @@ -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=35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0 +checksum=fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8 long_desc=" XULRunner is a runtime environment for applications using the XML User Interface Language, XUL. It is the successor of the Gecko @@ -58,6 +58,8 @@ Add_dependency run nss Add_dependency run libnotify Add_dependency run dbus-glib Add_dependency run startup-notification +Add_dependency run pixman + Add_dependency build zip Add_dependency build python Add_dependency build bison @@ -77,6 +79,7 @@ Add_dependency build atk-devel Add_dependency build libXt-devel Add_dependency build libXext-devel Add_dependency build gtk+-devel +Add_dependency build pixman-devel Add_dependency build alsa-lib-devel Add_dependency build sqlite-devel Add_dependency build libIDL-devel