Sun Feb 24 00:48:48 PST 2013

2 files changed, 8 insertions, 56 deletions

diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
deleted file mode 100644
index d111214d3..000000000
--- a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix <ted@tedfelix.com>
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().
----
- input_layer.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
---- a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-    evtest.c, acpi_genl, or kacpimon to find new events to add to this
-    table. */
- 
-+/*
-+ * The two numbers (e.g. "00000080 00000000") in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
- 	/*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
- 	{{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"},
- 	{{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"},
- 	{{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"},
- 
- 
- 	/*** VIDEO ***/
--- 
-1.8.1.1
-
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 9f477998c..d31a614a8 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.17
-pkgrel=4
+pkgver=2.0.18
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,22 +15,19 @@ depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"
         'acpid.socket'
         'acpid.service'
         'anything'
-        'handler.sh'
-        '0001-Fix-format-of-video-tabletmode-event-string.patch')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+        'handler.sh')
+md5sums=('7c4ff315ae960c54eea303c71c49f152'
          'ee6cb99e50e580c50331a73045412ae9'
          '10290f69491206cd104654e5b900b661'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '47f44ff5f02685dce8bcdab8568f0c38'
-         'a813e00553104f2129f64cae95a7983f')
+         '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
   ./configure --prefix=/usr
   make
 }