diff options
| author | Eric Sandall | 2009-02-06 22:38:13 -0800 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-02-10 17:51:28 +0100 |
| commit | 90202cf23d2ea099b75fe17ef05cb24fe8920292 (patch) | |
| tree | 55ba21905066ac5c1074fa7716e38090adf010ca | |
| parent | 753b0be99e23e4d2e043c3b147ea47b9f657f7e1 (diff) | |
cups: Include linux/types.h before linux/serial.h
Based on Julien's hal/probe-serial.patch
Fixes Bug#15065
(cherry picked from commit 45cd8d4190d1a48ded6ae761cd2acb8794b8be94)
| -rw-r--r-- | printer/cups/HISTORY | 6 | ||||
| -rwxr-xr-x | printer/cups/PRE_BUILD | 3 | ||||
| -rw-r--r-- | printer/cups/serial.patch | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY index 64f67fa455..51ba3c0c4c 100644 --- a/printer/cups/HISTORY +++ b/printer/cups/HISTORY @@ -1,3 +1,9 @@ +2009-02-06 Eric Sandall <sandalle@sourcemage.org> + * serial.patch: Include linux/types.h before linux/serial.h + Based on Julien's hal/probe-serial.patch + Fixes Bug#15065 + * PRE_BUILD: Apply serial.patch + 2008-12-16 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.4b2 (devel) diff --git a/printer/cups/PRE_BUILD b/printer/cups/PRE_BUILD new file mode 100755 index 0000000000..e04d108966 --- /dev/null +++ b/printer/cups/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SPELL_DIRECTORY/serial.patch diff --git a/printer/cups/serial.patch b/printer/cups/serial.patch new file mode 100644 index 0000000000..6ca948f6f6 --- /dev/null +++ b/printer/cups/serial.patch @@ -0,0 +1,11 @@ +diff -Naur cups-1.3.9.orig/backend/serial.c cups-1.3.9/backend/serial.c +--- cups-1.3.9.orig/backend/serial.c 2009-02-06 22:33:09.226962859 -0800 ++++ cups-1.3.9/backend/serial.c 2009-02-06 22:33:35.356190020 -0800 +@@ -74,6 +74,7 @@ + #endif /* __APPLE__ */ + + #if defined(__linux) && defined(TIOCGSERIAL) ++# include <linux/types.h> + # include <linux/serial.h> + # include <linux/ioctl.h> + #endif /* __linux && TIOCGSERIAL */ |