| 1 |
commit: e680d3082c58612c924d23126fe5443aa19492a9 |
| 2 |
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 4 16:22:47 2011 +0000 |
| 4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 4 16:22:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=e680d3082c58612c924d23126fe5443aa19492a9 |
| 7 |
|
| 8 |
Version bump, backported patch to fix compilation with cups-1.3.x |
| 9 |
|
| 10 |
--- |
| 11 |
net-print/cups-bjnp/Manifest | 5 +++-- |
| 12 |
...ps-bjnp-0.5.4.ebuild => cups-bjnp-0.5.5.ebuild} | 10 ++++++++-- |
| 13 |
.../files/0.5.5-cups-1.3.x-compile-fix.patch | 17 +++++++++++++++++ |
| 14 |
3 files changed, 28 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest |
| 17 |
index 482dd6f..d62eac1 100644 |
| 18 |
--- a/net-print/cups-bjnp/Manifest |
| 19 |
+++ b/net-print/cups-bjnp/Manifest |
| 20 |
@@ -1,2 +1,3 @@ |
| 21 |
-EBUILD cups-bjnp-0.5.4.ebuild 557 RMD160 2c2cfbb70b32868bbac596b5048aff47c2cce357 SHA1 d8ad7befdd19f02411e39246aa8a9beae8eed465 SHA256 d7add9cba54e12a658de91791ba2e7bee69c2840fc160c0635444b9eb7765fe9 |
| 22 |
-DIST cups-bjnp-0.5.4.tar.gz 140698 RMD160 a7669d132370c951ca9e8a95fea4a888b3490022 SHA1 7b74ec4b898b65018a6393f0aa86eb78394c1b91 SHA256 c6d1db090674cc8c2dd122efb1696a61d277d0bf26e7cfb627443f0974bcb6e0 |
| 23 |
+EBUILD cups-bjnp-0.5.5.ebuild 649 RMD160 1305c4bd6b3ea75f2962ed2a472ee52f4f87a2d4 SHA1 d2f7dca27d53d049c057071b82409d0dc423c57f SHA256 96539767f34a7617dfbcc7fdf13e8b68c8ed797030efe5ca5894da958031a1b8 |
| 24 |
+AUX 0.5.5-cups-1.3.x-compile-fix.patch 514 RMD160 def479115c4251f7e7b567a536d800c20d6bc3a9 SHA1 d9e98678b6a8755dcd8a0915dcac3f12e8aa3006 SHA256 5238d888a2421e158e7ffb206de7d135781a73ee3e9e17e90f454ff623d2e932 |
| 25 |
+DIST cups-bjnp-0.5.5.tar.gz 122011 RMD160 fac228e5706c9c1aab104efcd4da95e96c32a19d SHA1 ee92a655ef6fc1f2f8488f1ac6e9df778897c53f SHA256 84373d666a73de462e7edaee605d6ec2569f15505cdb060cf8931c37b2020407 |
| 26 |
|
| 27 |
diff --git a/net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild b/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild |
| 28 |
similarity index 78% |
| 29 |
rename from net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild |
| 30 |
rename to net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild |
| 31 |
index 0241579..b5b65d1 100644 |
| 32 |
--- a/net-print/cups-bjnp/cups-bjnp-0.5.4.ebuild |
| 33 |
+++ b/net-print/cups-bjnp/cups-bjnp-0.5.5.ebuild |
| 34 |
@@ -1,8 +1,10 @@ |
| 35 |
-# Copyright 1999-2009 Tiziano Müller |
| 36 |
+# Copyright 1999-2011 Tiziano Müller |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
# $Header: $ |
| 39 |
|
| 40 |
-EAPI="2" |
| 41 |
+EAPI="4" |
| 42 |
+ |
| 43 |
+inherit eutils |
| 44 |
|
| 45 |
DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol." |
| 46 |
HOMEPAGE="http://sourceforge.net/projects/cups-bjnp/" |
| 47 |
@@ -16,6 +18,10 @@ IUSE="" |
| 48 |
DEPEND="net-print/cups" |
| 49 |
RDEPEND="${DEPEND}" |
| 50 |
|
| 51 |
+src_prepare() { |
| 52 |
+ epatch "${FILESDIR}/${PV}-cups-1.3.x-compile-fix.patch" |
| 53 |
+} |
| 54 |
+ |
| 55 |
src_install() { |
| 56 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch b/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch |
| 60 |
new file mode 100644 |
| 61 |
index 0000000..3f1bb33 |
| 62 |
--- /dev/null |
| 63 |
+++ b/net-print/cups-bjnp/files/0.5.5-cups-1.3.x-compile-fix.patch |
| 64 |
@@ -0,0 +1,17 @@ |
| 65 |
+Index: bjnp-runloop.c |
| 66 |
+=================================================================== |
| 67 |
+--- bjnp-runloop.c (Revision 45) |
| 68 |
++++ bjnp-runloop.c (Arbeitskopie) |
| 69 |
+@@ -224,9 +224,12 @@ |
| 70 |
+ bjnp_debug (LOG_DEBUG, "Received side-channel request, command is %d\n", command); |
| 71 |
+ switch (command) |
| 72 |
+ { |
| 73 |
++#ifdef CUPS_SC_CMD_NONE |
| 74 |
+ case CUPS_SC_CMD_NONE: |
| 75 |
++ /* this value is private, but it is received sometimes.... */ |
| 76 |
+ /* Nothing to do.... */ |
| 77 |
+ break; |
| 78 |
++#endif |
| 79 |
+ |
| 80 |
+ case CUPS_SC_CMD_DRAIN_OUTPUT: |
| 81 |
+ /* |
Archives