From bd06c3641a0c5c30302d421cf27de22effed93da Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Tue, 13 Dec 2016 15:05:39 -0800 Subject: ghostscript 9.19 -> 9.20 1)Upgrade ghostscript from 9.19 to 9.20. 2)Modify ghostscript-9.15-parallel-make.patch, since the data has been changed. (From OE-Core rev: 4f3483c3a0ba22f46d768d78d6f56880e8ac5608) (From OE-Core rev: 9133ba6b8138951f3ef798f0a1cc6f694fe71868) Signed-off-by: Huang Qiyu Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../ghostscript-9.15-parallel-make.patch | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch') diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch index 797b8947cf..8fa2c4022c 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch @@ -1,40 +1,39 @@ -From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Fri, 30 Jan 2015 00:40:22 -0800 -Subject: [PATCH] contrib.mak: fix for parallel build +From 14937d9247330065359ca0fb648c28dfa5c3b224 Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Tue, 13 Dec 2016 18:16:41 +0900 +Subject: [PATCH] ghostscript-9.15-parallel-make -Fixed: -rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory +From 767bdf8a412b0cce2b734998e9b7e55abeaf932c Mon Sep 17 00:00:00 2001 +From: Huang Qiyu +Date: Tue, 13 Dec 2016 17:55:54 +0900 +Subject: [PATCH] Robert Yang Date: Fri, 30 Jan +2015 00:40:22 -0800 Subject: [PATCH] contrib.mak: fix for parallel build -Create lib before install to fix the race issue. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang +Signed-off-by: Huang Qiyu --- - contrib/contrib.mak | 2 ++ + contrib/contrib.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 08a80d1..de2e20d 100644 +index 55415b3..0b6b5ae 100644 --- a/contrib/contrib.mak +++ b/contrib/contrib.mak -@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h +@@ -1099,6 +1099,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c - extra-dmprt-install: + extra-dmprt-install: install-libdata + mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 -@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) +@@ -1267,6 +1268,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ ### ----------------- Additional .upp files ---------------- ### - extra-upp-install: + extra-upp-install: install-libdata + mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ done -- -1.7.9.5 +2.7.4 -- cgit v1.2.3-54-g00ecf