[patch] Tar file containing 14 patches used by the modified cnijfilter-3.40-r2 ebuild

cnijfilter-3.40-r2-patches.tar (text/plain), 50.00 KB, created by Ted Marston on 2020-08-07 01:17:45 UTC

net-print/cnijfilter/files/cnijfilter-3.20-4-ppd.patch0000644000000000000000000000117013422451612021402 0ustar  rootroot--- cngpijmon/src/bjcupsmon_cups.c	2012-06-01 14:45:32.054513422 +0200
+++ cngpijmon/src/bjcupsmon_cups.c	2012-06-01 14:46:28.921802482 +0200
@@ -20,6 +20,7 @@
 /*** Includes ***/
 #include <cups/cups.h>
 #include <cups/language.h>
+#include <cups/ppd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <pwd.h>
--- backend/src/cnij_backend_common.c	2012-06-01 14:45:19.251673478 +0200
+++ backend/src/cnij_backend_common.c	2012-06-01 14:46:13.486995445 +0200
@@ -38,6 +38,7 @@
 // CUPS Header
 #include <cups/cups.h>
 #include <cups/ipp.h>
+#include <cups/ppd.h>
 
 // Header file for CANON
 #include "cnij_backend_common.h"
net-print/cnijfilter/files/cnijfilter-3.40-4-libpng15.patch0000644000000000000000000000107413422451612022245 0ustar  rootroot--- a/cnijfilter/src/bjfimage.c	2012-05-28 05:38:48.580529587 +0200
+++ b/cnijfilter/src/bjfimage.c	2012-05-28 05:38:57.515417885 +0200
@@ -945,8 +945,8 @@
 	short			tmpformat;
 	short			retbyte = 0;
 	short			bpp = 3;
-	long			width = 0;
-	long			length = 0;
+	png_uint_32		width = 0;
+	png_uint_32		length = 0;
 	long			maxvalue = 0;
 	long			rstep = 0;
 	long			RasterLength = 0;
@@ -1574,7 +1574,7 @@
 		goto onErr;
 	}
 
-	if (setjmp (png_p->jmpbuf))
+	if (setjmp (png_jmpbuf(png_p)))
 	{
 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
 		goto onErr;
net-print/cnijfilter/files/cnijfilter-3.70-5-abi_x86_32.patch0000644000000000000000000000325613422451612022400 0ustar  rootroot--- backendnet/configure.in	2014-08-11 08:38:46.034984462 +0200
+++ backendnet/configure.in	2014-08-11 08:35:42.902985813 +0200
@@ -19,7 +19,11 @@
 AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
 AC_SUBST(BJLIB_PATH)
 
-ARC=`getconf LONG_BIT`
+case "$ABI" in
+    x86) ARC=32;;
+    amd64) ARC=64;;
+    *) ARC=`getconf LONG_BIT`;;
+esac
 AC_SUBST(ARC)
 
 # Checks for programs.
--- cnijfilter/configure.in	2014-08-11 08:39:44.426984031 +0200
+++ cnijfilter/configure.in	2014-08-11 08:35:19.788985984 +0200
@@ -43,7 +43,11 @@
 esac
 AC_SUBST(CNCL_LIB_ID)
 
-ARC=`getconf LONG_BIT`
+case "$ABI" in
+    x86) ARC=32;;
+    amd64) ARC=64;;
+    *) ARC=`getconf LONG_BIT`;;
+esac
 AC_SUBST(ARC)
 
 AC_PROG_CC
--- cngpijmon/cnijnpr/configure.in	2014-08-11 08:41:12.712983380 +0200
+++ cngpijmon/cnijnpr/configure.in	2014-08-11 08:40:44.354983589 +0200
@@ -37,7 +37,11 @@
 
 CFLAGS="-O2"
 
-ARC=`getconf LONG_BIT`
+case "$ABI" in
+    x86) ARC=32;;
+    amd64) ARC=64;;
+    *) ARC=`getconf LONG_BIT`;;
+esac
 AC_SUBST(ARC)
 
 AC_OUTPUT(Makefile
--- lgmon/configure.in	2014-08-11 08:41:56.070983060 +0200
+++ lgmon/configure.in	2014-08-11 08:34:47.338986223 +0200
@@ -37,7 +37,11 @@
 esac
 AC_SUBST(CNCL_LIB_ID)
 
-ARC=`getconf LONG_BIT`
+case "$ABI" in
+    x86) ARC=32;;
+    amd64) ARC=64;;
+    *) ARC=`getconf LONG_BIT`;;
+esac
 AC_SUBST(ARC)
 
 AC_PROG_CC
