From 20e39abd0cfbabb76e127ef2b9daf73085687351 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Mon, 28 Jun 2021 16:24:47 +0200 Subject: [PATCH] Add specfile patch from Mauro Carvalho Chehab to fix building with FreeType support (RHBZ#1803711, RHBZ#1853802) --- perl-Tk.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/perl-Tk.spec b/perl-Tk.spec index 51bef1b..558d6b5 100644 --- a/perl-Tk.spec +++ b/perl-Tk.spec @@ -5,7 +5,7 @@ Name: perl-Tk Version: 804.036 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl Graphical User Interface ToolKit License: (GPL+ or Artistic) and SWL @@ -19,7 +19,7 @@ Patch2: perl-Tk-seg.patch # Versions before this have Unicode issues -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: perl-devel >= 3:5.8.3 BuildRequires: perl-generators @@ -64,6 +64,7 @@ BuildRequires: perl(XSLoader) # X11 tests: BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-xinit +BuildRequires: google-noto-sans-fonts BuildRequires: font(:lang=en) # Specific font is needed for tests, bug #1141117, CPAN RT#98831 BuildRequires: liberation-sans-fonts @@ -135,7 +136,7 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm %patch2 -p1 -b .seg %build -%{__perl} Makefile.PL INSTALLDIRS=vendor X11LIB=%{_libdir} XFT=0 +%{__perl} Makefile.PL INSTALLDIRS=vendor X11LIB=%{_libdir} XFT=1 find . -name Makefile | xargs %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' make %{?_smp_mflags} @@ -180,6 +181,10 @@ find __demos/ -type f -exec chmod -x {} \; %changelog +* Mon Jun 28 2021 Xavier Bachelot - 804.036-3 +- Add specfile patch from Mauro Carvalho Chehab to fix building with FreeType + support (RHBZ#1803711, RHBZ#1853802) + * Fri May 21 2021 Jitka Plesnikova - 804.036-2 - Perl 5.34 rebuild