diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-08 09:16:29 -0300 |
| commit | 91b1c319d6364307eb3bfcb0768e3eaa09df7c17 (patch) | |
| tree | 91a5fcd8f433130db7dfc8060b66f98103949797 /~emulatorman | |
| parent | 0c2419984cf5501fc1ba410e09f61fa4112c7d2a (diff) | |
| parent | 9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts:
libre/kdelibs-libre/PKGBUILD
Diffstat (limited to '~emulatorman')
| -rw-r--r-- | ~emulatorman/jitsi/PKGBUILD | 5 | ||||
| -rw-r--r-- | ~emulatorman/jitsi/jitsi.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD index 5d8a2e4cb..61460bd5c 100644 --- a/~emulatorman/jitsi/PKGBUILD +++ b/~emulatorman/jitsi/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=jitsi pkgver=1.0.3967 -pkgrel=1 +pkgrel=3 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" arch=('i686' 'x86_64') url="http://jitsi.org" @@ -17,7 +16,7 @@ source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.z jitsi.sh) md5sums=('0fb7aaaad551177c3037ae570ca2f2e1' 'aad7cf1fb18ff5d7c964834ecc38aed8' - 'c75c74f41e613a7d17bf2f1f310adee3') + 'b36c119d2005507e38cd5cb68f4ba31a') build() { diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh index c78c69f2f..71dba6a36 100644 --- a/~emulatorman/jitsi/jitsi.sh +++ b/~emulatorman/jitsi/jitsi.sh @@ -1,9 +1,9 @@ #!/bin/bash CLIENTARGS="" -arch | grep i686 && CLIENTARGS="-client -Xmx256m" +uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" -javabin=${JAVA_HOME}/bin/java +javabin=/usr/bin/java SCDIR=/usr/lib/jitsi LIBPATH=$SCDIR/lib |