Merge branch 'f14'
This commit is contained in:
Tim Waugh
commit
ef8c5d97b7
@ -1,37 +0,0 @@
|
||||
diff -up hplip-2.7.12/prnt/hpijs/compression.cpp.alloc hplip-2.7.12/prnt/hpijs/compression.cpp
|
||||
--- hplip-2.7.12/prnt/hpijs/compression.cpp.alloc 2008-01-25 12:16:45.000000000 +0000
|
||||
+++ hplip-2.7.12/prnt/hpijs/compression.cpp 2008-01-25 12:18:02.000000000 +0000
|
||||
@@ -104,12 +104,12 @@ Mode9::Mode9 (SystemServices* pSys,unsig
|
||||
if (constructor_error != NO_ERROR) // if error in base constructor
|
||||
return;
|
||||
|
||||
- // In the worst case, compression expands data by 50%
|
||||
- compressBuf = (BYTE*)pSS->AllocMem(RasterSize + RasterSize/2);
|
||||
+ // In the worst case, compression expands data by 100%
|
||||
+ compressBuf = (BYTE*)pSS->AllocMem(2 * RasterSize);
|
||||
if (compressBuf == NULL)
|
||||
constructor_error=ALLOCMEM_ERROR;
|
||||
|
||||
- memset(compressBuf, 0, RasterSize + RasterSize/2);
|
||||
+ memset(compressBuf, 0, 2 * RasterSize);
|
||||
memset(SeedRow,0,RasterSize);
|
||||
|
||||
ResetSeedRow = FALSE;
|
||||
@@ -199,7 +199,7 @@ BOOL Mode9::Process(RASTERDATA* input)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
- memset(compressBuf, 0, inputsize + inputsize/2);
|
||||
+ memset(compressBuf, 0, 2 * inputsize);
|
||||
|
||||
unsigned int originalsize=input->rastersize[myplane];
|
||||
unsigned int size=input->rastersize[myplane];
|
||||
@@ -571,7 +571,7 @@ Mode3::Mode3 (SystemServices* pSys, Prin
|
||||
// Worst case is when two rows are completely different
|
||||
// In that case, one command byte is added for every 8 bytes
|
||||
// In the worst case, compression expands data by 50%
|
||||
- compressBuf = (BYTE*)pSS->AllocMem(RasterSize + RasterSize/2);
|
||||
+ compressBuf = (BYTE*)pSS->AllocMem(2 * RasterSize);
|
||||
if (compressBuf == NULL)
|
||||
constructor_error=ALLOCMEM_ERROR;
|
||||
|
||||
24
hplip-cups-web.patch
Normal file
24
hplip-cups-web.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -up hplip-3.10.9/ui4/nodevicesdialog.py.cups-web hplip-3.10.9/ui4/nodevicesdialog.py
|
||||
--- hplip-3.10.9/ui4/nodevicesdialog.py.cups-web 2011-01-12 11:48:50.743722601 +0000
|
||||
+++ hplip-3.10.9/ui4/nodevicesdialog.py 2011-01-12 11:48:59.869475866 +0000
|
||||
@@ -71,7 +71,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevi
|
||||
|
||||
def CUPSButton_clicked(self):
|
||||
self.close()
|
||||
- utils.openURL("http://localhost:631/admin?op=add-printer")
|
||||
+ utils.openURL("http://localhost:631/admin")
|
||||
|
||||
|
||||
def CloseButton_clicked(self):
|
||||
diff -up hplip-3.10.9/ui/nodevicesform.py.cups-web hplip-3.10.9/ui/nodevicesform.py
|
||||
--- hplip-3.10.9/ui/nodevicesform.py.cups-web 2011-01-12 11:48:31.161230788 +0000
|
||||
+++ hplip-3.10.9/ui/nodevicesform.py 2011-01-12 11:48:43.253920424 +0000
|
||||
@@ -43,7 +43,7 @@ class NoDevicesForm(NoDevicesForm_base):
|
||||
|
||||
def CUPSButton_clicked(self):
|
||||
self.close()
|
||||
- utils.openURL("http://localhost:631/admin?op=add-printer")
|
||||
+ utils.openURL("http://localhost:631/admin")
|
||||
|
||||
|
||||
def ExitButton_clicked(self):
|
||||
@ -1,12 +0,0 @@
|
||||
--- hplip-1.6.7/fax/backend/hpfax.py.guest 2006-08-21 17:35:34.000000000 +0100
|
||||
+++ hplip-1.6.7/fax/backend/hpfax.py 2006-08-21 17:38:48.000000000 +0100
|
||||
@@ -188,9 +188,6 @@
|
||||
except IndexError:
|
||||
input_fd = 0
|
||||
|
||||
- pdb = pwd.getpwnam(username)
|
||||
- home_folder, uid, gid = pdb[5], pdb[2], pdb[3]
|
||||
-
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
try:
|
||||
sock.connect((prop.hpssd_host, prop.hpssd_port))
|
||||
12
hplip.spec
12
hplip.spec
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.10.9
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -45,6 +45,7 @@ Patch31: hplip-hpaio-segfault.patch
|
||||
Patch32: hplip-newline.patch
|
||||
Patch33: hplip-dbus-threads.patch
|
||||
Patch34: hplip-notification-exception.patch
|
||||
Patch35: hplip-cups-web.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -289,6 +290,9 @@ done
|
||||
# Catch GError exception when notification showing failed (bug #665577).
|
||||
%patch34 -p1 -b .notification-exception
|
||||
|
||||
# Fixed "CUPS Web Interface" button (bug #633899).
|
||||
%patch35 -p1 -b .cups-web
|
||||
|
||||
sed -i.duplex-constraints \
|
||||
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
||||
prnt/drv/hpcups.drv.in
|
||||
@ -299,7 +303,7 @@ sed -i.duplex-constraints \
|
||||
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
||||
--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
|
||||
--enable-hpijs-install --enable-udev-acl-rules \
|
||||
--disable-policykit
|
||||
--disable-policykit --with-mimedir=%{_datadir}/cups/mime
|
||||
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
@ -515,6 +519,10 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Jan 12 2011 Tim Waugh <twaugh@redhat.com> - 3.10.9-11
|
||||
- Fixed "CUPS Web Interface" button (bug #633899).
|
||||
- Set mimedir explicitly via configure.
|
||||
|
||||
* Wed Jan 05 2011 Jiri Popelka <jpopelka@redhat.com> 3.10.9-10
|
||||
- Catch GError exception when notification showing failed (bug #665577).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user