gperf 3.1 patch

some name substitution in rules

3 files changed, 70 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a13f7bcc355..5a1f8bfa76f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -44,3 +44,51 @@ pkgname = libeudev
 	provides = libudev.so
 	conflicts = libudev.so
 
+pkgbase = eudev
+	pkgver = 3.2.1
+	pkgrel = 3
+	url = http://www.gentoo.org/proj/en/eudev/
+	arch = i686
+	arch = x86_64
+	groups = base
+	groups = base-openrc
+	license = GPL
+	makedepends = gobject-introspection
+	makedepends = gperf
+	makedepends = gtk-doc
+	makedepends = intltool
+	makedepends = kmod
+	options = !libtool
+	options = !staticlibs
+	source = eudev-3.2.1.tar.gz::https://github.com/gentoo/eudev/archive/v3.2.1.tar.gz
+	source = initcpio_hooks
+	source = initcpio_install
+	source = udev-hwdb.hook
+	source = gperf-3.1.patch
+	sha256sums = 88f530c1540750e6daa91b5eaeebf88e761e6f0c86515c1c28eedfd871f027c6
+	sha256sums = 892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13
+	sha256sums = 77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875
+	sha256sums = 846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151
+	sha256sums = c45ceb0fdd65d8379ebfe574da0f8783d139f207d6e6a7f3a451fbe4a86a462e
+
+pkgname = eudev
+	pkgdesc = The userspace dev tools (udev) forked by Gentoo
+	depends = libeudev
+	depends = kbd
+	depends = kmod
+	depends = hwids
+	depends = util-linux
+	optdepends = eudev-systemd: makes packages compiled with systemd features run
+	optdepends = udev-openrc: udev starup scripts for openrc
+	provides = udev=232
+	backup = etc/udev/udev.conf
+
+pkgname = libeudev
+	pkgdesc = eudev client libraries
+	depends = glib2
+	depends = glibc
+	optdepends = libeudev-systemd: systemd client libraries
+	provides = libudev=232
+	provides = libudev.so
+	conflicts = libudev.so
+
diff --git a/PKGBUILD b/PKGBUILD
index 61109de76438..249b38e69ee9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _udev_ver=232
 pkgbase=eudev
 pkgname=( 'eudev' 'libeudev')
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.gentoo.org/proj/en/eudev/"
 license=('GPL')
@@ -17,15 +17,21 @@ options=('!libtool' '!staticlibs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/eudev/archive/v${pkgver}.tar.gz"
 	'initcpio_hooks'
 	'initcpio_install'
-	'udev-hwdb.hook')
+	'udev-hwdb.hook'
+	'gperf-3.1.patch')
 sha256sums=('88f530c1540750e6daa91b5eaeebf88e761e6f0c86515c1c28eedfd871f027c6'
             '892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13'
             '77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875'
-            '846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151')
+            '846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151'
+            'c45ceb0fdd65d8379ebfe574da0f8783d139f207d6e6a7f3a451fbe4a86a462e')
 
 prepare(){
 	cd "${srcdir}/${pkgbase}-${pkgver}"
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules
+	patch -Np1 -i ${srcdir}/gperf-3.1.patch
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-e 's/GROUP="tape"/GROUP="storage"/' \
+		-e 's/GROUP="cdrom"/GROUP="optical"/' \
+		-i rules/*.rules
 }
 
 groups=('base' 'base-openrc')
diff --git a/gperf-3.1.patch b/gperf-3.1.patch
new file mode 100644
index 000000000000..68233b266946
--- /dev/null
+++ b/gperf-3.1.patch
@@ -0,0 +1,12 @@
+diff -Naur eudev-3.2.1-orig/src/udev/udev-builtin-keyboard.c eudev-3.2.1/src/udev/udev-builtin-keyboard.c
+--- eudev-3.2.1-orig/src/udev/udev-builtin-keyboard.c	2016-11-17 18:14:19.000000000 -0300
++++ eudev-3.2.1/src/udev/udev-builtin-keyboard.c	2017-02-18 20:39:09.960018936 -0300
+@@ -28,7 +28,7 @@
+ 
+ #include "udev.h"
+ 
+-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
++static const struct key *keyboard_lookup_key(const char *str, size_t len);
+ #include "keyboard-keys-from-name.h"
+ #include "keyboard-keys-to-name.h"
+