--- printui/configure.in	2014-08-11 08:33:40.208986718 +0200
+++ printui/configure.in	2014-08-11 08:27:46.788989326 +0200
@@ -97,7 +97,11 @@
 XML2_CFLAGS=`xml2-config --cflags`
 AC_SUBST(XML2_CFLAGS)
 
-ARC=`getconf LONG_BIT`
+case "$ABI" in
+    x86) ARC=32;;
+    amd64) ARC=64;;
+    *) ARC=`getconf LONG_BIT`;;
+esac
 AC_SUBST(ARC)
 
 AC_OUTPUT([
net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-cups.patch0000644000000000000000000000041313422451612023203 0ustar  rootroot--- a/pstocanonij/filter/Makefile.am	2012-12-21 17:27:54.370964561 +0100
+++ b/pstocanonij/filter/Makefile.am	2012-12-21 18:22:48.804097963 +0100
@@ -1,4 +1,4 @@
-filterdir=$(libdir)/cups/filter
+filterdir=$(libexecdir)/cups/filter
 
 filter_PROGRAMS= pstocanonij
 

net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-backend.patch0000644000000000000000000000130213422451612023616 0ustar  rootroot--- a/backend/src/Makefile.am	2012-12-22 11:09:21.674631729 +0100
+++ b/backend/src/Makefile.am	2012-12-22 14:20:50.879566578 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-backend_bindir = /usr/lib/cups/backend
+backend_bindir = /usr/libexec/cups/backend
 backend_bin_PROGRAMS = cnijusb
 transform = 
 
--- a/backendnet/backend/Makefile.am	2012-12-22 11:09:21.673631729 +0100
+++ b/backendnet/backend/Makefile.am	2012-12-22 14:20:20.176569425 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-backendnet_bindir = /usr/lib/cups/backend
+backendnet_bindir = /usr/libexec/cups/backend
 backendnet_bin_PROGRAMS = cnijnet
 transform = 
 

net-print/cnijfilter/files/cnijfilter-3.70-1-libdl.patch0000644000000000000000000000057013422451612021712 0ustar  rootroot--- cngpijmon/cnijnpr/cnijnpr/Makefile.am	2016-11-13 01:57:23.494707086 +0100
+++ cngpijmon/cnijnpr/cnijnpr/Makefile.am	2016-11-13 01:57:37.183706841 +0100
@@ -5,7 +5,7 @@
 cnijnpr_SOURCES=\
 	cnijnpr.c
 
-cnijnpr_LDADD = -lcnnet -lbscc2sts
+cnijnpr_LDADD = -lcnnet -lbscc2sts -ldl
 cnijnpr_LDFLAGS = -L../../../com/libs_bin@ARC@ -L../../../lgmon/src
 
 #AM_CFLAGS= -O2 -Wall
net-print/cnijfilter/files/cnijfilter-3.80-1-cups-1.6.patch0000644000000000000000000000445113422451612022103 0ustar  rootroot--- a/cngpij/cngpij/bjcups.c
+++ a/cngpij/cngpij/bjcups.c
@@ -698,8 +719,8 @@
 	else {
 		pRequest = ippNew();
 		
-		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
-		pRequest->request.op.request_id   = 1;
+		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
+		ippSetRequestId(pRequest, 1);
 		
 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 		
@@ -708,29 +729,29 @@
 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
 		
 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 				fputs("ERROR: IPP ERROR\n", stderr);
 				goto onErr;
 			}
 			else {
-				pAttribute = pResponse->attrs;
+				pAttribute = ippFirstAttribute(pResponse);
 
 				while (pAttribute != NULL) {
-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
-						pAttribute = pAttribute->next;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					if (pAttribute == NULL) {
 						break;
 					}
 					
-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
-						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
-							pPrinter = pAttribute->values[0].string.text;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
+						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
+							pPrinter = ippGetString(pAttribute, 0, NULL);
 						}
-						if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
-							pDUri = pAttribute->values[0].string.text;
+						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
+							pDUri = ippGetString(pAttribute, 0, NULL);
 						}
-						pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 					}
 
 					if (strcasecmp(pDestName, pPrinter) == 0) {
@@ -739,7 +760,7 @@
 					}
 					
 					if (pAttribute != NULL)
-						 pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 				}
 			}

