2 files changed, 0 insertions, 39 deletions

diff --git a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c
deleted file mode 100644
index 6a74220cfb88..000000000000
--- a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- camlibs/canon/usb.c.orig	Sat Nov 25 15:47:24 2006
-+++ camlibs/canon/usb.c	Wed Dec 13 09:28:25 2006
-@@ -1308,6 +1308,7 @@
-         int j, canon_subfunc = 0;
-         char subcmd = 0, *subfunct_descr = "";
-         int additional_read_bytes = 0;
-+        char *msg;
- 
-         /* clear this to indicate that no data is there if we abort */
-         if (return_length)
-@@ -1546,7 +1547,7 @@
-                 }
-         }
- 
--                char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
-+                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
index 8b68428b415e..d9636d61fd6a 100644
--- a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
+++ b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
@@ -9,23 +9,3 @@
  #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);