added upstream patch against libfreetype 2.10.4 [release 9.53.3-2mamba;Mon Nov 30 2020]
This commit is contained in:
parent
4054cfd66a
commit
eabee3b79b
50
ghostscript-9.53.3-libfreetype-2.10.4.patch
Normal file
50
ghostscript-9.53.3-libfreetype-2.10.4.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Tue, 20 Oct 2020 09:49:45 +0100
|
||||
Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def
|
||||
|
||||
From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what
|
||||
we used when defining our callbacks from Freetype.
|
||||
|
||||
No guidance forthcoming from the Freetype developer who made those changes,
|
||||
so change to explicitly declaring the callbacks file static.
|
||||
|
||||
Should fix the reported build failures.
|
||||
---
|
||||
base/fapi_ft.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/base/fapi_ft.c b/base/fapi_ft.c
|
||||
index 65fa6dcf4..21aef2f06 100644
|
||||
--- a/base/fapi_ft.c
|
||||
+++ b/base/fapi_ft.c
|
||||
@@ -125,7 +125,7 @@ static void
|
||||
delete_inc_int_info(gs_fapi_server * a_server,
|
||||
FT_IncrementalRec * a_inc_int_info);
|
||||
|
||||
-FT_CALLBACK_DEF(void *)
|
||||
+static void *
|
||||
FF_alloc(FT_Memory memory, long size)
|
||||
{
|
||||
gs_memory_t *mem = (gs_memory_t *) memory->user;
|
||||
@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
|
||||
return (gs_malloc(mem, size, 1, "FF_alloc"));
|
||||
}
|
||||
|
||||
-FT_CALLBACK_DEF(void *)
|
||||
+static void *
|
||||
FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
|
||||
{
|
||||
gs_memory_t *mem = (gs_memory_t *) memory->user;
|
||||
@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
|
||||
return (tmp);
|
||||
}
|
||||
|
||||
-FT_CALLBACK_DEF(void)
|
||||
+static void
|
||||
FF_free(FT_Memory memory, void *block)
|
||||
{
|
||||
gs_memory_t *mem = (gs_memory_t *) memory->user;
|
||||
--
|
||||
2.17.1
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
Name: ghostscript
|
||||
Version: 9.53.3
|
||||
Release: 1mamba
|
||||
Release: 2mamba
|
||||
Summary: The GPL release of the Ghostscript interpreter
|
||||
Group: Applications/Publishing
|
||||
Vendor: openmamba
|
||||
@ -15,6 +15,7 @@ Source: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/do
|
||||
#Source: http://downloads.sourceforge.net/sourceforge/ghostscript/ghostscript-%{version}.tar.bz2
|
||||
Patch0: ghostscript-9.07-european-locales-comma-separator.patch
|
||||
Patch1: ghostscript-9.27-system-zlib.patch
|
||||
Patch2: ghostscript-9.53.3-libfreetype-2.10.4.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -131,13 +132,15 @@ X11 support library for Ghostscript.
|
||||
#:<< _EOF
|
||||
#%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# To force using system libs
|
||||
rm -rfv cups/libs freetype jbig2dec jpeg lcms2 libpng tiff zlib
|
||||
|
||||
./autogen.sh
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
./autogen.sh
|
||||
FONTPATH=
|
||||
for path in \
|
||||
%{_datadir}/cups/fonts \
|
||||
@ -280,14 +283,14 @@ rm -f %{buildroot}%{_datadir}/ghostscript/%{version}/doc
|
||||
%{_libdir}/libgs.so
|
||||
%{_libdir}/pkgconfig/ijs.pc
|
||||
|
||||
#%if "%{stage1}" != "1"
|
||||
%if "%{stage1}" != "1"
|
||||
#%files cups
|
||||
#%defattr(-,root,root)
|
||||
#%{_datadir}/cups/model/pxlcolor.ppd
|
||||
#%{_datadir}/cups/model/pxlmono.ppd
|
||||
##%{_datadir}/cups/model/pxlmono.ppd
|
||||
#%{_sysconfdir}/cups/*
|
||||
#%{_libdir}/cups/filter/*
|
||||
#%endif
|
||||
%endif
|
||||
|
||||
%files gtk
|
||||
%defattr(-,root,root)
|
||||
@ -298,6 +301,9 @@ rm -f %{buildroot}%{_datadir}/ghostscript/%{version}/doc
|
||||
%{_libdir}/ghostscript/*/X11.so
|
||||
|
||||
%changelog
|
||||
* Mon Nov 30 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 9.53.3-2mamba
|
||||
- added upstream patch against libfreetype 2.10.4
|
||||
|
||||
* Thu Oct 01 2020 Automatic Build System <autodist@mambasoft.it> 9.53.3-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user