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

[Ionut Biru]

    Date: Wednesday, December 16, 2009 @ 11:11:02
  Author: ibiru
Revision: 61449

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

........
  r61448 | ibiru | 2009-12-16 18:10:20 +0200 (Wed, 16 Dec 2009) | 2 lines
  
  upgpkg: seamonkey 2.0.1-1
      update to 2.0.1
........

Modified:
  seamonkey/repos/extra-i686/	(properties)
  seamonkey/repos/extra-i686/PKGBUILD
Deleted:
  seamonkey/repos/extra-i686/firefox-2.0-link-layout.patch
  seamonkey/repos/extra-i686/xulrunner-elif.patch

-------------------------------+
 PKGBUILD                      |   23 +++++++++++++----------
 firefox-2.0-link-layout.patch |   19 -------------------
 xulrunner-elif.patch          |   12 ------------
 3 files changed, 13 insertions(+), 41 deletions(-)


Property changes on: seamonkey/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /seamonkey/trunk:1-58194
   + /seamonkey/trunk:1-61448

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-16 16:10:20 UTC (rev 61448)
+++ extra-i686/PKGBUILD	2009-12-16 16:11:02 UTC (rev 61449)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=2.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -13,21 +13,24 @@
 replaces=('mozilla')
 url="http://www.mozilla.org/projects/seamonkey"
 source=(http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2
-        mozconfig 
-        seamonkey.desktop)
-md5sums=('494608587e3ba4e4cc2e754d95154435'
-         '6f25f3af4506a3dfdd9da2d79181c0fd'
-	 '448848e65efcbf1b2be2873b66b6cd48')
+        mozconfig
+        seamonkey.desktop
+    	seamonkey-appversion.patch
+	seamonkey-2.0-lang.patch)
+md5sums=('100c67f5dc351af5b9efb02bb375db50' '6f25f3af4506a3dfdd9da2d79181c0fd'
+         '448848e65efcbf1b2be2873b66b6cd48' '788091fa626317c7e226717df869aa40'
+         '25b6fe16ac24cd5c852213e5c1adb272')
 
 build() {
   cd "${srcdir}/comm-1.9.1"
+  patch -Np1 -i "${srcdir}/seamonkey-appversion.patch" || return 1
+  patch -Np1 -i "${srcdir}/seamonkey-2.0-lang.patch" || return 1
+
   cp "${srcdir}/mozconfig" .mozconfig
-
-  unset LDFLAGS
   unset CFLAGS
   unset CXXFLAGS
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-${pkgver}"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.0"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
   make -j1 DESTDIR="${pkgdir}" install || return 1

Deleted: extra-i686/firefox-2.0-link-layout.patch
===================================================================
--- extra-i686/firefox-2.0-link-layout.patch	2009-12-16 16:10:20 UTC (rev 61448)
+++ extra-i686/firefox-2.0-link-layout.patch	2009-12-16 16:11:02 UTC (rev 61449)
@@ -1,19 +0,0 @@
-Index: mozilla/layout/build/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v
-retrieving revision 1.127.8.7
-diff -d -u -p -r1.127.8.7 Makefile.in
---- mozilla/layout/build/Makefile.in	17 Jul 2006 19:05:13 -0000	1.127.8.7
-+++ mozilla/layout/build/Makefile.in	10 Oct 2006 04:29:16 -0000
-@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
- 	$(NULL)
- endif
- 
-+# Add explicit X11 dependency when building against X11 toolkits
-+ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \

Deleted: extra-i686/xulrunner-elif.patch
===================================================================
--- extra-i686/xulrunner-elif.patch	2009-12-16 16:10:20 UTC (rev 61448)
+++ extra-i686/xulrunner-elif.patch	2009-12-16 16:11:02 UTC (rev 61449)
@@ -1,12 +0,0 @@
-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
-