[hplip] 3.13.9: hplipjs filter removed, several patches applied upstream
Jiří Popelka
jpopelka at fedoraproject.org
Tue Sep 10 13:09:15 UTC 2013
commit b5dbf8cf037fb97b25c3762c6d3bf7ed794e4a51
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Sep 10 14:56:51 2013 +0200
3.13.9: hplipjs filter removed, several patches applied upstream
.gitignore | 1 +
hplip-3.13.8.tar.gz.asc | 7 --
hplip-3.13.9.tar.gz.asc | 7 ++
hplip-IEEE-1284-4.patch | 13 ---
hplip-UnicodeDecodeError.patch | 12 ---
hplip-dbglog-newline.patch | 188 ------------------------------------
hplip-dbus-exception.patch | 18 ----
hplip-logdir.patch | 13 ---
hplip-no-asm.patch | 13 ---
hplip-notification-exception.patch | 15 ---
hplip-raw_deviceID-traceback.patch | 24 -----
hplip-skip-blank-lines.patch | 11 --
hplip-systray-dbus-exception.patch | 27 -----
hplip-wifisetup.patch | 12 ---
hplip.spec | 92 ++++++------------
sources | 2 +-
16 files changed, 38 insertions(+), 417 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d00a6e..027d13d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ hplip-3.10.6.tar.gz
/hplip-3.13.6.tar.gz
/hplip-3.13.7.tar.gz
/hplip-3.13.8.tar.gz
+/hplip-3.13.9.tar.gz
diff --git a/hplip-3.13.9.tar.gz.asc b/hplip-3.13.9.tar.gz.asc
new file mode 100644
index 0000000..61303ee
--- /dev/null
+++ b/hplip-3.13.9.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlIoR1sACgkQc9dwzaWQR7lohwCfaoxhATOoQn1B2kcsDZrx5FB5
+tMYAn35uKn+H5/feIApEUN+DKjeam1/x
+=75MO
+-----END PGP SIGNATURE-----
diff --git a/hplip-logdir.patch b/hplip-logdir.patch
index 3ef579b..807c66a 100644
--- a/hplip-logdir.patch
+++ b/hplip-logdir.patch
@@ -31,19 +31,6 @@ diff -up hplip-3.13.5/logcapture.py.logdir hplip-3.13.5/logcapture.py
if File_list:
sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
if sts != 0:
-diff -up hplip-3.13.5/prnt/filters/hplipjs.c.logdir hplip-3.13.5/prnt/filters/hplipjs.c
---- hplip-3.13.5/prnt/filters/hplipjs.c.logdir 2013-05-10 12:04:50.000000000 +0200
-+++ hplip-3.13.5/prnt/filters/hplipjs.c 2013-05-14 14:57:19.459942157 +0200
-@@ -275,7 +275,8 @@ int main (int argc, char **argv)
- {
- fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
- }
-- snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps","/var/log/hp/tmp");
-+ snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps",
-+ getenv ("TMPDIR") ? : "/var/log/hp/tmp");
-
- HPFp = fopen (szPSFile, "w");
- #endif
diff -up hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-05-14 14:57:19.450942281 +0200
+++ hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp 2013-05-14 14:59:45.745927028 +0200
diff --git a/hplip-no-asm.patch b/hplip-no-asm.patch
index 92c283f..1240c17 100644
--- a/hplip-no-asm.patch
+++ b/hplip-no-asm.patch
@@ -1,16 +1,3 @@
-diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
---- hplip-3.9.8/ip/ipmain.c.no-asm 2009-08-04 22:37:28.000000000 +0100
-+++ hplip-3.9.8/ip/ipmain.c 2009-08-25 14:44:04.497202437 +0100
-@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
- void fatalBreakPoint (void)
- {
- /* do nothing */
--#if defined _DEBUG
-- __asm int 3;
--#endif
- PRINT0 (_T("\nhit fatalBreakPoint!\n"));
- }
-
diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
--- hplip-3.9.8/ip/xfax.c.no-asm 2009-08-04 22:37:28.000000000 +0100
+++ hplip-3.9.8/ip/xfax.c 2009-08-25 14:44:04.502202418 +0100
diff --git a/hplip.spec b/hplip.spec
index e4fe00e..9cafa4d 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -6,8 +6,8 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.13.8
-Release: 2%{?dist}
+Version: 3.13.9
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@@ -27,25 +27,16 @@ Patch9: hplip-snmp-quirks.patch
Patch10: hplip-discovery-method.patch
Patch11: hplip-hpijs-marker-supply.patch
Patch12: hplip-clear-old-state-reasons.patch
-Patch13: hplip-systray-dbus-exception.patch
-Patch14: hplip-hpcups-sigpipe.patch
-Patch15: hplip-logdir.patch
-Patch16: hplip-bad-low-ink-warning.patch
-Patch17: hplip-deviceIDs-ppd.patch
-Patch18: hplip-skip-blank-lines.patch
-Patch19: hplip-dbglog-newline.patch
-Patch21: hplip-ppd-ImageableArea.patch
-Patch22: hplip-raw_deviceID-traceback.patch
-Patch23: hplip-UnicodeDecodeError.patch
-Patch24: hplip-addprinter.patch
-Patch25: hplip-dbus-exception.patch
-Patch26: hplip-notification-exception.patch
-Patch28: hplip-wifisetup.patch
-Patch29: hplip-makefile-chgrp.patch
-Patch30: hplip-hpaio-localonly.patch
-Patch31: hplip-IEEE-1284-4.patch
-Patch32: hplip-check.patch
-Patch33: hplip-mkstemp.patch
+Patch13: hplip-hpcups-sigpipe.patch
+Patch14: hplip-logdir.patch
+Patch15: hplip-bad-low-ink-warning.patch
+Patch16: hplip-deviceIDs-ppd.patch
+Patch17: hplip-ppd-ImageableArea.patch
+Patch18: hplip-addprinter.patch
+Patch19: hplip-makefile-chgrp.patch
+Patch20: hplip-hpaio-localonly.patch
+Patch21: hplip-check.patch
+Patch22: hplip-mkstemp.patch
%global hpijs_epoch 1
Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release}
@@ -203,17 +194,14 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
# Clear old printer-state-reasons we used to manage (bug #510926).
%patch12 -p1 -b .clear-old-state-reasons
-# Catch DBusException in hp-systray (bug #746024).
-%patch13 -p1 -b .systray-dbus-exception
-
# Avoid busy loop in hpcups when backend has exited (bug #525944).
-%patch14 -p1 -b .hpcups-sigpipe
+%patch13 -p1 -b .hpcups-sigpipe
# CUPS filters should use TMPDIR when available (bug #865603).
-%patch15 -p1 -b .logdir
+%patch14 -p1 -b .logdir
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
-%patch16 -p1 -b .bad-low-ink-warning
+%patch15 -p1 -b .bad-low-ink-warning
# Add Device ID for
# LaserJet 1200 (bug #577308)
@@ -233,66 +221,42 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
# Designjet T770 (bug #747957)
# Color LaserJet CM4540 MFP (bug #968177)
# Color LaserJet cp4005 (bug #980976)
-for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
+for ppd_file in $(grep '^diff' %{PATCH16} | cut -d " " -f 4);
do
gunzip ${ppd_file#*/}.gz
done
-%patch17 -p1 -b .deviceIDs-ppd
-for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
+%patch16 -p1 -b .deviceIDs-ppd
+for ppd_file in $(grep '^diff' %{PATCH16} | cut -d " " -f 4);
do
gzip -n ${ppd_file#*/}
done
-# Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461).
-%patch18 -p1 -b .skip-blank-lines
-
-# Added missing newline to string argument in dbglog() call (bug #585275).
-%patch19 -p1 -b .dbglog-newline
-
# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
-for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4);
+for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
do
gunzip ${ppd_file#*/}.gz
done
-%patch21 -p1 -b .ImageableArea
-for ppd_file in $(grep '^diff' %{PATCH21} | cut -d " " -f 4);
+%patch17 -p1 -b .ImageableArea
+for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
do
gzip -n ${ppd_file#*/}
done
-# Fixed traceback on error condition in device.py (bug #628125).
-%patch22 -p1 -b .raw_deviceID-traceback
-
-# Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).
-%patch23 -p1 -b .UnicodeDecodeError
-
# Call cupsSetUser in cupsext's addPrinter method before connecting so
# that we can get an authentication callback (bug #538352).
-%patch24 -p1 -b .addprinter
-
-# Catch D-Bus exceptions in fax dialog (bug #645316).
-%patch25 -p1 -b .dbus-exception
-
-# Catch GError exception when notification showing failed (bug #665577).
-%patch26 -p1 -b .notification-exception
-
-# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
-%patch28 -p1 -b .wifisetup
+%patch18 -p1 -b .addprinter
# Don't run 'chgrp lp /var/log/hp' and 'chgrp lp /var/log/hp/tmp' in makefile
-%patch29 -p1 -b .chgrp
+%patch19 -p1 -b .chgrp
# Pay attention to the SANE localOnly flag in hpaio (bug #743593).
-%patch30 -p1 -b .hpaio-localonly
-
-# Support IEEE 1284.4 protocol over USB (bug #858861).
-%patch31 -p1 -b .hplip-IEEE-1284-4
+%patch20 -p1 -b .hpaio-localonly
# Various adjustments to make 'hp-check' run more smoothly (bug #683007).
-%patch32 -p1 -b .check
+%patch21 -p1 -b .check
# Avoid several bugs in createTempFile (bug #925032).
-%patch33 -p1 -b .mkstemp
+%patch22 -p1 -b .mkstemp
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@@ -509,7 +473,6 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/cups/drv/*
%{_cups_serverbin}/filter/hpcups
%{_cups_serverbin}/filter/hpcupsfax
-%{_cups_serverbin}/filter/hplipjs
%{_cups_serverbin}/filter/hpps
%files -n libsane-hpaio
@@ -524,6 +487,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
+* Tue Sep 10 2013 Jiri Popelka <jpopelka at redhat.com> - 3.13.9-1
+- 3.13.9: hplipjs filter removed, several patches applied upstream
+
* Wed Aug 14 2013 Tim Waugh <twaugh at redhat.com> - 3.13.8-2
- Moved hpps filter to hpijs sub-package (bug #996852).
- Fixed typo in systemtray.py (bug #991638).
diff --git a/sources b/sources
index 546f7c8..ca52e0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44de6a1e4d295ae6f1f0f0ef1cdc7301 hplip-3.13.8.tar.gz
+8fcbbd0d3a0b76550f325bd6cf46d9d9 hplip-3.13.9.tar.gz
More information about the scm-commits
mailing list