Hello community, here is the log from the commit of package ghostscript-library for openSUSE:Factory checked in at Fri Nov 27 13:12:03 CET 2009. -------- --- ghostscript-library/ghostscript-library.changes 2009-07-20 12:47:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/ghostscript-library/ghostscript-library.changes 2009-11-24 13:02:17.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 24 11:28:03 CET 2009 - werner@suse.de + +- Add patch to correct bitcmyk blank output on e.g. Samsung CLP-300 + and other printers (bnc# 557948) +- Do not destroy upstream patches due fuzz=0 + +------------------------------------------------------------------- ghostscript-mini.changes: same change calling whatdependson for head-i586 New: ---- ghostscript-8.64-bitcmyk-blank-output.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.8TQJFF/_old 2009-11-27 12:59:49.000000000 +0100 +++ /var/tmp/diff_new_pack.8TQJFF/_new 2009-11-27 12:59:49.000000000 +0100 @@ -64,8 +64,8 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.64 -Release: 5 -License: GPL v2 or later +Release: 6 +License: GPLv2+ Source0: ghostscript-8.64.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 Source2: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ghostscript-fonts-other-6.0.tar.bz2 @@ -113,6 +113,7 @@ Patch21: ghostscript-8.64-echogs.patch # Currently not applied, does not fit into revision 8594+ Patch22: ghostscript-8.62-cjk.patch +Patch23: ghostscript-8.64-bitcmyk-blank-output.patch Patch24: ghostscript-fonts-std-8.11.patch Patch25: Omni-0.9.2.dif.bz2 Patch26: Omni-0.9.2-glibc210.dif @@ -138,6 +139,7 @@ %endif %define buildsys %{_target_cpu}-suse-%{_build_os} %global gsver %{version} +%define _default_patch_fuzz 2 %description This package contains all start-up files for calling gs (GNU @@ -164,7 +166,7 @@ %if "%name" != "ghostscript-mini" %package -n ghostscript-x11 -License: GPL v2 or later +License: GPLv2+ Conflicts: ghostscript-vga ghostscript-both PreReq: coreutils Requires: ghostscript-library @@ -190,7 +192,7 @@ and many others %package -n ghostscript-fonts-std -License: GPL v2 or later +License: GPLv2+ Summary: Standard Fonts for Ghostscript PreReq: coreutils %suseconfig_fonts_prereq Group: Productivity/Publishing/PS @@ -214,7 +216,7 @@ and many others %package -n ghostscript-fonts-other -License: GPL v2 or later +License: GPLv2+ Summary: Optional fonts for Ghostscript Group: Productivity/Publishing/PS Provides: gs_fonto @@ -235,7 +237,7 @@ and many others %package -n ghostscript-fonts-rus -License: GPL v2 or later +License: GPLv2+ Summary: Russian Fonts for Ghostscript Group: Productivity/Publishing/PS Provides: gs_fontr @@ -252,7 +254,7 @@ Eugene V. Demidov <jack@gpi.ru> %package -n ghostscript-omni -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Omni Printer Drivers for Ghostscript PreReq: ghostscript-library Group: Productivity/Publishing/PS @@ -275,7 +277,7 @@ %if %suse_version > 1020 %package -n ghostscript-ijs-devel -License: GPL v2 or later +License: GPLv2+ Summary: IJS development kit PreReq: ghostscript-library Provides: ghostscript-library:/usr/bin/ijs-config @@ -300,7 +302,7 @@ %if %suse_version > 1030 %package -n ghostscript-devel -License: GPL v2 or later +License: GPLv2+ Summary: Ghostscript API header Requires: ghostscript-library = %version Group: Development/Libraries/C and C++ @@ -323,9 +325,9 @@ %endif %package -n libgimpprint -License: GPL v2 or later +License: GPLv2+ Version: 4.2.7 -Release: 313 +Release: 314 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -339,9 +341,9 @@ Robert Krawitz <rlk@alum.mit.edu> %package -n libgimpprint-devel -License: GPL v2 or later +License: GPLv2+ Version: 4.2.7 -Release: 313 +Release: 314 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -444,6 +446,7 @@ %patch20 -p0 -b .bbox %patch21 -p0 -b .echogs #%patch22 -p0 -b .cjk +%patch23 -p1 -b .bitcmyk %patch0 -p0 -b .0 %build ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.8TQJFF/_old 2009-11-27 12:59:49.000000000 +0100 +++ /var/tmp/diff_new_pack.8TQJFF/_new 2009-11-27 12:59:49.000000000 +0100 @@ -64,8 +64,8 @@ Summary: Necessary Files for Running Ghostscript %endif Version: 8.64 -Release: 5 -License: GPL v2 or later +Release: 6 +License: GPLv2+ Source0: ghostscript-8.64.tar.bz2 Source1: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.bz2 Source2: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ghostscript-fonts-other-6.0.tar.bz2 @@ -113,6 +113,7 @@ Patch21: ghostscript-8.64-echogs.patch # Currently not applied, does not fit into revision 8594+ Patch22: ghostscript-8.62-cjk.patch +Patch23: ghostscript-8.64-bitcmyk-blank-output.patch Patch24: ghostscript-fonts-std-8.11.patch Patch25: Omni-0.9.2.dif.bz2 Patch26: Omni-0.9.2-glibc210.dif @@ -138,6 +139,7 @@ %endif %define buildsys %{_target_cpu}-suse-%{_build_os} %global gsver %{version} +%define _default_patch_fuzz 2 %description This package contains all start-up files for calling gs (GNU @@ -164,7 +166,7 @@ %if "%name" != "ghostscript-mini" %package -n ghostscript-x11 -License: GPL v2 or later +License: GPLv2+ Conflicts: ghostscript-vga ghostscript-both PreReq: coreutils Requires: ghostscript-library @@ -190,7 +192,7 @@ and many others %package -n ghostscript-fonts-std -License: GPL v2 or later +License: GPLv2+ Summary: Standard Fonts for Ghostscript PreReq: coreutils %suseconfig_fonts_prereq Group: Productivity/Publishing/PS @@ -214,7 +216,7 @@ and many others %package -n ghostscript-fonts-other -License: GPL v2 or later +License: GPLv2+ Summary: Optional fonts for Ghostscript Group: Productivity/Publishing/PS Provides: gs_fonto @@ -235,7 +237,7 @@ and many others %package -n ghostscript-fonts-rus -License: GPL v2 or later +License: GPLv2+ Summary: Russian Fonts for Ghostscript Group: Productivity/Publishing/PS Provides: gs_fontr @@ -252,7 +254,7 @@ Eugene V. Demidov <jack@gpi.ru> %package -n ghostscript-omni -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Omni Printer Drivers for Ghostscript PreReq: ghostscript-library Group: Productivity/Publishing/PS @@ -275,7 +277,7 @@ %if %suse_version > 1020 %package -n ghostscript-ijs-devel -License: GPL v2 or later +License: GPLv2+ Summary: IJS development kit PreReq: ghostscript-library Provides: ghostscript-library:/usr/bin/ijs-config @@ -300,7 +302,7 @@ %if %suse_version > 1030 %package -n ghostscript-devel -License: GPL v2 or later +License: GPLv2+ Summary: Ghostscript API header Requires: ghostscript-library = %version Group: Development/Libraries/C and C++ @@ -323,9 +325,9 @@ %endif %package -n libgimpprint -License: GPL v2 or later +License: GPLv2+ Version: 4.2.7 -Release: 313 +Release: 314 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -339,9 +341,9 @@ Robert Krawitz <rlk@alum.mit.edu> %package -n libgimpprint-devel -License: GPL v2 or later +License: GPLv2+ Version: 4.2.7 -Release: 313 +Release: 314 PreReq: %install_info_prereq Requires: libgimpprint = %{version} Requires: glibc-devel @@ -444,6 +446,7 @@ %patch20 -p0 -b .bbox %patch21 -p0 -b .echogs #%patch22 -p0 -b .cjk +%patch23 -p1 -b .bitcmyk %patch0 -p0 -b .0 %build ++++++ ghostscript-8.64-bitcmyk-blank-output.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 35_bitcmyk-blank-output.dpatch by <till.kamppeter@gmail.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad ghostscript-8.64.dfsg.1~/base/gdevbit.c ghostscript-8.64.dfsg.1/base/gdevbit.c --- ghostscript-8.64.dfsg.1~/base/gdevbit.c 2008-08-21 01:58:43.000000000 +0200 +++ ghostscript-8.64.dfsg.1/base/gdevbit.c 2009-02-18 19:50:13.000000000 +0100 @@ -11,7 +11,7 @@ San Rafael, CA 94903, U.S.A., +1(415)492-9861, for further information. */ -/* $Id: gdevbit.c 9007 2008-08-20 23:58:43Z giles $ */ +/* $Id: gdevbit.c 9470 2009-02-11 20:35:13Z henrys $ */ /* "Plain bits" devices to measure rendering time. */ #include "gdevprn.h" @@ -653,7 +653,7 @@ pdev->color_info.depth == 32 ? cmyk_8bit_map_cmyk_color : bit_map_cmyk_color); } - /* Reset the sparable and linear shift, masks, bits. */ + /* Reset the separable and linear shift, masks, bits. */ set_linear_color_bits_mask_shift(pdev); pdev->color_info.separable_and_linear = GX_CINFO_SEP_LIN; ((gx_device_bit *)pdev)->FirstLine = FirstLine; @@ -671,16 +671,18 @@ byte *in = gs_alloc_bytes(pdev->memory, line_size, "bit_print_page(in)"); byte *data; int nul = !strcmp(pdev->fname, "nul") || !strcmp(pdev->fname, "/dev/null"); - int lnum = ((gx_device_bit *)pdev)->FirstLine; - int bottom = ((gx_device_bit *)pdev)->LastLine; + int lnum = ((gx_device_bit *)pdev)->FirstLine >= pdev->height ? pdev->height - 1 : + ((gx_device_bit *)pdev)->FirstLine; + int bottom = ((gx_device_bit *)pdev)->LastLine >= pdev->height ? pdev->height - 1 : + ((gx_device_bit *)pdev)->LastLine; int line_count = any_abs(bottom - lnum); int i, step = lnum > bottom ? -1 : 1; if (in == 0) return_error(gs_error_VMerror); if ((lnum == 0) && (bottom == 0)) - bottom = pdev->height - 1; - for (i = 0; i < line_count; i++, lnum += step) { + line_count = pdev->height - 1; /* default when LastLine == 0, FirstLine == 0 */ + for (i = 0; i <= line_count; i++, lnum += step) { gdev_prn_get_bits(pdev, lnum, in, &data); if (!nul) fwrite(data, 1, line_size, prn_stream); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org