net-print/cnijfilter/files/cnijfilter-3.70-6-headers.patch0000644000000000000000000000051013422451612022236 0ustar  rootroot--- cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2016-11-13 01:48:51.814716249 +0100
+++ cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2016-11-13 01:49:50.523715198 +0100
@@ -34,6 +34,8 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <sys/sysctl.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <config.h>
 #include <fcntl.h>
 
net-print/cnijfilter/files/cnijfilter-3.80-6-headers.patch0000644000000000000000000000531313422451612022245 0ustar  rootrootdiff --git a/cnijfilter/src/bjfilter.c b/cnijfilter/src/bjfilter.c
index 926d745..68f3e57 100755
--- a/cnijfilter/src/bjfilter.c
+++ b/cnijfilter/src/bjfilter.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <popt.h>
 #include <time.h>
 #include <string.h>
diff --git a/cnijfilter/src/bjfimage.c b/cnijfilter/src/bjfimage.c
index 7c2feda..9231caf 100755
--- a/cnijfilter/src/bjfimage.c
+++ b/cnijfilter/src/bjfimage.c
@@ -39,6 +39,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 #include <png.h>
 
 #include "cpktypes.h"
diff --git a/cnijfilter/src/bjfoption.c b/cnijfilter/src/bjfoption.c
index 5465534..64a5187 100755
--- a/cnijfilter/src/bjfoption.c
+++ b/cnijfilter/src/bjfoption.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <popt.h>
 #include <string.h>
 
diff --git a/cnijfilter/src/bjfpos.h b/cnijfilter/src/bjfpos.h
index 64086da..aeb04f7 100755
--- a/cnijfilter/src/bjfpos.h
+++ b/cnijfilter/src/bjfpos.h
@@ -84,6 +84,7 @@ typedef struct BJF_MARGIN_INFO				/* borderless information  */
 extern void bjf_pos_img_init( LPBJF_POS_IMGINFO lpimginfo );
 extern void bjf_pos_prn_init( LPBJF_POS_PRNINFO lpprninfo );
 extern void bjf_pos_init( LPBJF_POSINFO lpposinfo );
