[arch-commits] Commit in seamonkey/repos (4 files)

[Jan de Groot]

    Date: Friday, October 23, 2009 @ 04:42:45
  Author: jgc
Revision: 56594

Merged revisions 56593 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/seamonkey/trunk

........
  r56593 | jgc | 2009-10-23 10:42:31 +0200 (Fri, 23 Oct 2009) | 2 lines
  
  upgpkg: seamonkey 1.1.18-1
      Update to 1.1.18, fix build
........

Added:
  seamonkey/repos/extra-x86_64/xulrunner-elif.patch
    (from rev 56593, seamonkey/trunk/xulrunner-elif.patch)
Modified:
  seamonkey/repos/extra-x86_64/	(properties)
  seamonkey/repos/extra-x86_64/PKGBUILD
  seamonkey/repos/extra-x86_64/mozconfig

----------------------+
 PKGBUILD             |   26 +++++++++++++++-----------
 mozconfig            |    1 +
 xulrunner-elif.patch |   12 ++++++++++++
 3 files changed, 28 insertions(+), 11 deletions(-)


Property changes on: seamonkey/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /seamonkey/trunk:1-44550
   + /seamonkey/trunk:1-56593

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-23 08:42:31 UTC (rev 56593)
+++ extra-x86_64/PKGBUILD	2009-10-23 08:42:45 UTC (rev 56594)
@@ -1,30 +1,34 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=1.1.17
+pkgver=1.1.18
 pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=(i686 x86_64)
 license=('MPL')
-depends=('gtk2>=2.16.4' 'libidl2>=0.8.13' 'mozilla-common>=1.3' 'nss>=3.12.3' 'libxt' 'gcc-libs>=4.4.0')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'gcc' 'libgnomeui>=2.24.1')
+depends=('gtk2>=2.18.3' 'libidl2>=0.8.13' 'mozilla-common>=1.3' 'nss>=3.12.4' 'libxt' 'gcc-libs>=4.4.1')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'gcc' 'libgnomeui>=2.24.2')
+optdepends=('libgnomeui')
 replaces=('mozilla')
 url="http://www.mozilla.org/projects/seamonkey"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/${pkgver}/seamonkey-${pkgver}.source.tar.bz2
         mozconfig 
         seamonkey.desktop
-        firefox-2.0-link-layout.patch)
-md5sums=('9eba600ba6ca522b8eada9a0a8e890e2'
-         '195fb49e6e39b6ca6acee0c35aec1c13'
+        firefox-2.0-link-layout.patch
+        xulrunner-elif.patch)
+md5sums=('ef4455becf3a12833dca7dd92854aeaa'
+         '8d0272d4d08674fa55e5d4833570395e'
          '448848e65efcbf1b2be2873b66b6cd48'
-         'b933c00957ea793fe940f4d46a85e10e')
+         'b933c00957ea793fe940f4d46a85e10e'
+         '38457261a6355365079dbe5c2342ec68')
 
 build() {
   cd "${srcdir}/mozilla"
   patch -Np1 -i "${srcdir}/firefox-2.0-link-layout.patch" || return 1
-  cp ${srcdir}/mozconfig .mozconfig
+  patch -Np1 -i "${srcdir}/xulrunner-elif.patch" || return 1
+  cp "${srcdir}/mozconfig" .mozconfig
 
+  unset LDFLAGS
   unset CFLAGS
   unset CXXFLAGS
 
@@ -39,5 +43,5 @@
                 "${pkgdir}/usr/share/pixmaps/" || return 1
   install -m644 "${srcdir}/seamonkey.desktop" "${pkgdir}/usr/share/applications/" || return 1
 
-  rm -f ${pkgdir}/usr/lib/pkgconfig/seamonkey-ns{s,pr}.pc
+  rm -f "${pkgdir}/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
 }

Modified: extra-x86_64/mozconfig
===================================================================
--- extra-x86_64/mozconfig	2009-10-23 08:42:31 UTC (rev 56593)
+++ extra-x86_64/mozconfig	2009-10-23 08:42:45 UTC (rev 56594)
@@ -20,6 +20,7 @@
 ac_add_options --mandir=/usr/share/man
 ac_add_options --enable-crypto
 ac_add_options --enable-application=suite
+ac_cv_visibility_pragma=no
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

Copied: seamonkey/repos/extra-x86_64/xulrunner-elif.patch (from rev 56593, seamonkey/trunk/xulrunner-elif.patch)
===================================================================
--- extra-x86_64/xulrunner-elif.patch	                        (rev 0)
+++ extra-x86_64/xulrunner-elif.patch	2009-10-23 08:42:45 UTC (rev 56594)
@@ -0,0 +1,12 @@
+diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
+--- mozilla/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
++++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
+@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-#elif
++#else
+ #error Oops, you need platform-specific code here
+ #endif
+