summaryrefslogtreecommitdiff
path: root/net-print/cnijfilter
diff options
context:
space:
mode:
Diffstat (limited to 'net-print/cnijfilter')
-rw-r--r--net-print/cnijfilter/Manifest2
-rw-r--r--net-print/cnijfilter/cnijfilter-4.10.ebuild47
-rw-r--r--net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-backend.patch21
-rw-r--r--net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-cups.patch9
-rw-r--r--net-print/cnijfilter/files/cnijfilter-3.80-1-cups-1.6.patch90
-rw-r--r--net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-backend.patch10
-rw-r--r--net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-cups.patch9
-rw-r--r--net-print/cnijfilter/files/cnijfilter-4.00-4-ppd.patch10
-rw-r--r--net-print/cnijfilter/files/cnijfilter-4.00-5-abi_x86_32.patch45
9 files changed, 1 insertions, 242 deletions
diff --git a/net-print/cnijfilter/Manifest b/net-print/cnijfilter/Manifest
index 590de2a4..d445c620 100644
--- a/net-print/cnijfilter/Manifest
+++ b/net-print/cnijfilter/Manifest
@@ -1 +1 @@
-DIST cnijfilter-source-4.10-1.tar.gz 7683230 SHA256 0cff37fe6684dcfeb12a7350fb94cb5dda055b18c9987bbd32259320d46fc598 SHA512 58198e92e360c71c95423bfa8278f449eb645245af1b96770323cb6f4b2b7186e5ab326d58377c20627c750d3d8c253addf637f9d18e085b1c89a81d6239ab51 WHIRLPOOL fe8071465a38dedb2d3b41802c9c243d8f748d3ef724830a9b8fe5c036c4c74f425cb13b4f141e0af951fdd77b424032689baf48387794b866fa252cda2f8534
+DIST cnijfilter-source-3.80-1.tar.gz 8923054 SHA256 8b6d408f18191f19465ee8fc31aa08455e8bec186fdd3f02ee822f53a9b086a9 SHA512 95a16e3b4fc38ce0b7a12bd74466d97e726bc410b59bf6d1963fa52b16a8cc67f6a993a5ef945107201f860d8ac6734c462bc0bf6d2160d6c85c5f61aff040c1 WHIRLPOOL 2e27afa454ce1fa41700f65ace7ae7469464cc8685499c4927c559aef2fd79613297d1ec1e5cf1dd309da541c5b662a0c4d4d71fabf4b514e186eb2bceb80c5c
diff --git a/net-print/cnijfilter/cnijfilter-4.10.ebuild b/net-print/cnijfilter/cnijfilter-4.10.ebuild
deleted file mode 100644
index a2e5cbf2..00000000
--- a/net-print/cnijfilter/cnijfilter-4.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: net-print/cnijfilter-drivers/cnijfilter-drivers-4.00.ebuild,v 2.0 2015/08/08 03:10:53 Exp $
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-PRINTER_MODEL=( "ix6700" "ix6800" "ip2800" "mx470" "mx530" "ip8700" "e560" "e400" )
-PRINTER_ID=( "431" "432" "433" "434" "435" "436" "437" "438" )
-
-inherit ecnij
-
-DESCRIPTION="Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)"
-HOMEPAGE="http://www.canon-europe.com/Support/"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100005858/01/${PN}-source-${PV}-1.tar.gz"
-
-IUSE="+doc +net"
-SLOT="${PV:0:1}"
-
-DEPEND=">=net-print/cups-1.1.14[${MULTILIB_USEDEP}]
- gtk? ( virtual/libusb:1 )"
-RDEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${PN}-source-${PV}-1
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.00-4-ppd.patch
- "${FILESDIR}"/${PN}-3.70-1-libexec-cups.patch
- "${FILESDIR}"/${PN}-3.70-1-libexec-backend.patch
- "${FILESDIR}"/${PN}-4.00-1-libexec-backend.patch
- "${FILESDIR}"/${PN}-4.00-1-libexec-cups.patch
- "${FILESDIR}"/${PN}-4.00-5-abi_x86_32.patch
- "${FILESDIR}"/${PN}-3.80-1-cups-1.6.patch
-)
-
-src_prepare() {
- local arc=64
- [[ x${ABI} == xx86 ]] && arc=32
- sed -e "s,cnijlgmon2_LDADD =,cnijlgmon2_LDADD = -L../../com/libs_bin${arc}," \
- -i lgmon2/src/Makefile.am || die
-
- ecnij_src_prepare
-}
-
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-backend.patch b/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-backend.patch
deleted file mode 100644
index 0d8c9b88..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-backend.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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 =
-
-
diff --git a/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-cups.patch b/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-cups.patch
deleted file mode 100644
index 25f7b2ea..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.70-1-libexec-cups.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
-
-
diff --git a/net-print/cnijfilter/files/cnijfilter-3.80-1-cups-1.6.patch b/net-print/cnijfilter/files/cnijfilter-3.80-1-cups-1.6.patch
deleted file mode 100644
index b97598f5..00000000
--- a/net-print/cnijfilter/files/cnijfilter-3.80-1-cups-1.6.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/cngpij/cngpij/bjcups.c
-+++ a/cngpij/cngpij/bjcups.c
-@@ -66,6 +66,27 @@
-
- char* g_printer_name = NULL;
-
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+
-+#define ippSetOperation(ipp_request, ipp_op_id) ipp_request->request.op.operation_id = ipp_op_id
-+#define ippSetRequestId(ipp_request, ipp_rq_id) ipp_request->request.op.request_id = ipp_rq_id
-+#define ippGetStatusCode(ipp_request) ipp_request->request.status.status_code
-+#define ippFirstAttribute(ipp) ipp->attrs /* simplistic */
-+#define bjcups_ippNextAttribute(resp, attr) attr->next
-+#define ippGetGroupTag(attr) attr->group_tag
-+#define ippGetName(attr) attr->name
-+#define ippGetString(attr, ind, lang) attr->values[ind].string.text
-+#define ippGetValueTag(attr) attr->value_tag
-+
-+#else
-+
-+#define bjcups_ippNextAttribute(resp, attr) ippNextAttribute(resp)
-+
-+#endif
-
- extern int GetIPCData(LPIPCU pipc, char *sname);
- static short getDeviceURI( const char *pDestName, char *pDeviceURI, short bufSize);
-@@ -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 = bjcups_ippNextAttribute(pResponse, pAttribute);
- }
- 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 = bjcups_ippNextAttribute(pResponse, pAttribute);
- }
-
- if (strcasecmp(pDestName, pPrinter) == 0) {
-@@ -739,7 +760,7 @@
- }
-
- if (pAttribute != NULL)
-- pAttribute = pAttribute->next;
-+ pAttribute = bjcups_ippNextAttribute(pResponse, pAttribute);
- }
- }
-
diff --git a/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-backend.patch b/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-backend.patch
deleted file mode 100644
index f55e79a2..00000000
--- a/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-backend.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cnijbe/src/Makefile.am 2014-08-08 22:40:21.697967931 +0200
-+++ cnijbe/src/Makefile.am 2014-08-08 22:41:44.972967317 +0200
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--cnijbe_bindir = /usr/lib/cups/backend
-+cnijbe_bindir = /usr/libexec/cups/backend
- cnijbe_bin_PROGRAMS = cnijbe
- transform =
-
diff --git a/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-cups.patch b/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-cups.patch
deleted file mode 100644
index 1c04c49f..00000000
--- a/net-print/cnijfilter/files/cnijfilter-4.00-1-libexec-cups.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- cmdtocanonij/filter/Makefile.am 2012-12-21 17:27:54.370964561 +0100
-+++ cmdtocanonij/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= cmdtocanonij
-
-
diff --git a/net-print/cnijfilter/files/cnijfilter-4.00-4-ppd.patch b/net-print/cnijfilter/files/cnijfilter-4.00-4-ppd.patch
deleted file mode 100644
index ca3fccff..00000000
--- a/net-print/cnijfilter/files/cnijfilter-4.00-4-ppd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
diff --git a/net-print/cnijfilter/files/cnijfilter-4.00-5-abi_x86_32.patch b/net-print/cnijfilter/files/cnijfilter-4.00-5-abi_x86_32.patch
deleted file mode 100644
index d3b00f52..00000000
--- a/net-print/cnijfilter/files/cnijfilter-4.00-5-abi_x86_32.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
---- cnijnpr/configure.in 2014-08-11 08:41:12.712983380 +0200
-+++ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 19:18:16 +0000