From 41b8088bd754084ad8119a36e7ed478891025aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 1 May 2020 12:53:06 +0200 Subject: [PATCH 1/3] fix symbol font display with pango >= 1.44 --- R-3.6.3-fix-symbol-font.patch | 12 ++++++++++++ R.spec | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 R-3.6.3-fix-symbol-font.patch diff --git a/R-3.6.3-fix-symbol-font.patch b/R-3.6.3-fix-symbol-font.patch new file mode 100644 index 0000000..3584f54 --- /dev/null +++ b/R-3.6.3-fix-symbol-font.patch @@ -0,0 +1,12 @@ +diff -up R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c.symbol R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c +--- R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c.symbol 2020-05-01 12:16:01.605789337 +0200 ++++ R-3.6.3/src/library/grDevices/src/cairo/cairoFns.c 2020-05-01 12:16:11.757724467 +0200 +@@ -464,7 +464,7 @@ static PangoFontDescription + + fontdesc = pango_font_description_new(); + if (face == 5) +- pango_font_description_set_family(fontdesc, "symbol"); ++ pango_font_description_set_family(fontdesc, "OpenSymbol"); + else { + const char *fm = gc->fontfamily; + if (!fm[0]) fm = family; diff --git a/R.spec b/R.spec index 46c1e65..a5915bd 100644 --- a/R.spec +++ b/R.spec @@ -37,11 +37,13 @@ %if 0%{?fedora} >= 31 %global usemacros 1 +%global symbolsfont 1 %else %if 0%{?rhel} && 0%{?rhel} >= 8 %global usemacros 1 %else %global usemacros 0 +%global symbolsfont 0 %endif %endif @@ -148,7 +150,7 @@ Name: R Version: 3.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -258,6 +260,12 @@ BuildRequires: tex(upquote.sty) BuildRequires: devtoolset-%{dts_version}-toolchain %endif +%if %{symbolsfont} +# see https://bugzilla.redhat.com/show_bug.cgi?id=1815128 +Patch2: R-3.6.3-fix-symbol-font.patch +BuildRequires: libreoffice-opensymbol-fonts +%endif + # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath @@ -316,6 +324,10 @@ Requires: openblas-Rblas Requires: devtoolset-%{dts_version}-toolchain %endif +%if %{symbolsfont} +Requires: libreoffice-opensymbol-fonts +%endif + # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for # packager convenience. @@ -509,6 +521,9 @@ from the R project. This package provides the static libRmath library. %setup -q -n %{name}-%{version} %endif %patch1 -p1 -b .fixpath +%if %{symbolsfont} +%patch2 -p1 -b .symbol +%endif # Filter false positive provides. cat < %{name}-prov @@ -1234,6 +1249,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Fri May 1 2020 Iñaki Úcar - 3.6.3-2 +- fix symbol font display with pango >= 1.44 + * Mon Mar 2 2020 Tom Callaway - 3.6.3-1 - update to 3.6.3 - conditionalize lapack changes from previous commits to Fedora 32+ and EPEL-8 From 5f42075c5f85f41f76e7c3d9f1a89d024f898285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 1 May 2020 14:41:34 +0200 Subject: [PATCH 2/3] don't hide the patch definition --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index a5915bd..4a5975f 100644 --- a/R.spec +++ b/R.spec @@ -260,9 +260,9 @@ BuildRequires: tex(upquote.sty) BuildRequires: devtoolset-%{dts_version}-toolchain %endif -%if %{symbolsfont} # see https://bugzilla.redhat.com/show_bug.cgi?id=1815128 Patch2: R-3.6.3-fix-symbol-font.patch +%if %{symbolsfont} BuildRequires: libreoffice-opensymbol-fonts %endif From 3d7139e96124e0329c424f5cd310a6f2773de905 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 31 Aug 2020 11:16:27 -0400 Subject: [PATCH 3/3] rebuild with syslapack on --- R.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/R.spec b/R.spec index 4a5975f..3aab7b2 100644 --- a/R.spec +++ b/R.spec @@ -4,10 +4,10 @@ %global runjavareconf 1 # lapack comes from openblas, whenever possible. -# We decided to implement this change in Fedora 32+ and EPEL-8 only. +# We decided to implement this change in Fedora 31+ and EPEL-8 only. # This was to minimize the impact on end-users who might have R modules # installed locally with the old dependency on libRlapack.so -%if 0%{?fedora} >= 32 +%if 0%{?fedora} >= 31 %global syslapack 1 %else %if 0%{?rhel} && 0%{?rhel} >= 8 @@ -150,7 +150,7 @@ Name: R Version: 3.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz @@ -1249,6 +1249,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Aug 31 2020 Tom Callaway - 3.6.3-3 +- rebuild with syslapack on + * Fri May 1 2020 Iñaki Úcar - 3.6.3-2 - fix symbol font display with pango >= 1.44