debian/ubuntu: add libfontconfig-dev for svglite/systemfonts

opencpu · Jan 25, 2024 · c7dc9f3 · c7dc9f3
1 parent 75a0ae6
commit c7dc9f3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-opencpu (2.2.11-jammy2) jammy; urgency=low
+opencpu (2.2.11-jammy3) jammy; urgency=low
 
   * Debian package with OpenCPU software. See www.opencpu.org
 

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: opencpu
 Section: gnu-r
 Priority: optional
 Maintainer: Jeroen Ooms <jeroen@berkeley.edu>
-Build-Depends: r-base-core (>= 3.5.1), r-base-dev (>= 3.5.1), r-cran-codetools, r-cran-lattice, libicu-dev, libprotobuf-dev, protobuf-compiler, apache2-dev, libapparmor-dev, libcurl4-openssl-dev, libssl-dev, libxml2-dev, libssh2-1-dev, xvfb, xauth, xfonts-base, debhelper (>> 4.1.0), pkg-config, cmake
+Build-Depends: r-base-core (>= 3.5.1), r-base-dev (>= 3.5.1), r-cran-codetools, r-cran-lattice, libicu-dev, libprotobuf-dev, protobuf-compiler, apache2-dev, libapparmor-dev, libcurl4-openssl-dev, libfontconfig-dev, libssl-dev, libxml2-dev, libssh2-1-dev, xvfb, xauth, xfonts-base, debhelper (>> 4.1.0), pkg-config, cmake
 Standards-Version: 3.9.4
 
 Package: opencpu-server

diff --git a/docker/debian-11/Dockerfile b/docker/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ARG RSTUDIO=2023.12.0-369
 RUN \
   apt-get update && \
   apt-get -y dist-upgrade && \
-  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
+  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libfontconfig-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
   useradd -ms /bin/bash builder
 
 # Note: this is different from Ubuntu (c.f. 'language-pack-en-base')

diff --git a/docker/debian-12/Dockerfile b/docker/debian-12/Dockerfile
@@ -9,7 +9,7 @@ RUN sed 's|bookworm-updates|bookworm-updates bookworm-backports|' -i /etc/apt/so
 RUN \
   apt-get update && \
   apt-get -y dist-upgrade && \
-  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
+  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libfontconfig-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
   useradd -ms /bin/bash builder
 
 # Note: this is different from Ubuntu (c.f. 'language-pack-en-base')

diff --git a/docker/ubuntu-22.04/Dockerfile b/docker/ubuntu-22.04/Dockerfile
@@ -14,7 +14,7 @@ RUN \
 #  apt-get install -y software-properties-common && \
 #  add-apt-repository -y ppa:opencpu/opencpu-2.2 && \
   apt-get update && \
-  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
+  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev libfontconfig-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
   useradd -ms /bin/bash builder
 
 # Different from debian

diff --git a/docker/ubuntu-24.04/Dockerfile b/docker/ubuntu-24.04/Dockerfile
@@ -14,7 +14,7 @@ RUN \
 #  apt-get install -y software-properties-common && \
 #  add-apt-repository -y ppa:opencpu/opencpu-2.2 && \
   apt-get update && \
-  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
+  apt-get install -y wget make devscripts apache2-dev apache2 libapreq2-dev r-base r-base-dev libapparmor-dev libcurl4-openssl-dev libprotobuf-dev protobuf-compiler libcairo2-dev libfontconfig-dev xvfb xauth xfonts-base curl libssl-dev libxml2-dev libicu-dev pkg-config libssh2-1-dev locales apt-utils cmake && \
   useradd -ms /bin/bash builder
 
 # Different from debian

diff --git a/rpm/opencpu.spec b/rpm/opencpu.spec
@@ -3,7 +3,7 @@
 
 Name: opencpu
 Version: 2.2.11
-Release: 2
+Release: 3
 Source: opencpu-server-%{branch}.tar.gz
 License: Apache2
 Summary: The OpenCPU system for embedded scientific computing and reproducible research.