From owner-svn-ports-all@FreeBSD.ORG  Tue Jun  3 17:32:37 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3BACED9;
 Tue,  3 Jun 2014 17:32:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76B112326;
 Tue,  3 Jun 2014 17:32:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53HWbKn086908;
 Tue, 3 Jun 2014 17:32:37 GMT (envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53HWbqR086906;
 Tue, 3 Jun 2014 17:32:37 GMT (envelope-from olivierd@svn.freebsd.org)
Message-Id: <201406031732.s53HWbqR086906@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Tue, 3 Jun 2014 17:32:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356385 - in head/print/xfce4-print: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 17:32:37 -0000

Author: olivierd
Date: Tue Jun  3 17:32:36 2014
New Revision: 356385
URL: http://svnweb.freebsd.org/changeset/ports/356385
QAT: https://qat.redports.org/buildarchive/r356385/

Log:
  - Fix build when CUPS is set
  - Bump PORTREVISION
  
  PR:		188799 [1]
  Submitted by:	<jwbacon@tds.net> [1], Miltiadis Margaronis (private email)

Added:
  head/print/xfce4-print/files/
  head/print/xfce4-print/files/patch-printing-systems__cups__cups.c   (contents, props changed)
Modified:
  head/print/xfce4-print/Makefile

Modified: head/print/xfce4-print/Makefile
==============================================================================
--- head/print/xfce4-print/Makefile	Tue Jun  3 17:28:22 2014	(r356384)
+++ head/print/xfce4-print/Makefile	Tue Jun  3 17:32:36 2014	(r356385)
@@ -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}

Added: head/print/xfce4-print/files/patch-printing-systems__cups__cups.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/xfce4-print/files/patch-printing-systems__cups__cups.c	Tue Jun  3 17:32:36 2014	(r356385)
@@ -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;
+       }