Attachment #129777 for bug #173827

View | Details | Raw Unified | Return to bug 173827
Collapse All | Expand All




#

PORTNAME=	hplip
PORTVERSION=	3.12.10a
PORTREVISION=	2
CATEGORIES=	print
MASTER_SITES=	SF


CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
		--enable-foomatic-rip-hplip-install \
		--enable-hpijs-install \
		--enable-cups-ppd-install \
		--enable-libusb01_build \
		--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
		--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
		--with-icondir=${DESKTOPDIR} \

		-e 's,/etc/sane.d,${LOCALBASE}&,g' \
		-e 's,/usr/share,${LOCALBASE}/share,g' \
		-e 's,/usr/include,${LOCALBASE}/include,g' \
		-e 's,/usr/bin,${LOCALBASE}/bin,g' \
		${FILES4FIX:S,^,${WRKSRC}/,}
	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \
		${WRKSRC}/installer/core_install.py

Lines 1-2 Link Here

(-)hplip/distinfo (-2 / +2 lines)
1	SHA256 (hplip-3.12.2.tar.gz) = 6eaa0cc6f255cc3ebeddb73dee208e6bdc22ba467e3b1da943844ae266d3c314	1	SHA256 (hplip-3.12.10a.tar.gz) = 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc
2	SIZE (hplip-3.12.2.tar.gz) = 20579749	2	SIZE (hplip-3.12.10a.tar.gz) = 21827613




--- Makefile.in.orig	2012-10-10 02:16:15.000000000 -0400
+++ Makefile.in	2012-11-21 22:06:31.000000000 -0500
@@ -93,10 +93,10 @@
 @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_2 = -lusb
 @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_3 = -lusb-1.0
 @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_TRUE@am__append_4 = data/rules/40-hplip_sysfs.rules
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_TRUE@am__append_5 = data/rules/55-hpmud_sysfs.rules
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_FALSE@am__append_6 = data/rules/40-hplip.rules
-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_FALSE@am__append_7 = data/rules/55-hpmud.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_TRUE@am__append_4 = data/rules/40-hplip_sysfs.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_TRUE@am__append_5 = data/rules/55-hpmud_sysfs.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_FALSE@am__append_6 = data/rules/40-hplip.rules
+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_FALSE@am__append_7 = data/rules/55-hpmud.rules
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_8 =  \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
@@ -2330,15 +2330,15 @@
 	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
 am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
 	prnt/pcl.py prnt/colorcal.py
-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
-	data/rules/86-hpmud_plugin.rules \
-	data/rules/56-hpmud_add_printer.rules \
-	data/rules/40-hplip.rules data/rules/55-hpmud.rules \
-	data/rules/56-hpmud_support_sysfs.rules \
-	data/rules/86-hpmud_plugin_sysfs.rules \
-	data/rules/56-hpmud_add_printer_sysfs.rules \
-	data/rules/40-hplip_sysfs.rules \
-	data/rules/55-hpmud_sysfs.rules
+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
+#	data/rules/86-hpmud_plugin.rules \
+#	data/rules/56-hpmud_add_printer.rules \
+#	data/rules/40-hplip.rules data/rules/55-hpmud.rules \
+#	data/rules/56-hpmud_support_sysfs.rules \
+#	data/rules/86-hpmud_plugin_sysfs.rules \
+#	data/rules/56-hpmud_add_printer_sysfs.rules \
+#	data/rules/40-hplip_sysfs.rules \
+#	data/rules/55-hpmud_sysfs.rules
 am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
 am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
 	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
