summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-12-06 19:49:54 +0000
committerjoerg <joerg@pkgsrc.org>2011-12-06 19:49:54 +0000
commit99ff9c2071eb4be7b3f584bad27442682cac23c4 (patch)
tree5d81f05b295700de8544f326ac911222aa8ddac4 /print
parent2e13515646e01fa08b7859d483f23b4c7a59f43b (diff)
downloadpkgsrc-99ff9c2071eb4be7b3f584bad27442682cac23c4.tar.gz
Fix build with newer CUPS
Diffstat (limited to 'print')
-rw-r--r--print/scribus/distinfo4
-rw-r--r--print/scribus/patches/patch-scribus_cupsoptions.cpp12
-rw-r--r--print/scribus/patches/patch-scribus_printerutil.cpp12
3 files changed, 27 insertions, 1 deletions
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index 2870a6f2a91..f9f81710a99 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2010/02/12 08:35:28 adam Exp $
+$NetBSD: distinfo,v 1.24 2011/12/06 19:49:54 joerg Exp $
SHA1 (scribus-1.3.3.14.tar.bz2) = 3ad5341fb815e2782aa4d817025d74af4a7c78e1
RMD160 (scribus-1.3.3.14.tar.bz2) = b0f35060eb61f033cb86ee644d5c88222b534596
@@ -10,3 +10,5 @@ SHA1 (patch-ae) = 063d4737cbffd3f712d505818fd028f132267c90
SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58
SHA1 (patch-ah) = 51d12aabcbdc7abbee12b0a445b57311b6bd28d4
SHA1 (patch-ai) = 7dd3641fef0cafe79313cf04d9765bb77c6b6e61
+SHA1 (patch-scribus_cupsoptions.cpp) = 92eb7dd8b0caf1efb2019b8e10b25daf1499f870
+SHA1 (patch-scribus_printerutil.cpp) = 5a6d7b3d7dc327473b14dc5dcbe74f4fdb8a724b
diff --git a/print/scribus/patches/patch-scribus_cupsoptions.cpp b/print/scribus/patches/patch-scribus_cupsoptions.cpp
new file mode 100644
index 00000000000..0b42b3414b3
--- /dev/null
+++ b/print/scribus/patches/patch-scribus_cupsoptions.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-scribus_cupsoptions.cpp,v 1.1 2011/12/06 19:49:54 joerg Exp $
+
+--- scribus/cupsoptions.cpp.orig 2011-12-06 14:32:35.000000000 +0000
++++ scribus/cupsoptions.cpp
+@@ -33,6 +33,7 @@ for which a new license (GPL+exception)
+ #include <qstringlist.h>
+ #ifdef HAVE_CUPS
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #endif
+ #include <qtooltip.h>
+ extern QPixmap loadIcon(QString nam);
diff --git a/print/scribus/patches/patch-scribus_printerutil.cpp b/print/scribus/patches/patch-scribus_printerutil.cpp
new file mode 100644
index 00000000000..b1074343e6d
--- /dev/null
+++ b/print/scribus/patches/patch-scribus_printerutil.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-scribus_printerutil.cpp,v 1.1 2011/12/06 19:49:54 joerg Exp $
+
+--- scribus/printerutil.cpp.orig 2011-12-06 14:37:43.000000000 +0000
++++ scribus/printerutil.cpp
+@@ -9,6 +9,7 @@ for which a new license (GPL+exception)
+
+ #if defined( HAVE_CUPS )
+ #include <cups/cups.h>
++ #include <cups/ppd.h>
+ #elif defined(_WIN32)
+ #include <windows.h>
+ #include <winspool.h>