[arch-commits] Commit in xulrunner/trunk (3 files)

Ionut Biru ibiru at archlinux.org
Tue Jun 22 16:37:04 EDT 2010


    Date: Tuesday, June 22, 2010 @ 16:37:03
  Author: ibiru
Revision: 83765

upgpkg: xulrunner 1.9.2.4-1
update to 1.9.2.4

Modified:
  xulrunner/trunk/PKGBUILD
Deleted:
  xulrunner/trunk/nsThreadUtils.patch
  xulrunner/trunk/startup-notification.patch

----------------------------+
 PKGBUILD                   |   40 +++++++-----------
 nsThreadUtils.patch        |   42 -------------------
 startup-notification.patch |   92 -------------------------------------------
 3 files changed, 16 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 20:26:41 UTC (rev 83764)
+++ PKGBUILD	2010-06-22 20:37:03 UTC (rev 83765)
@@ -2,19 +2,17 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xulrunner
-pkgver=1.9.2.3
-_ffoxver=3.6.3
+pkgver=1.9.2.4
+_ffoxver=3.6.4
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.20.0' 'gcc-libs>=4.4.3' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.6' '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' 'autoconf2.13')
+depends=('gtk2>=2.20.1' 'gcc-libs>=4.5.0' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.6' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.86' 'alsa-lib>=1.0.23')
+makedepends=('zip' 'pkg-config' '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"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
         mozconfig
@@ -23,49 +21,43 @@
         mozilla-ps-pdf-simplify-operators.patch
         xulrunner-version.patch
         xulrunner-png14.patch
-        enable-x86_64-tracemonkey.patch
-        startup-notification.patch)
-md5sums=('5e4541ab23084b7b14ba228291ce2688'
+        enable-x86_64-tracemonkey.patch)
+md5sums=('66b1610362ed6009d66fe762645679a0'
          'c99bced771a39690bd71e5e1c1770e73'
          '2d2d7143a4e0bfe71149a51f8dbbab2f'
          '63eee2d1da3b43c9d604f2253f242f40'
          '13dca58c04e62a8916691c63c5c492a0'
          '371303c5bdc4fa0d955d14521b93b69d'
          '3bd0566180ad2daa32743b3ce58b2095'
-         'cbd938cd1fb8210cd8a2c41833489af9'
-         '5876c45f85dc3d8989a9d2d098dc9f15')
+         'cbd938cd1fb8210cd8a2c41833489af9')
 
 build() {
   cd "${srcdir}/mozilla-1.9.2"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #Upstream patch. Still not applied to 1.9.2
-  patch -Np1 -i "${srcdir}/mozilla-ps-pdf-simplify-operators.patch" || return 1
+  patch -Np1 -i "${srcdir}/mozilla-ps-pdf-simplify-operators.patch"
 
   #fix libdir/sdkdir - fedora
-  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" || return 1
+  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
   #Fix stub launcher - archlinux
-  patch -Np0 -i "${srcdir}/fix-mozilla-launcher.patch" || return 1
+  patch -Np0 -i "${srcdir}/fix-mozilla-launcher.patch"
 
   #Force installation to the same path for every version
-  patch -Np1 -i "${srcdir}/xulrunner-version.patch" || return 1
+  patch -Np1 -i "${srcdir}/xulrunner-version.patch"
 
   #Fix compile with libpng 1.4
-  patch -Np0 -i "${srcdir}/xulrunner-png14.patch" || return 1
+  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
 
   #Tracemonkey for x86_64
-  patch -Np0 -i "${srcdir}/enable-x86_64-tracemonkey.patch" || return 1
+  patch -Np0 -i "${srcdir}/enable-x86_64-tracemonkey.patch"
 
-  #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
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  make -j1 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

Deleted: nsThreadUtils.patch
===================================================================
--- nsThreadUtils.patch	2010-06-22 20:26:41 UTC (rev 83764)
+++ nsThreadUtils.patch	2010-06-22 20:37:03 UTC (rev 83765)
@@ -1,42 +0,0 @@
---- xulrunner-1.9.0.4.orig/xpcom/glue/nsThreadUtils.cpp
-+++ xulrunner-1.9.0.4/xpcom/glue/nsThreadUtils.cpp
-@@ -187,24 +187,27 @@
- }
- #endif // XPCOM_GLUE_AVOID_NSPR
- 
-+inline PRBool
-+hasPendingEvents(nsIThread *thread)
-+{
-+  PRBool val;
-+  return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val;
-+}
-+
- PRBool
- NS_HasPendingEvents(nsIThread *thread)
- {
--#ifdef MOZILLA_INTERNAL_API
-   if (!thread) {
-+#ifndef MOZILLA_INTERNAL_API
-+    nsCOMPtr<nsIThread> current;
-+    NS_GetCurrentThread(getter_AddRefs(current));
-+    return hasPendingEvents(current);
-+#else
-     thread = NS_GetCurrentThread();
-     NS_ENSURE_TRUE(thread, PR_FALSE);
--  }
--#else
--  nsCOMPtr<nsIThread> current;
--  if (!thread) {
--    NS_GetCurrentThread(getter_AddRefs(current));
--    NS_ENSURE_TRUE(current, PR_FALSE);
--    thread = current.get();
--  }
- #endif
--  PRBool val;
--  return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val;
-+  }
-+  return hasPendingEvents(thread);
- }
- 
- PRBool
-

Deleted: startup-notification.patch
===================================================================
--- startup-notification.patch	2010-06-22 20:26:41 UTC (rev 83764)
+++ startup-notification.patch	2010-06-22 20:37:03 UTC (rev 83765)
@@ -1,92 +0,0 @@
-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(&currentDesktopStartupID);
--        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