Djam/sane
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/sane.git synced 2025-02-23 17:23:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop unused patches

Browse source
This commit is contained in:
Andrey Bondrov 2015-10-24 01:29:17 +10:00
parent e0271820e6
commit 6c61dab714
3 changed files with 0 additions and 10632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10604
09_po_update_es_add_gl.dpatch
View file

File diff suppressed because it is too large Load diff

22
sane-backends-1.0.21-link.patch
View file

@ -1,22 +0,0 @@
--- backend/Makefile.am.link 2010-12-04 18:15:16.000000000 +0000
+++ backend/Makefile.am 2010-12-04 18:16:13.000000000 +0000
@@ -1089,7 +1089,7 @@
nodist_libsane_la_SOURCES = dll-s.c
libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(IEEE1284_LIBS) $(USB_LIBS)
# WARNING: Automake is getting this wrong so have to do it ourselves.
libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
--- tools/sane-config.in.orig 2010-12-04 19:18:07.000000000 +0000
+++ tools/sane-config.in 2010-12-04 19:19:22.000000000 +0000
@@ -13,7 +13,7 @@
exec_prefix="@exec_prefix@"
LDFLAGS="@LDFLAGS@ @GPHOTO2_LDFLAGS@"
-LIBS="@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@"
+LIBS="@DL_LIBS@ @USB_LIBS@ @IEEE1284_LIBS@"
pkgincludedir="@pkgincludedir@"
pkglibdir="@pkglibdir@"
includedir="@includedir@"

6
sane.spec
View file

@ -51,7 +51,6 @@ Source15: sane.rpmlintrc
Patch0: sane-backends-1.0.19-fix-str-fmt.patch
Patch1: sane-backends-1.0.18-plustek-s12.patch
Patch23: iscan-2.29.3-fix-link.patch
Patch24: sane-backends-1.0.21-link.patch
Patch26: iscan-2.20.1-no_non-free_please.diff
Patch27: iscan-2.28.1-linkage_fix.patch
# (fc) 1.0.19-12mdv fix group for device
@ -69,9 +68,6 @@ Patch101: 01_missing_pthreads.dpatch
# add back SANE_CAP_ALWAYS_SETTABLE which was mistakenly
# removed from SANE 1.0.20
Patch106: 06_cap_always_settable.dpatch
# Update es translation and add new gl translation, courtesy of
# Miguel Bouzada <mbouzada@gmail.com>.
Patch109: 09_po_update_es_add_gl.dpatch
# Use fedora's patch to remove rpath
# Patch to the dll backend to look for pieces of dll.conf inside the
# /etc/sane.d/dll.d/ directory. This is a facility for packages providing
@ -184,7 +180,6 @@ access image acquisition devices available on the local host.
%setup -qn sane-backends-%{version}%{beta}
%patch1 -p1 -b .plusteks12
###%patch24 -p0 -b .link
%patch28 -p1 -b .group
%patch30 -p1 -b .brother2list
%patch31 -p1 -b .strformat
@ -192,7 +187,6 @@ access image acquisition devices available on the local host.
%patch101 -p1
%patch106 -p1
#%patch109 -p1
%patch113 -p1
%patch115 -p1