Skip to contentSkip to conversation

ghostscript: remove legacy patch png_mak.patch

PATCH New [email protected] 1 participant 2 messages Jul 17, 2017

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover ghostscript: remove legacy patch png_mak.patch

From: Kai Kang <[email protected]>

The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628:

yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kangkai/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/misc

Kai Kang (1):
ghostscript: remove legacy patch png_mak.patch

 .../ghostscript/ghostscript/png_mak.patch          | 32 ----------------------
 .../ghostscript/ghostscript_9.21.bb                |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
Signature · 1 line
2.10.1
author
#1 lore raw

PATCH 1/1 ghostscript: remove legacy patch png_mak.patch

From: Kai Kang <[email protected]>

png_mak.patch was created for ghostscript 9.16 and causes make circular dependency now. Check source code base/png.mak after apply png_mak.patch:

Line 77: $(MAKEDIRS) : $(pnglibconf_h)
Line 83: $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(TOP_MAKEFILES) $(MAKEDIRS)

So remove png_mak.patch.

Signed-off-by Kai Kang <[email protected]>
---
 .../ghostscript/ghostscript/png_mak.patch          | 32 ----------------------
 .../ghostscript/ghostscript_9.21.bb                |  1 -
 2 files changed, 33 deletions(-)
 delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
meta/recipes-extended/ghostscript/ghostscript/png_mak.patch deleted +0 -32
deleted file mode 100644
index 8b84986..0000000
@@ -1,32 +0,0 @@
-ghostscript: add dependency for pnglibconf.h
-
-When using parallel make jobs, we need to be sure that
-pnglibconf.h is created before we try to reference it,
-so add a rule to png.mak.
-
-Upstream-Status: Pending
-
-Signed-off-by: Joe Slater <[email protected]>
-
-Rebase to 9.19
-Signed-off-by: Hongxu Jia <[email protected]>
----
- base/png.mak | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/base/png.mak b/base/png.mak
-index fe5c6e2..8abb53a 100644
---- a/base/png.mak
-+++ b/base/png.mak
-@@ -74,6 +74,8 @@ png.clean-not-config-clean :
- 
- pnglibconf_h=$(PNGGENDIR)$(D)pnglibconf.h
- 
-+$(MAKEDIRS) : $(pnglibconf_h)
-+
- png.config-clean :
- 	$(RM_) $(pnglibconf_h)
- 	$(RM_) $(PNGGEN)lpg*.dev
--- 
-2.8.1
-
meta/recipes-extended/ghostscript/ghostscript_9.21.bb +0 -1
index fb36a13..adad9fd 100644
@@ -22,7 +22,6 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
 SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/${BPN}-${PV}.tar.gz \
                 file://ghostscript-9.15-parallel-make.patch \
                 file://ghostscript-9.16-Werror-return-type.patch \
-                file://png_mak.patch \
                 file://do-not-check-local-libpng-source.patch \
                 file://avoid-host-contamination.patch \
                 file://mkdir-p.patch \
Signature · 1 line
2.10.1