Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mlt/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/xmonad/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/cups/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/swt/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus-core/dbus.install

1 files changed, 35 insertions, 51 deletions

diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 01ca0fe9e..332cb5a36 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,75 +1,59 @@
-# $Id: PKGBUILD 138506 2011-09-26 08:00:12Z guillaume $
+# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
-pkgver=3.7.1
+pkgver=3.7.2
 pkgrel=1
+_date=201202080800
 pkgdesc="An open source widget toolkit for Java"
-_date=201109091335
-arch=(i686 x86_64 mips64el)
+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' 'mesa')
-makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant')
+optdepends=('libgnomeui' 'mesa' 'libwebkit')
+makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
 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=('b7d6d24e2feb7489b0baa0ce941ea4d2'
+  _carch=x86
+  md5sums=('9a858b11e66de8af41786eaf09fc9ee2'
            '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=('8816631e7993a783a87e98ba39da7fa6'
+  _carch=x86_64
+  md5sums=('b16ab5c9d274b9488432ebeae6e4af5a'
            'f5e548bc26a0f1f3c18131be76face40')
-  noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
 fi
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
+        build-swt.xml)
+noextract=(swt-${pkgver}-gtk-linux-${_carch}.zip)
+# To test this pkg:
+# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
 
 build() {
-  cd "${srcdir}"
-  . /etc/profile.d/openjdk6.sh
-  . /etc/profile.d/apache-ant.sh
-  unzip -jqo ${srcdir}/swt-${pkgver}-gtk-linux-*.zip "*src.zip"
-  unzip -qo src.zip
-  rm -rf about_files
-  mkdir src
-  mv org src/
-  cp build-swt.xml build.xml
+  cd ${srcdir}
+  unzip -oq swt-${pkgver}-gtk-linux-${_carch}.zip src.zip
+  unzip -oq src.zip -d src
 
-  [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DJNI64
+  . /etc/profile.d/jdk.sh
+  . /etc/profile.d/apache-ant.sh
 
-  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
+  # Shared objects
+  cd src
+  ./build.sh
 
-  make -f make_linux.mak make_cairo
-  make -f make_linux.mak make_glx
- 
-  ant compile
+  # SWT jar
+  ant -f ../build-swt.xml compile
 }
 
 package() {
-  cd "${srcdir}"
-  cp version.txt build/version.txt
-  cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/
+  cd ${srcdir}/src
 
-  ant jar
+  # Shared objects
+  export OUTPUT_DIR=${pkgdir}/usr/lib
+  install -dm755 ${OUTPUT_DIR} 
+  make -f make_linux.mak install
 
-  install -m755 -d "${pkgdir}/usr/share/java"
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m644 swt.jar "${pkgdir}/usr/share/java/"
-  install -m755 *.so "${pkgdir}/usr/lib/"
+  # SWT jar
+  ant -f ../build-swt.xml jar
+  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
+  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
 }