Skip to content
Snippets Groups Projects
Commit 201b1965 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents cfba0139 eddeb558
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,7 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest ...@@ -78,7 +78,7 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest
rm -f "$@" rm -f "$@"
mkdir $(TMPDIR)/ring-project mkdir $(TMPDIR)/ring-project
git archive HEAD | tar xf - -C $(TMPDIR)/ring-project git archive HEAD | tar xf - -C $(TMPDIR)/ring-project
for m in daemon lrc client-gnome; do \ for m in daemon lrc client-gnome client-qt; do \
(cd "$$m" && git archive --prefix "$$m/" HEAD \ (cd "$$m" && git archive --prefix "$$m/" HEAD \
| tar xf - -C $(TMPDIR)/ring-project); \ | tar xf - -C $(TMPDIR)/ring-project); \
done done
...@@ -106,7 +106,7 @@ package-all: $(PACKAGE-TARGETS) ...@@ -106,7 +106,7 @@ package-all: $(PACKAGE-TARGETS)
.PHONY: list-package-targets .PHONY: list-package-targets
list-package-targets: list-package-targets:
$(foreach p,$(PACKAGE-TARGETS),\ @$(foreach p,$(PACKAGE-TARGETS),\
echo $(p);) echo $(p);)
docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
......
client-gnome @ bdf4c582
Subproject commit 83b35589fc1912342e17ed6ed366fcb214e77d44 Subproject commit bdf4c58234ed846b5d16da3f647d507edaddbd08
client-qt @ 5f127033
Subproject commit 3a157ed8eb2191e758abba1a1ada0fc03c81bd06 Subproject commit 5f12703302e63fe9aa4304ea3d66758cb899b166
daemon @ 5bd9a4af
Subproject commit ad8909f0cbf1c18dd1cd12d79857ecd70287aa1d Subproject commit 5bd9a4af705226aebd95231854b3eeaab1d193b2
lrc @ 76de4edc
Subproject commit 125de6387e78cffed7e7b191bd65dfcc862965ce Subproject commit 76de4edc67f90b0f0729a93724b586b1e6884e2d
...@@ -182,23 +182,22 @@ PACMAN_CLIENT_QT_DEPENDENCIES = [ ...@@ -182,23 +182,22 @@ PACMAN_CLIENT_QT_DEPENDENCIES = [
OSX_DEPENDENCIES = [ OSX_DEPENDENCIES = [
'autoconf', 'cmake', 'gettext', 'pkg-config', 'qt5', 'autoconf', 'cmake', 'gettext', 'pkg-config', 'qt5',
'libtool', 'yasm', 'nasm', 'automake', 'libtasn' 'libtool', 'yasm', 'nasm', 'automake'
] ]
OSX_DEPENDENCIES_UNLINK = [ OSX_DEPENDENCIES_UNLINK = [
'autoconf*', 'cmake*', 'gettext*', 'pkg-config*', 'qt*', 'qt@5.*', 'autoconf*', 'cmake*', 'gettext*', 'pkg-config*', 'qt*', 'qt@5.*',
'libtool*', 'yasm*', 'nasm*', 'automake*', 'gnutls*', 'nettle*', 'msgpack*', 'libtool*', 'yasm*', 'nasm*', 'automake*', 'gnutls*', 'nettle*', 'msgpack*'
'libtasn'
] ]
IOS_DEPENDENCIES = [ IOS_DEPENDENCIES = [
'autoconf', 'automake', 'cmake', 'yasm', 'libtool', 'autoconf', 'automake', 'cmake', 'yasm', 'libtool',
'pkg-config', 'gettext', 'swiftlint', 'swiftgen', 'libtasn' 'pkg-config', 'gettext', 'swiftlint', 'swiftgen'
] ]
IOS_DEPENDENCIES_UNLINK = [ IOS_DEPENDENCIES_UNLINK = [
'autoconf*', 'automake*', 'cmake*', 'yasm*', 'libtool*', 'autoconf*', 'automake*', 'cmake*', 'yasm*', 'libtool*',
'pkg-config*', 'gettext*', 'swiftlint*', 'swiftgen*', 'libtasn' 'pkg-config*', 'gettext*', 'swiftlint*', 'swiftgen*'
] ]
UNINSTALL_DAEMON_SCRIPT = [ UNINSTALL_DAEMON_SCRIPT = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment