summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/boo/PKGBUILD4
-rw-r--r--extra/libssh/PKGBUILD8
-rw-r--r--extra/most/PKGBUILD4
-rw-r--r--extra/qemu/PKGBUILD13
-rw-r--r--extra/sane/1.0.23-hp2400c.patch81
-rw-r--r--extra/sane/PKGBUILD20
-rw-r--r--extra/sane/kodakaio.c.patch11
7 files changed, 22 insertions, 119 deletions
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index 27ae5ff7e..8243ba40e 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149602 2012-02-08 17:29:14Z stephane $
+# $Id: PKGBUILD 195921 2013-10-05 12:22:09Z bpiotrowski $
# Maintainer: Hugo Doria <hugo@archlinux.org>
# Contributor: tardo <tardo@nagi-fanboi.net>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=boo
pkgver=0.9.4.9
-pkgrel=2
+pkgrel=3
pkgdesc="A wrist friendly language for the CLI"
arch=('i686' 'x86_64')
url="http://boo.codehaus.org/"
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index fa668b5be..16405b14d 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $
+# $Id: PKGBUILD 195938 2013-10-05 20:32:06Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: ice-man <icemanf@gmail.com>
# Contributor: sergeantspoon <sergeantspoon@archlinux.us>
pkgname=libssh
-pkgver=0.5.4
+pkgver=0.5.5
pkgrel=1
pkgdesc="Library for accessing ssh client services through C libraries"
url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ license=('LGPL')
arch=('i686' 'x86_64')
depends=('openssl')
makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz")
+source=("https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz")
build() {
cd "${srcdir}"
@@ -29,4 +29,4 @@ package(){
cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install
}
-md5sums=('b8b4e733c13dfabae33b2688ef82dacc')
+md5sums=('bb308196756c7255c0969583d917136b')
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index 0f11f741e..d716d4234 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176312 2013-01-29 13:46:57Z stephane $
+# $Id: PKGBUILD 195919 2013-10-05 12:05:12Z bpiotrowski $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: juergen <juergen@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=most
pkgver=5.0.0a
-pkgrel=5
+pkgrel=6
pkgdesc="A terminal pager similar to 'more' and 'less'"
arch=('i686' 'x86_64')
depends=('slang')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 458e6c515..b97721f09 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194681 2013-09-21 21:20:52Z tpowa $
+# $Id: PKGBUILD 195926 2013-10-05 14:25:32Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=('qemu' 'libcacard')
-pkgver=1.5.3
-pkgrel=1
+pkgver=1.6.0
+pkgrel=4
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="http://wiki.qemu.org/Index.html"
@@ -20,7 +20,7 @@ build ()
./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
--python=/usr/bin/python2 --smbd=/usr/bin/smbd \
--enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
- --disable-gtk --enable-linux-aio --enable-seccomp
+ --disable-gtk --enable-linux-aio --enable-seccomp --localstatedir=/var
make
}
@@ -33,9 +33,12 @@ package_qemu() {
backup=('etc/qemu/target-x86_64.conf')
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ # provided by seabios package
rm "${pkgdir}/usr/share/qemu/bios.bin"
rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+ # remove conflicting /var/run directory
+ rm -r "${pkgdir}/var"
install -D -m644 "${srcdir}/65-kvm.rules" \
"${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
# bridge_helper needs suid
@@ -66,5 +69,5 @@ package_libcacard() {
cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
}
-md5sums=('7a7ce91bea6a69e55b3c6e20e4999898'
+md5sums=('f3f39308472d629aca57a255a0c91ba9'
'9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
deleted file mode 100644
index 8bfd29b66..000000000
--- a/extra/sane/1.0.23-hp2400c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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 966dccd0c..b2a096bd8 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
+# $Id: PKGBUILD 195929 2013-10-05 19:26:39Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Simo L. <neotuli@yahoo.com>
# Contributor: eric <eric@archlinux.org>
pkgname=sane
-pkgver=1.0.23
-pkgrel=7
+pkgver=1.0.24
+pkgrel=1
pkgdesc="Scanner Access Now Easy"
url="http://www.sane-project.org/"
arch=('i686' 'x86_64')
@@ -18,17 +18,11 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
'sane.xinetd'
'saned.socket'
'saned.service'
- 'kodakaio.c.patch'
- 'network.patch'
- '1.0.23-hp2400c.patch')
+ 'network.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
patch -Np1 -i ${srcdir}/network.patch
}
@@ -71,10 +65,8 @@ package () {
install -D -m644 ${srcdir}/saned.service \
"${pkgdir}/usr/lib/systemd/system/saned@.service"
}
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
+md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
'bc2c8b4f7b3012c8936c7da21f60e2ac'
'e57e9e15528f47f5f1b3f1411135ed5d'
'3f9fe36b0c4ff0b01b53b1cffa5d9700'
- 'e65dbefb7c3d69955fb6eb3ace14aa12'
- '44e77692c52db15b0f530a1d9a8e1296'
- '0c8bfabcaa499c4a2583aa2fe53d1686')
+ '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
deleted file mode 100644
index 95cb1ee9a..000000000
--- a/extra/sane/kodakaio.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100
-+++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100
-@@ -2197,7 +2197,7 @@
-
- reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT,
- "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
-- if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
-+ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
-
- return 0;
- }
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-18 18:04:21 +0000