[arch-commits] Commit in swt/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, June 22, 2008 @ 14:28:12
  Author: jgc
Revision: 3426

Merged revisions 2-3425 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/swt/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3322 | jgc | 2008-06-22 00:01:18 +0000 (Sun, 22 Jun 2008) | 2 lines
  
  upgpkg: swt 3.3.2-1
      Build with xulrunner 1.9
........
  r3425 | jgc | 2008-06-22 18:24:09 +0000 (Sun, 22 Jun 2008) | 1 line
  
  upgpkg: swt 3.3.2-1
........

Modified:
  swt/repos/extra-x86_64/	(properties)
  swt/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)


Property changes on: swt/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /swt/trunk:1
   + /swt/trunk:1-3425

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-22 18:24:09 UTC (rev 3425)
+++ extra-x86_64/PKGBUILD	2008-06-22 18:28:12 UTC (rev 3426)
@@ -1,29 +1,28 @@
 # $Id$
 # Maintainer: simo <simo at archlinux.org>
 pkgname=swt
-pkgver=3.3
-pkgrel=2
+pkgver=3.3.2
+pkgrel=1
 pkgdesc="An open source widget toolkit for Java"
-_date=200706251500
+_date=200802211800
 arch=(i686 x86_64)
 url="http://www.eclipse.org/swt/"
 license=('EPL')
 depends=('java-runtime')
-makedepends=('java-gcj-compat' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.8.1.11' 'unzip' \
-             'pkgconfig' 'apache-ant')
+makedepends=('java-gcj-compat' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9' 'unzip' 'pkgconfig' 'apache-ant')
 if [ "${CARCH}" = "i686" ]; then
-  source=(http://archive.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
+  source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
           build-swt.xml)
   noextract=(swt-${pkgver}-gtk-linux-x86.zip)
-  md5sums=('7398cdf9340cb131b76ed98495239520'
-         'f5e548bc26a0f1f3c18131be76face40')
+  md5sums=('7c5019b624a7ef37376bc6039aefaae8'
+           'f5e548bc26a0f1f3c18131be76face40')
 fi
 if [ "${CARCH}" = "x86_64" ]; then
   source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
           build-swt.xml)
   noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
-  md5sums=('b0a4b3442e61d2968acecfa18cdd3aa9'
-         'f5e548bc26a0f1f3c18131be76face40')
+  md5sums=('12aca4fa7e66c5086a4fe9cf83956c4a'
+           'f5e548bc26a0f1f3c18131be76face40')
 fi
 
 build() {
@@ -41,11 +40,11 @@
   make -f make_linux.mak make_swt || return 1
   make -f make_linux.mak make_atk || return 1
   make -f make_linux.mak make_gnome || return 1
-  MOZILLA_INCLUDES="`pkg-config --cflags xulrunner-xpcom`" \
-  MOZILLA_LIBS="`pkg-config --libs xulrunner-xpcom` -Wl,-R/opt/mozilla/lib/xulrunner" \
+  MOZILLA_INCLUDES="`pkg-config --cflags libxul`" \
+  MOZILLA_LIBS="`pkg-config --libs libxul` -Wl,-R/usr/lib/xulrunner-1.9" \
     make -f make_linux.mak make_mozilla || return 1
-  XULRUNNER_INCLUDES="`pkg-config --cflags xulrunner-xpcom`" \
-  XULRUNNER_LIBS="`pkg-config --libs xulrunner-xpcom` -Wl,-R/opt/mozilla/lib/xulrunner" \
+  XULRUNNER_INCLUDES="`pkg-config --cflags libxul`" \
+  XULRUNNER_LIBS="`pkg-config --libs libxul` -Wl,-R/usr/lib/xulrunner-1.9" \
     make -f make_linux.mak make_xulrunner || return 1
 
   make -f make_linux.mak make_cairo || return 1