c8ea6c07c6
Java's desktop integration on Linux relies on dlopen'ing some libraries (gtk2 or gnome). This commit makes Java able to find gtk2, fixing the problem of Jitsi's system tray icon not appearing. Part of bug #4014.
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000
|
|
+++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000
|
|
@@ -1,4 +1,9 @@
|
|
-mkdir -p $HOME/.sip-communicator/log
|
|
+#! /bin/bash
|
|
+# A modified version of the generic run.sh
|
|
+
|
|
+#mkdir -p $HOME/.sip-communicator/log
|
|
+
|
|
+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
|
|
|
|
# Get architecture
|
|
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
|
|
@@ -6,10 +11,12 @@
|
|
# Additionnal JVM arguments
|
|
CLIENTARGS=""
|
|
|
|
+NATIVELIBS="lib/native/linux-64"
|
|
if [ $ARCH -eq 32 ]
|
|
then
|
|
CLIENTARGS="-client -Xmx256m"
|
|
+ NATIVELIBS="lib/native/linux"
|
|
fi
|
|
|
|
export PATH=$PATH:native
|
|
-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
|
|
+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
|