From 010926ba5e18b8d82fa3dbe17d00fad63d5a6419 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 23 Sep 2015 11:53:00 +0000
Subject: Fix gphoto update fallout.

---
 graphics/digikam-kde3/distinfo                     |  3 ++-
 .../patch-digikam_utilities_cameragui_gpcamera.cpp | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp

(limited to 'graphics/digikam-kde3')

diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo
index 338e0624ce7..a41de32f950 100644
--- a/graphics/digikam-kde3/distinfo
+++ b/graphics/digikam-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/04/30 22:21:41 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/09/23 11:53:00 joerg Exp $
 
 SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 3dc532aa36451f7df8d10aa35149db767b295d8c
 SHA1 (patch-digikam_digikam_albummanager.cpp) = 49df2695fd8aae3b13257efaf07af96adac6a638
 SHA1 (patch-digikam_digikam_albumwidgetstack.h) = ee709372079cedbe0cb020caaf8aa1631376ec9d
 SHA1 (patch-digikam_imageplugins_coreplugin_sharpnesseditor_clapack_f2c.h) = 238d27ec419b87482fdaed1291b756ccab383f9a
+SHA1 (patch-digikam_utilities_cameragui_gpcamera.cpp) = 6cabcccac13abdf8029bc5a9c921c939f19f4695
diff --git a/graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp b/graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp
new file mode 100644
index 00000000000..737577243e4
--- /dev/null
+++ b/graphics/digikam-kde3/patches/patch-digikam_utilities_cameragui_gpcamera.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-digikam_utilities_cameragui_gpcamera.cpp,v 1.1 2015/09/23 11:53:00 joerg Exp $
+
+--- digikam/utilities/cameragui/gpcamera.cpp.orig	2015-09-20 17:16:43.000000000 +0000
++++ digikam/utilities/cameragui/gpcamera.cpp
+@@ -847,6 +847,8 @@ bool GPCamera::uploadItem(const QString&
+ 
+     errorCode = gp_camera_folder_put_file(d->camera,
+                                           QFile::encodeName(folder),
++                                          QFile::encodeName(itemName),
++                                          GP_FILE_TYPE_NORMAL,
+                                           cfile,
+                                           m_status->context);
+     if (errorCode != GP_OK) 
+@@ -1108,7 +1110,9 @@ void GPCamera::getSupportedPorts(QString
+         for (int i = 0 ; i < numPorts ; i++) 
+         {
+             gp_port_info_list_get_info( list, i, &info );
+-            plist.append( info.path );
++            char *path;
++            gp_port_info_get_path(info, &path);
++            plist.append(path);
+         }
+     }
+ 
-- 
cgit v1.2.3