[arch-commits] Commit in xulrunner/trunk (PKGBUILD xulrunner-png14.patch)

Jan de Groot jgc at archlinux.org
Sat Jan 16 18:50:10 EST 2010


    Date: Saturday, January 16, 2010 @ 18:50:10
  Author: jgc
Revision: 63328

upgpkg: xulrunner 1.9.1.7-2
    Rebuild for libjpeg8 and libpng14

Added:
  xulrunner/trunk/xulrunner-png14.patch
Modified:
  xulrunner/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   12 ++++++++----
 xulrunner-png14.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-16 23:49:25 UTC (rev 63327)
+++ PKGBUILD	2010-01-16 23:50:10 UTC (rev 63328)
@@ -4,11 +4,11 @@
 pkgname=xulrunner
 pkgver=1.9.1.7
 _ffoxver=3.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.18.3' 'gcc-libs>=4.4.2' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.4' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.82' 'alsa-lib>=1.0.21.a')
+depends=('gtk2>=2.18.6' 'gcc-libs>=4.4.2' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.4' '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')
 optdepends=('libgnomeui' 'python' 'wireless_tools')
 provides=(gecko-sdk)
@@ -21,7 +21,8 @@
         fix-mozilla-launcher.patch
         mozilla-ps-pdf-simplify-operators.patch
         nsThreadUtils.patch
-        xulrunner-version.patch)
+        xulrunner-version.patch
+        xulrunner-png14.patch)
 md5sums=('82e6f568ddeaae52e85aa089277f5d14'
          '7c87142a23e75bbd4d41e0c8de8ab4a6'
          '5efd6772ed0ecf8eddec5d5650191d3c'
@@ -29,7 +30,8 @@
          '63eee2d1da3b43c9d604f2253f242f40'
          '13dca58c04e62a8916691c63c5c492a0'
          'ccc3a0672c783c043434f256fbd38c86'
-         'd8a3066a3d9039b6f375316ed763e8f8')
+         'd8a3066a3d9039b6f375316ed763e8f8'
+         '3bd0566180ad2daa32743b3ce58b2095')
 
 build() {
   cd "${srcdir}/mozilla-1.9.1"
@@ -53,6 +55,8 @@
   #Force installation to the same path for every version
   patch -Np1 -i "${srcdir}/xulrunner-version.patch" || return 1
 
+  patch -Np0 -i "${srcdir}/xulrunner-png14.patch" || return 1
+
   unset CFLAGS
   unset CXXFLAGS
   export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.1"

Added: xulrunner-png14.patch
===================================================================
--- xulrunner-png14.patch	                        (rev 0)
+++ xulrunner-png14.patch	2010-01-16 23:50:10 UTC (rev 63328)
@@ -0,0 +1,11 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-01-17 00:15:53.979744638 +0100
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+ 
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)



More information about the arch-commits mailing list