@@ -4353,21 +4353,21 @@
 @HPLIP_BUILD_TRUE@dist_cron_DATA = data/rules/hplip_cron
 
 # hpmud.rules
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	data/rules/86-hpmud_plugin.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	data/rules/56-hpmud_add_printer.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	$(am__append_6) \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	$(am__append_7)
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	data/rules/86-hpmud_plugin_sysfs.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	data/rules/56-hpmud_add_printer_sysfs.rules \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_4) \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_5) \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_6) \
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_7)
-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
+# @HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	data/rules/86-hpmud_plugin.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	data/rules/56-hpmud_add_printer.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	$(am__append_6) \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@	$(am__append_7)
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	data/rules/86-hpmud_plugin_sysfs.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	data/rules/56-hpmud_add_printer_sysfs.rules \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_4) \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_5) \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_6) \
+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@	$(am__append_7)
+# @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+# @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
 
 # hplip.conf
 @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
@@ -4428,14 +4428,14 @@
 
 # data
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models

 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
@@ -8894,20 +8894,20 @@
 
 
 install-dist_hplip_LogDATA:

+#@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@HPLIP_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
 
 install-dist_hplip_tmpDATA:
-@FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-@FULL_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+# @FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+# @FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+# @FULL_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+# @HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+# @HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+# @HPLIP_BUILD_TRUE@	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
 
 install-dist_cronDATA:$(dist_cron_DATA)
 	test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \




--- base/utils.py.orig	2012-11-21 21:40:54.000000000 -0500
+++ base/utils.py	2012-11-21 21:42:16.000000000 -0500
@@ -881,8 +881,8 @@
         if not f(x): return False
     return True
 
