diff --git a/files/jitsi.desktop b/files/jitsi.desktop
deleted file mode 100644
--- a/files/jitsi.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Jitsi
-GenericName=jitsi
-Comment=VoIP and Instant Messaging client
-Icon=/usr/share/pixmaps/jitsi.svg
-Type=Application
-Categories=Network
-Exec=/usr/bin/jitsi
-Terminal=false
\ No newline at end of file
diff --git a/files/jitsi.sh b/files/jitsi.sh
--- a/files/jitsi.sh
+++ b/files/jitsi.sh
@@ -1,15 +1,14 @@
-#!/bin/bash
-
+#!/bin/sh
SCDIR=/usr/share/jitsi
LIBPATH="$SCDIR/lib"
-CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
+CLASSPATH="${LIBPATH}/felix.jar:${SCDIR}/sc-bundles/sc-launcher.jar:${SCDIR}/sc-bundles/util.jar:${SCDIR}/sc-bundles/dnsjava.jar:${LIBPATH}"
FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
LOG_CONFIG="$LIBPATH/logging.properties"
-COMMAND=(java -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
+
+COMMAND=(/usr/lib/openjdk-8/bin/java -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
cd "$SCDIR"
-
-exec "${COMMAND[@]}" "$@"
\ No newline at end of file
+exec "${COMMAND[@]}" "$@"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,27 +1,35 @@
name : jitsi
-version : 2.11.5602
-release : 6
+version : '5633'
+release : 7
source :
- - https://github.com/jitsi/jitsi/archive/5602.tar.gz : 01a4567e11388ae075522b6f26203a55e8464d94c21c814000196b960c5e5637
+ - https://github.com/jitsi/jitsi/archive/5633.tar.gz : ad2ad72ac0103190f2ecd180861a12370cca1a8ca5c57474eff2967e2ca8c01e
license : Apache-2.0
component : network.im
summary : Jitsi is a free open-source audio/video and chat communicator
description: |
Jitsi is a free open-source audio/video and chat communicator
builddeps :
- - pkgconfig(gtk+-2.0)
- - pkgconfig(libpulse)
- - pkgconfig(xscrnsaver)
- apache-ant
rundeps :
+ - gnome-themes-extra
- openjdk-8
build : |
+ sed 's|0\.build\.by\.SVN|%version%|' -i src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+ sed -e 's|_APP_NAME_|Jitsi|' -e 's|_PACKAGE_NAME_|jitsi|' -i resources/install/debian/jitsi.desktop.tmpl
ant rebuild
install : |
- find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} $installdir/usr/share/jitsi/{} \;
- shopt -sq extglob
- find lib/native/linux-64 -maxdepth 1 -type f -execdir install -Dm644 {} $installdir/usr/share/jitsi/lib/native/{} \;
- find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} $installdir/usr/share/jitsi/sc-bundles/{} \;
- install -Dm755 $pkgfiles/jitsi.sh $installdir/usr/bin/jitsi
- install -Dm644 $pkgfiles/jitsi.desktop $installdir/usr/share/applications/jitsi.desktop
- install -Dm644 resources/install/debian/jitsi.svg $installdir/usr/share/pixmaps/jitsi.svg
+ # Refer to this article: https://desktop.jitsi.org/Documentation/HowToBuildAnInstaller
+
+ find sc-bundles -maxdepth 1 -type f \
+ -name '*.jar' -not -name '*-slick.jar' \
+ -execdir install -Dm00644 -t $installdir/usr/share/jitsi/sc-bundles {} +
+ install -Dm00644 sc-bundles/os-specific/linux/* -t $installdir/usr/share/jitsi/sc-bundles
+
+ install -Dm00644 lib/{*.jar,{felix.client.run,jitsi-defaults,logging}.properties} -t $installdir/usr/share/jitsi/lib
+ cp -a lib/bundle $installdir/usr/share/jitsi/lib
+ install -Dm00644 lib/native/linux-64/* -t $installdir/usr/share/jitsi/lib/native
+
+ install -Dm00755 $pkgfiles/jitsi.sh $installdir/usr/bin/jitsi
+ install -Dm00644 resources/install/debian/jitsi.desktop.tmpl $installdir/usr/share/applications/jitsi.desktop
+ install -Dm00644 resources/install/debian/jitsi.svg -t $installdir/usr/share/pixmaps
+
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
jitsi
- Joey Riches
- josephriches@gmail.com
+ Fabio Forni
+ livingsilver94.solus@redaril.me
Apache-2.0
network.im
Jitsi is a free open-source audio/video and chat communicator
Jitsi is a free open-source audio/video and chat communicator
- https://solus-project.com/sources/README.Solus
+ https://getsol.us/sources/README.Solus
jitsi
@@ -21,13 +21,11 @@
/usr/bin/jitsi
/usr/share/applications/jitsi.desktop
- /usr/share/jitsi/lib/accounts.properties.template
/usr/share/jitsi/lib/bundle/commons-logging.jar
/usr/share/jitsi/lib/bundle/junit.jar
/usr/share/jitsi/lib/bundle/log4j.jar
/usr/share/jitsi/lib/felix.client.run.properties
/usr/share/jitsi/lib/felix.jar
- /usr/share/jitsi/lib/felix.unit.test.properties
/usr/share/jitsi/lib/jitsi-defaults.properties
/usr/share/jitsi/lib/logging.properties
/usr/share/jitsi/lib/native/libgalagonotification.so
@@ -37,7 +35,6 @@
/usr/share/jitsi/lib/native/libjdic_misc.so
/usr/share/jitsi/lib/native/libsysactivitynotifications.so
/usr/share/jitsi/lib/native/libunix-java.so
- /usr/share/jitsi/lib/testing.properties
/usr/share/jitsi/sc-bundles/accountinfo.jar
/usr/share/jitsi/sc-bundles/addrbook.jar
/usr/share/jitsi/sc-bundles/advancedconfig.jar
@@ -49,21 +46,19 @@
/usr/share/jitsi/sc-bundles/bouncycastle.jar
/usr/share/jitsi/sc-bundles/branding.jar
/usr/share/jitsi/sc-bundles/browserlauncher.jar
- /usr/share/jitsi/sc-bundles/callhistory-slick.jar
/usr/share/jitsi/sc-bundles/callhistory.jar
/usr/share/jitsi/sc-bundles/certificate.jar
/usr/share/jitsi/sc-bundles/chatalerter.jar
/usr/share/jitsi/sc-bundles/chatconfig.jar
/usr/share/jitsi/sc-bundles/commons-codec.jar
+ /usr/share/jitsi/sc-bundles/commons-compress.jar
/usr/share/jitsi/sc-bundles/commons-lang.jar
- /usr/share/jitsi/sc-bundles/configuration-slick.jar
/usr/share/jitsi/sc-bundles/configuration.jar
/usr/share/jitsi/sc-bundles/connectioninfo.jar
/usr/share/jitsi/sc-bundles/contacteventhandler.jar
/usr/share/jitsi/sc-bundles/contactinfo.jar
/usr/share/jitsi/sc-bundles/contactlist.jar
/usr/share/jitsi/sc-bundles/contactsource.jar
- /usr/share/jitsi/sc-bundles/credentialsstorage-slick.jar
/usr/share/jitsi/sc-bundles/credentialsstorage.jar
/usr/share/jitsi/sc-bundles/customavatar-service.jar
/usr/share/jitsi/sc-bundles/customcontactactions.jar
@@ -75,7 +70,6 @@
/usr/share/jitsi/sc-bundles/dnsjava.jar
/usr/share/jitsi/sc-bundles/dnssecjava.jar
/usr/share/jitsi/sc-bundles/dnsservice.jar
- /usr/share/jitsi/sc-bundles/fileaccess-slick.jar
/usr/share/jitsi/sc-bundles/fileaccess.jar
/usr/share/jitsi/sc-bundles/filehistory.jar
/usr/share/jitsi/sc-bundles/fmj.jar
@@ -90,7 +84,6 @@
/usr/share/jitsi/sc-bundles/guava.jar
/usr/share/jitsi/sc-bundles/hid-service.jar
/usr/share/jitsi/sc-bundles/hid.jar
- /usr/share/jitsi/sc-bundles/history-slick.jar
/usr/share/jitsi/sc-bundles/history.jar
/usr/share/jitsi/sc-bundles/hsqldb.jar
/usr/share/jitsi/sc-bundles/httpclient.jar
@@ -106,31 +99,34 @@
/usr/share/jitsi/sc-bundles/jabberaccregwizz.jar
/usr/share/jitsi/sc-bundles/jain-sip-ri.jar
/usr/share/jitsi/sc-bundles/java-sdp-nist-bridge.jar
- /usr/share/jitsi/sc-bundles/jitsi-gpl-dependencies.jar
+ /usr/share/jitsi/sc-bundles/jbosh.jar
/usr/share/jitsi/sc-bundles/jitsi-lgpl-dependencies.jar
+ /usr/share/jitsi/sc-bundles/jitsi-utils.jar
+ /usr/share/jitsi/sc-bundles/jitsi-xmpp-extensions.jar
/usr/share/jitsi/sc-bundles/jmdnslib.jar
/usr/share/jitsi/sc-bundles/jmork.jar
/usr/share/jitsi/sc-bundles/jna-platform.jar
/usr/share/jitsi/sc-bundles/jna.jar
+ /usr/share/jitsi/sc-bundles/jnsapi.jar
/usr/share/jitsi/sc-bundles/json.jar
+ /usr/share/jitsi/sc-bundles/jxmpp-core.jar
+ /usr/share/jitsi/sc-bundles/jxmpp-jid.jar
+ /usr/share/jitsi/sc-bundles/jxmpp-util-cache.jar
/usr/share/jitsi/sc-bundles/keybindingChooser.jar
/usr/share/jitsi/sc-bundles/keybindings.jar
/usr/share/jitsi/sc-bundles/ldap.jar
/usr/share/jitsi/sc-bundles/libjitsi.jar
- /usr/share/jitsi/sc-bundles/meta-cl-slick.jar
/usr/share/jitsi/sc-bundles/meta-cl.jar
- /usr/share/jitsi/sc-bundles/metahistory-slick.jar
/usr/share/jitsi/sc-bundles/metahistory.jar
- /usr/share/jitsi/sc-bundles/msghistory-slick.jar
/usr/share/jitsi/sc-bundles/msghistory.jar
/usr/share/jitsi/sc-bundles/muc.jar
/usr/share/jitsi/sc-bundles/neomedia.jar
- /usr/share/jitsi/sc-bundles/netaddr-slick.jar
/usr/share/jitsi/sc-bundles/netaddr.jar
/usr/share/jitsi/sc-bundles/notification-handlers.jar
/usr/share/jitsi/sc-bundles/notification-service.jar
/usr/share/jitsi/sc-bundles/notification-wiring.jar
/usr/share/jitsi/sc-bundles/notificationconfig.jar
+ /usr/share/jitsi/sc-bundles/org.apache.servicemix.bundles.xpp3.jar
/usr/share/jitsi/sc-bundles/osdependent.jar
/usr/share/jitsi/sc-bundles/otr.jar
/usr/share/jitsi/sc-bundles/packetlogging.jar
@@ -144,16 +140,12 @@
/usr/share/jitsi/sc-bundles/plugin-msofficecomm.jar
/usr/share/jitsi/sc-bundles/plugin-nimbuzzavatars.jar
/usr/share/jitsi/sc-bundles/pluginmanager.jar
- /usr/share/jitsi/sc-bundles/popupmessagehandler-slick.jar
/usr/share/jitsi/sc-bundles/propertieseditor.jar
- /usr/share/jitsi/sc-bundles/protocol-icq-slick.jar
/usr/share/jitsi/sc-bundles/protocol-icq.jar
/usr/share/jitsi/sc-bundles/protocol-irc.jar
- /usr/share/jitsi/sc-bundles/protocol-jabber-slick.jar
/usr/share/jitsi/sc-bundles/protocol-jabber.jar
/usr/share/jitsi/sc-bundles/protocol-media.jar
/usr/share/jitsi/sc-bundles/protocol-mock.jar
- /usr/share/jitsi/sc-bundles/protocol-sip-slick.jar
/usr/share/jitsi/sc-bundles/protocol-sip.jar
/usr/share/jitsi/sc-bundles/protocol.jar
/usr/share/jitsi/sc-bundles/provdisc-dhcp.jar
@@ -188,7 +180,17 @@
/usr/share/jitsi/sc-bundles/slf4j-jdk14.jar
/usr/share/jitsi/sc-bundles/slick-runner.jar
/usr/share/jitsi/sc-bundles/slickless.jar
- /usr/share/jitsi/sc-bundles/smacklib.jar
+ /usr/share/jitsi/sc-bundles/smack-bosh.jar
+ /usr/share/jitsi/sc-bundles/smack-core.jar
+ /usr/share/jitsi/sc-bundles/smack-debug.jar
+ /usr/share/jitsi/sc-bundles/smack-experimental.jar
+ /usr/share/jitsi/sc-bundles/smack-extensions.jar
+ /usr/share/jitsi/sc-bundles/smack-im.jar
+ /usr/share/jitsi/sc-bundles/smack-java7.jar
+ /usr/share/jitsi/sc-bundles/smack-legacy.jar
+ /usr/share/jitsi/sc-bundles/smack-resolver-javax.jar
+ /usr/share/jitsi/sc-bundles/smack-sasl-javax.jar
+ /usr/share/jitsi/sc-bundles/smack-tcp.jar
/usr/share/jitsi/sc-bundles/spellChecker.jar
/usr/share/jitsi/sc-bundles/splash-screen.jar
/usr/share/jitsi/sc-bundles/swing-ui.jar
@@ -208,12 +210,12 @@
-
- 2018-07-29
- 2.11.5602
+
+ 2020-04-19
+ 5633
Packaging update
- Joey Riches
- josephriches@gmail.com
+ Fabio Forni
+ livingsilver94.solus@redaril.me
\ No newline at end of file