Accepting request 126028 from home:phiwag:branches:Printing
Updated to hplip 3.12.6 OBS-URL: https://build.opensuse.org/request/show/126028 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=50
This commit is contained in:
Johannes Meixner
Git OBS Bridge
parent
3fd5839584
commit
c8eef55832
@ -276,19 +276,26 @@
|
||||
-LABEL="hpmud_rules_end"
|
||||
+LABEL="hpmud_support_rules_end"
|
||||
+
|
||||
--- data/rules/86-hpmud_plugin.rules.orig 2011-12-09 12:19:54.000000000 +0100
|
||||
+++ data/rules/86-hpmud_plugin.rules 2012-01-12 17:07:28.000000000 +0100
|
||||
@@ -1,9 +1,9 @@
|
||||
--- data/rules/86-hpmud_plugin.rules.orig 2012-06-25 11:39:13.821298335 +0200
|
||||
+++ data/rules/86-hpmud_plugin.rules 2012-06-25 11:40:03.421562113 +0200
|
||||
@@ -1,13 +1,13 @@
|
||||
# Load hp firmware for this printer.
|
||||
|
||||
-ACTION!="add", GOTO="hpmud_rules_end"
|
||||
+ACTION!="add", GOTO="hpmud_plugin_rules_end"
|
||||
|
||||
#Check and add printer for Suse 10.3 distro
|
||||
# hp_Marvel_Device (These printer requires the plugin files. installling when device is detected)
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'"
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m &'"
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'"
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM} &'"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'logger -p user.info loading hp_printer_device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m $env{BUSNUM}:$env{DEVNUM}&'"
|
||||
|
||||
#Check and add printer for other distros
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m %c &'"
|
||||
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m %c &'"
|
||||
-LABEL="hpmud_rules_end"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m %c &'"
|
||||
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="03f0", ATTR{idProduct}=="??2a", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/hp-check-plugin -m %c &'"
|
||||
+LABEL="hpmud_plugin_rules_end"
|
||||
|
||||
|
||||
136
fix-no-return-in-nonvoid-function.diff
Normal file
136
fix-no-return-in-nonvoid-function.diff
Normal file
@ -0,0 +1,136 @@
|
||||
--- scan/sane/hpaio.c.orig 2012-06-18 12:42:51.000000000 +0200
|
||||
+++ scan/sane/hpaio.c 2012-06-25 16:30:00.364432019 +0200
|
||||
@@ -332,121 +332,132 @@
|
||||
if (ma.scantype == HPMUD_SCANTYPE_SOAP)
|
||||
return soap_open(devicename, pHandle);
|
||||
if (ma.scantype == HPMUD_SCANTYPE_SOAPHT)
|
||||
return soapht_open(devicename, pHandle);
|
||||
if (ma.scantype == HPMUD_SCANTYPE_LEDM)
|
||||
return ledm_open(devicename, pHandle);
|
||||
if ((ma.scantype == HPMUD_SCANTYPE_SCL) || (ma.scantype == HPMUD_SCANTYPE_PML))
|
||||
return sclpml_open(devicename, pHandle);
|
||||
+
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_open() */
|
||||
|
||||
extern void sane_hpaio_close(SANE_Handle handle)
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_close(handle);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_close(handle);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_close(handle);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_close(handle);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_close(handle);
|
||||
+
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_close() */
|
||||
|
||||
extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option)
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_get_option_descriptor(handle, option);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_get_option_descriptor(handle, option);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_get_option_descriptor(handle, option);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_get_option_descriptor(handle, option);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_get_option_descriptor(handle, option);
|
||||
+
|
||||
+ return 0;
|
||||
} /* sane_hpaio_get_option_descriptor() */
|
||||
|
||||
extern SANE_Status sane_hpaio_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void * pValue, SANE_Int * pInfo )
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_control_option(handle, option, action, pValue, pInfo);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_control_option(handle, option, action, pValue, pInfo);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_control_option(handle, option, action, pValue, pInfo);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_control_option(handle, option, action, pValue, pInfo);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_control_option(handle, option, action, pValue, pInfo);
|
||||
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_control_option() */
|
||||
|
||||
extern SANE_Status sane_hpaio_get_parameters(SANE_Handle handle, SANE_Parameters *pParams)
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_get_parameters(handle, pParams);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_get_parameters(handle, pParams);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_get_parameters(handle, pParams);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_get_parameters(handle, pParams);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_get_parameters(handle, pParams);
|
||||
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_get_parameters() */
|
||||
|
||||
extern SANE_Status sane_hpaio_start(SANE_Handle handle)
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_start(handle);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_start(handle);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_start(handle);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_start(handle);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_start(handle);
|
||||
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_start() */
|
||||
|
||||
|
||||
extern SANE_Status sane_hpaio_read(SANE_Handle handle, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength)
|
||||
{
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_read(handle, data, maxLength, pLength);
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_read(handle, data, maxLength, pLength);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_read(handle, data, maxLength, pLength);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_read(handle, data, maxLength, pLength);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_read(handle, data, maxLength, pLength);
|
||||
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_read() */
|
||||
|
||||
/* Note, sane_cancel is called normally not just during IO abort situations. */
|
||||
extern void sane_hpaio_cancel( SANE_Handle handle )
|
||||
{
|
||||
if (strcmp(*((char **)handle), "MARVELL") == 0)
|
||||
return marvell_cancel(handle);
|
||||
if (strcmp(*((char **)handle), "SOAP") == 0)
|
||||
return soap_cancel(handle);
|
||||
if (strcmp(*((char **)handle), "SOAPHT") == 0)
|
||||
return soapht_cancel(handle);
|
||||
if (strcmp(*((char **)handle), "LEDM") == 0)
|
||||
return ledm_cancel(handle);
|
||||
if (strcmp(*((char **)handle), "SCL-PML") == 0)
|
||||
return sclpml_cancel(handle);
|
||||
-
|
||||
+
|
||||
+ return SANE_STATUS_UNSUPPORTED;
|
||||
} /* sane_hpaio_cancel() */
|
||||
|
||||
extern SANE_Status sane_hpaio_set_io_mode(SANE_Handle handle, SANE_Bool nonBlocking)
|
||||
{
|
||||
return SANE_STATUS_UNSUPPORTED;
|
||||
}
|
||||
|
||||
extern SANE_Status sane_hpaio_get_select_fd(SANE_Handle handle, SANE_Int *pFd)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
|
||||
size 20603723
|
||||
3
hplip-3.12.6.tar.gz
Normal file
3
hplip-3.12.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775
|
||||
size 21227044
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 25 15:56:54 UTC 2012 - mail@philipp-wagner.com
|
||||
|
||||
- Add libusb 1.0 as dependency. If necessary building with libusb 0.1
|
||||
would be possible as well by setting a configure flag.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 25 14:42:59 UTC 2012 - mail@philipp-wagner.com
|
||||
|
||||
- Add patch to fix compiler warnings causing a
|
||||
no-return-in-nonvoid-function error during the build.
|
||||
An upstream bug report is open at
|
||||
https://bugs.launchpad.net/hplip/+bug/1017496
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 25 09:47:53 UTC 2012 - mail@philipp-wagner.com
|
||||
|
||||
- Upgraded to version 3.12.6:
|
||||
'hp-check' tool when run with "--fix" option resolves missing dependencies/groups/plugin and disable SELinux
|
||||
Added PIN to PRINT support for HP Color LaserJet CM4540 MFP
|
||||
libusb-1.0 support added
|
||||
Several more supported printers and all-in-one devices.
|
||||
Several bug fixes.
|
||||
For details see
|
||||
http://hplipopensource.com/hplip-web/release_notes.html
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 24 13:51:03 CEST 2012 - jsmeix@suse.de
|
||||
|
||||
|
||||
19
hplip.spec
19
hplip.spec
@ -15,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: hplip
|
||||
# BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR:
|
||||
# link target doesn't exist (neither in build root nor in installed system):
|
||||
@ -30,7 +31,8 @@ BuildRequires: libgphoto2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libqt4-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: libusb-1_0-0
|
||||
BuildRequires: libusb-1_0-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: pkgconfig
|
||||
# All printer driver packages should have "BuildRequires: python-cups"
|
||||
@ -55,15 +57,15 @@ Group: Hardware/Printing
|
||||
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
|
||||
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
|
||||
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
|
||||
Version: 3.12.4
|
||||
Version: 3.12.6
|
||||
Release: 0
|
||||
Url: http://hplipopensource.com
|
||||
# Source0...Source9 is for sources from HP:
|
||||
# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz
|
||||
# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz.asc
|
||||
# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.6.tar.gz
|
||||
# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.6.tar.gz.asc
|
||||
# How to verify Source0 see: http://hplipopensource.com/node/327
|
||||
# For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9
|
||||
# /usr/bin/gpg --verify hplip-3.12.4.tar.gz.asc hplip-3.12.4.tar.gz
|
||||
# /usr/bin/gpg --verify hplip-3.12.6.tar.gz.asc hplip-3.12.6.tar.gz
|
||||
# must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip@hp.com>"
|
||||
Source0: hplip-%{version}.tar.gz
|
||||
# Patch0...Patch9 is for patches from HP:
|
||||
@ -105,6 +107,10 @@ Patch101: change-udev-rules.diff
|
||||
# this is done in the files section via attr(0774,root,lp)
|
||||
# where mode 0774 matches to what is set in Makefile.am:
|
||||
Patch102: no-chgrp_lp_hplip_Logdir.diff
|
||||
# Fix validation errors about no return values for non-void functions.
|
||||
# An upstream bug report is open at
|
||||
# https://bugs.launchpad.net/hplip/+bug/1017496
|
||||
Patch103: fix-no-return-in-nonvoid-function.diff
|
||||
# Install into this non-root directory (required when norootforbuild is used):
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: coreutils
|
||||
@ -318,6 +324,9 @@ with the scan drivers in HPLIP for standard HP all-in-one printers.
|
||||
# this is done in the files section via attr(0774,root,lp)
|
||||
# where mode 0774 matches to what is set in Makefile.am:
|
||||
%patch102
|
||||
# Patch103 fix-no-return-in-nonvoid-function.diff
|
||||
# fixes no-return-in-nonvoid-function errors
|
||||
%patch103
|
||||
|
||||
%build
|
||||
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user