-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
-BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
+BROWSERS = ['xdg-open', 'firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
+BROWSER_OPTS = {'xdg-open': '', 'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
+BROWSER_OPTS = {'xdg-open': '','firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
 
 
 def find_browser():




--- installer/core_install.py.orig	2012-11-21 21:43:00.000000000 -0500
+++ installer/core_install.py	2012-11-21 21:45:41.000000000 -0500
@@ -1,4 +1,4 @@
-﻿# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #
 # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
 #
@@ -885,14 +885,14 @@
             if not check_lib('libusb'):
                 return False
             if self.distro_name != "rhel":
-                return len(locate_file_contains("usb.h", '/usr/include', 'usb_init'))
+                return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init'))
             else:
                 return True
         else:
             if not check_lib('libusb-1.0'):
                 return False
             if self.distro_name != "rhel":
-                return len(locate_file_contains("libusb.h", '/usr/include/libusb-1.0', 'libusb_init'))
+                return len(locate_file_contains("libusb.h", '%USB_INCLUDE%/libusb-1.0', 'libusb_init'))
             else:
                 return True
 
@@ -958,7 +958,7 @@
+        return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init(void)'))
 
 
     def check_sane_devel(self):
-        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
+        return len(locate_file_contains("sane.h", '%USB_INCLUDE%', 'extern SANE_Status sane_init'))
 
 
     def check_xsane(self):
@@ -1061,7 +1061,7 @@
     def check_dbus(self):
         log.debug("Checking for dbus running and header files present (dbus-devel)...")
         return check_ps(['dbus-daemon'])  and \
-            len(locate_file_contains("dbus-message.h", '/usr/include', 'dbus_message_new_signal'))
+            len(locate_file_contains("dbus-message.h", '%USB_INCLUDE%', 'dbus_message_new_signal'))
 
 
     def check_cups_devel(self):
@@ -1079,7 +1079,7 @@
 
 
     def check_cups_image(self):
-      return check_file("raster.h", "/usr/include/cups")
+      return check_file("raster.h", "%USB_INCLUDE%/cups")
 
 
     def check_hplip(self):




--- io/hpmud/musb.c.orig	2012-11-21 21:50:35.000000000 -0500
+++ io/hpmud/musb.c	2012-11-21 21:51:45.000000000 -0500
@@ -133,11 +133,17 @@
                  0x409, 
                  tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
 
-      if (ret==0)
-      {
+#ifdef __FreeBSD__
+       || ret == -EIO
+#endif
+       )
       {
-         /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
-         BUG("get_string_descriptor zero result, retrying...");
-         continue;
+       if (ret==0
+ #ifdef __FreeBSD__
+        || ret == -EIO
+ #endif
+        )
+      {
+          /* This retry is necessary for lj1000 and lj1005. des 12/12/07
+          Also HP Photosmart 42xx seems to suffer transient errors with serial id */
+          BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
+          sleep(2);
+          continue;
       }
       break;
    }




--- ./prnt/hpcups/HPCupsFilter.cpp.orig	2010-08-25 11:15:08.000000000 +0400
+++ ./prnt/hpcups/HPCupsFilter.cpp	2010-08-25 11:35:36.000000000 +0400
@@ -433,13 +433,14 @@
 
     memset(&m_JA, 0, sizeof(JobAttributes));
     struct    tm       *t;
-    struct    timeb    tb;
+    struct    timeval    tv;
+    struct    timezone   tz;
     time_t             long_time;
     time(&long_time);
     t = localtime(&long_time);
-    ftime(&tb);
+    gettimeofday(&tv, &tz);
     strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1);    // returns Fri Jun  5 08:12:16 2009
-    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
+    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds
 
     getLogLevel();
     m_JA.job_id = atoi(argv[1]);

Return to bug 173827

Lines 6-13 Link Here

(-)hplip/Makefile (-2 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= hplip	8	PORTNAME= hplip
9	PORTVERSION= 3.12.2	9	PORTVERSION= 3.12.10a
10	PORTREVISION= 2
11	CATEGORIES= print	10	CATEGORIES= print
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 34-39 Link Here
34	CONFIGURE_ARGS= --enable-foomatic-ppd-install \	33	CONFIGURE_ARGS= --enable-foomatic-ppd-install \
35	--enable-foomatic-rip-hplip-install \	34	--enable-foomatic-rip-hplip-install \
36	--enable-hpijs-install \	35	--enable-hpijs-install \
		36	--enable-cups-ppd-install \
		37	--enable-libusb01_build \
37	--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \	38	--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
38	--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \	39	--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
39	--with-icondir=${DESKTOPDIR} \	40	--with-icondir=${DESKTOPDIR} \
Lines 162-167 Link Here
162	-e 's,/etc/sane.d,${LOCALBASE}&,g' \	163	-e 's,/etc/sane.d,${LOCALBASE}&,g' \
163	-e 's,/usr/share,${LOCALBASE}/share,g' \	164	-e 's,/usr/share,${LOCALBASE}/share,g' \
164	-e 's,/usr/include,${LOCALBASE}/include,g' \	165	-e 's,/usr/include,${LOCALBASE}/include,g' \
		166	-e 's,/usr/bin,${LOCALBASE}/bin,g' \
165	${FILES4FIX:S,^,${WRKSRC}/,}	167	${FILES4FIX:S,^,${WRKSRC}/,}
166	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \	168	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \
167	${WRKSRC}/installer/core_install.py	169	${WRKSRC}/installer/core_install.py

Lines 1-49 Link Here

(-)hplip/files/patch-Makefile.in (-30 / +78 lines)
1	--- ./Makefile.in.orig 2011-12-09 11:23:55.000000000 +0000	1	--- Makefile.in.orig 2012-10-10 02:16:15.000000000 -0400
2	+++ ./Makefile.in 2012-01-14 20:21:23.105509188 +0000	2	+++ Makefile.in 2012-11-21 22:06:31.000000000 -0500
3	@@ -90,8 +90,8 @@	3	@@ -93,10 +93,10 @@
4	# ip library	4	@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE@am__append_2 = -lusb
5	@HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la	5	@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@am__append_3 = -lusb-1.0
6	@HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)	6	@HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
7	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules	7	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_TRUE@am__append_4 = data/rules/40-hplip_sysfs.rules
8	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules	8	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_TRUE@am__append_5 = data/rules/55-hpmud_sysfs.rules
9	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules	9	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_FALSE@am__append_6 = data/rules/40-hplip.rules
10	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules	10	-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_FALSE@am__append_7 = data/rules/55-hpmud.rules
11	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 = \	11	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_TRUE@am__append_4 = data/rules/40-hplip_sysfs.rules
		12	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_TRUE@am__append_5 = data/rules/55-hpmud_sysfs.rules
		13	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@@UDEV_SYSFS_RULES_FALSE@am__append_6 = data/rules/40-hplip.rules
		14	+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@@UDEV_SYSFS_RULES_FALSE@am__append_7 = data/rules/55-hpmud.rules
		15	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_8 = \
12	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \	16	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \
13	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \	17	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \
14	@@ -2214,9 +2214,9 @@	18	@@ -2330,15 +2330,15 @@
15	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz	19	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
16	am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \	20	am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
17	prnt/pcl.py prnt/colorcal.py	21	prnt/pcl.py prnt/colorcal.py
18	-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \	22	-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
19	- data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \	23	- data/rules/86-hpmud_plugin.rules \
20	- data/rules/55-hpmud.rules	24	- data/rules/56-hpmud_add_printer.rules \
		25	- data/rules/40-hplip.rules data/rules/55-hpmud.rules \
		26	- data/rules/56-hpmud_support_sysfs.rules \
		27	- data/rules/86-hpmud_plugin_sysfs.rules \
		28	- data/rules/56-hpmud_add_printer_sysfs.rules \
		29	- data/rules/40-hplip_sysfs.rules \
		30	- data/rules/55-hpmud_sysfs.rules
21	+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \	31	+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
22	+# data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \	32	+# data/rules/86-hpmud_plugin.rules \
23	+# data/rules/55-hpmud.rules	33	+# data/rules/56-hpmud_add_printer.rules \
		34	+# data/rules/40-hplip.rules data/rules/55-hpmud.rules \
		35	+# data/rules/56-hpmud_support_sysfs.rules \
		36	+# data/rules/86-hpmud_plugin_sysfs.rules \
		37	+# data/rules/56-hpmud_add_printer_sysfs.rules \
		38	+# data/rules/40-hplip_sysfs.rules \
		39	+# data/rules/55-hpmud_sysfs.rules
24	am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py	40	am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
25	am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \	41	am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
26	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \	42	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
27	@@ -4106,12 +4106,12 @@	43	@@ -4353,21 +4353,21 @@
28	@HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"	44	@HPLIP_BUILD_TRUE@dist_cron_DATA = data/rules/hplip_cron
29		45
30	# hpmud.rules	46	# hpmud.rules
31	-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d	47	-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
32	-@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \	48	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
33	-@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \	49	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/86-hpmud_plugin.rules \
34	-@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)	50	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/56-hpmud_add_printer.rules \
		51	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ $(am__append_6) \
		52	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ $(am__append_7)
		53	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules \
		54	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ data/rules/86-hpmud_plugin_sysfs.rules \
		55	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ data/rules/56-hpmud_add_printer_sysfs.rules \
		56	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_4) \
		57	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_5) \
		58	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_6) \
		59	-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_7)
