summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-12-06 19:48:47 +0000
committerjoerg <joerg@pkgsrc.org>2011-12-06 19:48:47 +0000
commit2e13515646e01fa08b7859d483f23b4c7a59f43b (patch)
tree79a011f5135c1400cf92c051445578d131601b90 /print
parent14dacbb2476de9f17465424941f3830c7ab8299d (diff)
downloadpkgsrc-2e13515646e01fa08b7859d483f23b4c7a59f43b.tar.gz
Fix build with newer GCC and newer CUPS
Diffstat (limited to 'print')
-rw-r--r--print/xpp/distinfo5
-rw-r--r--print/xpp/patches/patch-ad14
-rw-r--r--print/xpp/patches/patch-cupshelper.cxx12
3 files changed, 26 insertions, 5 deletions
diff --git a/print/xpp/distinfo b/print/xpp/distinfo
index 098959e0b95..30504cd5e12 100644
--- a/print/xpp/distinfo
+++ b/print/xpp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2010/05/09 04:21:40 sbd Exp $
+$NetBSD: distinfo,v 1.10 2011/12/06 19:48:47 joerg Exp $
SHA1 (xpp-1.5.tar.gz) = 7f3c1427979516e47402a0acb708eb83b68daa61
RMD160 (xpp-1.5.tar.gz) = a64ec4c93013d1db08a6c9b6705b43850c36c337
@@ -6,5 +6,6 @@ Size (xpp-1.5.tar.gz) = 107755 bytes
SHA1 (patch-aa) = f8df413715f4f9319f8d52358a99e54d31cd5a6f
SHA1 (patch-ab) = 76d0ca39bef410e580f805ca10a3d953285c58bb
SHA1 (patch-ac) = d94f9359d19de5dff684f61a53af4607bb31f78c
-SHA1 (patch-ad) = 8cda85598eb8a8621aed9293e532c1aa9a2603c0
+SHA1 (patch-ad) = 5af9e367c1b025ec1d9940101a8b3338d84ae5d6
SHA1 (patch-ae) = a9adc82236847b2749eceacc4b00b2973dd80058
+SHA1 (patch-cupshelper.cxx) = beba4e1af0ff8a95d5d6042bd39254aa6e1d1e21
diff --git a/print/xpp/patches/patch-ad b/print/xpp/patches/patch-ad
index 1bd97dbee56..3a4b59f25b1 100644
--- a/print/xpp/patches/patch-ad
+++ b/print/xpp/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2007/11/30 19:35:12 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2011/12/06 19:48:47 joerg Exp $
--- xpp.h.orig 2004-12-06 17:59:35.000000000 +0000
-+++ xpp.h 2007-11-30 19:24:17.000000000 +0000
-@@ -177,7 +177,7 @@ public:
++++ xpp.h
+@@ -36,6 +36,7 @@
+ #include <cups/cups.h>
+ #include <cups/ipp.h>
+ #include <cups/language.h>
++#include <cups/ppd.h>
+ #include <FL/Fl.H>
+ #include <FL/Fl_Window.H>
+ #include <FL/Fl_Box.H>
+@@ -177,7 +178,7 @@ public:
*/
int /* O - index of the record of the given option in the array */
diff --git a/print/xpp/patches/patch-cupshelper.cxx b/print/xpp/patches/patch-cupshelper.cxx
new file mode 100644
index 00000000000..5ebc01ac997
--- /dev/null
+++ b/print/xpp/patches/patch-cupshelper.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-cupshelper.cxx,v 1.1 2011/12/06 19:48:47 joerg Exp $
+
+--- cupshelper.cxx.orig 2011-12-06 14:22:14.000000000 +0000
++++ cupshelper.cxx
+@@ -34,6 +34,7 @@
+ #include "cupshelper.h"
+ #include "passworddialog.h"
+
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <cups/language.h>
+