diff --git a/hplip-marker-supply.patch b/hplip-marker-supply.patch new file mode 100644 index 0000000..ad10d7b --- /dev/null +++ b/hplip-marker-supply.patch @@ -0,0 +1,33 @@ +--- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply 2007-03-30 17:44:32.000000000 +0100 ++++ hplip-1.7.2/prnt/hpijs/hpijs.cpp 2007-03-30 17:53:23.000000000 +0100 +@@ -516,7 +516,30 @@ + goto BUGOUT; + } + if (pSS->pPC->constructor_error < 0) ++ { + bug("WARNING: %s\n", pSS->GetDriverMessage(pSS->pPC->constructor_error)); ++ switch (pSS->pPC->constructor_error) ++ { ++ case WARN_LOW_INK_BOTH_PENS: ++ case WARN_LOW_INK_BLACK: ++ case WARN_LOW_INK_COLOR: ++ case WARN_LOW_INK_PHOTO: ++ case WARN_LOW_INK_GREY: ++ case WARN_LOW_INK_BLACK_PHOTO: ++ case WARN_LOW_INK_COLOR_PHOTO: ++ case WARN_LOW_INK_GREY_PHOTO: ++ case WARN_LOW_INK_COLOR_GREY: ++ case WARN_LOW_INK_COLOR_GREY_PHOTO: ++ case WARN_LOW_INK_COLOR_BLACK_PHOTO: ++ case WARN_LOW_INK_CYAN: ++ case WARN_LOW_INK_MAGENTA: ++ case WARN_LOW_INK_YELLOW: ++ case WARN_LOW_INK_MULTIPLE_PENS: ++ bug("STATE: +marker-supply-low\n"); ++ default: ++ bug("STATE: -marker-supply-low"); ++ } ++ } + + #if 0 + bug("device model=%s\n", pSS->pPC->PrinterModel()); diff --git a/hplip.spec b/hplip.spec index 86a12a9..f66fbd0 100644 --- a/hplip.spec +++ b/hplip.spec @@ -19,6 +19,7 @@ Patch3: hplip-quiet.patch Patch4: hplip-cups-backend.patch Patch5: hplip-libm.patch Patch6: hplip-ipv6.patch +Patch7: hplip-marker-supply.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -81,6 +82,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # IPv6 support (bug #198377). %patch6 -p1 -b .ipv6 +# Use marker-supply-low IPP message. +%patch7 -p1 -b .marker-supply + autoconf # for patch4 %build @@ -181,6 +185,9 @@ fi exit 0 %changelog +* Fri Mar 30 2007 Tim Waugh +- Use marker-supply-low IPP message. + * Wed Mar 1 2007 Tim Waugh 1.7.2-1 - 1.7.2.