+extern void bjf_margin_init( LPBJF_MARGIN_INFO );
 extern short bjf_pos_imageresolution( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
 extern short bjf_pos_imageresolution_fit( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
 extern short bjf_pos_imageresolution_center( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO );
@@ -120,6 +121,7 @@ extern short ImageScaling(LPBJF_POS_PRNINFO, LPBJF_POSINFO,short);
 extern short ImageCenter( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );
 extern short ImageCut( LPBJF_POS_IMGINFO, LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO );
 extern short MarginInit(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO);
+extern short SetExtLevel( LPBJF_MARGIN_INFO, short);
 extern short SetExtMargin(LPBJF_POS_PRNINFO, LPBJF_POSINFO, LPBJF_MARGIN_INFO, LPBJFLTOVERMARGININFO);
 extern short SetBbox(LPBJF_OPTINFO , LPBJF_POS_IMGINFO , LPBJF_POSINFO , LPBJF_MARGIN_INFO , int , int);
 short bjf_pos_set_paperwidth( LPBJF_MARGIN_INFO , long );
diff --git a/cnijfilter/src/getipc.c b/cnijfilter/src/getipc.c
index e6973b0..ec7f8b5 100755
--- a/cnijfilter/src/getipc.c
+++ b/cnijfilter/src/getipc.c
@@ -43,7 +43,7 @@ short GetIPCData(LPIPCU pipc, char *sname)
 	struct sockaddr_un		sun;
 	int						s, c;
 	char					buf[128];
-	size_t					adrlen;
+	socklen_t				adrlen;
 	short					ret = RET_ERROR;
 
 	if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
net-print/cnijfilter/files/cnijfilter-3.70-6-cups-1.6.patch0000644000000000000000000002404213422451612022105 0ustar  rootroot--- cngpijmon/src/bjcupsmon_cups.c	2016-11-13 01:24:56.544741952 +0100
+++ cngpijmon/src/bjcupsmon_cups.c	2016-11-13 01:30:31.112735961 +0100
@@ -214,8 +215,8 @@
 	else {
 		pRequest = ippNew();
 		
-		pRequest->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-		pRequest->request.op.request_id   = 1;
+		ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
+		ippSetRequestId(pRequest, 1);
 		
 		pLanguage = bjcupsLangDefault();			// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19 
 				
@@ -224,12 +225,12 @@
 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, pURI);
 
 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 				retVal = ID_ERR_CUPS_API_FAILED;
 			}
 			else {
 				if ((pAttribute = ippFindAttribute(pResponse, "printer-state", IPP_TAG_ENUM)) != NULL) {
-					printerState = (ipp_state_t)pAttribute->values[0].integer;
+					printerState = ippGetInteger(pAttribute, 0);
 				}
 			}
 			
@@ -287,8 +288,8 @@
 		else {
 			pRequest = ippNew();
 			
-			pRequest->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-			pRequest->request.op.request_id   = 1;
+			ippSetOperation(pRequest, IPP_GET_PRINTER_ATTRIBUTES);
+			ippSetRequestId(pRequest, 1);
 			
 			pLanguage = bjcupsLangDefault();		// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 			
@@ -297,7 +298,7 @@
 			ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printerURI);
 			
 			if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-				if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+				if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 					retVal = ID_ERR_CUPS_API_FAILED;
 				}
 				else {
@@ -309,7 +310,7 @@
 					//}
 					pAttribute = ippFindAttribute(pResponse, "printer-state-message", IPP_TAG_TEXT);
 					if (pAttribute != NULL) {
-						strncpy(pStatus, pAttribute->values[0].string.text, bufSize);
+						strncpy(pStatus, ippGetString(pAttribute, 0, NULL), bufSize);
 					}
 				}
 				ippDelete(pResponse);
@@ -368,8 +369,8 @@
 			else {
 				pRequest = ippNew();
 				
-				pRequest->request.op.operation_id = IPP_CANCEL_JOB;
-				pRequest->request.op.request_id   = 1;
+				ippSetOperation(pRequest, IPP_CANCEL_JOB);
+				ippSetRequestId(pRequest, 1);
 				
 				pLanguage = bjcupsLangDefault();		// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 				
@@ -380,7 +381,7 @@
 				ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
 				
 				if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/jobs/")) != NULL) {
-					if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+					if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 						retVal = ID_ERR_CUPS_API_FAILED;
 					}
 					ippDelete(pResponse);
