Fix build on 4.x

2 files changed, 49 insertions, 0 deletions

diff --git a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c
new file mode 100644
index 000000000000..cccc8bc6f2ec
--- /dev/null
+++ b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c
@@ -0,0 +1,18 @@
+--- camlibs/canon/usb.c.orig	Tue Dec 12 19:09:39 2006
++++ camlibs/canon/usb.c	Tue Dec 12 19:10:26 2006
+@@ -1308,6 +1308,7 @@
+         int j, canon_subfunc = 0;
+         char subcmd = 0, *subfunct_descr = "";
+         int additional_read_bytes = 0;
++	char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
+ 
+         /* clear this to indicate that no data is there if we abort */
+         if (return_length)
+@@ -1546,7 +1547,6 @@
+                 }
+         }
+ 
+-                char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
+                 if ( msg != NULL ) {
+                         GP_DEBUG ( "canon_usb_dialogue_full: camera status \"%s\""
+ 				   " in response to command 0x%x 0x%x 0x%x (%s)",
diff --git a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
new file mode 100644
index 000000000000..8b68428b415e
--- /dev/null
+++ b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
@@ -0,0 +1,31 @@
+--- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
++++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
+@@ -19,6 +19,8 @@
+  */
+ #include "config.h"
+ 
++#include <sys/types.h>
++#include <netinet/in.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+@@ -1739,15 +1741,14 @@
+ static int
+ _get_nikon_list_wifi_profiles (CONFIG_GET_ARGS)
+ {
+-	gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget);
+-	gp_widget_set_name (*widget, menu->name);
+-
+-	CameraWidget *child;
+-
+ 	int ret;
+ 	char buffer[4096];
+ 	int i;
++	CameraWidget *child;
+ 	PTPParams *params = &(camera->pl->params);
++
++        gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget);
++        gp_widget_set_name (*widget, menu->name);
+ 
+ 	if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_NIKON)
+ 		return (GP_ERROR_NOT_SUPPORTED);