mirror of
https://abf.rosa.ru/djam/sane.git
synced 2025-02-23 09:12:57 +00:00
SILENT fix build
This commit is contained in:
akdengi
parent
4ff1612fdb
commit
7f9b4f020c
6 changed files with 10616 additions and 154 deletions
10604
09_po_update_es_add_gl.dpatch
Normal file
10604
09_po_update_es_add_gl.dpatch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,32 +0,0 @@
|
|||
--- sane-backends-1.0.21/doc/descriptions-external/brother2.desc.brother2list 2009-06-09 05:03:36.000000000 +0200
|
||||
+++ sane-backends-1.0.21/doc/descriptions-external/brother2.desc 2010-05-18 10:39:47.000000000 +0200
|
||||
@@ -56,6 +56,16 @@
|
||||
:interface "USB"
|
||||
:usbid "0x04f9" "0x0190"
|
||||
|
||||
+:model "DCP-130C"
|
||||
+:status :untested
|
||||
+:interface "USB"
|
||||
+:usbid "0x04f9" "0x01a8"
|
||||
+
|
||||
+:model "DCP-195C"
|
||||
+:status :untested
|
||||
+:interface "USB"
|
||||
+:usbid "0x04f9" "0x0222"
|
||||
+
|
||||
:model "DCP-310CN"
|
||||
:status :untested
|
||||
:interface "USB network"
|
||||
@@ -113,6 +123,12 @@
|
||||
:usbid "0x04f9" "0x01ab"
|
||||
:comment "Reportedly working."
|
||||
|
||||
+:model "MFC-260C"
|
||||
+:status :untested
|
||||
+:interface "USB"
|
||||
+:usbid "0x04f9" "0x01d6"
|
||||
+:comment "brscan2 needed."
|
||||
+
|
||||
:model "MFC-3240C"
|
||||
:status :untested
|
||||
:interface "USB"
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Index: doc/descriptions/epson.desc
|
||||
===================================================================
|
||||
--- ./doc/descriptions/epson.desc
|
||||
+++ ./doc/descriptions/epson.desc 2010-05-03 09:47:04.000000000 +0200
|
||||
@@ -172,7 +172,7 @@
|
||||
:status :complete
|
||||
|
||||
:model "Expression 800"
|
||||
-:interface "SCSI"
|
||||
+:interface "SCSI" "EPSON" "Expression800" "processor
|
||||
:status :complete
|
||||
|
||||
:model "Expression 1600"
|
||||
Index: doc/descriptions/epson2.desc
|
||||
===================================================================
|
||||
--- ./doc/descriptions/epson2.desc
|
||||
+++ ./doc/descriptions/epson2.desc 2010-05-03 09:48:31.000000000 +0200
|
||||
@@ -239,7 +239,7 @@
|
||||
:comment "overseas version of the GT-9500"
|
||||
|
||||
:model "Expression 800" ; command spec
|
||||
-:interface "SCSI"
|
||||
+:interface "SCSI" "EPSON" "Expression800" "processor
|
||||
:status :complete
|
||||
:comment "overseas version of the GT-9600"
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
--- sane-backends-1.0.23/backend/Makefile.am.primascan 2012-07-25 02:02:14.000000000 +0200
|
||||
+++ sane-backends-1.0.23/backend/Makefile.am 2012-08-28 11:08:14.753159014 +0200
|
||||
@@ -191,7 +191,7 @@ be_convenience_libs = libabaton.la libag
|
||||
libtamarack.la libtest.la libteco1.la \
|
||||
libteco2.la libteco3.la libu12.la libumax.la \
|
||||
libumax1220u.la libumax_pp.la libv4l.la \
|
||||
- libxerox_mfp.la
|
||||
+ libxerox_mfp.la libprimascan.la
|
||||
|
||||
# Each stand alone backend thats possible to be built should be listed
|
||||
# here. There are the libraries that are installed under $(libdir)/sane.
|
||||
@@ -225,7 +225,7 @@ be_dlopen_libs = libsane-abaton.la libsa
|
||||
libsane-tamarack.la libsane-test.la libsane-teco1.la \
|
||||
libsane-teco2.la libsane-teco3.la libsane-u12.la libsane-umax.la \
|
||||
libsane-umax1220u.la libsane-umax_pp.la libsane-v4l.la \
|
||||
- libsane-xerox_mfp.la
|
||||
+ libsane-xerox_mfp.la libsane-primascan.la
|
||||
|
||||
EXTRA_LTLIBRARIES = $(be_convenience_libs) $(be_dlopen_libs)
|
||||
|
||||
@@ -1083,6 +1083,14 @@ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SA
|
||||
libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
|
||||
EXTRA_DIST += xerox_mfp.conf.in
|
||||
|
||||
+libprimascan_la_SOURCES = primascan.c primascan.h
|
||||
+libprimascan_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=primascan
|
||||
+
|
||||
+nodist_libsane_primascan_la_SOURCES = primascan-s.c
|
||||
+libsane_primascan_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=primascan
|
||||
+libsane_primascan_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
||||
+libsane_primascan_la_LIBADD = $(COMMON_LIBS) libprimascan.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS)
|
||||
+
|
||||
libdll_preload_la_SOURCES = dll.c
|
||||
libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
|
||||
libdll_la_SOURCES = dll.c
|
||||
--- sane-backends-1.0.23/configure.in.primascan 2012-08-19 22:31:09.000000000 +0200
|
||||
+++ sane-backends-1.0.23/configure.in 2012-08-28 11:07:18.947949072 +0200
|
||||
@@ -590,7 +590,7 @@ ALL_BACKENDS="abaton agfafocus apple art
|
||||
pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
|
||||
sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
|
||||
stv680 tamarack teco1 teco2 teco3 test u12 umax
|
||||
- umax_pp umax1220u v4l xerox_mfp p5"
|
||||
+ umax_pp umax1220u v4l xerox_mfp p5 primascan"
|
||||
|
||||
# If user specifies backends manually then cause configure
|
||||
# to fail if its detected it can't be compiled. If we
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
diff -p -up sane-backends-1.0.20/backend/rts8891.c.strformat sane-backends-1.0.20/backend/rts8891.c
|
||||
--- sane-backends-1.0.20/backend/rts8891.c.strformat 2009-04-30 15:15:20.000000000 +0200
|
||||
+++ sane-backends-1.0.20/backend/rts8891.c 2009-09-28 14:00:28.000000000 +0200
|
||||
@@ -3751,7 +3751,7 @@ init_device (struct Rts8891_Device *dev)
|
||||
for (i = 0; i < dev->reg_count; i++)
|
||||
sprintf (message + strlen (message), "0x%02x ", dev->regs[i]);
|
||||
sprintf (message + strlen (message), "\n");
|
||||
- DBG (DBG_io2, message);
|
||||
+ DBG (DBG_io2, "%s", message);
|
||||
}
|
||||
|
||||
/* initial sensor guess */
|
||||
--- sane-backends-1.0.22/frontend/scanimage.c.str 2011-04-01 10:42:12.000000000 +0200
|
||||
+++ sane-backends-1.0.22/frontend/scanimage.c 2011-04-01 10:42:36.000000000 +0200
|
||||
@@ -1891,7 +1891,7 @@
|
||||
printf (start, int_arg);
|
||||
break;
|
||||
case 0:
|
||||
- printf (start);
|
||||
+ printf ("%s", start);
|
||||
break;
|
||||
}
|
||||
*percent = cc;
|
||||
@@ -1905,7 +1905,7 @@
|
||||
}
|
||||
}
|
||||
if (*start)
|
||||
- printf (start);
|
||||
+ printf ("%s",start);
|
||||
}
|
||||
}
|
||||
if (i == 0 && ch != 'f')
|
||||
30
sane.spec
30
sane.spec
|
|
@ -183,7 +183,6 @@ access image acquisition devices available on the local host.
|
|||
|
||||
%prep
|
||||
%setup -qn sane-backends-%{version}%{beta}
|
||||
%apply_patches
|
||||
|
||||
%patch1 -p1 -b .plusteks12
|
||||
###%patch24 -p0 -b .link
|
||||
|
|
@ -231,7 +230,7 @@ access image acquisition devices available on the local host.
|
|||
#echo 'hp_rts88xx' >> backend/dll.conf.in
|
||||
|
||||
# Primax parallel port scanners
|
||||
%if %{primax_support}
|
||||
%if %{with primax}
|
||||
%setup -q -T -D -a 3 -n sane-backends-%{version}%{beta}
|
||||
%endif
|
||||
|
||||
|
|
@ -250,7 +249,7 @@ echo '#primascan' >> backend/dll.conf.in
|
|||
#setup -q -T -D -a 10 -n sane-backends-%{version}%{beta}
|
||||
|
||||
# Epson Avasys driver for Epson scanners
|
||||
%if %{epkowa_support}
|
||||
%if %{with epkowa}
|
||||
%setup -q -T -D -a 13 -n sane-backends-%{version}%{beta}
|
||||
%endif
|
||||
|
||||
|
|
@ -262,7 +261,7 @@ perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /LDFLAGS=.*with_ptal/" configure
|
|||
# the scanner
|
||||
perl -p -i -e 's:for \(retries = 20; retries; retries--\):for (retries = 5; retries; retries--):' backend/snapscan-scsi.c
|
||||
|
||||
%if %{epkowa_support}
|
||||
%if %{with epkowa}
|
||||
pushd iscan-%{iscanversion}
|
||||
%patch23 -p0 -b .iscan-2.10.0-1_fix_link
|
||||
%patch26 -p0 -b .no_non-free_please
|
||||
|
|
@ -340,7 +339,7 @@ perl -p -i -e 's/HP\s+OfficeJet/HPLIP/g' %{buildroot}%{_sysconfdir}/sane.d/dll.c
|
|||
perl -p -i -e 's/hpoj.sf.net/hplip.sf.net/g' %{buildroot}%{_sysconfdir}/sane.d/dll.conf
|
||||
perl -p -i -e 's/hpoj/hpaio/g' %{buildroot}%{_sysconfdir}/sane.d/dll.conf
|
||||
|
||||
%if %{empty_dll_conf}
|
||||
%if %{with empty_dll_conf}
|
||||
# The /etc/sane.d/dll.conf contains lines for every backend, so every
|
||||
# backend probes for a scanner when a SANE frontend (e. g. xsane) is
|
||||
# started. With this the user has always to wait around one minute
|
||||
|
|
@ -359,14 +358,14 @@ install -d %{buildroot}%{_docdir}/sane-backends-%{version}/
|
|||
install -d %{buildroot}%{_docdir}/sane-backends-doc-%{version}/
|
||||
pushd %{buildroot}/usr/doc/sane-%{version}
|
||||
#pushd %{buildroot}/usr/doc/sane-1.0.18-cvs
|
||||
mv `find -mindepth 1 -type d` *.html *.ps *.txt %{buildroot}%{_docdir}/sane-backends-doc-%{version}/
|
||||
mv `find -mindepth 1 -type d` *.html *.txt %{buildroot}%{_docdir}/sane-backends-doc-%{version}/
|
||||
mv README README.linux %{buildroot}%{_docdir}/sane-backends-%{version}/
|
||||
rm -f README.*
|
||||
mv * %{buildroot}%{_docdir}/sane-backends-%{version}/
|
||||
popd
|
||||
|
||||
# Primax parallel port scanners
|
||||
%if %{primax_support}
|
||||
%if %{with primax}
|
||||
cd primaxscan*
|
||||
%makeinstall_std
|
||||
rm -f %{buildroot}%{_libdir}/libsane-primax.a %{buildroot}%{_prefix}/lib/sane/libsane-primax.a
|
||||
|
|
@ -375,7 +374,7 @@ cd ..
|
|||
%endif
|
||||
|
||||
# Epson Avasys driver for Epson scanners
|
||||
%if %{epkowa_support}
|
||||
%if %{with epkowa}
|
||||
cd iscan-%{iscanversion}
|
||||
%makeinstall_std
|
||||
rm -f %{buildroot}%{_libdir}/sane/libsane-epkowa.a
|
||||
|
|
@ -397,14 +396,8 @@ install -m644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/60-libsane.
|
|||
perl -p -i -e 's/(\#.{500}).*$/$1 .../' %{buildroot}/lib/udev/rules.d/60-libsane.rules
|
||||
|
||||
%find_lang sane-backends
|
||||
%if %{epkowa_support}
|
||||
%find_lang iscan
|
||||
%endif
|
||||
|
||||
sed -i '/^%dir/d' sane-backends.lang
|
||||
%if %{epkowa_support}
|
||||
sed -i '/^%dir/d' iscan.lang
|
||||
%endif
|
||||
|
||||
%post -n saned
|
||||
%_post_service saned
|
||||
|
|
@ -427,22 +420,23 @@ sed -i '/^%dir/d' iscan.lang
|
|||
%_postun_groupdel scanner
|
||||
|
||||
%files backends -f sane-backends.lang
|
||||
%doc %{_docdir}/sane-backends-%{version}
|
||||
doc %{_docdir}/sane-backends-%{version}
|
||||
%{_bindir}/sane-find-scanner
|
||||
%{_bindir}/scanimage
|
||||
%{_bindir}/gamma4scanimage
|
||||
%if %{with primax}
|
||||
%if %{primax_support}
|
||||
%{_bindir}/primax_scan
|
||||
%endif
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man5/*
|
||||
%{_mandir}/man7/*
|
||||
%dir %{_sysconfdir}/sane.d
|
||||
%dir %{_sysconfdir}/sane.d/dll.d
|
||||
#config(noreplace) %{_sysconfdir}/sane.d/*[^saned]
|
||||
%config(noreplace) %{_sysconfdir}/sane.d/*
|
||||
%{_sysconfdir}/udev/rules.d/*-libsane.rules
|
||||
/lib/udev/rules.d/*-libsane.rules
|
||||
%attr(1777,root,root) %dir /var/lib/lock/sane
|
||||
%if %{with epkowa}
|
||||
%if %{epkowa_support}
|
||||
# iscan files
|
||||
%exclude %{_sysconfdir}/sane.d/epkowa.conf
|
||||
%exclude %{_mandir}/man5/sane-epkowa.5*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue