diff --git a/add_missing_includes_and_define_GNU_SOURCE.patch b/add_missing_includes_and_define_GNU_SOURCE.patch new file mode 100644 index 0000000..75fa41f --- /dev/null +++ b/add_missing_includes_and_define_GNU_SOURCE.patch @@ -0,0 +1,62 @@ +--- protocol/hp_ipp.c.orig 2015-04-14 11:53:09.000000000 +0200 ++++ protocol/hp_ipp.c 2015-05-19 13:12:47.000000000 +0200 +@@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA. + + \******************************************************************************/ + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif + + #include + #include +--- scan/sane/sclpml.c.orig 2015-04-14 11:53:17.000000000 +0200 ++++ scan/sane/sclpml.c 2015-05-19 13:45:44.000000000 +0200 +@@ -25,11 +25,16 @@ + + \************************************************************************************/ + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ + #include + #include + #include + #include + #include ++#include + #include "sane.h" + #include "saneopts.h" + #include "common.h" +--- scan/sane/bb_ledm.c.orig 2015-05-19 13:47:53.000000000 +0200 ++++ scan/sane/bb_ledm.c 2015-05-19 13:48:42.000000000 +0200 +@@ -26,7 +26,7 @@ + # include "http.h" + # include "xml.h" + # include +- ++# include + # include + + # define _STRINGIZE(x) #x +--- scan/sane/hpaio.c.orig 2015-04-14 11:53:17.000000000 +0200 ++++ scan/sane/hpaio.c 2015-05-19 13:51:21.000000000 +0200 +@@ -43,6 +43,7 @@ + #include "hpaio.h" + # include "ledm.h" + #include "sclpml.h" ++#include "io.h" + + #define DEBUG_DECLARE_ONLY + #include "sanei_debug.h" +--- io/hpmud/jd.c.orig 2015-05-19 13:46:39.000000000 +0200 ++++ io/hpmud/jd.c 2015-05-19 13:47:01.000000000 +0200 +@@ -31,6 +31,7 @@ + #endif + + #include ++#include + #include "hpmud.h" + #include "hpmudi.h" + diff --git a/hplip-3.15.2.tar.gz b/hplip-3.15.2.tar.gz deleted file mode 100644 index 4f9da9d..0000000 --- a/hplip-3.15.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f02eca743d85240db07ed2fc6551e1dce0dedc85ad4a0e90417e4d5b630f67c -size 21793148 diff --git a/hplip-3.15.2.tar.gz.asc b/hplip-3.15.2.tar.gz.asc deleted file mode 100644 index 300759c..0000000 --- a/hplip-3.15.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlTKJoUACgkQc9dwzaWQR7nT8gCdEy8HVaJNSA5ajtXet7YAGs5H -6NwAoLVDro3CLYkLqnwHIDTzR+leQgdM -=qmEP ------END PGP SIGNATURE----- diff --git a/hplip-3.15.4.tar.gz b/hplip-3.15.4.tar.gz new file mode 100644 index 0000000..7a7bba2 --- /dev/null +++ b/hplip-3.15.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3872f17690f2bfafbe025cea524b933260c81349b91083c465600705d8c3e68 +size 21926172 diff --git a/hplip-3.15.4.tar.gz.asc b/hplip-3.15.4.tar.gz.asc new file mode 100644 index 0000000..16ca756 --- /dev/null +++ b/hplip-3.15.4.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlUs5JkACgkQc9dwzaWQR7kX6QCfQrjES2UQSQNadZD7kT+SyeFr +9woAoKJjGtKRmFF7tucUCxZN/uBmLsNe +=RtGm +-----END PGP SIGNATURE----- diff --git a/hplip.changes b/hplip.changes index 70d09a1..070173b 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Tue May 19 17:04:45 CEST 2015 - jsmeix@suse.de + +- Disabled build for parallel port because parallel port support + was disabled by default by upstream HPLIP at least since 2011 + and is deprecated by upstream HPLIP since 2013, + see https://bugs.launchpad.net/bugs/750796 + and http://hplipopensource.com/node/217 + furthermore parallel port support gets more or less abandoned + by upstream projects in general, see "Parallel port printers" + at https://en.opensuse.org/SDB:Installing_a_Printer +- Version upgrade to 3.15.4: + Added Support for the Following New Printers: + HP Color LaserJet Pro M252dw + HP Color LaserJet Pro M252n + HP Color LaserJet Pro MFP M277n + HP Color LaserJet Pro MFP M277dw + HP Color LaserJet Enterprise M553n + HP Color LaserJet Enterprise M553dn + HP Color LaserJet Enterprise M553x + HP Color LaserJet Enterprise M553dh + HP Color LaserJet Enterprise M552dn + HP LaserJet Enterprise M604n + HP LaserJet Enterprise M604dn + HP LaserJet Enterprise M605dn + HP LaserJet Enterprise M605n + HP LaserJet Enterprise M605x + HP LaserJet Enterprise M606x + HP LaserJet Enterprise M606dn + Some bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- add_missing_includes_and_define_GNU_SOURCE.patch adds + missing '#include <...>' and missing '#define _GNU_SOURCE' + see https://bugs.launchpad.net/hplip/+bug/1456590 +- Using again plain 'make' instead of 'make %{?_smp_mflags}' + (cf. the entry below dated "Sun Apr 20 09:48:39 UTC 2014") + and plain 'make ... install' instead of + 'make ... install %{?_smp_mflags}' to avoid random obscure + build failures with errors like "libtool: install: error: relink + `cupsext.la' with the above command before installing it", cf. + http://lists.gnu.org/archive/html/automake/2010-03/msg00039.html + ------------------------------------------------------------------- Wed Mar 18 16:51:06 CET 2015 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index eb87c4b..5b83145 100644 --- a/hplip.spec +++ b/hplip.spec @@ -17,18 +17,18 @@ Name: hplip -Version: 3.15.2 +Version: 3.15.4 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause and GPL-2.0+ and MIT Group: Hardware/Printing Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.4.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.4.tar.gz.asc # How to verify Source0 see: http://hplipopensource.com/node/327 # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 -# /usr/bin/gpg --verify hplip-3.14.10.tar.gz.asc hplip-3.14.10.tar.gz +# /usr/bin/gpg --verify hplip-3.15.4.tar.gz.asc hplip-3.15.4.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) " Source0: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz.asc @@ -81,6 +81,9 @@ Patch104: do_not_open_mdns_port.diff Patch106: disable_hp-upgrade.patch # PATCH-FIX-SUSE: use proper udev rulesdir which is in usr not in /etc Patch107: hplip-udev-rules-in-usr.patch +# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' +# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 +Patch108: add_missing_includes_and_define_GNU_SOURCE.patch # HPLIP's Python module cupsext.so has a build-time dependancy on the CUPS version: # It needs symbols (like ippFirstAttribute, ippNextAttribute, ippSetOperation etc) # that are defined only in libcups.so version > 1.5. For backward compatibility @@ -394,6 +397,9 @@ This sub-package is only required by developers. # To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used. %patch106 -b .disable_hp-upgrade.orig %patch107 -p1 -b .udev_rules_dir.orig +# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' +# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 +%patch108 -b .add_missing_includes_and_define_GNU_SOURCE.orig %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -403,6 +409,8 @@ AUTOMAKE='automake --foreign' autoreconf -fvi # Set our preferred architecture-specific flags for the compiler and linker: export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -fno-strict-aliasing" +# --disable-pp-build disables parallel port build because parallel port support is deprecated by upstream HPLIP +# and by upstream in general cf. "Parallel port printers" at https://en.opensuse.org/SDB:Installing_a_Printer # Static "hpijs" PPD files via enable-foomatic-ppd-install # require foomatic-rip-hplip via their cupsFilter entries # so that enable-foomatic-rip-hplip-install is also needed. @@ -435,7 +443,7 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" --disable-policykit \ --enable-doc-build \ --enable-network-build \ - --enable-pp-build \ + --disable-pp-build \ --enable-scan-build \ --enable-gui-build \ --enable-fax-build \ @@ -454,10 +462,10 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" --with-mimedir=%{_sysconfdir}/cups \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-htmldir==%{_defaultdocdir}/%{name} -make %{?_smp_mflags} +make %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make DESTDIR=%{buildroot} install # Make and install Python compiled bytecode files # (.pyc compiled python and .pyo optimized compiled python) # because normal users do not have write permissions @@ -768,6 +776,7 @@ exit 0 %{_bindir}/hpijs %doc %{_mandir}/man1/hpijs.1.gz %{_libdir}/libhpip.so.* +%{_libdir}/libhpipp.so.* %{_libdir}/libhpmud.so.* %dir %{_libexecdir}/cups %dir %{_libexecdir}/cups/backend @@ -800,6 +809,7 @@ exit 0 %files devel %defattr(-, root, root) %{_libdir}/libhpip.so +%{_libdir}/libhpipp.so %{_libdir}/libhpmud.so %{_libdir}/*.la %{_libdir}/sane/libsane-hpaio.so