35	-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor	60	-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
36	-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi	61	-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
37	+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d	62	+# @HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
38	+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \	63	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
39	+#@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \	64	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/86-hpmud_plugin.rules \
40	+#@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3)	65	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ data/rules/56-hpmud_add_printer.rules \
41	+#@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor	66	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ $(am__append_6) \
42	+#@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi	67	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@ $(am__append_7)
		68	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules \
		69	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ data/rules/86-hpmud_plugin_sysfs.rules \
		70	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ data/rules/56-hpmud_add_printer_sysfs.rules \
		71	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_4) \
		72	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_5) \
		73	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_6) \
		74	+# @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@ $(am__append_7)
		75	+# @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
		76	+# @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
43		77
44	# hplip.conf	78	# hplip.conf
45	@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp	79	@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
46	@@ -4169,14 +4169,14 @@	80	@@ -4428,14 +4428,14 @@
47		81
48	# data	82	# data
49	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models	83	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models
Lines 66-72 Link Here
66	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl	100	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
67	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl	101	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
68	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps	102	@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
69	@@ -8581,12 +8581,12 @@	103	@@ -8894,20 +8894,20 @@
70		104
71		105
72	install-dist_hplip_LogDATA:	106	install-dist_hplip_LogDATA:
Lines 83-87 Link Here
83	+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)	117	+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
84	+#@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)	118	+#@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
85		119
86	install-data-hook:	120	install-dist_hplip_tmpDATA:
87	# If scanner build, add hpaio entry to sane dll.conf.	121	-@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" \|\| mkdir -p $(DESTDIR)$(hplip_tmpdir)
		122	-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
		123	-@FULL_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
		124	-@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" \|\| mkdir -p $(DESTDIR)$(hplip_tmpdir)
		125	-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
		126	-@HPLIP_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
		127	+# @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" \|\| mkdir -p $(DESTDIR)$(hplip_tmpdir)
		128	+# @FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
		129	+# @FULL_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
		130	+# @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" \|\| mkdir -p $(DESTDIR)$(hplip_tmpdir)
		131	+# @HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
		132	+# @HPLIP_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
		133
		134	install-dist_cronDATA:$(dist_cron_DATA)
		135	test -z "$(DESTDIR)$(crondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(crondir)"; \

