From f0e747a1c8b5e34836985ea447e93e80a690a90c Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 7 Dec 2023 16:30:31 +0100
Subject: [PATCH] Add some new dependencies.

---
 defaults/main.yml            |  9 +++++++--
 tasks/r-installation-deb.yml | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8d3d8ab..831de8f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -93,6 +93,10 @@ r_distribution_required_packages:
   - texlive-xetex
   - libnetcdf-dev
   - netcdf-bin
+  - libfribidi-dev
+  - libfribidi-bin
+  - libfreetype6-dev
+  - libxft-dev
 
 # Some packages that must be put on hold
 r_base_packages_hold_list: []
@@ -107,7 +111,7 @@ r_plugins_packages_list: []
 # http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/
 #
 r_sitelib_el_path: '/usr/local/lib/R/library'
-r_el_dev_pkgs: True
+r_el_dev_pkgs: true
 r_base_packages_el:
   - R
   - R-core
@@ -125,6 +129,7 @@ r_base_packages_java_dev_el:
 
 r_distribution_required_el_packages: []
 
+r_cran_install_from_ppa: "{% if r_base_versioned %}false{% else %}true{% endif %}"
 r_cran_ubuntu_packages:
   - r-cran-abind
   - r-cran-askpass
@@ -257,7 +262,7 @@ r_cran_ubuntu_packages:
   - r-cran-yaml
   - r-cran-zoo
 
-r_cran_install_from_sources: True
+r_cran_install_from_sources: true
 r_plugins_list_to_install: []
 #   - { name: 'robis', repo: '{{ r_cran_mirror_site }}' }
 
diff --git a/tasks/r-installation-deb.yml b/tasks/r-installation-deb.yml
index 24e8d3e..39f0bfa 100644
--- a/tasks/r-installation-deb.yml
+++ b/tasks/r-installation-deb.yml
@@ -100,18 +100,21 @@
       with_items: '{{ r_base_packages_hold_list | default([]) }}'
       tags: ['r_software', 'r_pkg', 'r_pkg_hold']
 
-- name: r-installation-deb | Manage additional packages
-  tags: ['r_software', 'r_pkg', r_unversioned_packages]
+- name: r-installation-deb | Manage deb packages from CRAN
+  when: r_cran_install_from_ppa
+  tags: ['r_software', 'r_pkg', r_cran_packages]
   block:
-    - name: r-installation-deb | Install some additional R modules from the deb repo
+    - name: r-installation-deb | Install some additional R modules from the CRAN deb repo
       ansible.builtin.apt:
         pkg: '{{ r_plugins_packages_list }}'
         state: present
         cache_valid_time: 3600
 
+- name: r-installation-deb | Manage dependencies required by R packages installed from source
+  tags: ['r_software', 'r_pkg', r_cran_dependencies]
+  block:
     - name: r-installation-deb | Install some packages required by R packages when installed from source
       ansible.builtin.apt:
         pkg: '{{ r_distribution_required_packages }}'
         state: present
         cache_valid_time: 3600
-      tags: ['r_software', 'r_pkg', 'r_deps']