@@ -443,8 +444,8 @@
 	else {
 		pRequest = ippNew();
 		
-		pRequest->request.op.operation_id = IPP_GET_JOBS;
-		pRequest->request.op.request_id   = 1;
+		ippSetOperation(pRequest, IPP_GET_JOBS);
+		ippSetRequestId(pRequest, 1);
 		
 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 		
@@ -455,31 +456,31 @@
 		ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes",(int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);
 		
 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 				retVal = ID_ERR_CUPS_API_FAILED;
 			}
 			else {
-				pAttribute = pResponse->attrs;
+				pAttribute = ippFirstAttribute(pResponse);
 
 				while (pAttribute != NULL) {
-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_JOB) {
-						pAttribute = pAttribute->next;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					if (pAttribute == NULL) {
 						break;
 					}
 					
-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_JOB) {
-						if (strcmp(pAttribute->name, "job-id") == 0 && pAttribute->value_tag == IPP_TAG_INTEGER) {
-							jobID = pAttribute->values[0].integer;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_JOB) {
+						if (strcmp(ippGetName(pAttribute), "job-id") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_INTEGER) {
+							jobID = ippGetInteger(pAttribute, 0);
 						}
-						if (strcmp(pAttribute->name, "job-state") == 0 && pAttribute->value_tag == IPP_TAG_ENUM) {
-							jobState = (ipp_jstate_t)pAttribute->values[0].integer;
+						if (strcmp(ippGetName(pAttribute), "job-state") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_ENUM) {
+							jobState = (ipp_jstate_t)ippGetInteger(pAttribute, 0);
 						}
-						if (strcmp(pAttribute->name, "job-originating-user-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
-							pJobUserName = pAttribute->values[0].string.text;
+						if (strcmp(ippGetName(pAttribute), "job-originating-user-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
+							pJobUserName = ippGetString(pAttribute, 0, NULL);
 						}
-						pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					if (jobState == IPP_JOB_PROCESSING) {
 						if (pJobUserName != NULL) {
@@ -496,7 +497,7 @@
 					}
 
 					if (pAttribute != NULL)
-						pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 				}
 			}
 			
@@ -554,8 +555,8 @@
 	else {
 		pRequest = ippNew();
 		
-		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
-		pRequest->request.op.request_id   = 1;
+		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
+		ippSetRequestId(pRequest, 1);
 		
 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 		
@@ -564,28 +565,28 @@
 		ippAddStrings(pRequest, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(attributes) / sizeof(attributes[0]), NULL, attributes);
 		
 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 				retVal = ID_ERR_CUPS_API_FAILED;
 			}
 			else {
-				pAttribute = pResponse->attrs;
+				pAttribute = ippFirstAttribute(pResponse);
 
 				while (pAttribute != NULL) {
-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
-						pAttribute = pAttribute->next;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					if (pAttribute == NULL) {
 						break;
 					}
 					
-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
-						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
-							pPrinter = pAttribute->values[0].string.text;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
+						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
+							pPrinter = ippGetString(pAttribute, 0, NULL);
 						}
-						if (strcmp(pAttribute->name, "printer-uri-supported") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
-							pUri = pAttribute->values[0].string.text;
+						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
+							pURI = ippGetString(pAttribute, 0, NULL);
 						}
-						pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					
 					// Tora 020418: Compare two printer names ignoring the character case.
@@ -602,7 +603,7 @@
 					}
 
 					if (pAttribute != NULL)
-						 pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 				}
 			}
 			
@@ -657,8 +658,8 @@
 	else {
 		pRequest = ippNew();
 		
-		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
-		pRequest->request.op.request_id   = 1;
+		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
+		ippSetRequestId(pRequest, 1);
 		
 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
 		
@@ -667,28 +668,28 @@
 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
 		
 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
+			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
 				retVal = ID_ERR_CUPS_API_FAILED;
 			}
 			else {
-				pAttribute = pResponse->attrs;
+				pAttribute = ippFirstAttribute(pResponse);
 
 				while (pAttribute != NULL) {
-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
-						pAttribute = pAttribute->next;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
+						pAttribute = ippNextAttribute(pResponse);
 					}
 					if (pAttribute == NULL) {
 						break;
 					}
 					
-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
-						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
-							pPrinter = pAttribute->values[0].string.text;
+					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
+						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
+							pPrinter = ippGetString(pAttribute, 0, NULL);
 						}
-						if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
-							pDUri = pAttribute->values[0].string.text;
+						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
+							pDUri = ippGetString(pAttribute, 0, NULL);
 						}
-						pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 					}
 
 					if (strcasecmp(pDestName, pPrinter) == 0) {
@@ -697,7 +698,7 @@
 					}
 					
 					if (pAttribute != NULL)
-						 pAttribute = pAttribute->next;
+						pAttribute = ippNextAttribute(pResponse);
 				}
 			}
 			

net-print/cnijfilter/files/cnijfilter-3.40-1_CFLAG.patch0000644000000000000000000002022013673234400021513 0ustar  rootrootdiff -Nur cnijfilter-source-3.40-1.orig/backend/configure.in cnijfilter-source-3.40-1/backend/configure.in
--- cnijfilter-source-3.40-1.orig/backend/configure.in	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/backend/configure.in	2011-09-18 16:28:50.000000000 +0100
@@ -36,7 +36,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset socket strdup strrchr])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 AC_OUTPUT(Makefile
 src/Makefile)
diff -Nur cnijfilter-source-3.40-1.orig/backend/src/Makefile.am cnijfilter-source-3.40-1/backend/src/Makefile.am
--- cnijfilter-source-3.40-1.orig/backend/src/Makefile.am	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/backend/src/Makefile.am	2011-09-18 16:29:26.000000000 +0100
@@ -7,7 +7,7 @@
 
 cnijusb_SOURCES = cnij_backend_common.c cnij_usb.c
 
-CFLAGS = -O2 -Wall
+cnijusb_CFLAGS = ${CFLAGS:=}
 
 cnijusb_LDADD = -lcups
 
