Skip to content
Snippets Groups Projects
Commit d36686ed authored by Frisbee Whisperwind's avatar Frisbee Whisperwind Committed by Amin Bandali
Browse files

make-ring: add Qt5 dependencies for pacman

- remove extra print statement
- add dependency qt5-tools

Change-Id: I280a41e504557a7fcaf8f862bcef72432edbf473
parent bd29c75d
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment