Wed Jun 29 23:10:38 UTC 2011

1 files changed, 37 insertions, 28 deletions

diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index b78448b94..747013569 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 90058 2010-09-06 21:07:12Z guillaume $
+# $Id: PKGBUILD 129501 2011-06-28 14:09:34Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
-pkgver=3.6
-pkgrel=2
+pkgver=3.7
+pkgrel=1
 pkgdesc="An open source widget toolkit for Java"
-_date=201006080911
+_date=201106131736
 arch=(i686 x86_64)
 url="http://www.eclipse.org/swt/"
 license=('EPL')
 depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
-optdepends=('libgnomeui' 'xulrunner' 'mesa')
-makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant')
+#optdepends=('libgnomeui' 'xulrunner' 'mesa')
+#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant')
+optdepends=('libgnomeui' 'mesa')
+makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant')
 source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
         http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
         build-swt.xml)
-md5sums=('514206a4b9e27ac66cb7876157c3e74f'
-         '244f63edc7e609c7ac7f4bd1d7e0298a'
+md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
+         '60f11408bc8db299c5406a904a665a5e'
          'f5e548bc26a0f1f3c18131be76face40')
 if [ "${CARCH}" = "i686" ]; then
   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=('514206a4b9e27ac66cb7876157c3e74f'
+  md5sums=('21d084526f5df4e02900b2ce4ae8b5d1'
            '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)
-  md5sums=('244f63edc7e609c7ac7f4bd1d7e0298a'
+  md5sums=('60f11408bc8db299c5406a904a665a5e'
            'f5e548bc26a0f1f3c18131be76face40')
   noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
 fi
@@ -41,32 +43,39 @@ build() {
   rm -rf about_files
   mkdir src
   mv org src/
-  cp build-swt.xml build.xml || return 1
+  cp build-swt.xml build.xml
 
-  [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+  [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DJNI64
 
-  make -f make_linux.mak make_awt || return 1
-  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
-  export MOZILLA_INCLUDES="`pkg-config --cflags libxul`"
-  export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`"
-  export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
-  export XULRUNNER_LIBS="${MOZILLA_LIBS}"
-  make -f make_linux.mak make_mozilla || return 1
-  make -f make_linux.mak make_xulrunner || return 1
+  make -f make_linux.mak make_awt
+  make -f make_linux.mak make_swt
+  make -f make_linux.mak make_atk
+  make -f make_linux.mak make_gnome
+# "XULRunner >= 2.0 is not currently supported"
+#   https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696
+#
+#  export MOZILLA_INCLUDES="`pkg-config --cflags libxul`"
+#  export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`"
+#  export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
+#  export XULRUNNER_LIBS="${MOZILLA_LIBS}"
+#  make -f make_linux.mak make_mozilla
+#  make -f make_linux.mak make_xulrunner
 
-  make -f make_linux.mak make_cairo || return 1
-  make -f make_linux.mak make_glx || return 1
+  make -f make_linux.mak make_cairo
+  make -f make_linux.mak make_glx
  
-  ant compile || return 1
+  ant compile
+}
+
+package() {
+  cd "${srcdir}"
   cp version.txt build/version.txt
   cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/
 
-  ant jar || return 1
+  ant jar
 
   install -m755 -d "${pkgdir}/usr/share/java"
   install -m755 -d "${pkgdir}/usr/lib"
-  install -m644 swt.jar "${pkgdir}/usr/share/java/" || return 1
-  install -m755 *.so "${pkgdir}/usr/lib/" || return 1
+  install -m644 swt.jar "${pkgdir}/usr/share/java/"
+  install -m755 *.so "${pkgdir}/usr/lib/"
 }