slackware-current/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff

diff -Nur libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c libgphoto2-2.4.11/packaging/generic/print-camera-list.c
--- libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c	2011-04-06 16:42:09.000000000 -0500
+++ libgphoto2-2.4.11/packaging/generic/print-camera-list.c	2011-12-10 20:31:37.621092267 -0600
@@ -409,7 +409,7 @@
 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
 		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"
 		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n"
-		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n"
+		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n"
 		/* ignore mass storage class having devices in mark-up */
 		"ENV{ID_USB_INTERFACES}==\"*:08*:*\", GOTO=\"libgphoto2_usb_end\"\n"
 		/* shortcut the most common camera driver, ptp class, so we avoid parsing 1000
Slackware 14.0 Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-) 2012-09-26 01:10:42 +00:00			`diff -Nur libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c libgphoto2-2.4.11/packaging/generic/print-camera-list.c`
			`--- libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c 2011-04-06 16:42:09.000000000 -0500`
			`+++ libgphoto2-2.4.11/packaging/generic/print-camera-list.c 2011-12-10 20:31:37.621092267 -0600`
			`@@ -409,7 +409,7 @@`
			`"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"`
			`"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"`
			`"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n"`
			`- "ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n"`
			`+ "ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n"`
			`/* ignore mass storage class having devices in mark-up */`
			`"ENV{ID_USB_INTERFACES}==\":08:*\", GOTO=\"libgphoto2_usb_end\"\n"`
			`/* shortcut the most common camera driver, ptp class, so we avoid parsing 1000`