Author: wiget Date: Sun Nov 7 17:16:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix unresolved symbols bug
---- Files affected: packages/hplip: hplip.spec (1.76 -> 1.77) , unresolved.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hplip/hplip.spec diff -u packages/hplip/hplip.spec:1.76 packages/hplip/hplip.spec:1.77 --- packages/hplip/hplip.spec:1.76 Thu Oct 21 14:07:59 2010 +++ packages/hplip/hplip.spec Sun Nov 7 18:16:43 2010 @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz # Source0-md5: 609718830a26874fc0ea84a47b8132f3 Patch0: %{name}-desktop.patch +Patch1: unresolved.patch URL: http://hplipopensource.com/ BuildRequires: autoconf BuildRequires: automake @@ -140,12 +141,16 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py -%{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure %build -install /usr/share/automake/config.* . +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__automake} install /usr/share/automake/config.* prnt +%{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" %configure \ --enable-hpcups-install \ @@ -350,6 +355,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.77 2010/11/07 17:16:43 wiget +- fix unresolved symbols bug + Revision 1.76 2010/10/21 12:07:59 caleb - Up to 3.10.9 ================================================================ Index: packages/hplip/unresolved.patch diff -u /dev/null packages/hplip/unresolved.patch:1.1 --- /dev/null Sun Nov 7 18:16:49 2010 +++ packages/hplip/unresolved.patch Sun Nov 7 18:16:43 2010 @@ -0,0 +1,22 @@ +--- hplip-3.10.9/scan/sane/ledm.c.wiget 2010-11-07 18:01:26.887129289 +0100 ++++ hplip-3.10.9/scan/sane/ledm.c 2010-11-07 18:02:17.662175777 +0100 +@@ -973,7 +973,7 @@ void ledm_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++// BUG("invalid sane_close\n"); + return; + } + +--- hplip-3.10.9/Makefile.am.wiget 2010-11-07 18:02:32.254945320 +0100 ++++ hplip-3.10.9/Makefile.am 2010-11-07 18:03:03.497071268 +0100 +@@ -56,7 +56,7 @@ else + libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 + endif + # The following is a interlibrary dependency that must be compiled first. +-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl ++libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -ldl -lc + #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG + libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) + endif # SCAN_BUILD ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.76&r2=1.77&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit