diff --git a/client-gnome b/client-gnome index a471e91e224d74a4aea6dbe30439a05d313f6a04..e82ff5e1f6fb41e1240ff8b121f67c35d9299692 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit a471e91e224d74a4aea6dbe30439a05d313f6a04 +Subproject commit e82ff5e1f6fb41e1240ff8b121f67c35d9299692 diff --git a/client-qt b/client-qt index 1f91576a0bf33c9d632595cf433d547d1f1d1e06..4a06565e572e9f8c3d2fcc98c22f577155cf895b 160000 --- a/client-qt +++ b/client-qt @@ -1 +1 @@ -Subproject commit 1f91576a0bf33c9d632595cf433d547d1f1d1e06 +Subproject commit 4a06565e572e9f8c3d2fcc98c22f577155cf895b diff --git a/daemon b/daemon index 46c952b30627eda31e721e0ebeb3d35a06e48963..855019860621baead5fa83d94b7cf636cc7a72b8 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 46c952b30627eda31e721e0ebeb3d35a06e48963 +Subproject commit 855019860621baead5fa83d94b7cf636cc7a72b8 diff --git a/lrc b/lrc index 95a54a7fc02c4cd0ac98614cba8c4d4249712204..e791b81686cf685aac2f7e079763c67bc7ffaf53 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 95a54a7fc02c4cd0ac98614cba8c4d4249712204 +Subproject commit e791b81686cf685aac2f7e079763c67bc7ffaf53 diff --git a/make-ring.py b/make-ring.py index da1ab6cb320998fb241d7be5ea7ee47ea27308bf..44cec5077a845c726ec65a4a125b635be71bec49 100755 --- a/make-ring.py +++ b/make-ring.py @@ -164,12 +164,20 @@ APT_CLIENT_QT_DEPENDENCIES = [ PACMAN_DEPENDENCIES = [ 'autoconf', 'autoconf-archive', 'gettext', 'cmake', 'dbus', 'doxygen', 'gcc', - 'gnome-icon-theme-symbolic', 'ffmpeg', 'boost', 'clutter-gtk', 'cppunit', - 'libdbus', 'dbus-c++', 'libe-book', 'expat', 'gtk3', 'jack', 'libnotify', - 'opus', 'pcre', 'libpulse', 'speex', 'speexdsp', 'libtool', 'yaml-cpp', + 'ffmpeg', 'boost', 'cppunit', 'libdbus', 'dbus-c++', 'libe-book', 'expat', + 'jack', 'opus', 'pcre', 'libpulse', 'speex', 'speexdsp', 'libtool', 'yaml-cpp', 'qt5-base', 'swig', 'yasm', 'qrencode', 'make', 'patch', 'pkg-config', - 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanberra', - 'openssl', 'pandoc', 'nasm' + 'automake', 'libva', 'libnm', 'libvdpau', 'openssl', 'pandoc', 'nasm' +] + +PACMAN_CLIENT_GNOME_DEPENDENCIES = [ + 'clutter-gtk','gnome-icon-theme-symbolic', 'gtk3', 'libappindicator-gtk3', + 'libcanberra', 'libnotify', 'webkit2gtk' +] + +PACMAN_CLIENT_QT_DEPENDENCIES = [ + 'qt5-declarative', 'qt5-graphicaleffects', 'qt5-multimedia', 'qt5-quickcontrols', + 'qt5-quickcontrols2', 'qt5-svg', 'qt5-tools', 'qt5-webengine' ] OSX_DEPENDENCIES = [ @@ -199,6 +207,8 @@ UNINSTALL_SCRIPT = [ 'rm -rf ./lrc/build-local/', 'rm -rf ./client-gnome/build-global', 'rm -rf ./client-gnome/build-local', + 'rm -rf ./client-qt/build-global', + 'rm -rf ./client-qt/build-local', ] OSX_UNINSTALL_SCRIPT = [ @@ -259,6 +269,10 @@ def run_dependencies(args): ) elif args.distribution in PACMAN_BASED_DISTROS: + if args.qt is None: + PACMAN_DEPENDENCIES.extend(PACMAN_CLIENT_GNOME_DEPENDENCIES) + else: + PACMAN_DEPENDENCIES.extend(PACMAN_CLIENT_QT_DEPENDENCIES) execute_script( PACMAN_INSTALL_SCRIPT, {"packages": ' '.join(map(shlex.quote, PACMAN_DEPENDENCIES))} @@ -514,9 +528,10 @@ def validate_args(parsed_args): # The Qt client support will be added incrementally. if parsed_args.qt is not None: supported_qt_distros = [ - WIN32_DISTRIBUTION_NAME, APT_BASED_DISTROS, DNF_BASED_DISTROS - ] - if parsed_args.distribution not in supported_distros: + WIN32_DISTRIBUTION_NAME + ] + APT_BASED_DISTROS + DNF_BASED_DISTROS + PACMAN_BASED_DISTROS + + if parsed_args.distribution not in supported_qt_distros: print('Distribution \'{0}\' not supported when building the Qt client.' '\nChoose one of: {1}'.format( parsed_args.distribution, ', '.join(supported_qt_distros) diff --git a/packaging/rules/snap/snapcraft.yaml b/packaging/rules/snap/snapcraft.yaml index 0c9f5b0f287c0d6397b8748ba384534d86a7d67e..13c01b71b4eb8605fdfa71399ea2e4f1108698d1 100644 --- a/packaging/rules/snap/snapcraft.yaml +++ b/packaging/rules/snap/snapcraft.yaml @@ -114,7 +114,7 @@ apps: command-chain: - bin/desktop-launch - snap/command-chain/alsa-launch - - bin/jami-gnome-wrapper + # - bin/jami-gnome-wrapper common-id: net.jami.Jami desktop: usr/share/applications/jami-gnome.desktop slots: @@ -240,7 +240,7 @@ parts: cd $SNAPCRAFT_PART_BUILD/daemon ./autogen.sh - ./configure --prefix=/usr --disable-shared + ./configure --prefix=/usr make -j$SNAPCRAFT_PARALLEL_BUILD_COUNT DESTDIR=$SNAPCRAFT_PART_INSTALL make install @@ -249,6 +249,7 @@ parts: cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_PREFIX_PATH=$SNAPCRAFT_PART_INSTALL/usr \ + -DENABLE_STATIC=true -DENABLE_LIBWRAP=true \ -DRING_BUILD_DIR=$SNAPCRAFT_PART_BUILD/daemon/src make -j$SNAPCRAFT_PARALLEL_BUILD_COUNT DESTDIR=$SNAPCRAFT_PART_INSTALL make install @@ -302,6 +303,7 @@ parts: - libspeex-dev - libspeexdsp-dev - libsrtp0-dev + - libssl-dev - libswscale-dev - libtool - libudev-dev