summaryrefslogtreecommitdiff
path: root/extra/sane
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-06-20 16:36:47 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-06-20 16:36:47 -0300
commit572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch)
tree89f43dd22eaacadfa97977de1f3b73285da15735 /extra/sane
parentcebf33d7109e0157a80f34d6136e212f0a28d274 (diff)
parent5898d76e47144f2366f9acda9ab52827b696c2d5 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/ecryptfs-utils/PKGBUILD community/erlang/PKGBUILD community/esmtp/PKGBUILD community/gmic/PKGBUILD community/ibus-sunpinyin/PKGBUILD community/libev/PKGBUILD community/libmirage/PKGBUILD community/libraw/PKGBUILD community/lilypond/PKGBUILD community/luajit/PKGBUILD community/matchbox-window-manager/PKGBUILD community/miniupnpc/PKGBUILD community/mplayer2/PKGBUILD community/mumble/PKGBUILD community/oss/PKGBUILD community/pidgin-lwqq/PKGBUILD community/postgis/PKGBUILD community/python2-pytables/PKGBUILD community/qmc2/PKGBUILD community/qtfm/PKGBUILD community/ruby-gtk3/PKGBUILD community/tea/PKGBUILD community/yacpi/PKGBUILD core/bridge-utils/PKGBUILD core/gcc/PKGBUILD core/libsasl/PKGBUILD core/lvm2/PKGBUILD core/net-tools/PKGBUILD core/ppp/PKGBUILD core/pptpclient/PKGBUILD core/sdparm/PKGBUILD core/systemd/PKGBUILD core/sysvinit-tools/PKGBUILD extra/aisleriot/PKGBUILD extra/arora/PKGBUILD extra/bluez-hcidump/PKGBUILD extra/bluez/PKGBUILD extra/cups/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/dhcp/PKGBUILD extra/gnome-bluetooth/PKGBUILD extra/gnome-desktop/PKGBUILD extra/gnutls/PKGBUILD extra/gts/PKGBUILD extra/guile/PKGBUILD extra/harfbuzz/PKGBUILD extra/iptraf-ng/PKGBUILD extra/json-c/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdepim/PKGBUILD extra/kdesdk-kate/PKGBUILD extra/libatasmart/PKGBUILD extra/libbsd/PKGBUILD extra/libdmtx/PKGBUILD extra/libhangul/PKGBUILD extra/libindi/PKGBUILD extra/libpeas/PKGBUILD extra/libsmbios/PKGBUILD extra/libspiro/PKGBUILD extra/libsrtp/PKGBUILD extra/libxml2/PKGBUILD extra/libxrender/PKGBUILD extra/libxvmc/PKGBUILD extra/llvm/PKGBUILD extra/maxima/PKGBUILD extra/msmtp/PKGBUILD extra/ortp/PKGBUILD extra/perl-dbd-sqlite/PKGBUILD extra/perl-yaml-syck/PKGBUILD extra/php/PKGBUILD extra/pm-utils/PKGBUILD extra/pulseaudio/PKGBUILD extra/pyqt4/PKGBUILD extra/scim-anthy/PKGBUILD extra/scim-chewing/PKGBUILD extra/scim-m17n/PKGBUILD extra/scim/PKGBUILD extra/ssmtp/PKGBUILD extra/texmacs/PKGBUILD extra/v86d/PKGBUILD extra/vlc/PKGBUILD extra/webkitgtk/PKGBUILD extra/webkitgtk2/PKGBUILD extra/wireshark/PKGBUILD extra/zsh/PKGBUILD libre/bogofilter-libre/PKGBUILD libre/ecasound-libre/PKGBUILD libre/libretools/libretools.install libre/mc-libre/PKGBUILD
Diffstat (limited to 'extra/sane')
-rw-r--r--extra/sane/1.0.23-hp2400c.patch81
-rw-r--r--extra/sane/PKGBUILD13
2 files changed, 89 insertions, 5 deletions
diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
new file mode 100644
index 000000000..8bfd29b66
--- /dev/null
+++ b/extra/sane/1.0.23-hp2400c.patch
@@ -0,0 +1,81 @@
+From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
+Date: Mon, 3 Jun 2013 06:33:08 +0200
+Subject: [PATCH] bug 314293 fix
+
+- don't use non-existent end of records
+---
+ ChangeLog | 3 +++
+ backend/genesys_gl646.c | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
+index c6a5af5..2d5cddc 100644
+--- a/backend/genesys_gl646.c
++++ b/backend/genesys_gl646.c
+@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
+ i = 0;
+ dpi = 9600;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* computes distance and keep mode if it is closer than previous */
+ if (sensor == sensor_master[i].sensor
+@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
+ dpi = 0;
+ dist = 9600;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* exit on perfect match */
+ if (sensor == sensor_master[i].sensor
+@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
+
+ i = 0;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* exit on perfect match */
+ if (sensor == sensor_master[i].sensor
+@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
+
+ i = 0;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ /* exit on perfect match */
+ if (sensor == sensor_master[i].sensor
+@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
+ * sensor mode setting */
+ i = 0;
+ nb = sizeof (sensor_master) / sizeof (Sensor_Master);
+- while (sensor_master[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ if (dev->model->ccd_type == sensor_master[i].sensor
+ && sensor_master[i].dpi == xresolution
+@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
+ * motor mode setting */
+ i = 0;
+ nb = sizeof (motor_master) / sizeof (Motor_Master);
+- while (motor_master[i].motor != -1 && i < nb)
++ while (i < nb)
+ {
+ if (dev->model->motor_type == motor_master[i].motor
+ && motor_master[i].dpi == resolution
+@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
+ /* now we can search for the specific sensor settings */
+ i = 0;
+ nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
+- while (sensor_settings[i].sensor != -1 && i < nb)
++ while (i < nb)
+ {
+ if (sensor->sensor == sensor_settings[i].sensor
+ && sensor->cksel == sensor_settings[i].cksel)
+--
+1.7.2.5
+
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 494ff622e..82f211b7b 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $
+# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
pkgname=sane
pkgver=1.0.23
-pkgrel=6
+pkgrel=7
pkgdesc="Scanner Access Now Easy"
url="http://www.sane-project.org/"
arch=('i686' 'x86_64' 'mips64el')
@@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
'saned.socket'
'saned.service'
'kodakaio.c.patch'
- 'network.patch')
+ 'network.patch'
+ '1.0.23-hp2400c.patch')
options=(!libtool)
prepare() {
cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
+ # fix FS#35549
+ patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
# fix FS#33657
patch -Np0 -i ${srcdir}/kodakaio.c.patch
# fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
@@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573'
'e57e9e15528f47f5f1b3f1411135ed5d'
'3f9fe36b0c4ff0b01b53b1cffa5d9700'
'e65dbefb7c3d69955fb6eb3ace14aa12'
- '44e77692c52db15b0f530a1d9a8e1296')
+ '44e77692c52db15b0f530a1d9a8e1296'
+ '0c8bfabcaa499c4a2583aa2fe53d1686')