diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /net-print/c2esp/files | |
parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) |
gentoo resync : 29.08.2018
Diffstat (limited to 'net-print/c2esp/files')
-rw-r--r-- | net-print/c2esp/files/0001-Fix-various-missing-includes.patch | 35 | ||||
-rw-r--r-- | net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch | 32 |
2 files changed, 35 insertions, 32 deletions
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch new file mode 100644 index 000000000000..bde86e666688 --- /dev/null +++ b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch @@ -0,0 +1,35 @@ +From 4341f243a34dbb8140800337d189345c370dc499 Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Fri, 9 Feb 2018 17:23:25 +0100 +Subject: Fix various missing includes + +Last-Update: 2016-10-03 +--- + src/c2espcommon.h | 1 + + src/command2esp.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/c2espcommon.h b/src/c2espcommon.h +index 471f46a..088a2b8 100644 +--- a/src/c2espcommon.h ++++ b/src/c2espcommon.h +@@ -19,6 +19,7 @@ + */ + + #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants ++#include <stdio.h> // FILE + #include <fcntl.h> //files + #include <time.h> //time functions used for debugging + +diff --git a/src/command2esp.c b/src/command2esp.c +index 529342c..e30357e 100644 +--- a/src/command2esp.c ++++ b/src/command2esp.c +@@ -44,6 +44,7 @@ Maintenance=003? + #include <cups/cups.h> + #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants + #include "string.h" ++#include "strings.h" // strncasecmp + #include <ctype.h> + #include <fcntl.h> //files + #include <time.h> //time functions used for debugging diff --git a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch deleted file mode 100644 index a551cc0f46ab..000000000000 --- a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -166,16 +166,16 @@ - @echo - - c2esp: c2esp.o c2espcommon.o $(LIBJBG85) -- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) - - c2espC: c2espC.o c2espcommon.o -- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz - - command2esp: command2esp.o c2espcommon.o -- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver - - myopldecode: myopldecode.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz - - # - # Installation rules -@@ -351,3 +326,8 @@ - command2esp.o: c2espcommon.h - c2espcommon.o: c2espcommon.h - -+ -+# Respect CPPFLAGS. -+.SUFFIXES: .c .o -+.c.o: -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<' |