diff -Nur cnijfilter-source-3.40-1.orig/backendnet/backend/Makefile.am cnijfilter-source-3.40-1/backendnet/backend/Makefile.am
--- cnijfilter-source-3.40-1.orig/backendnet/backend/Makefile.am	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/backendnet/backend/Makefile.am	2011-09-18 16:20:54.000000000 +0100
@@ -7,7 +7,7 @@
 
 cnijnet_SOURCES = cnijnetlm.c cnijnet.c 
 
-CFLAGS = -O2 -Wall -I.
+cnijnet_CFLAGS = ${CFLAGS:=} -I.
 
 cnijnet_LDADD = -lcups
 
diff -Nur cnijfilter-source-3.40-1.orig/backendnet/configure.in cnijfilter-source-3.40-1/backendnet/configure.in
--- cnijfilter-source-3.40-1.orig/backendnet/configure.in	2010-03-10 02:16:28.000000000 +0000
+++ cnijfilter-source-3.40-1/backendnet/configure.in	2011-09-18 16:23:12.000000000 +0100
@@ -47,7 +47,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset socket strdup strrchr])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 AC_OUTPUT(Makefile
 backend/Makefile
diff -Nur cnijfilter-source-3.40-1.orig/backendnet/lmonitor/Makefile.am cnijfilter-source-3.40-1/backendnet/lmonitor/Makefile.am
--- cnijfilter-source-3.40-1.orig/backendnet/lmonitor/Makefile.am	2010-03-10 02:16:28.000000000 +0000
+++ cnijfilter-source-3.40-1/backendnet/lmonitor/Makefile.am	2011-09-19 00:00:41.000000000 +0100
@@ -6,7 +6,7 @@
 
 cnijnetprn_SOURCES = cnijnetchk.c cnijnetprn.c 
 
-CFLAGS = -O2 -Wall -I. -I./common 
+cnijnetprn_CFLAGS = ${CFLAGS:=} -I. -I./common
 
 cnijnetprn_LDADD = -lcnnet -lc -ldl 
 cnijnetprn_LDFLAGS = -L../../com/libs_bin@ARC@
diff -Nur cnijfilter-source-3.40-1.orig/cngpij/cngpij/Makefile.am cnijfilter-source-3.40-1/cngpij/cngpij/Makefile.am
--- cnijfilter-source-3.40-1.orig/cngpij/cngpij/Makefile.am	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/cngpij/cngpij/Makefile.am	2011-09-18 22:48:40.000000000 +0100
@@ -7,5 +7,5 @@
 cngpij_LDADD= -lpopt -lcups -lparamlist 
 cngpij_LDFLAGS = -L../../libs/paramlist
 
-AM_CFLAGS= -O2 -Wall -I../include/cncl -I../include/misc -I../../libs/paramlist
+AM_CFLAGS= -I../include/cncl -I../include/misc -I../../libs/paramlist
 
diff -Nur cnijfilter-source-3.40-1.orig/cngpij/configure.in cnijfilter-source-3.40-1/cngpij/configure.in
--- cnijfilter-source-3.40-1.orig/cngpij/configure.in	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/cngpij/configure.in	2011-09-18 16:46:23.000000000 +0100
@@ -41,7 +41,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset socket strdup strrchr])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 AC_OUTPUT(Makefile
                  cngpij/Makefile)
diff -Nur cnijfilter-source-3.40-1.orig/cngpijmon/cnijnpr/configure.in cnijfilter-source-3.40-1/cngpijmon/cnijnpr/configure.in
--- cnijfilter-source-3.40-1.orig/cngpijmon/cnijnpr/configure.in	2010-03-11 01:33:21.000000000 +0000
+++ cnijfilter-source-3.40-1/cngpijmon/cnijnpr/configure.in	2011-09-18 16:30:44.000000000 +0100
@@ -35,7 +35,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset socket strdup strrchr])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 ARC=`getconf LONG_BIT`
 AC_SUBST(ARC)
diff -Nur cnijfilter-source-3.40-1.orig/cngpijmon/configure.in cnijfilter-source-3.40-1/cngpijmon/configure.in
--- cnijfilter-source-3.40-1.orig/cngpijmon/configure.in	2010-03-11 01:33:21.000000000 +0000
+++ cnijfilter-source-3.40-1/cngpijmon/configure.in	2011-09-18 16:32:35.000000000 +0100
@@ -58,7 +58,7 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 dnl Use -Wall if we have gcc.
 changequote(,)dnl
