From 8bff890b9c091f7e1333cca899e528f63caa36e2 Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Wed, 19 Dec 2012 22:50:51 +0000
Subject: [PATCH] Fix

---
 lib32-glib2/PKGBUILD | 48 +++++++++-----------------------------------
 lib32-mesa/PKGBUILD  |  8 +++++---
 lib32-nspr/PKGBUILD  |  6 +++---
 lib32-nss/PKGBUILD   | 17 ++++------------
 4 files changed, 21 insertions(+), 58 deletions(-)

diff --git a/lib32-glib2/PKGBUILD b/lib32-glib2/PKGBUILD
index c28c773..d34fbd1 100644
--- a/lib32-glib2/PKGBUILD
+++ b/lib32-glib2/PKGBUILD
@@ -1,13 +1,12 @@
 # Lib32 Packages for Chakra, part of chakra-project.org
 #
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 
 _pkgbasename=glib2
 pkgname="lib32-${_pkgbasename}"
 pkgver=2.32.1
 _pkgver=2.32
-pkgrel=4
+pkgrel=5
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs. (ELF32)"
 url="http://www.gtk.org/"
 arch=('x86_64')
@@ -19,53 +18,24 @@ source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${_pkgver}/glib-${pkgver}.t
 sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398')
 
 build() {
-  export CC="gcc -m32 -march=i686"
-  export CXX="g++ -m32 -march=i686"
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/glib-${pkgver}"
-
-  #############################################################################
-  # Generate an autoconfig cache file.
-  # This is needed to properly cross-compile GLib.
-  #
-  # See:
-  #   http://developer.gnome.org/glib/stable/glib-cross-compiling.html
-
-  cat > i686.cache <<EOF
-glib_cv_long_long_format=ll
-glib_cv_stack_grows=no
-glib_cv_uscore=no
-ac_cv_func_posix_getpwuid_r=yes
-ac_cv_func_nonposix_getpwuid_r=no
-ac_cv_func_posix_getgrgid_r=yes
-EOF
-
-  ./configure \
-    --cache-file="i686.cache" \
-    --build="${CARCH}-unknown-linux-gnu" \
-    --host="i686-unknown-linux-gnu" \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib32 \
-    --enable-static \
-    --enable-shared \
-    --with-pcre=system \
-    --disable-fam \
-  || return 1
-
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
+      --enable-static --enable-shared --with-pcre=system --disable-fam
   make
 }
 
 package() {
   cd "${srcdir}/glib-${pkgver}"
-  make install DESTDIR="${pkgdir}"
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/{etc,usr/{share,include}}
 
-  cd "${pkgdir}/usr/bin"
+  cd "${pkgdir}"/usr/bin
   mv gio-querymodules gio-querymodules-32
   rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "${pkgdir}/usr"/{bin,lib32/gdbus-2.0}
+  rm -rf "$pkgdir"/usr/lib32/gdbus-2.0
+  find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/lib32-mesa/PKGBUILD b/lib32-mesa/PKGBUILD
index daf1873..84f16bc 100644
--- a/lib32-mesa/PKGBUILD
+++ b/lib32-mesa/PKGBUILD
@@ -8,9 +8,11 @@ pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libe
 
 pkgver=8.0.3
 
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.37' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'lib32-llvm>=3.0' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.37' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 
+             'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'lib32-llvm>=3.0' 
+             'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake)
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
@@ -162,4 +164,4 @@ package_lib32-svga-dri() {
   pkgdesc="Gallium3D VMware guest GL driver"
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-}
\ No newline at end of file
+}
diff --git a/lib32-nspr/PKGBUILD b/lib32-nspr/PKGBUILD
index 82969d0..f4bf70c 100644
--- a/lib32-nspr/PKGBUILD
+++ b/lib32-nspr/PKGBUILD
@@ -1,11 +1,10 @@
 # Lib32 Packages for Chakra, part of chakra-project.org
 #
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
 _pkgbasename=nspr
 pkgname=lib32-$_pkgbasename
-pkgver=4.9
+pkgver=4.9.4
 pkgrel=1
 pkgdesc="Netscape Portable Runtime (32-bit)"
 arch=('x86_64')
@@ -16,7 +15,7 @@ makedepends=('zip' 'gcc-multilib')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a'
+md5sums=('cf58772702b3abbdcff14e22014eeeaf'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
@@ -56,3 +55,4 @@ package() {
 
   rm -rf "${pkgdir}"/usr/{bin,share,include}
 }
+
diff --git a/lib32-nss/PKGBUILD b/lib32-nss/PKGBUILD
index 42fbac3..7f0fa04 100644
--- a/lib32-nss/PKGBUILD
+++ b/lib32-nss/PKGBUILD
@@ -1,27 +1,24 @@
 # Lib32 Packages for Chakra, part of chakra-project.org
 #
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
 _pkgbasename=nss
 pkgname=lib32-$_pkgbasename
-pkgver=3.13.3
+pkgver=3.14
 pkgrel=1
 pkgdesc="Mozilla's Netscape Security Services Library that implements PKI support (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9
-depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename=$pkgver" 'lib32-zlib')
+_nsprver=4.9.4
+depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.7.11' "$_pkgbasename=$pkgver" 'lib32-zlib')
 makedepends=('gcc-multilib' 'perl')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
-        nss-no-rpath.patch
         nss.pc.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
 options=('!strip')
-md5sums=('006cb82fa900e9e664b4b14a9b7810ca'
-         'e5c97db0c884d5f4cfda21e562dc9bba'
+md5sums=('3918d5f9eb2996271cf62d52f084fd45'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '7f39c19b1dfd62d7db7d8bf19f156fed'
          'd83c7b61abb7e9f8f7bcd157183d1ade')
@@ -32,11 +29,6 @@ build() {
   patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
   patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
-
-  # copy linux 2.6 to linux 3.0
- #  cp mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux3.0.mk
 
   make -C mozilla/security/nss/lib/ckfw/builtins generate
 
@@ -82,5 +74,4 @@ package() {
 
   install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib32/"
   install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib32/"
-
 }