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

[Jan de Groot]

    Date: Sunday, June 8, 2008 @ 09:12:35
  Author: jgc
Revision: 2583

upgpkg: xulrunner 1.8.1.14-2
    Unset CFLAGS/CXXFLAGS just like thunderbird

Modified:
  xulrunner/trunk/PKGBUILD
  xulrunner/trunk/mozconfig
Deleted:
  xulrunner/trunk/firefox-1.5-new-gtkim.patch

-----------------------------+
 PKGBUILD                    |   11 +++++++----
 firefox-1.5-new-gtkim.patch |   13 -------------
 mozconfig                   |    2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-08 13:06:05 UTC (rev 2582)
+++ PKGBUILD	2008-06-08 13:12:35 UTC (rev 2583)
@@ -3,11 +3,11 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xulrunner
 pkgver=1.8.1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.12.9-2' 'gcc-libs>=4.3.0' 'libidl2>=0.8.10' 'mozilla-common' 'nss>=3.11.9' 'libxt')
+depends=('gtk2>=2.12.10' 'gcc-libs>=4.3.0' 'libidl2>=0.8.10' 'mozilla-common' 'nss>=3.11.9' 'libxt')
 makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnome>=2.22.0')
 options=(!makeflags)
 provides=(gecko-sdk)
@@ -21,7 +21,7 @@
 	gnome_helpers_with_params.patch)
 md5sums=('29139dcd6037e7c935edb29fb552d4d2'
          'b2b5ce5ddf6e84858b8acb1e71b4682f'
-         '8f9d3910ff4e7a1709b87bd891c24695'
+         'bd53b644c5a2855d3a2288a382b0d1e5'
          '29194973e2a535b460c6b7f92c635eaf'
          '11b221ff41078d97c131e17361072e47'
          'fd50e0a1c20f5418eb10effb9eaacac2')
@@ -33,11 +33,14 @@
   patch -Np0 -i ${startdir}/src/firefox-2.0-buildversion.patch || return 1
   patch -Np1 -i ${startdir}/src/about-plugins.patch || return 1
 
-  sed "s/#CFLAGS#/${CFLAGS}/g" ${startdir}/src/mozconfig >.mozconfig
+  cp ${startdir}/src/mozconfig .mozconfig
 
   if [ "${CARCH}" = "x86_64" ]; then
     echo "ac_cv_visibility_pragma=no" >> .mozconfig
   fi
+  
+  unset CFLAGS
+  unset CXXFLAGS
 
   make -f client.mk build || return 1
   make DESTDIR=${startdir}/pkg DISTDIR=${startdir}/pkg install || return 1

Deleted: firefox-1.5-new-gtkim.patch
===================================================================
--- firefox-1.5-new-gtkim.patch	2008-06-08 13:06:05 UTC (rev 2582)
+++ firefox-1.5-new-gtkim.patch	2008-06-08 13:12:35 UTC (rev 2583)
@@ -1,13 +0,0 @@
-diff -b -u -r mozilla.orig/widget/src/gtk2/nsWindow.cpp mozilla/widget/src/gtk2/nsWindow.cpp
---- mozilla.orig/widget/src/gtk2/nsWindow.cpp   2005-07-01 12:29:41.000000000 +0800
-+++ mozilla/widget/src/gtk2/nsWindow.cpp        2005-09-07 18:31:10.000000000 +0800
-@@ -4405,6 +4405,9 @@
-         delete[] textEvent.rangeArray;
-     }
-
-+    if (aLen == 0)
-+        return;
-+
-     gint x1, y1, x2, y2;
-     GtkWidget *widget =
-         get_gtk_widget_for_gdk_window(this->mDrawingarea->inner_window);

Modified: mozconfig
===================================================================
--- mozconfig	2008-06-08 13:06:05 UTC (rev 2582)
+++ mozconfig	2008-06-08 13:12:35 UTC (rev 2583)
@@ -21,7 +21,7 @@
 ac_add_options --enable-ldap
 ac_add_options --disable-freetype2
 ac_add_options --prefix=/usr
-ac_add_options --enable-optimize="#CFLAGS#"
+ac_add_options --enable-optimize
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-system-cairo
 ac_add_options --disable-xprint