diff -Nur cnijfilter-source-3.40-1.orig/cnijfilter/configure.in cnijfilter-source-3.40-1/cnijfilter/configure.in
--- cnijfilter-source-3.40-1.orig/cnijfilter/configure.in	2010-03-09 10:51:24.000000000 +0000
+++ cnijfilter-source-3.40-1/cnijfilter/configure.in	2011-09-18 16:45:07.000000000 +0100
@@ -61,7 +61,7 @@
 AC_TYPE_SIZE_T
 
 dnl OPTION
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(socket)
diff -Nur cnijfilter-source-3.40-1.orig/lgmon/configure.in cnijfilter-source-3.40-1/lgmon/configure.in
--- cnijfilter-source-3.40-1.orig/lgmon/configure.in	2010-03-11 01:18:24.000000000 +0000
+++ cnijfilter-source-3.40-1/lgmon/configure.in	2011-09-18 16:25:29.000000000 +0100
@@ -70,7 +70,7 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 dnl Use -Wall if we have gcc.
 changequote(,)dnl
diff -Nur cnijfilter-source-3.40-1.orig/libs/configure.in cnijfilter-source-3.40-1/libs/configure.in
--- cnijfilter-source-3.40-1.orig/libs/configure.in	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/libs/configure.in	2011-09-18 16:43:54.000000000 +0100
@@ -25,7 +25,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([dup2 memset])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 AC_OUTPUT(Makefile
                  buftool/Makefile
diff -Nur cnijfilter-source-3.40-1.orig/libs/paramlist/Makefile.am cnijfilter-source-3.40-1/libs/paramlist/Makefile.am
--- cnijfilter-source-3.40-1.orig/libs/paramlist/Makefile.am	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/libs/paramlist/Makefile.am	2011-09-18 22:18:34.000000000 +0100
@@ -3,4 +3,4 @@
 libparamlist_la_SOURCES = \
 	paramlist.c paramlist.h
 
-AM_CFLAGS= -O2 -Wall
+AM_CFLAGS=
diff -Nur cnijfilter-source-3.40-1.orig/printui/configure.in cnijfilter-source-3.40-1/printui/configure.in
--- cnijfilter-source-3.40-1.orig/printui/configure.in	2010-07-05 12:02:35.000000000 +0100
+++ cnijfilter-source-3.40-1/printui/configure.in	2011-09-18 16:35:30.000000000 +0100
@@ -81,6 +81,8 @@
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
 
+CFLAGS="${CFLAGS:=}"
+
 dnl Use -Wall if we have gcc.
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -91,9 +93,6 @@
 fi
 changequote([,])dnl
 
-CFLAGS="-O2 -Wall"
-
-
 XML2_CFLAGS=`xml2-config --cflags`
 AC_SUBST(XML2_CFLAGS)
 
diff -Nur cnijfilter-source-3.40-1.orig/printui/src/Makefile.am cnijfilter-source-3.40-1/printui/src/Makefile.am
--- cnijfilter-source-3.40-1.orig/printui/src/Makefile.am	2010-04-19 01:47:25.000000000 +0100
+++ cnijfilter-source-3.40-1/printui/src/Makefile.am	2011-09-18 16:33:33.000000000 +0100
@@ -49,7 +49,7 @@
 
 #CFLAGS = -O2 -Wall
 #printui_CFLAGS = -O2 -Wall
-printui_CFLAGS = -O2 -Wall @UI_DFLAGS@
+printui_CFLAGS = ${CFLAGS:=} @UI_DFLAGS@
 
 #printui_LDADD = @GTK_LIBS@ -lxml -lpopt \
 #  -lcnbpcnclui@CNCL_LIB_ID@ -lcnbpcmcm@CNCL_LIB_ID@
diff -Nur cnijfilter-source-3.40-1.orig/pstocanonij/configure.in cnijfilter-source-3.40-1/pstocanonij/configure.in
--- cnijfilter-source-3.40-1.orig/pstocanonij/configure.in	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/pstocanonij/configure.in	2011-09-18 16:26:11.000000000 +0100
@@ -43,7 +43,7 @@
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([dup2 memset socket strdup strrchr])
 
-CFLAGS="-O2"
+CFLAGS="${CFLAGS:=}"
 
 AC_OUTPUT(Makefile
                  filter/Makefile
diff -Nur cnijfilter-source-3.40-1.orig/pstocanonij/filter/Makefile.am cnijfilter-source-3.40-1/pstocanonij/filter/Makefile.am
--- cnijfilter-source-3.40-1.orig/pstocanonij/filter/Makefile.am	2010-02-23 03:57:49.000000000 +0000
+++ cnijfilter-source-3.40-1/pstocanonij/filter/Makefile.am	2011-09-18 22:23:54.000000000 +0100
@@ -10,5 +10,5 @@
 pstocanonij_LDADD= -lcups ../../libs/buftool/libbuftool.a
 pstocanonij_LDFLAGS = -L../../libs/buftool
 
-AM_CFLAGS= -O2 -Wall -I../../libs/buftool
+AM_CFLAGS= -I../../libs/buftool
 
net-print/cnijfilter/files/cnijfilter_3.30-1_amd64-implicit-function-fix.patch0000644000000000000000000000101213675236226026122 0ustar  rootroot# Modified. -Ted. 2020-06-24
#
diff -Nur old/cngpijmon/src/bjcupsmon_ui.c cngpijmon/src/bjcupsmon_ui.c
--- old/cngpijmon/src/bjcupsmon_ui.c   2010-01-29 00:43:01.000000000 -0500
+++ cngpijmon/src/bjcupsmon_ui.c   2011-04-14 16:11:59.813000118 -0400
@@ -35,6 +35,7 @@
 PRIVATE GladeXML	*gXmlMainWnd = NULL;		// Pointer to glade xml of main window.
 #else
 PRIVATE GtkWidget	*gMainWnd = NULL;			// Pointer to main window. ver.2.50
+GtkWidget* create_mainWindow (void);
 #endif
 
 PRIVATE const gchar	*gSTSMessageTable[] = {
net-print/cnijfilter/files/cnijfilter_3.30-1_printui_m4.patch0000644000000000000000000000051613675231511023062 0ustar  rootrootdiff -Nur old/printui/Makefile.am new/cnijfilter-source-3.30-1/printui/Makefile.am
--- old/printui/Makefile.am    2009-10-05 04:44:03.000000000 -0400
+++ new/printui/Makefile.am    2011-04-15 09:38:44.724000084 -0400
@@ -71,6 +71,4 @@
          done \
        fi
 
-ACLOCAL_AMFLAGS = -I m4
-
 EXTRA_DIST = mkinstalldirs  config.rpath
net-print/cnijfilter/files/cnijfilter-3.40-1_fix-printui.patch0000644000000000000000000000174313703102331023155 0ustar  rootroot--- printui/src/colordlg2.c.Orig	2010-02-25 00:55:00.000000000 +0000
+++ printui/src/colordlg2.c	2020-07-13 15:52:17.462658056 +0100
@@ -165,7 +165,7 @@
 }
 
 /* Ver.2.90 */
-static short CofirmSpinValue( spinbutton )
+static short CofirmSpinValue(GtkSpinButton* spinbutton )
 {
 	short	result = 0;
 
--- printui/src/comdb.h.Orig	2010-02-25 00:55:00.000000000 +0000
+++ printui/src/comdb.h	2020-07-13 16:12:14.238800853 +0100
@@ -32,6 +32,8 @@
 int ModelNameToID(char* model_name);
 char* GetModelName();
 char* GetDispModelName();
+gboolean IsAvailableBlackAdjustment();
+gboolean IsAvailableBlackAdjustmentMode();
 gboolean IsAvailableBorderless();
 gboolean IsAvailableVivid();
 gboolean IsAvailableDuplex();
--- printui/src/uimain.c.Orig	2010-04-19 01:47:26.000000000 +0100
+++ printui/src/uimain.c	2020-07-13 15:32:59.699426930 +0100
@@ -225,7 +225,7 @@
 }
 
 static
-void ShowPaperGapCombo(main_window)
+void ShowPaperGapCombo(UIMainDialog* main_window)
 {
 	int show_lever_box = FALSE;