From 90e311707723f334b32d984facb6eb5f77c84fcf Mon Sep 17 00:00:00 2001 From: Artur Frysiak Date: Sun, 7 Nov 2010 17:16:43 +0000 Subject: [PATCH] - fix unresolved symbols bug Changed files: hplip.spec -> 1.77 unresolved.patch -> 1.1 --- hplip.spec | 9 +++++++-- unresolved.patch | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 unresolved.patch diff --git a/hplip.spec b/hplip.spec index e0717a6..da3dc97 100644 --- a/hplip.spec +++ b/hplip.spec @@ -8,6 +8,7 @@ Group: Applications/System 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 @@ -139,12 +140,16 @@ HAL device information for HPLIP supported devices %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 \ diff --git a/unresolved.patch b/unresolved.patch new file mode 100644 index 0000000..2f76c60 --- /dev/null +++ b/unresolved.patch @@ -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 -- 2.44.0