Lines 1-13 Link Here

(-)hplip/files/patch-base__utils.py (-8 / +8 lines)
1	--- ./base/utils.py.orig 2011-05-14 22:26:06.000000000 +0400	1	--- base/utils.py.orig 2012-11-21 21:40:54.000000000 -0500
2	+++ ./base/utils.py 2011-07-04 11:57:33.000000000 +0400	2	+++ base/utils.py 2012-11-21 21:42:16.000000000 -0500
3	@@ -840,8 +840,8 @@	3	@@ -881,8 +881,8 @@
		4	if not f(x): return False
4	return True	5	return True
5		6
6		7	-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
7	-BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order	8	-BROWSER_OPTS = {'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
8	-BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}	9	+BROWSERS = ['xdg-open', 'firefox', 'mozilla', 'konqueror', 'epiphany', 'skipstone'] # in preferred order
9	+BROWSERS = ['xdg-open', 'firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order	10	+BROWSER_OPTS = {'xdg-open': '', 'firefox': '-new-tab', 'mozilla': '', 'konqueror': '', 'epiphany': '--new-tab', 'skipstone': ''}
10	+BROWSER_OPTS = {'xdg-open': '','firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
11		11
12		12
13	def find_browser():	13	def find_browser():

Lines 1-11 Link Here

(-)hplip/files/patch-core_install.py (-8 / +49 lines)
1	--- ./installer/core_install.py.orig 2010-08-26 02:29:22.000000000 +0400	1	--- installer/core_install.py.orig 2012-11-21 21:43:00.000000000 -0500
2	+++ ./installer/core_install.py 2010-08-26 02:30:22.429959790 +0400	2	+++ installer/core_install.py 2012-11-21 21:45:41.000000000 -0500
3	@@ -833,7 +833,7 @@	3	@@ -1,4 +1,4 @@
4	if not check_lib('libusb'):	4	-# -- coding: utf-8 --
5	return False	5	+# -- coding: utf-8 --
		6	#
		7	# (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P.
		8	#
		9	@@ -885,14 +885,14 @@
		10	if not check_lib('libusb'):
		11	return False
		12	if self.distro_name != "rhel":
		13	- return len(locate_file_contains("usb.h", '/usr/include', 'usb_init'))
		14	+ return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init'))
		15	else:
		16	return True
		17	else:
		18	if not check_lib('libusb-1.0'):
		19	return False
		20	if self.distro_name != "rhel":
		21	- return len(locate_file_contains("libusb.h", '/usr/include/libusb-1.0', 'libusb_init'))
		22	+ return len(locate_file_contains("libusb.h", '%USB_INCLUDE%/libusb-1.0', 'libusb_init'))
		23	else:
		24	return True
6		25
7	- return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))	26	@@ -958,7 +958,7 @@
8	+ return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init(void)'))
9		27
10		28
11	def check_libjpeg(self):	29	def check_sane_devel(self):
		30	- return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
		31	+ return len(locate_file_contains("sane.h", '%USB_INCLUDE%', 'extern SANE_Status sane_init'))
		32
		33
		34	def check_xsane(self):
		35	@@ -1061,7 +1061,7 @@
		36	def check_dbus(self):
		37	log.debug("Checking for dbus running and header files present (dbus-devel)...")
		38	return check_ps(['dbus-daemon']) and \
		39	- len(locate_file_contains("dbus-message.h", '/usr/include', 'dbus_message_new_signal'))
		40	+ len(locate_file_contains("dbus-message.h", '%USB_INCLUDE%', 'dbus_message_new_signal'))
		41
		42
		43	def check_cups_devel(self):
		44	@@ -1079,7 +1079,7 @@
		45
		46
		47	def check_cups_image(self):
		48	- return check_file("raster.h", "/usr/include/cups")
		49	+ return check_file("raster.h", "%USB_INCLUDE%/cups")
		50
		51
		52	def check_hplip(self):

