aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2020-06-27 14:55:18 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2020-06-27 14:55:18 +0000
commit79698c94c80e809e4e1c2d0c61f7bc5132a93ff0 (patch)
tree213c8489792fd3bdd8b86e60725cde9d369d8f2e /print
parent96595c544e42632bdaa32a86b28273197f7d5376 (diff)
downloadports-79698c94c80e809e4e1c2d0c61f7bc5132a93ff0.tar.gz
ports-79698c94c80e809e4e1c2d0c61f7bc5132a93ff0.zip
Remove CUPS option. It's not working anymore since the cups update
to 2.3.3. The port was already using a deprecated interface exposing cups internal structures. Support for this has been recently removed upstream. PR: 247580 Submitted by: O. Hartmann <ohartmann@walstatt.org>
Notes
Notes: svn path=/head/; revision=540612
Diffstat (limited to 'print')
-rw-r--r--print/xfce4-print/Makefile7
-rw-r--r--print/xfce4-print/files/patch-printing-systems_cups_cups.c32
2 files changed, 2 insertions, 37 deletions
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 4fa0475afb4a..2007824cf22b 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= print xfce
MASTER_SITES= XFCE/archive
DISTNAME= xfprint-${DISTVERSIONFULL}
@@ -32,16 +32,13 @@ INSTALL_TARGET= install-strip
OPTIONS_DEFINE= LETTER NLS
OPTIONS_SINGLE= PRINTMETHOD
-OPTIONS_SINGLE_PRINTMETHOD= LPR CUPS
+OPTIONS_SINGLE_PRINTMETHOD= LPR
OPTIONS_DEFAULT= LPR
OPTIONS_SUB= yes
LETTER_DESC= Use letter paper format instead of A4
LPR_DESC= LPR printing system support
-CUPS_CONFIGURE_ENABLE= cups
-CUPS_LIB_DEPENDS= libcups.so:print/cups
-
LETTER_CONFIGURE_ENABLE=letter
LPR_CONFIGURE_ENABLE= bsdlpr
LPR_CONFIGURE_WITH= printcap=/etc/printcap
diff --git a/print/xfce4-print/files/patch-printing-systems_cups_cups.c b/print/xfce4-print/files/patch-printing-systems_cups_cups.c
deleted file mode 100644
index d20d929ff1d2..000000000000
--- a/print/xfce4-print/files/patch-printing-systems_cups_cups.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- printing-systems/cups/cups.c.orig 2009-02-24 21:34:16 UTC
-+++ printing-systems/cups/cups.c
-@@ -23,7 +23,9 @@
-
- #include <gmodule.h>
-
-+#define _IPP_PRIVATE_STRUCTURES 1
- #include <cups/ipp.h>
-+#undef _IPP_PRIVATE_STRUCTURES
- #include <cups/ppd.h>
- #include <cups/cups.h>
- #include <cups/language.h>
-@@ -133,8 +135,8 @@ cups_request_new (int operation_id)
-
- language = cupsLangDefault ();
- request = ippNew ();
-- request->request.op.operation_id = operation_id;
-- request->request.op.request_id = 1;
-+ ippSetOperation(request,operation_id);
-+ ippSetRequestId(request,1);
-
- ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
-
-@@ -242,7 +244,7 @@ get_printers ()
-
- if (!request)
- continue;
-- if (request->state == IPP_ERROR || request->state == IPP_IDLE) {
-+ if (ippGetState(request) == IPP_ERROR || request->state == IPP_IDLE) {
- ippDelete (request);
- continue;
- }