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

[Ionut Biru]

    Date: Tuesday, October 19, 2010 @ 14:21:04
  Author: ibiru
Revision: 96273

upgpkg: xulrunner 1.9.2.11-1
update to 3.6.11, mozilla-ps-pdf-simplify-operators.patch was merged upstream, added python27 support

Added:
  xulrunner/trunk/python2.7.patch
Modified:
  xulrunner/trunk/PKGBUILD
Deleted:
  xulrunner/trunk/mozilla-ps-pdf-simplify-operators.patch

-----------------------------------------+
 PKGBUILD                                |   26 +++++++++---------
 mozilla-ps-pdf-simplify-operators.patch |   42 ------------------------------
 python2.7.patch                         |   11 +++++++
 3 files changed, 24 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-19 18:10:53 UTC (rev 96272)
+++ PKGBUILD	2010-10-19 18:21:04 UTC (rev 96273)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xulrunner
-pkgver=1.9.2.10
-_ffoxver=3.6.10
-pkgrel=2
+pkgver=1.9.2.11
+_ffoxver=3.6.11
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.20.1' 'gcc-libs' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.8' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.86' 'alsa-lib>=1.0.23' 'libevent')
-makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui' 'python' 'wireless_tools' 'autoconf2.13')
+depends=('gtk2>=2.22.0' 'gcc-libs' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.8' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.86' 'alsa-lib>=1.0.23' 'libevent')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'wireless_tools' 'autoconf2.13')
 optdepends=('libgnomeui: GNOME integration and MIME handling'
             'wireless_tools: Location aware browsing')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
@@ -17,26 +17,23 @@
         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)
-md5sums=('59ee60ddfd8b33e99a24788d3b12adb3'
+        enable-x86_64-tracemonkey.patch
+        python2.7.patch)
+md5sums=('f698dd0f8f145d84933a50f69662c8db'
          'e195cdcd51a8fb6fc77f0f653ff1e582'
          '2d2d7143a4e0bfe71149a51f8dbbab2f'
          '63eee2d1da3b43c9d604f2253f242f40'
-         '13dca58c04e62a8916691c63c5c492a0'
          '371303c5bdc4fa0d955d14521b93b69d'
          '3bd0566180ad2daa32743b3ce58b2095'
-         'cbd938cd1fb8210cd8a2c41833489af9')
+         'cbd938cd1fb8210cd8a2c41833489af9'
+         '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"
-
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
@@ -52,6 +49,9 @@
   #Tracemonkey for x86_64
   patch -Np0 -i "${srcdir}/enable-x86_64-tracemonkey.patch"
 
+  #python2.7
+  patch -Np0 -i "${srcdir}/python2.7.patch"
+
   unset CFLAGS
   unset CXXFLAGS
 

Deleted: mozilla-ps-pdf-simplify-operators.patch
===================================================================
--- mozilla-ps-pdf-simplify-operators.patch	2010-10-19 18:10:53 UTC (rev 96272)
+++ mozilla-ps-pdf-simplify-operators.patch	2010-10-19 18:21:04 UTC (rev 96273)
@@ -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;

Added: python2.7.patch
===================================================================
--- python2.7.patch	                        (rev 0)
+++ python2.7.patch	2010-10-19 18:21:04 UTC (rev 96273)
@@ -0,0 +1,11 @@
+--- configure.in	2010-10-12 10:44:37.000000000 -0700
++++ configure.in~	2010-10-19 09:51:49.660019364 -0700
+@@ -811,7 +811,7 @@
+     AC_MSG_RESULT([yes])    
+ fi
+ 
+-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
+ if test -z "$PYTHON"; then
+     AC_MSG_ERROR([python was not found in \$PATH])
+ fi