[mbm-gpsd-pl4nkton] Fix incorrect syntax in udev

Signed-off-by: Olivier Mehani <shtrom@ssji.net>

4 files changed, 36 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 043110853666..cca83e8c10be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,8 +16,10 @@ pkgbase = mbm-gpsd-pl4nkton-git
 	conflicts = mbm-gpsd
 	source = git+https://github.com/pl4nkton/mbm-gpsd.git/
 	source = mbm-gpsd.service
+	source = 0001-Fix-incorrect-syntax-in-udev.patch
 	md5sums = SKIP
 	md5sums = c436e8bcf6b459f8f939e434aed0b9d4
+	md5sums = 32275446e564eccb76ea907a63a610fa
 
 pkgname = mbm-gpsd-pl4nkton-git
 
diff --git a/0001-Fix-incorrect-syntax-in-udev.patch b/0001-Fix-incorrect-syntax-in-udev.patch
new file mode 100644
index 000000000000..cefac7a073b0
--- /dev/null
+++ b/0001-Fix-incorrect-syntax-in-udev.patch
@@ -0,0 +1,26 @@
+From 621280dd51ab844cf01c2d19e010aa360bea90cc Mon Sep 17 00:00:00 2001
+From: Olivier Mehani <shtrom@ssji.net>
+Date: Sun, 31 May 2015 12:54:54 +1000
+Subject: [PATCH] Fix incorrect syntax in udev
+
+Signed-off-by: Olivier Mehani <shtrom@ssji.net>
+---
+ utils/99-mbm.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/99-mbm.rules b/utils/99-mbm.rules
+index a445d47..2fd8ba5 100644
+--- a/utils/99-mbm.rules
++++ b/utils/99-mbm.rules
+@@ -9,7 +9,7 @@ SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MBM_USBIFNUM}="$attr{bInt
+ 
+ ATTRS{idVendor}=="413c", ATTRS{idProduct}=="8147|8183|8184|818d", ENV{.MBM_USBIFNUM}=="09", ENV{MBM_CAPABILITY}="gps_nmea"
+ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130b|130c|1311", ENV{.MBM_USBIFNUM}=="09", ENV{MBM_CAPABILITY}="gps_nmea"
+-ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900|1902|1904|1905|1906|1907|1911|190d", ENV{.MBM_USBIFNUM}=="09", ENV{MBM_CAPABILITY}="gps_nmea", {ID_MM_DEVICE_IGNORE}="1"
++ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1900|1902|1904|1905|1906|1907|1911|190d", ENV{.MBM_USBIFNUM}=="09", ENV{MBM_CAPABILITY}="gps_nmea", ENV{ID_MM_DEVICE_IGNORE}="1"
+ 
+ ATTRS{idVendor}=="413c", ATTRS{idProduct}=="8147|8183|8184|818d", ENV{.MBM_USBIFNUM}=="03", ENV{MBM_CAPABILITY}="gps_ctrl"
+ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130b|130c|1311", ENV{.MBM_USBIFNUM}=="03", ENV{MBM_CAPABILITY}="gps_ctrl"
+-- 
+2.4.2
+
diff --git a/0001-Remove-call-to-g_type_init.patch b/0001-Remove-call-to-g_type_init.patch
deleted file mode 100644
index 7c6e560770a8..000000000000
--- a/0001-Remove-call-to-g_type_init.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 318fc17e6466d044bc8121d495f9db71f007d3c4 Mon Sep 17 00:00:00 2001
-From: Olivier Mehani <olivier.mehani@nicta.com.au>
-Date: Tue, 11 Jun 2013 12:25:06 +1000
-Subject: [PATCH] Remove call to g_type_init
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From [0]:
-
-“g_type_init has been deprecated since version 2.36 and should not be
-used in newly-written code. the type system is now initialised
-automatically”
-
-[0] https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
-
-Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
----
- src/mbm_gpsd.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mbm_gpsd.c b/src/mbm_gpsd.c
-index 924d6df..64faddb 100644
---- a/src/mbm_gpsd.c
-+++ b/src/mbm_gpsd.c
-@@ -155,7 +155,6 @@ int main (int argc, char *argv[])
-     sigaction (SIGHUP, &sig_action, NULL);
- 
- 	mbm_options_parse (argc, argv);
--	g_type_init ();
- 
- 	if (!mbm_foreground()) {
- 		pid_t pid, sid;
--- 
-1.8.3
-
diff --git a/PKGBUILD b/PKGBUILD
index 46b096e686e2..025c012b4405 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,6 +17,7 @@ provides=("${_gitname}")
 conflicts=("${_gitname}")
 source=("git+https://github.com/${_ghuser}/${_gitname}.git/"
 mbm-gpsd.service
+0001-Fix-incorrect-syntax-in-udev.patch
 )
 
 pkgver() {
@@ -24,6 +25,11 @@ pkgver() {
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+	cd "${srcdir}/${_gitname}"
+	patch -p1 < 0001-Fix-incorrect-syntax-in-udev.patch
+}
+
 build() {
 	cd "${srcdir}/${_gitname}"
 	unset CFLAGS
@@ -42,6 +48,5 @@ package() {
 	rmdir "${pkgdir}/var" "${pkgdir}/usr/sbin/"
 }
 md5sums=('SKIP'
-'1c4fd254cd00834f644ab614a76f5c96')
-md5sums=('SKIP'
-         'c436e8bcf6b459f8f939e434aed0b9d4')
+         'c436e8bcf6b459f8f939e434aed0b9d4'
+         '32275446e564eccb76ea907a63a610fa')