Skip to content
Snippets Groups Projects
Commit 535746a9 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents 4af2017a 835f5ae6
No related branches found
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 85 additions and 71 deletions
.gitmodules
+ 7
− 7
View file @ 535746a9
[submodule "client-android"]
path = client-android
url = https://review.jami.net/ring-client-android
url = https://review.jami.net/jami-client-android
[submodule "client-gnome"]
path = client-gnome
url = https://review.jami.net/ring-client-gnome
url = https://review.jami.net/jami-client-gnome
[submodule "daemon"]
path = daemon
url = https://review.jami.net/ring-daemon
url = https://review.jami.net/jami-daemon
[submodule "lrc"]
path = lrc
url = https://review.jami.net/ring-lrc
url = https://review.jami.net/jami-libclient
[submodule "client-macosx"]
path = client-macosx
url = https://review.jami.net/ring-client-macosx
url = https://review.jami.net/jami-client-macos
[submodule "client-ios"]
path = client-ios
url = https://review.jami.net/ring-client-ios
url = https://review.jami.net/jami-client-ios
[submodule "client-uwp"]
path = client-uwp
url = https://review.jami.net/ring-client-uwp
url = https://review.jami.net/jami-client-uwp
[submodule "client-qt"]
path = client-qt
url = https://review.jami.net/jami-client-qt
......
.gitreview
+ 1
− 1
View file @ 535746a9
[gerrit]
host=review.jami.net
port=29420
project=ring-project
project=jami-project
defaultremote=origin
defaultbranch=master
Jenkinsfile
+ 1
− 1
View file @ 535746a9
......@@ -29,7 +29,7 @@ pipeline {
[branches: [[compareType: 'PLAIN', pattern: 'master']],
compareType: 'PLAIN',
disableStrictForbiddenFileVerification: false,
pattern: 'ring-project']],
pattern: 'jami-project']],
triggerOnEvents: [
commentAddedContains('!build'),
patchsetCreated(excludeDrafts: true, excludeNoCodeChange: true,
......
Makefile
+ 1
− 0
View file @ 535746a9
......@@ -165,6 +165,7 @@ DISTRIBUTIONS := \
ubuntu_18.04 \
ubuntu_20.04 \
ubuntu_21.04 \
ubuntu_21.10 \
fedora_33 \
fedora_34 \
opensuse-leap_15.2 \
......
README.rst
+ 4
− 4
View file @ 535746a9
......@@ -2,13 +2,13 @@ jami-project
============
This repository is the master repository for Jami. It contains a build script, build.py,
that can be used to build and install ring from source on different platforms.
that can be used to build and install Jami from source on different platforms.
More documentation can be found on http://docs.jami.net. You may also build the documentation
with ``make docs``. The documentation will be built in ``docs/build/html``.
Using make-ring
###############
Using build.py
##############
Dependencies
------------
......@@ -105,7 +105,7 @@ You can find the .app file in the ``./install/client-macosx`` folder.
On Android
----------
Please make sure you have the Android SDK and NDK installed, and that their paths are properly set. For further information, please visit <https://github.com/savoirfairelinux/ring-client-android>
Please make sure you have the Android SDK and NDK installed, and that their paths are properly set. For further information, please visit <https://git.jami.net/savoirfairelinux/jami-client-android>
Build and install locally under this repository:
......
client-android @ 91b36792
Subproject commit 1376034cc660b69d09158aeb28d7665ae5cd6ec6
Subproject commit 91b367921398a44fd787b5b85a6e83cd50cbbd03
client-gnome @ e9bc9572
Subproject commit 40277efa9abd980b010cee852b405e564e6b0c3d
Subproject commit e9bc95724de31484a20d15c1a5acffb159a525a7
client-ios @ 556d248d
Subproject commit ba96ab4f0d1529ad5386f8542d3d20f2ba0ea98a
Subproject commit 556d248d2fa6dcd3a748cc3775f1e13385c6acd2
client-macosx @ 1c62576e
Subproject commit c35095bb31662e5655e591f31ce1c85bb9ba29c2
Subproject commit 1c62576ea7fe9b96d631d5b260f8660b9982ea9f
client-qt @ e0b28eed
Subproject commit e0737f4b70cb0e31bd7f8514847a26ccbedc8169
Subproject commit e0b28eed7b4971d1ac96a234395fd7d045ac9cdd
daemon @ 042ad25c
Subproject commit c2b167da6171d54740a9afeb7a66577a8abfb504
Subproject commit 042ad25ca2174df18ca18bcaf39286259fe275be
docker/Dockerfile_debian_testing
+ 1
− 1
View file @ 535746a9
......@@ -3,7 +3,7 @@ FROM debian:testing
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
RUN apt-get update --allow-releaseinfo-change && \
apt-get install -y -o Acquire::Retries=10 \
devscripts \
equivs \
......
docker/Dockerfile_ubuntu_21.10 0 → 100644
+ 21
− 0
View file @ 535746a9
FROM ubuntu:21.10
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
devscripts \
equivs \
wget
ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh qt-deps
COPY packaging/rules/debian/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh jami-deps
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"]
lrc @ 44202dea
Subproject commit bbda106696c397a16c9f7da5e0ff40821509f90a
Subproject commit 44202dea3b46ca5c7cd58f8c6f08530c0fae8efa
packaging/rules/debian-qt/rules
+ 12
− 0
View file @ 535746a9
......@@ -30,12 +30,24 @@ JOB_COUNT = $(call min,$(NO_CPUS),$(COMPUTED_JOB_COUNT))
dh $@
override_dh_auto_configure:
# https://bugs.gentoo.org/768261 (Qt 5.15)
sed -i 's,#include "absl/base/internal/spinlock.h"1,#include "absl/base/internal/spinlock.h"1\n#include <limits>,g' qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
sed -i 's,#include <stdint.h>,#include <stdint.h>\n#include <limits>,g' qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
# else, break build for ubuntu 21.10
sed -i 's/static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);/static const size_t kSigStackSize = std::max(size_t(16384), size_t(SIGSTKSZ));/g' qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
# https://bugreports.qt.io/browse/QTBUG-93452 (Qt 5.15)
sed -i 's,# include <utility>,# include <utility>\n# include <limits>,g' qtbase/src/corelib/global/qglobal.h
sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/src/corelib/global/qendian.h
cat qtbase/src/corelib/global/qendian.h
sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/src/corelib/global/qfloat16.h
sed -i 's,#include <QtCore/qbytearray.h>,#include <QtCore/qbytearray.h>\n#include <limits>,g' qtbase/src/corelib/text/qbytearraymatcher.h
./configure \
-opensource \
-confirm-license \
-nomake examples \
-nomake tests \
-prefix "${QT_JAMI_PREFIX}"
sed -i 's,bin/python,bin/env python3,g' qtbase/mkspecs/features/uikit/devices.py
override_dh_auto_build:
@echo Building Qt using $(JOB_COUNT) parallel jobs
......
packaging/rules/debian/control
+ 2
− 2
View file @ 535746a9
......@@ -60,8 +60,8 @@ Build-Depends: debhelper (>= 9),
yasm,
Standards-Version: 4.1.5
Homepage: https://jami.net
Vcs-Git: https://git.jami.net/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project
Vcs-Git: https://git.jami.net/savoirfairelinux/jami-project.git
Vcs-Browser: https://git.jami.net/savoirfairelinux/jami-project
# The jami-all package is used as the "one-click install" package
# offered on the Jami website. The following relationships ensure
......
packaging/rules/debian/jami-all.postinst
+ 2
− 0
View file @ 535746a9
......@@ -106,6 +106,8 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_20.04"
elif [ "${UBUNTU_CODENAME}" = "hirsute" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.04" ]; then
ENDTAG="ubuntu_21.04"
elif [ "${UBUNTU_CODENAME}" = "impish" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.10" ]; then
ENDTAG="ubuntu_21.10"
elif [ "${ID}" = "debian" ] && \
[ "$(command -v lsb_release)" ] && \
[ "$(lsb_release -rs)" = "testing" ]; then
......
packaging/rules/debian/rules
+ 23
− 46
View file @ 535746a9
......@@ -55,9 +55,9 @@ OCI_INSTALL_DIR = $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)
dh $@
override_dh_auto_configure:
###########################
## Daemon configure ##
###########################
override_dh_auto_build:
# Daemon contribs build + configure
mkdir -p daemon/contrib/native
cd daemon/contrib/native && \
../bootstrap \
......@@ -75,68 +75,45 @@ override_dh_auto_configure:
--disable-natpmp \
--enable-gnutls $(BUNDLED_PKGS) && \
make list && \
GTKDOCIZE=true make -j$(NO_CPUS) V=1
make -j$(NO_CPUS) V=1
cd daemon && \
./autogen.sh && \
./configure \
--disable-shared \
--prefix=/usr \
--host=${HOST_ARCH}
#############################
## libringclient configure ##
#############################
# Daemon build
make -C daemon -j$(NO_CPUS) V=1
pod2man daemon/man/jamid.pod > daemon/jamid.1
# Libringclient configure
cd lrc && \
mkdir build && \
cd build && \
cmake \
-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
-DENABLE_LIBWRAP=false \
-DENABLE_LIBWRAP=true \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
$(CMAKE_OPTIONS) ..
############################
## gnome client configure ##
############################
# libringclient build
make -C lrc/build -j$(NO_CPUS) V=1
# GNOME client configure
cd client-gnome && \
mkdir build && \
cd build && \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \
-DGSETTINGS_LOCALCOMPILE=OFF \
$(CMAKE_OPTIONS) \
..
#########################
## qt client configure ##
#########################
# needs to be done after lrc is built; see below
dh_auto_configure
override_dh_auto_build:
#######################
## Daemon build ##
#######################
make -C daemon -j$(NO_CPUS) V=1
pod2man daemon/man/jamid.pod > daemon/jamid.1
#########################
## libringclient build ##
#########################
make -C lrc/build -j$(NO_CPUS) V=1
$(CMAKE_OPTIONS) ..
########################
## gnome client build ##
########################
# GNOME client build
make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1
###################################
## qt client configure and build ##
###################################
# Qt client configure and build
cd client-qt && \
mkdir build && \
cd build && \
......
packaging/rules/rpm/jami-daemon.spec
+ 2
− 2
View file @ 535746a9
......@@ -85,8 +85,7 @@ cd %{_builddir}/ring-project/daemon && \
./autogen.sh && \
./configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--disable-shared
--libdir=%{_libdir}
# Build the daemon.
make -C %{_builddir}/ring-project/daemon %{_smp_mflags} V=1
......@@ -102,6 +101,7 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%files
%defattr(-,root,root,-)
%{_libdir}/libring.so*
# XXX: Use %%{_libexecdir}/jamid after there's no more OpenSUSE Leap
# < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
/usr/libexec/jamid
......
packaging/rules/rpm/jami-libclient.spec
+ 1
− 0
View file @ 535746a9
......@@ -34,6 +34,7 @@ users.
cd %{_builddir}/ring-project/lrc && \
mkdir build && cd build && \
cmake -DRING_BUILD_DIR=%{_builddir}/ring-project/daemon/src \
-DENABLE_LIBWRAP=true \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DCMAKE_BUILD_TYPE=Debug \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment