Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4511 from Rmys/master

Browse Source 
hplip-3.17.11:ver.bump
This commit is contained in:
Rmys
2018-02-15 20:28:42 +03:00
committed by GitHub
parent 7b0ddd9903 e47b7cc1d8
commit 8a3fed4fb2
31 changed files with 684 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/printer/hplip/files/fedora/hplip-3165-sourceoption.patch
+11
View File
@@ -0,0 +1,11 @@
diff -up hplip-3.16.5/scan.py.sourceoption hplip-3.16.5/scan.py
--- hplip-3.16.5/scan.py.sourceoption 2016-06-22 10:25:52.742799941 +0200
+++ hplip-3.16.5/scan.py 2016-06-22 10:34:51.945766487 +0200
@@ -658,6 +658,7 @@ try:
sys.exit(1)
except:
log.error("Failed to get the source from device.")
+ sys.exit(1)
#check if device has only ADF
if len(source_option) == 1 and 'ADF' in source_option:
hardware/printer/hplip/files/fedora/hplip-avahi-parsing.patch
+1 -1
View File
@@ -16,4 +16,4 @@ diff -up hplip-3.15.2/base/avahi.py.parsing hplip-3.15.2/base/avahi.py
+ key, value = keyvalue
if key == 'ty':
y['mdns'] = value
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value
y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value
hardware/printer/hplip/files/fedora/hplip-bad-low-ink-warning.patch
Executable → Regular
+1 -1
View File
@@ -36,4 +36,4 @@ diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/p
+ if ((*(pStr+1) & 0xf3) > '1')
{
if (err != NO_ERROR)
{
{
hardware/printer/hplip/files/fedora/hplip-check-cups.patch
+16
View File
@@ -0,0 +1,16 @@
diff -up hplip-3.17.11/installer/core_install.py.check-cups hplip-3.17.11/installer/core_install.py
--- hplip-3.17.11/installer/core_install.py.check-cups 2017-12-07 15:34:24.855761874 +0100
+++ hplip-3.17.11/installer/core_install.py 2017-12-07 15:38:44.749568860 +0100
@@ -349,9 +349,9 @@ class CoreInstall(object):
'automake': (True, ['prnt'], AUTOMAKE_STR, self.check_automake, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
'libjpeg': (True, ['base', 'prnt'], JPEG_STR, self.check_libjpeg, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', None, GENERALDEP),
'libtool': (True, ['base', 'prnt'], LIBTOOL_STR, self.check_libtool, DEPENDENCY_COMPILE_TIME, '-', 'libtool --version', COMPILEDEP),
- 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'cups-config --version', EXTERNALDEP),
- 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
- 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
+ 'cups': (True, ['base', 'prnt'], CUPS_STR, self.check_cups, DEPENDENCY_RUN_TIME, '1.1', 'lpstat -r', EXTERNALDEP),
+ 'cups-devel': (True, ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
+ 'cups-image': (True, ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'lpstat -r', GENERALDEP),
'gcc': (True, ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP),
'make': (True, ['base', 'prnt'], MAKE_STR, self.check_make, DEPENDENCY_COMPILE_TIME, '3.0', 'make --version', COMPILEDEP),
'libpthread': (True, ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP),
hardware/printer/hplip/files/fedora/hplip-clear-old-state-reasons.patch
Executable → Regular
+1 -1
View File
@@ -14,4 +14,4 @@ diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip
+
cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ);
if (cups_raster == NULL) {
if (cups_raster == NULL) {
hardware/printer/hplip/files/fedora/hplip-colorlaserjet-mfp-m278-m281.patch
+62
View File
@@ -0,0 +1,62 @@
diff -urw hplip-3.17.10-orig/data/models/models.dat hplip-3.17.10/data/models/models.dat
--- hplip-3.17.10-orig/data/models/models.dat 2017-10-13 10:39:44.000000000 +0200
+++ hplip-3.17.10/data/models/models.dat 2017-11-02 21:14:40.931754882 +0100
@@ -57211,6 +57211,58 @@
usb-vid=3f0
wifi-config=3
+[hp_colorlaserjet_mfp_m278-m281]
+align-type=0
+clean-type=0
+color-cal-type=0
+copy-type=0
+embedded-server-type=1
+fax-type=7
+fw-download=False
+icon=hp_color_laserjet_cm1312_mfp.png
+io-mfp-mode=1
+io-mode=1
+io-support=14
+job-storage=0
+linefeed-cal-type=0
+model1=HP Color LaserJet MFP M278-281
+monitor-type=0
+panel-check-type=0
+pcard-type=0
+plugin=1
+plugin-reason=64
+power-settings=0
+ppd-name=hp-color_laserjet_pro_mfp_m277
+pq-diag-type=0
+r-type=0
+r0-agent1-kind=4
+r0-agent1-sku=CF400A/CF400X
+r0-agent1-type=1
+r0-agent2-kind=4
+r0-agent2-sku=CF401A
+r0-agent2-type=4
+r0-agent3-kind=4
+r0-agent3-sku=CF403A
+r0-agent3-type=5
+r0-agent4-kind=4
+r0-agent4-sku=CF402A
+r0-agent4-type=6
+scan-src=3
+scan-type=5
+status-battery-check=0
+status-dynamic-counters=0
+status-type=10
+support-released=True
+support-subtype=48c3
+support-type=2
+support-ver=3.15.4
+tech-class=Postscript
+tech-subclass=Normal
+tech-type=4
+usb-pid=3c2a
+usb-vid=3f0
+wifi-config=3
+
[hp_color_laserjet_m553]
align-type=0
clean-type=0
hardware/printer/hplip/files/fedora/hplip-deviceIDs-drv.patch
Executable → Regular
+359 -358
View File
File diff suppressed because it is too large Load Diff
hardware/printer/hplip/files/fedora/hplip-deviceIDs-ppd.patch
Executable → Regular
+1 -1
View File
@@ -8,4 +8,4 @@ diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 400 color M451dn;DES:HP LaserJet 400 color M451dn;"
*UIConstraints: *HPOption_Duplexer False *Duplex
*UIConstraints: *Duplex *HPOption_Duplexer False
*UIConstraints: *HPOption_Tray3 False *InputSlot Tray3
*UIConstraints: *HPOption_Tray3 False *InputSlot Tray3
hardware/printer/hplip/files/fedora/hplip-dj990c-margin.patch
+1 -1
View File
@@ -12,4 +12,4 @@ diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin hplip-3.14.10/prnt/d
+ CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
"<</cupsInteger0 10/PageSize[612 936]/ImagingBBox null>>setpagedevice"
hardware/printer/hplip/files/fedora/hplip-hpcups-sigpipe.patch
Executable → Regular
View File
hardware/printer/hplip/files/fedora/hplip-hpijs-marker-supply.patch
Executable → Regular
View File
hardware/printer/hplip/files/fedora/hplip-jpeg-compression.patch
+17
View File
@@ -0,0 +1,17 @@
diff -up hplip-3.17.11/scan.py.jpeg-compression hplip-3.17.11/scan.py
--- hplip-3.17.11/scan.py.jpeg-compression 2018-01-08 09:26:42.547072815 +0100
+++ hplip-3.17.11/scan.py 2018-01-08 09:29:39.753604411 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
# (c) Copyright 2003-2015 HP Development Company, L.P.
@@ -1079,6 +1079,7 @@ try:
log.info("Saving to file %s" % output)
try:
+ im = im.convert("RGB")
im.save(output)
except IOError as e:
log.error("Error saving file: %s (I/O)" % e)
hardware/printer/hplip/files/fedora/hplip-log-stderr.patch
+1 -1
View File
@@ -34,4 +34,4 @@ diff -up hplip-3.15.2/prnt/filters/hpps.log-stderr hplip-3.15.2/prnt/filters/hpp
+ sys.stderr.write("INFO: %s\n" % msg)
if os.path.exists(config_file):
config = configparser.ConfigParser()
config = configparser.ConfigParser()
hardware/printer/hplip/files/fedora/hplip-logdir.patch
Executable → Regular
+1 -1
View File
@@ -21,4 +21,4 @@ diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hp
+ snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
createTempFile(fname, &m_fp);
if (m_fp)
{
{
hardware/printer/hplip/files/fedora/hplip-no-asm.patch
Executable → Regular
+1 -1
View File
@@ -33,4 +33,4 @@ diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h
#define OK 1
#define ERROR 0
#define MAX_LIST_SIZE 32
diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c
diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c
hardware/printer/hplip/files/fedora/hplip-no-write-bytecode.patch
+1 -1
View File
@@ -24,4 +24,4 @@ diff -up hplip-3.15.11/prnt/filters/hpps.no-write-bytecode hplip-3.15.9/prnt/fil
+#!/usr/bin/env python -B
# -*- coding: utf-8 -*-
#
# (c) Copyright 2003-2015 HP Development Company, L.P.
# (c) Copyright 2003-2015 HP Development Company, L.P.
hardware/printer/hplip/files/fedora/hplip-noernie.patch
+64
View File
@@ -0,0 +1,64 @@
diff -up hplip-3.17.4/Makefile.am.no-ernie hplip-3.17.4/Makefile.am
--- hplip-3.17.4/Makefile.am.no-ernie 2017-04-26 16:28:35.398099978 +0200
+++ hplip-3.17.4/Makefile.am 2017-04-26 16:29:02.235879035 +0200
@@ -519,7 +519,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
prnt/hpcups/Mode2.cpp prnt/hpcups/Mode2.h prnt/hpcups/Mode3.cpp prnt/hpcups/Mode3.h \
prnt/hpcups/Mode9.cpp prnt/hpcups/Mode9.h prnt/hpcups/Mode10.cpp prnt/hpcups/Mode10.h \
prnt/hpcups/ModeDeltaPlus.cpp prnt/hpcups/ModeDeltaPlus.h prnt/hpcups/ModeJbig.cpp prnt/hpcups/ModeJbig.h \
- prnt/hpcups/ErnieFilter.cpp prnt/hpcups/ErnieFilter.h prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
+ prnt/hpcups/EncapsulatorFactory.cpp prnt/hpcups/EncapsulatorFactory.h \
prnt/hpcups/Encapsulator.cpp prnt/hpcups/Encapsulator.h prnt/hpcups/Pcl3.cpp prnt/hpcups/Pcl3.h \
prnt/hpcups/Pcl3Gui.cpp prnt/hpcups/Pcl3Gui.h prnt/hpcups/Pcl3Gui2.cpp prnt/hpcups/Pcl3Gui2.h \
prnt/hpcups/LJMono.cpp prnt/hpcups/LJMono.h prnt/hpcups/LJColor.cpp prnt/hpcups/LJColor.h \
diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp
--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp.no-ernie 2017-04-26 16:28:39.525066003 +0200
+++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.cpp 2017-04-26 16:29:46.987510614 +0200
@@ -30,7 +30,6 @@
#include "CommonDefinitions.h"
#include "Pcl3Gui2.h"
-#include "ErnieFilter.h"
#include "Mode10.h"
#include "Mode9.h"
#include "PrinterCommands.h"
@@ -38,7 +37,6 @@
Pcl3Gui2::Pcl3Gui2() : Encapsulator()
{
speed_mech_enabled = true;
- m_run_ernie_filter = true;
crd_type = eCrd_both;
strcpy(m_szLanguage, "PCL3GUI");
}
@@ -59,21 +57,6 @@ DRIVER_ERROR Pcl3Gui2::Configure(Pipelin
}
width = m_pMA->printable_width;;
- if (m_run_ernie_filter) {
- ErnieFilter *pErnie;
-
- // Normal: threshold = (resolution) * (0.0876) - 2
- int threshold = ((m_pQA->horizontal_resolution * 876) / 10000) - 2;
-
- pErnie = new ErnieFilter (width, eBGRPixelData, threshold);
- p = new Pipeline (pErnie);
- if (head) {
- head->AddPhase (p);
- }
- else {
- head = p;
- }
- }
if (crd_type != eCrd_black_only) {
Mode10 *pMode10;
diff -up hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h
--- hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h.no-ernie 2017-04-26 16:28:43.277035115 +0200
+++ hplip-3.17.4/prnt/hpcups/Pcl3Gui2.h 2017-04-26 16:30:05.826355522 +0200
@@ -60,7 +60,6 @@ private:
DRIVER_ERROR encapsulateRaster(BYTE *input_raster, unsigned int num_bytes, COLORTYPE c_type);
bool speed_mech_enabled;
int page_number;
- bool m_run_ernie_filter;
eCrdType crd_type;
};
hardware/printer/hplip/files/fedora/hplip-ppd-ImageableArea.patch
Executable → Regular
+1 -1
View File
@@ -456,4 +456,4 @@ diff -up hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip
+*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76"
*da.ImageableArea Env10/Konvolut Comm10: ""
*de.ImageableArea Env10/Umschlag Comm10: ""
*es.ImageableArea Env10/Sobre Comm10: ""
*es.ImageableArea Env10/Sobre Comm10: ""
hardware/printer/hplip/files/fedora/hplip-pstotiff-is-rubbish.patch
Executable → Regular
+1 -1
View File
@@ -62,4 +62,4 @@ diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/
+RET=$?
+cat "$TMPFILE"
+rm -f "$TMPFILE"
+exit $RET
+exit $RET
hardware/printer/hplip/files/fedora/hplip-retry-open.patch
Executable → Regular
+1 -1
View File
@@ -13,4 +13,4 @@ diff -up hplip-3.9.12/prnt/backend/hp.c.retry-open hplip-3.9.12/prnt/backend/hp.
-
/* Display user error. */
device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);
hardware/printer/hplip/files/fedora/hplip-scan-tmp.patch
+1 -1
View File
@@ -22,4 +22,4 @@ diff -up hplip-3.15.2/scan/sane.py.scan-tmp hplip-3.15.2/scan/sane.py
+ prefix='hpscan')
self.buffer = os.fdopen(self.buffer_fd, "w+b")
self.format = -1
self.format_name = ''
self.format_name = ''
hardware/printer/hplip/files/fedora/hplip-silence-ioerror.patch
+2 -1
View File
@@ -8,4 +8,5 @@ diff -up hplip-3.15.2/base/logger.py.silence-ioerror hplip-3.15.2/base/logger.py
+ except IOError:
+ pass
finally:
self._lock.release()
self._lock.release()
hardware/printer/hplip/files/fedora/hplip-snmp-quirks.patch
Executable → Regular
+8 -8
View File
@@ -1,21 +1,21 @@
diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in
--- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks 2013-04-09 12:11:58.447587815 +0200
+++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:11:58.594585761 +0200
@@ -6757,6 +6757,8 @@ Manufacturer "HP"
diff -up hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.17.11/prnt/drv/hpcups.drv.in
--- hplip-3.17.11/prnt/drv/hpcups.drv.in.snmp-quirks 2017-12-07 15:21:34.149138400 +0100
+++ hplip-3.17.11/prnt/drv/hpcups.drv.in 2017-12-07 15:33:32.443211804 +0100
@@ -10831,6 +10831,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a hpijs"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
+ // This device lies about its supplies capacity.
+ Attribute "cupsSNMPQuirks" "" "capacity"
PCFileName "hp-officejet_pro_8500_a909a.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
}
@@ -6773,6 +6775,8 @@ Manufacturer "HP"
@@ -10839,6 +10841,8 @@ CustomMedia "B5/B5 176x250mm" 498.96 708
Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g hpijs"
Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
+ // This device lies about its supplies capacity.
+ Attribute "cupsSNMPQuirks" "" "capacity"
PCFileName "hp-officejet_pro_8500_a909g.ppd"
Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)"
}
}
hardware/printer/hplip/files/fedora/hplip-strncpy.patch
+1 -1
View File
@@ -45,4 +45,4 @@ diff -up hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.14.10/prnt/hpijs/
+ strncpy(user_name, argv[2], sizeof(user_name) - 1);
snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_ijsfax_Log_XXXXXX",CUPS_TMP_DIR, user_name);
hardware/printer/hplip/files/fedora/hplip-strstr-const.patch
Executable → Regular
+1 -1
View File
@@ -47,4 +47,4 @@ diff -up hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.6b/prnt/hpi
+ strstr (cmdStr+4, "postscript") ))
{
device = ePScript;
match = TRUE;
match = TRUE;
hardware/printer/hplip/files/fedora/hplip-typo.patch
+12
View File
@@ -0,0 +1,12 @@
diff -up hplip-3.17.11/firmware.py.typo hplip-3.17.11/firmware.py
--- hplip-3.17.11/firmware.py.typo 2018-01-12 16:50:10.338366719 +0100
+++ hplip-3.17.11/firmware.py 2018-01-12 16:50:33.563184939 +0100
@@ -99,7 +99,7 @@ try:
if mode == GUI_MODE and (ui_toolkit == 'qt4' or ui_toolkit == 'qt5'):
if not utils.canEnterGUIMode4():
log.error("%s -u/--gui requires Qt4/Qt5 GUI support. Entering interactive mode." % __mod__)
- mode = INTERACTIVE_MODE4
+ mode = INTERACTIVE_MODE
elif mode == GUI_MODE and ui_toolkit == 'qt3':
if not utils.canEnterGUIMode():
hardware/printer/hplip/files/fedora/hplip-udev-rules.patch
Executable → Regular
+6 -7
View File
@@ -1,13 +1,12 @@
diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am
--- hplip-3.15.11/Makefile.am.udev-rules 2015-11-12 11:29:04.000000000 +0100
+++ hplip-3.15.11/Makefile.am 2015-12-10 12:43:11.518518146 +0100
@@ -118,7 +118,7 @@ rulessystemdir=/usr/lib/systemd/system
dist_rulessystem_DATA =data/rules/hplip-printer@.service
diff -up hplip-3.17.11/Makefile.am.udev-rules hplip-3.17.11/Makefile.am
--- hplip-3.17.11/Makefile.am.udev-rules 2017-12-07 13:44:04.472414453 +0100
+++ hplip-3.17.11/Makefile.am 2017-12-07 15:20:18.544755557 +0100
@@ -132,7 +132,7 @@ dist_rulessystem_DATA =data/rules/hplip-
# hpmud.rules
if !HPLIP_CLASS_DRIVER
-rulesdir = /etc/udev/rules.d
+rulesdir = /lib/udev/rules.d
+rulesdir = /usr/lib/udev/rules.d
if UDEV_SYSFS_RULES
dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
else
hardware/printer/hplip/files/fedora/hplip-ui-optional.patch
Executable → Regular
+39 -12
View File
@@ -1,7 +1,7 @@
diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
--- hplip-3.12.11/base/utils.py.ui-optional 2012-11-20 10:55:15.000000000 +0100
+++ hplip-3.12.11/base/utils.py 2012-11-27 10:03:21.909512264 +0100
@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3
diff -up hplip-3.16.7/base/utils.py.ui-optional hplip-3.16.7/base/utils.py
--- hplip-3.16.7/base/utils.py.ui-optional 2016-07-15 12:12:28.000000000 +0200
+++ hplip-3.16.7/base/utils.py 2016-08-12 10:12:24.599398769 +0200
@@ -733,6 +733,13 @@ def checkPyQtImport(): # qt3
if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
no_qt_message_gtk()
@@ -15,13 +15,40 @@ diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
log.error("PyQt not installed. GUI not available. Exiting.")
return False
@@ -712,7 +719,8 @@ def checkPyQtImport4():
import PyQt4
import ui4
except ImportError:
- log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP")
+ # hplip-gui sub-package (Fedora) requires PyQt4
@@ -783,7 +790,8 @@ def checkPyQtImport4():
import PyQt5
import ui5
else:
- log.debug("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP again")
+ # hplip-gui sub-package (Fedora) requires python3-qt5
+ log.error("Install the hplip-gui package for graphical support.")
return False
else:
return True
return True
@@ -2434,6 +2442,7 @@ def checkPyQtImport45():
except ImportError as e:
log.debug(e)
+ log.error("Install the hplip-gui package for graphical support.")
raise ImportError("GUI Modules PyQt4 and PyQt5 are not installed")
@@ -2455,6 +2464,7 @@ def import_dialog(ui_toolkit):
return (QApplication, "ui4")
except ImportError as e:
log.error(e)
+ log.error("Unable to load Qt support. Is hplip-gui package installed?")
sys.exit(1)
elif ui_toolkit == "qt5":
try:
@@ -2463,9 +2473,7 @@ def import_dialog(ui_toolkit):
return (QApplication, "ui5")
except ImportError as e:
log.error(e)
- sys.exit(1)
- else:
- log.error("Unable to load Qt support. Is it installed?")
+ log.error("Unable to load Qt support. Is hplip-gui package installed?")
sys.exit(1)
hardware/printer/hplip/files/pisilinux/add-pisilinux-support.patch
Executable → Regular
+12 -7
View File
@@ -1,6 +1,6 @@
diff -Nuar a/installer/distros.dat b/installer/distros.dat
--- a/installer/distros.dat 2014-01-08 11:29:27.000000000 +0200
+++ b/installer/distros.dat 2014-01-17 11:36:40.776456834 +0200
--- a/installer/distros.dat 2017-11-23 15:10:13.000000000 +0300
+++ b/installer/distros.dat 2018-02-15 15:04:58.913643271 +0300
@@ -92,7 +92,7 @@
# ****************************************
@@ -10,11 +10,10 @@ diff -Nuar a/installer/distros.dat b/installer/distros.dat
# ****************************************
@@ -5957,3 +5957,25 @@
@@ -10111,9 +10111,30 @@
[lfs:6:avahi-utils]
packages=avahi
+
+# ****************************************
+[PiSilinux]
+index=51
@@ -34,6 +33,12 @@ diff -Nuar a/installer/distros.dat b/installer/distros.dat
+add_user_to_group=
+policykit=1
+native_cups=1
+ui_toolkit=qt4
+ui_toolkit=qt5
+acl_rules=1
\ Dosya sonunda yenisatır yok.
+
[lfs:6:automake]
packages=automake1.11
[lfs:6:epm]
packages=epm
-
hardware/printer/hplip/files/pisilinux/orj-add-pisilinux-support.patch
Executable
+39
View File
@@ -0,0 +1,39 @@
diff -Nuar a/installer/distros.dat b/installer/distros.dat
--- a/installer/distros.dat 2014-01-08 11:29:27.000000000 +0200
+++ b/installer/distros.dat 2014-01-17 11:36:40.776456834 +0200
@@ -92,7 +92,7 @@
# ****************************************
[distros]
-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs
+distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,pisilinux
# ****************************************
@@ -5957,3 +5957,25 @@
[lfs:6:avahi-utils]
packages=avahi
+
+# ****************************************
+[PiSilinux]
+index=51
+versions=1.0
+display=1
+display_name=Pisi
+package_mgrs=pisi
+package_mgr_cmd=su -c "pisi install $packages_to_install"
+hplip_remove_cmd=su -c "pisi remove hplip hplip-gui"
+su_sudo=su
+ppd_install=drv
+udev_mode_fix=1
+ppd_dir=/usr/share/cups/model/HP
+drv_dir=/usr/share/cups/drv/HP
+fix_ppd_symlink=0
+package_available=1
+add_user_to_group=
+policykit=1
+native_cups=1
+ui_toolkit=qt4
+acl_rules=1
\ Dosya sonunda yenisatır yok.
hardware/printer/hplip/pspec.xml
+22 -6
View File
@@ -12,7 +12,7 @@
<License>MIT</License>
<Summary>HP Linux Imaging and Printing System</Summary>
<Description>HP Linux Imaging and Printing (HPLIP) System includes printer and scanner drivers and related service tools.</Description>
<Archive sha1sum="177252a6c3e508b6d4f9d02663fe3556f37de71e" type="targz">mirrors://sourceforge/hplip/hplip-3.16.11.tar.gz</Archive>
<Archive sha1sum="72705f45157227907a79e326da6524317c1aaff6" type="targz">mirrors://sourceforge/hplip/hplip-3.17.11.tar.gz</Archive>
<AdditionalFiles>
<!-- PPD patcher -->
<AdditionalFile permission="0755" target="patch-ppds">patch-ppds.sh</AdditionalFile>
@@ -23,6 +23,7 @@
<AdditionalFile target="ppd-patches/002-hplip-ppd-ImageableArea.patch">fedora/hplip-ppd-ImageableArea.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>foomatic-db</Dependency>
<Dependency>net-snmp-devel</Dependency>
@@ -37,28 +38,34 @@
<Patches>
<Patch level="1">fedora/hplip-avahi-parsing.patch</Patch>
<Patch level="1">fedora/hplip-bad-low-ink-warning.patch</Patch>
<Patch level="1">fedora/hplip-check-cups.patch</Patch>
<Patch level="1">fedora/hplip-clear-old-state-reasons.patch</Patch>
<!-- <Patch level="1">fedora/hplip-device-reconnected.patch</Patch> -->
<Patch level="1">fedora/hplip-colorlaserjet-mfp-m278-m281.patch</Patch>
<Patch level="1">fedora/hplip-device-reconnected.patch</Patch>
<Patch level="1">fedora/hplip-deviceIDs-drv.patch</Patch>
<Patch level="1">fedora/hplip-dj990c-margin.patch</Patch>
<Patch level="1">fedora/hplip-3165-sourceoption.patch</Patch>
<Patch level="1">fedora/hplip-hpcups-sigpipe.patch</Patch>
<Patch level="1">fedora/hplip-hpijs-marker-supply.patch</Patch>
<Patch level="1">fedora/hplip-jpeg-compression.patch</Patch>
<Patch level="1">fedora/hplip-lineart.patch</Patch>
<Patch level="1">fedora/hplip-log-stderr.patch</Patch>
<Patch level="1">fedora/hplip-logdir.patch</Patch>
<Patch level="1">fedora/hplip-no-asm.patch</Patch>
<Patch level="1">fedora/hplip-no-write-bytecode.patch</Patch>
<Patch level="1">fedora/hplip-noernie.patch</Patch>
<!-- The pstotiff filter is rubbish so replace it -->
<!-- <Patch level="1">fedora/hplip-pstotiff-is-rubbish.patch</Patch> -->
<Patch level="1">fedora/hplip-pstotiff-is-rubbish.patch</Patch>
<Patch level="1">fedora/hplip-retry-open.patch</Patch>
<Patch level="1">fedora/hplip-scan-tmp.patch</Patch>
<Patch level="1">fedora/hplip-silence-ioerror.patch</Patch>
<Patch level="1">fedora/hplip-snmp-quirks.patch</Patch>
<Patch level="1">fedora/hplip-strncpy.patch</Patch>
<Patch level="1">fedora/hplip-udev-rules.patch</Patch>
<Patch level="1">fedora/hplip-typo.patch</Patch>
<Patch level="1">fedora/hplip-udev-rules.patch</Patch>
<Patch level="1">fedora/hplip-strstr-const.patch</Patch>
<!-- Make utils.checkPyQtImport() look for the gui sub-package -->
<!-- <Patch level="1">fedora/hplip-ui-optional.patch</Patch> -->
<Patch level="1">fedora/hplip-ui-optional.patch</Patch>
<!-- Make sure to avoid handwritten asm -->
<!-- PisiLinuX patches -->
<Patch level="1">pisilinux/desktop-i18n.patch</Patch>
@@ -74,6 +81,7 @@
<Patch level="1">Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch</Patch>
</Patches>
</Source>
</Source>
<Package>
<Name>hplip</Name>
@@ -81,6 +89,7 @@
<IsA>library</IsA>
<IsA>driver</IsA>
<RuntimeDependencies>
<Dependency>zlib</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>net-snmp</Dependency>
<Dependency>foomatic-db</Dependency>
@@ -163,6 +172,13 @@
</Package>
<History>
<Update release="5">
<Date>2017-04-15</Date>
<Version>3.17.11</Version>
<Comment>Version Bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2017-04-09</Date>
<Version>3.16.11</Version>
@@ -192,4 +208,4 @@
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>