head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.50
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.48
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.46
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.44
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.42
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.40
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.38
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.36
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.34
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.32
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.30
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.28
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.26
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.24
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.22
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.20
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.18
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.16
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.14
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.12
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.10
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.8
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.6
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.4
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.2
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.1.0.70
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.66
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.64
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.62
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.60
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.58
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.56
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.54
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.52
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.50
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.46
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.44
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.42
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.40
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.38
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.36
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.34
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.32
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.30
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.28
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.26
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.24
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.22
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.20
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.18
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.16
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.14
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.12
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.10
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.8
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.6
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.4
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.2
	pkgsrc-2011Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2020.03.05.14.57.59;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	YopPIJFug2wZTdZB;

1.1
date	2011.12.06.19.48.47;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Fix build with newer cups.
While there switch to fltk13
bump PKGREVISION
@
text
@$NetBSD: patch-cupshelper.cxx,v 1.1 2011/12/06 19:48:47 joerg Exp $

update for new cups API

--- cupshelper.cxx.orig	2002-05-28 17:49:45.000000000 +0200
+++ cupshelper.cxx	2020-03-04 15:02:34.300403189 +0100
@@@@ -34,6 +34,7 @@@@
 #include "cupshelper.h"
 #include "passworddialog.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <cups/language.h>
 
@@@@ -90,7 +91,7 @@@@
 
 ipp_t* CupsHelper::newIppRequest(){
 	ipp_t	*request = ippNew();
-	request->request.op.request_id = 1;
+	ippSetRequestId(request, 1);
 	cups_lang_t	*lang = cupsLangDefault();
 	ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_CHARSET,"attributes-charset",NULL,cupsLangEncoding(lang));
 	ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_LANGUAGE,"attributes-natural-language",NULL,lang->language);
@@@@ -108,7 +109,7 @@@@
 	httpClose(HTTP);
 	if (!answer)
 		return 0;
-	if (answer->state == IPP_ERROR || answer->state == IPP_IDLE)
+	if (ippGetState(answer) == IPP_ERROR || ippGetState(answer) == IPP_IDLE)
 	{
 		ippDelete(answer);
 		return 0;
@@@@ -151,15 +152,15 @@@@
 	char      str[256];
 	int	  value(-1);
 
-	request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+	ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
 	sprintf(str,"ipp://%s:%d/printers/%s",host(),port(),name);
 	ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI,"printer-uri",NULL,str);
 	//sprintf(str,"/printers/%s",name);
 	sprintf(str,"/printers/");
 	request = processRequest(request,str);
-	if (request && request->curtag == IPP_TAG_PRINTER) {
+	if (request) {
 		ipp_attribute_t	*attr = ippFindAttribute(request,"printer-type",IPP_TAG_ENUM);
-		if (attr) value = attr->values[0].integer;
+		if (attr) value = ippGetInteger(attr, 0);
 	}
 	ippDelete(request);
 	return value;
@


1.1
log
@Fix build with newer GCC and newer CUPS
@
text
@d1 1
a1 1
$NetBSD$
d3 4
a6 2
--- cupshelper.cxx.orig	2011-12-06 14:22:14.000000000 +0000
+++ cupshelper.cxx
d15 37
@