fix xulrunner pkgbuild

mesa-demos/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=('mesa-demos')
 pkgver=8.0.1
-pkgrel=2
+pkgrel=2.1
 arch=(i686 x86_64)
 pkgdesc="Mesa demos and tools"
 url="http://mesa3d.sourceforge.net"
@@ -32,4 +32,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
   install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
+  rm -v ${pkgdir}/usr/bin/line
+  rm -v ${pkgdir}/usr/bin/clear
 }

xulrunner/PKGBUILD

@@ -1,75 +1,58 @@
-# $Id: PKGBUILD 75703 2010-04-02 19:16:36Z ibiru $
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=xulrunner
 pkgver=1.9.2.13
 _ffoxver=3.6.13
 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')
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'python' 'wireless_tools' 'autoconf2.13')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'autoconf2.13')
-optdepends=('wireless_tools: Location aware browsing'
+optdepends=('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
         mozilla-pkgconfig.patch
         fix-mozilla-launcher.patch
-#       mozilla-ps-pdf-simplify-operators.patch
         xulrunner-version.patch
         xulrunner-png14.patch
         enable-x86_64-tracemonkey.patch
-        startup-notification.patch
         python2.7.patch)
 md5sums=('d7c90aed8209beefa74badf02e8eeae1'
-         '3b1ed7b2899189e2c8fc9a82d95209bf'
+         '01b1b13ac37122fbcb3b3c9198867a46'
          'd839d1c4ef736e6d89ccf91b23b965a4'
          '63eee2d1da3b43c9d604f2253f242f40'
-#        '13dca58c04e62a8916691c63c5c492a0'
          '371303c5bdc4fa0d955d14521b93b69d'
          '3bd0566180ad2daa32743b3ce58b2095'
          'cbd938cd1fb8210cd8a2c41833489af9'
-         '5876c45f85dc3d8989a9d2d098dc9f15'
          'ab3dc9aecae7f08b9492fb3c00a5fd28')
 
 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
-
   #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"
 
   #python2.7
   patch -Np0 -i "${srcdir}/python2.7.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 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  make -j1 DESTDIR="${pkgdir}" install || return 1
+  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

xulrunner/mozconfig

@@ -7,10 +7,11 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-png
+ac_add_options --with-system-libevent
 ac_add_options --enable-system-hunspell
-#disabled: mozilla is broken with recent versions of sqlite
+ac_add_options --enable-system-sqlite
-#ac_add_options --enable-system-sqlite
+#disabled: mozilla is broken with cairo 1.10
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --enable-strip
 ac_add_options --disable-tests

xulrunner/mozilla-pkgconfig.patch

@@ -58,13 +58,3 @@ diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/
  Libs: -L${sdkdir}/lib -lmozjs
 -Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
 +Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in
---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in	2010-01-21 05:31:27.000000000 +0200
-+++ mozilla-1.9.2/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%
- 

xulrunner/mozilla-ps-pdf-simplify-operators.patch

@@ -1,42 +0,0 @@
-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
---- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
-+++ mozilla/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<nsIOutputStream> 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
---- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
-+++ mozilla/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<nsIOutputStream> mStream;

xulrunner/nsThreadUtils.patch

@@ -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
-

xulrunner/startup-notification.patch

@@ -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);