Hello community, here is the log from the commit of package epson-inkjet-printer-escpr for openSUSE:Factory checked in at 2013-08-01 15:26:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epson-inkjet-printer-escpr (Old) and /work/SRC/openSUSE:Factory/.epson-inkjet-printer-escpr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epson-inkjet-printer-escpr" Changes: -------- --- /work/SRC/openSUSE:Factory/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.changes 2013-03-08 09:09:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.epson-inkjet-printer-escpr.new/epson-inkjet-printer-escpr.changes 2013-08-01 15:26:55.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Aug 1 11:34:39 CEST 2013 - jsm...@suse.de + +- fix_no-return-in-nonvoid-function.patch avoids that build fails + with "E: ... no-return-in-nonvoid-function filter.c:133". +- Upgraded to version 1.2.3 + Several more supported XP series devices. + For details see the NEWS file. +- Upgraded to version 1.2.2 + Many more supported devices. + For details see the NEWS file. +- Upgraded to version 1.2.1 + Fixed issue where borderless printing except for A4 size failed. + A few more supported devices. + For details see the NEWS file. +- Upgraded to version 1.2.0 + A few more supported devices. + Supported duplex printing for many models. + For details see the NEWS file. +- Upgraded to version 1.1.2: + Several more supported WP series devices. + For details see the NEWS file. + +------------------------------------------------------------------- Old: ---- epson-inkjet-printer-escpr-1.1.1-1lsb3.2.tar.gz New: ---- epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz fix_no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epson-inkjet-printer-escpr.spec ++++++ --- /var/tmp/diff_new_pack.28DmlO/_old 2013-08-01 15:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.28DmlO/_new 2013-08-01 15:26:56.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: epson-inkjet-printer-escpr BuildRequires: cups BuildRequires: cups-devel @@ -28,14 +27,17 @@ %if 0%{?suse_version} > 1010 BuildRequires: python-cups %endif -Version: 1.1.1 +Version: 1.2.3 Release: 0 Url: http://avasys.jp/english/linux_e/ Summary: Epson ESC/P-R Inkjet Printer Driver License: GPL-2.0 Group: Hardware/Printing -# URL to download Source0: http://avasys.jp/eng/linux_driver/download/lsb/epson-inkjet/escpr/ +# Example URL to download Source0: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX&productName=B700 Source0: epson-inkjet-printer-escpr-%{version}-1lsb3.2.tar.gz +# Patch0 fix_no-return-in-nonvoid-function.patch avoids that build fails +# with "E: epson-inkjet-printer-escpr no-return-in-nonvoid-function filter.c:133": +Patch0: fix_no-return-in-nonvoid-function.patch # This software is a filter program used with CUPS: Requires: cups # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: @@ -76,6 +78,9 @@ %prep # Be quiet when unpacking: %setup -q +# Patch0 fix_no-return-in-nonvoid-function.patch avoids that build fails +# with "E: epson-inkjet-printer-escpr no-return-in-nonvoid-function filter.c:133": +%patch0 %build # Set our preferred architecture-specific flags for the compiler and linker: @@ -90,7 +95,7 @@ # must match exactly to the installed epson-escpr filter and the libescpr library: %configure \ --with-cupsfilterdir=/usr/lib/cups/filter \ - --with-cupsppddir=%{_datadir}/cups/model/manufacturer-PPDs/epson-inkjet-printer-escpr + --with-cupsppddir=%{_datadir}/cups/model/manufacturer-PPDs make %install @@ -154,8 +159,6 @@ %dir %{_datadir}/cups/model %dir %{_datadir}/cups/model/manufacturer-PPDs %{_datadir}/cups/model/manufacturer-PPDs/epson-inkjet-printer-escpr/ -%dir %{_datadir}/epson-inkjet-printer-escpr -%{_datadir}/epson-inkjet-printer-escpr/paper_list.csv %doc %{_defaultdocdir}/%{name}/ %changelog ++++++ epson-inkjet-printer-escpr-1.1.1-1lsb3.2.tar.gz -> epson-inkjet-printer-escpr-1.2.3-1lsb3.2.tar.gz ++++++ ++++ 90005 lines of diff (skipped) ++++++ fix_no-return-in-nonvoid-function.patch ++++++ --- src/filter.c.orig 2013-06-04 08:04:30.000000000 +0200 +++ src/filter.c 2013-08-01 11:28:16.000000000 +0200 @@ -130,6 +130,7 @@ EPS_ERR_CODE epsInitLib(){ cmnFuncPtrs.stateCallback = NULL; /* current version unused */ memcpy((void*)(&epsCmnFnc), (void*)&cmnFuncPtrs, sizeof(EPS_CMN_FUNC)); + return EPS_ERR_NONE; } EPS_ERR_CODE epsInitJob(){ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org