Skip to content

GitLab

Commit b2e28863 authored by aviau's avatar aviau Committed by Alexandre Viau
Browse files
Options

Packaging: depend on cryptopp 

Change-Id: I31de9b38a0433e4cd3e524624871da157a5a9a09
Reviewed-by: Guillaume Roguez's avatarGuillaume Roguez <guillaume.roguez@savoirfairelinux.com>
parent 13264212
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 0 deletions
docker/Dockerfile_debian_8
View file @ b2e28863
......@@ -57,6 +57,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_debian_8_i386
View file @ b2e28863
......@@ -57,6 +57,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_debian_9
View file @ b2e28863
......@@ -57,8 +57,16 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
# Temporary fix! As soon as 5.6.4-3 is available, drop these lines.
RUN apt-get update && apt-get install -y wget
RUN wget http://ftp.us.debian.org/debian/pool/main/libc/libcrypto++/libcrypto++-dev_5.6.4-3_amd64.deb
RUN wget http://ftp.us.debian.org/debian/pool/main/libc/libcrypto++/libcrypto++6_5.6.4-3_amd64.deb
RUN dpkg -i libcrypto++6_5.6.4-3_amd64.deb
RUN dpkg -i libcrypto++-dev_5.6.4-3_amd64.deb
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD /opt/build-package-debian.sh
docker/Dockerfile_debian_9_i386
View file @ b2e28863
......@@ -57,8 +57,16 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
# Temporary fix! As soon as 5.6.4-3 is available, drop these lines.
RUN apt-get update && apt-get install -y wget
RUN wget http://ftp.us.debian.org/debian/pool/main/libc/libcrypto++/libcrypto++-dev_5.6.4-3_i386.deb
RUN wget http://ftp.us.debian.org/debian/pool/main/libc/libcrypto++/libcrypto++6_5.6.4-3_i386.deb
RUN dpkg -i libcrypto++6_5.6.4-3_i386.deb
RUN dpkg -i libcrypto++-dev_5.6.4-3_i386.deb
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD /opt/build-package-debian.sh
docker/Dockerfile_fedora_22
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_fedora_22_i386
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_fedora_23
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_fedora_23_i386
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_fedora_24
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_fedora_24_i386
View file @ b2e28863
......@@ -48,6 +48,7 @@ RUN dnf upgrade -y && \
jsoncpp-devel \
libnatpmp-devel \
webkitgtk4-devel \
cryptopp-devel \
libva-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
docker/Dockerfile_ubuntu_14.04
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_14.04_i386
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-3.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_15.10
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_15.10_i386
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_16.04
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_16.04_i386
View file @ b2e28863
......@@ -58,6 +58,7 @@ RUN apt-get update && \
libqrencode-dev \
libnm-glib-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
packaging/rules/debian/control
View file @ b2e28863
......@@ -51,6 +51,7 @@ Build-Depends: debhelper (>= 9),
libjsoncpp-dev,
libnatpmp-dev,
libva-dev,
libcrypto++-dev,
# other
yasm,
libsamplerate0-dev
......
packaging/rules/fedora/ring.spec
View file @ b2e28863
......@@ -65,6 +65,7 @@ BuildRequires: libappindicator-gtk3-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: libva-devel
BuildRequires: webkitgtk4-devel
BuildRequires: cryptopp-devel
%description
Ring is free software for universal communication which respects freedoms
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment