[arch-commits] Commit in sane/trunk (PKGBUILD fix_xerox_mfp_color_mode.patch)

Ionut Biru ibiru at archlinux.org
Sat Jul 3 11:09:26 EDT 2010


    Date: Saturday, July 3, 2010 @ 11:09:26
  Author: ibiru
Revision: 84679

upgpkg: sane 1.0.21-3
fix scanning FS#20053

Added:
  sane/trunk/fix_xerox_mfp_color_mode.patch
Modified:
  sane/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   24 ++++++++++++++----------
 fix_xerox_mfp_color_mode.patch |   21 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-03 14:55:42 UTC (rev 84678)
+++ PKGBUILD	2010-07-03 15:09:26 UTC (rev 84679)
@@ -4,7 +4,7 @@
 
 pkgname=sane
 pkgver=1.0.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org"
 arch=('i686' 'x86_64')
@@ -14,22 +14,24 @@
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp,v4l.conf} etc/xinetd.d/sane)
 source=(ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
         ftp://ftp.sane-project.org/pub/sane/$pkgname-backends-$pkgver/sane-backends-1.0.21-i18n.patch
-        sane.xinetd)
+        sane.xinetd
+        fix_xerox_mfp_color_mode.patch)
 options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
-  patch -Np1 -i ../sane-backends-1.0.21-i18n.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i ${srcdir}/sane-backends-1.0.21-i18n.patch
+  patch -Np1 -i ${srcdir}/fix_xerox_mfp_color_mode.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi
+  make
+  make DESTDIR="${pkgdir}" install
   # fix hp officejets
-  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" || return 1
+  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
   # install udev files
   install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/lib/udev/rules.d/53-sane.rules" || return 1
+    "${pkgdir}/lib/udev/rules.d/53-sane.rules"
   # fix udev rules
-  sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules || return 1
+  sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
   # fix group on /var/lock
   mkdir -p "${pkgdir}/var/lock/sane"
   chgrp 0 "${pkgdir}/var"
@@ -43,4 +45,6 @@
 }
 md5sums=('be586a23633949cf2ecf0c9c6d769130'
          '8a6443b731f04dada814e268c42b139a'
-         'da946cc36fb83612162cf9505986d4b2')
+         'da946cc36fb83612162cf9505986d4b2'
+         'd6542c340c2acf30ccb7ead7094ab9d9')
+

Added: fix_xerox_mfp_color_mode.patch
===================================================================
--- fix_xerox_mfp_color_mode.patch	                        (rev 0)
+++ fix_xerox_mfp_color_mode.patch	2010-07-03 15:09:26 UTC (rev 84679)
@@ -0,0 +1,21 @@
+Description: Fix xerox_mfp color mode
+ Corrected color mode malfunction.
+ 
+ Bug was introduced by mass change to SANE_VALUE macro, (commit ff048f41760c74e67dfea36a079c71fdb72bbf4c).
+Author: Alex Belkin <abc at telekom.ru>
+Origin: upstream, http://git.debian.org/?p=sane/sane-backends.git;a=commitdiff;h=043cc4b1651fe602f1b7fb58e6592bd3bef0f4ac
+Bug: https://alioth.debian.org/tracker/?func=detail&atid=410366&aid=312485&group_id=30186
+Bug-Debian: http://bugs.debian.org/583789
+
+Index: sane-backends-1.0.21/backend/xerox_mfp.c
+===================================================================
+--- sane-backends-1.0.21.orig/backend/xerox_mfp.c	2010-04-05 15:18:05.000000000 +0200
++++ sane-backends-1.0.21/backend/xerox_mfp.c	2010-06-01 19:34:07.350975337 +0200
+@@ -386,6 +386,7 @@
+ 
+ static SANE_String_Const scan_modes[] = {
+   SANE_VALUE_SCAN_MODE_LINEART,
++  SANE_VALUE_SCAN_MODE_HALFTONE,
+   SANE_VALUE_SCAN_MODE_GRAY,
+   SANE_VALUE_SCAN_MODE_COLOR,
+   NULL



More information about the arch-commits mailing list