| 1 |
billie 12/02/08 19:29:59 |
| 2 |
|
| 3 |
Modified: hplip-3.11.12-fast-pp.patch |
| 4 |
Log: |
| 5 |
Update the fast-pp patch to add linkage against lrt. This fixes bug #402177. Thanks to Juergen Rose and Martin Mokrejš for the patch. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-print/hplip/files/hplip-3.11.12-fast-pp.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.12-fast-pp.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.12-fast-pp.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/files/hplip-3.11.12-fast-pp.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: hplip-3.11.12-fast-pp.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip-3.11.12-fast-pp.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- hplip-3.11.12-fast-pp.patch 25 Jan 2012 18:50:03 -0000 1.1 |
| 23 |
+++ hplip-3.11.12-fast-pp.patch 8 Feb 2012 19:29:59 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-diff -ur hplip-3.11.5/io/hpmud/pp.c hplip-3.11.5-fast-pp/io/hpmud/pp.c |
| 26 |
---- hplip-3.11.5/io/hpmud/pp.c 2011-05-14 18:26:04.000000000 +0000 |
| 27 |
-+++ hplip-3.11.5-fast-pp/io/hpmud/pp.c 2011-07-13 22:06:57.000000000 +0000 |
| 28 |
+diff -Naur hplip-3.12.2-orig/io/hpmud/pp.c hplip-3.12.2/io/hpmud/pp.c |
| 29 |
+--- hplip-3.12.2-orig/io/hpmud/pp.c 2012-02-01 12:53:52.000000000 +0100 |
| 30 |
++++ hplip-3.12.2/io/hpmud/pp.c 2012-02-08 20:04:14.559884716 +0100 |
| 31 |
@@ -28,6 +28,8 @@ |
| 32 |
|
| 33 |
#include "hpmud.h" |
| 34 |
@@ -784,9 +784,9 @@ |
| 35 |
|
| 36 |
m = IEEE1284_MODE_NIBBLE; |
| 37 |
ioctl(pd->mlc_fd, PPNEGOT, &m); |
| 38 |
-diff -ur hplip-3.11.5/io/hpmud/pp.h hplip-3.11.5-fast-pp/io/hpmud/pp.h |
| 39 |
---- hplip-3.11.5/io/hpmud/pp.h 2011-05-14 18:26:04.000000000 +0000 |
| 40 |
-+++ hplip-3.11.5-fast-pp/io/hpmud/pp.h 2011-07-13 21:08:15.000000000 +0000 |
| 41 |
+diff -Naur hplip-3.12.2-orig/io/hpmud/pp.h hplip-3.12.2/io/hpmud/pp.h |
| 42 |
+--- hplip-3.12.2-orig/io/hpmud/pp.h 2012-02-01 12:53:52.000000000 +0100 |
| 43 |
++++ hplip-3.12.2/io/hpmud/pp.h 2012-02-08 20:04:14.559884716 +0100 |
| 44 |
@@ -60,18 +60,11 @@ |
| 45 |
* 0 - Strobe * |
| 46 |
* |
| 47 |
@@ -806,3 +806,27 @@ |
| 48 |
|
| 49 |
struct _mud_device; |
| 50 |
struct _mud_channel; |
| 51 |
+diff -Naur hplip-3.12.2-orig/Makefile.am hplip-3.12.2/Makefile.am |
| 52 |
+--- hplip-3.12.2-orig/Makefile.am 2012-02-01 12:53:57.000000000 +0100 |
| 53 |
++++ hplip-3.12.2/Makefile.am 2012-02-08 20:04:14.576551703 +0100 |
| 54 |
+@@ -68,9 +68,9 @@ |
| 55 |
+ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/musb.h io/hpmud/pml.h io/hpmud/dot4.c \ |
| 56 |
+ io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h |
| 57 |
+ if NETWORK_BUILD |
| 58 |
+-libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -l$(SNMPLIB) -lcrypto |
| 59 |
++libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt -l$(SNMPLIB) -lcrypto |
| 60 |
+ else |
| 61 |
+-libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread |
| 62 |
++libhpmud_la_LDFLAGS = -version-info 0:6:0 -lusb -lpthread -lrt |
| 63 |
+ endif |
| 64 |
+ libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" |
| 65 |
+ |
| 66 |
+@@ -87,7 +87,7 @@ |
| 67 |
+ hp_mkuridir = $(bindir) |
| 68 |
+ hp_mkuri_PROGRAMS = hp-mkuri |
| 69 |
+ hp_mkuri_SOURCES = io/hpmud/hp-mkuri.c |
| 70 |
+-hp_mkuri_LDADD = -ldl libhpmud.la |
| 71 |
++hp_mkuri_LDADD = -ldl -lrt libhpmud.la |
| 72 |
+ hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" |
| 73 |
+ |
| 74 |
+ # hpmud.rules |
Archives