Mercurial > mxe-octave
changeset 6852:1490118493f0
transfig: update to v3.2.9
* src/transfig.mk: update to v3.2.9
* src/transfig-1-fixes.patch: update patches
* src/graphicsmagick.mk: add transfig as a mingw graphicsmagick dependancy
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Tue, 29 Aug 2023 19:53:48 -0400 |
| parents | fbb972f95f49 |
| children | e77f1ac3b917 |
| files | src/graphicsmagick.mk src/transfig-1-fixes.patch src/transfig.mk |
| diffstat | 3 files changed, 44 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/graphicsmagick.mk Tue Aug 29 19:53:47 2023 -0400 +++ b/src/graphicsmagick.mk Tue Aug 29 19:53:48 2023 -0400 @@ -9,6 +9,9 @@ $(PKG)_FILE := GraphicsMagick-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := zlib bzip2 libjbig jpeg jasper lcms libpng tiff freetype libxml2 +ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_DEPS += transfig +endif ifneq ($(MXE_SYSTEM),msvc) $(PKG)_DEPS += pthreads libtool endif
--- a/src/transfig-1-fixes.patch Tue Aug 29 19:53:47 2023 -0400 +++ b/src/transfig-1-fixes.patch Tue Aug 29 19:53:48 2023 -0400 @@ -95,3 +95,42 @@ void init_stream(struct xfig_stream *restrict xf_stream) { +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.9/fig2dev/dev/genbitmaps.c +--- fig2dev-3.2.9.orig/fig2dev/dev/genbitmaps.c 2023-08-28 14:23:23.409382069 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/genbitmaps.c 2023-08-28 14:28:00.897893044 -0400 +@@ -36,7 +36,9 @@ + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#if ! defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "bool.h" + #include "fig2dev.h" /* includes bool.h and object.h */ +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readeps.c fig2dev-3.2.9/fig2dev/dev/readeps.c +--- fig2dev-3.2.9.orig/fig2dev/dev/readeps.c 2023-08-28 14:29:52.787550642 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/readeps.c 2023-08-28 14:30:41.593454664 -0400 +@@ -29,7 +29,9 @@ + #include <stdlib.h> + #include <string.h> + #include <math.h> ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "fig2dev.h" /* includes bool.h and object.h */ + //#include "object.h" +diff -ur fig2dev-3.2.9.orig/fig2dev/dev/readpics.c fig2dev-3.2.9/fig2dev/dev/readpics.c +--- fig2dev-3.2.9.orig/fig2dev/dev/readpics.c 2023-08-28 14:31:39.776916666 -0400 ++++ fig2dev-3.2.9/fig2dev/dev/readpics.c 2023-08-28 14:32:25.565641164 -0400 +@@ -31,7 +31,9 @@ + #include <string.h> + #include <unistd.h> + #include <sys/stat.h> ++#if !defined (__WIN32__) || defined (__CYGWIN__) + #include <sys/wait.h> ++#endif + + #include "messages.h" + #include "xtmpfile.h"
--- a/src/transfig.mk Tue Aug 29 19:53:47 2023 -0400 +++ b/src/transfig.mk Tue Aug 29 19:53:48 2023 -0400 @@ -3,8 +3,8 @@ PKG := transfig $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.8b -$(PKG)_CHECKSUM := 9a85b37a0770d73915584f1e75e58375b093d9bd +$(PKG)_VERSION := 3.2.9 +$(PKG)_CHECKSUM := 3983ae7306e608b503ac840973b1f86e9d867abf $(PKG)_SUBDIR := fig2dev-$($(PKG)_VERSION) $(PKG)_FILE := fig2dev-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)