Lines 1-21 Link Here

(-)hplip/files/patch-io-hpmud-musb.c (-16 / +20 lines)
1	Index: io/hpmud/musb.c	1	--- io/hpmud/musb.c.orig 2012-11-21 21:50:35.000000000 -0500
2	@@ -122,10 +122,16 @@	2	+++ io/hpmud/musb.c 2012-11-21 21:51:45.000000000 -0500
3	{	3	@@ -133,11 +133,17 @@
4	ret = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index,	4	0x409,
5	0x409, tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);	5	tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
		6
6	- if (ret==0)	7	- if (ret==0)
7	+ if (ret==0	8	- {
8	+#ifdef __FreeBSD__
9	+ \|\| ret == -EIO
10	+#endif
11	+ )
12	{
13	- /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */	9	- /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
14	- BUG("get_string_descriptor zero result, retrying...");	10	- BUG("get_string_descriptor zero result, retrying...");
15	+ /* This retry is necessary for lj1000 and lj1005. des 12/12/07	11	- continue;
16	+ Also HP Photosmart 42xx seems to suffer transient errors with serial id */	12	+ if (ret==0
17	+ BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);	13	+ #ifdef __FreeBSD__
18	+ sleep(2);	14	+ \|\| ret == -EIO
19	continue;	15	+ #endif
		16	+ )
		17	+ {
		18	+ /* This retry is necessary for lj1000 and lj1005. des 12/12/07
		19	+ Also HP Photosmart 42xx seems to suffer transient errors with serial id */
		20	+ BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
		21	+ sleep(2);
		22	+ continue;
20	}	23	}
21	break;	24	break;
		25	}

Lines 1-20 Link Here

(-)hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp (-20 lines)
1	--- ./prnt/hpcups/HPCupsFilter.cpp.orig 2010-08-25 11:15:08.000000000 +0400
2	+++ ./prnt/hpcups/HPCupsFilter.cpp 2010-08-25 11:35:36.000000000 +0400
3	@@ -433,13 +433,14 @@
4
5	memset(&m_JA, 0, sizeof(JobAttributes));
6	struct tm *t;
7	- struct timeb tb;
8	+ struct timeval tv;
9	+ struct timezone tz;
10	time_t long_time;
11	time(&long_time);
12	t = localtime(&long_time);
13	- ftime(&tb);
14	+ gettimeofday(&tv, &tz);
15	strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1); // returns Fri Jun 5 08:12:16 2009
16	- snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
17	+ snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds
18
19	getLogLevel();
20	m_JA.job_id = atoi(argv[1]);