1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Fix build when CUPS is set

- Bump PORTREVISION

PR:		188799 [1]
Submitted by:	<jwbacon@tds.net> [1], Miltiadis Margaronis (private email)
This commit is contained in:
Olivier Duchateau 2014-06-03 17:32:36 +00:00
parent 54899925cc
commit 72a4fd866a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=356385
2 changed files with 33 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= print xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R}

View File

@ -0,0 +1,32 @@
--- ./printing-systems/cups/cups.c.orig 2009-02-24 21:34:16.000000000 +0000
+++ ./printing-systems/cups/cups.c 2014-06-03 18:56:42.000000000 +0000
@@ -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 @@
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 @@
if (!request)
continue;
- if (request->state == IPP_ERROR || request->state == IPP_IDLE) {
+ if (ippGetState(request) == IPP_ERROR || request->state == IPP_IDLE) {
ippDelete (request);
continue;
}