Allow building kdegraphics3 and kipi-plugins-kde3 against newer
libgphoto2.


(joerg)

$NetBSD: patch-kamera_kcontrol_kameradevice.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kamera/kcontrol/kameradevice.cpp.orig	2015-09-13 16:48:14.000000000 +0000
+++ kamera/kcontrol/kameradevice.cpp
@@ -346,8 +346,10 @@ KameraDeviceSelectDialog::KameraDeviceSe
 	}
 	for (int i = 0; i < gphoto_ports; i++) {
 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
-			if (strncmp(info.path, "serial:", 7) == 0)
-				m_serialPortCombo->insertItem(QString::fromLatin1(info.path).mid(7));
+			char *path;
+			gp_port_info_get_path(info, &path);
+			if (strncmp(path, "serial:", 7) == 0)
+				m_serialPortCombo->insertItem(QString::fromLatin1(path).mid(7));
 		}
 	}
 	gp_port_info_list_free(list);

$NetBSD: patch-kamera_kioslave_kamera.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kamera/kioslave/kamera.cpp.orig	2015-09-13 16:49:10.000000000 +0000
+++ kamera/kioslave/kamera.cpp
@@ -55,10 +55,9 @@ extern "C"
 {
 	KDE_EXPORT int kdemain(int argc, char **argv);
 
-	static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
+	static void frontendCameraStatus(GPContext *context, const char *text, void *data);
 	static unsigned int frontendProgressStart(
-		GPContext *context, float totalsize, const char *format,
-		va_list args, void *data
+		GPContext *context, float totalsize, const char *text, void *data
 	);
 	static void frontendProgressUpdate(
 		GPContext *context, unsigned int id, float current, void *data
@@ -857,10 +856,7 @@ void KameraProtocol::translateFileToUDS(
 	udsEntry.append(atom);
 
 	atom.m_uds = UDS_NAME;
-	if (info.file.fields & GP_FILE_INFO_NAME)
-		atom.m_str = QString::fromLocal8Bit(info.file.name);
-	else
-		atom.m_str = name;
+	atom.m_str = name;
 	udsEntry.append(atom);
 
 	if (info.file.fields & GP_FILE_INFO_SIZE) {
@@ -986,81 +982,25 @@ void frontendProgressUpdate(
 }
 
 unsigned int frontendProgressStart(
-	GPContext * /*context*/, float totalsize, const char *format, va_list args,
-	void *data
+	GPContext * /*context*/, float totalsize, const char *text, void *data
 ) {
 	KameraProtocol *object = (KameraProtocol*)data;
-	char *status;
-
-	/* We must copy the va_list to walk it twice, or all hell 
-	 * breaks loose on non-i386 platforms.
-	 */
-#if defined(HAVE_VA_COPY) || defined(HAVE___VA_COPY)
-	va_list xvalist;
-# ifdef HAVE_VA_COPY
-	va_copy(xvalist, args);
-# elif HAVE___VA_COPY
-	__va_copy(xvalist, args);
-# endif
-	int size=vsnprintf(NULL, 0, format, xvalist);
-	if(size<=0)
-		return GP_OK; // vsnprintf is broken, better don't do anything.
-
-	status=new char[size+1];
-# ifdef HAVE_VA_COPY
-	va_copy(xvalist, args);
-# elif HAVE___VA_COPY
-	__va_copy(xvalist, args);
-# endif
-	vsnprintf(status, size+1, format, xvalist);
-#else
-	/* We cannot copy the va_list, so make sure we 
-	 * walk it just _once_.
-	 */
-	status=new char[300];
-	vsnprintf(status, 300, format, args);
-#endif
 
-	object->infoMessage(QString::fromLocal8Bit(status));
-	delete [] status;
+	object->infoMessage(QString::fromLocal8Bit(text));
 	object->totalSize((int)totalsize); // hack: call slot directly
 	return GP_OK;
 }
 
 // this callback function is activated on every status message from gphoto2
-static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
+static void frontendCameraStatus(GPContext * /*context*/, const char *text, void *data)
 {
 	KameraProtocol *object = (KameraProtocol*)data;
-	char *status;
 
 	/* We must copy the va_list to walk it twice, or all hell 
 	 * breaks loose on non-i386 platforms.
 	 */
-#if defined(HAVE_VA_COPY) || defined(HAVE___VA_COPY)
-	va_list xvalist;
-# ifdef HAVE_VA_COPY
-	va_copy(xvalist, args);
-# elif HAVE___VA_COPY
-	__va_copy(xvalist, args);
-# endif
-	int size=vsnprintf(NULL, 0, format, xvalist);
-	if(size<=0)
-		return; // vsnprintf is broken, better don't do anything.
-
-	status=new char[size+1];
-# ifdef HAVE_VA_COPY
-	va_copy(xvalist, args);
-# elif HAVE___VA_COPY
-	__va_copy(xvalist, args);
-# endif
-	vsnprintf(status, size+1, format, xvalist);
-#else
 	/* We cannot copy the va_list, so make sure we 
 	 * walk it just _once_.
 	 */
-	status=new char[300];
-	vsnprintf(status, 300, format, args);
-#endif
-	object->infoMessage(QString::fromLocal8Bit(status));
-	delete [] status;
+	object->infoMessage(QString::fromLocal8Bit(text));
 }

$NetBSD: patch-kipi-plugins_kameraklient_gpcamera.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kipi-plugins/kameraklient/gpcamera.cpp.orig	2015-09-13 15:58:37.000000000 +0000
+++ kipi-plugins/kameraklient/gpcamera.cpp
@@ -436,7 +436,12 @@ int GPCamera::uploadItem(const QString& 
         status = 0;
     }
     status = new GPStatus;
-    if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) {
+    if (gp_camera_folder_put_file(d->camera,
+                                  QFile::encodeName(folder),
+                                  QFile::encodeName(itemName),
+                                  GP_FILE_TYPE_NORMAL,
+                                  cfile,
+                                  status->context) != GP_OK) {
         gp_file_unref(cfile);
         delete status;
         status = 0;
@@ -530,7 +535,9 @@ void GPCamera::getSupportedPorts(QString
     int numPorts = gp_port_info_list_count( list );
     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);
     }
     gp_port_info_list_free( list );
 }

$NetBSD: patch-kipi-plugins_kameraklient_gpiface.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kipi-plugins/kameraklient/gpiface.cpp.orig	2015-09-13 16:08:06.000000000 +0000
+++ kipi-plugins/kameraklient/gpiface.cpp
@@ -114,7 +114,9 @@ void GPIface::getSupportedPorts(QStringL
     int numPorts = gp_port_info_list_count( list );
     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 );
     }
     gp_port_info_list_free( list );
 }

$NetBSD: patch-kipi-plugins_kameraklient_gpstatus.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kipi-plugins/kameraklient/gpstatus.cpp.orig	2015-09-13 16:09:58.000000000 +0000
+++ kipi-plugins/kameraklient/gpstatus.cpp
@@ -52,39 +52,21 @@ GPContextFeedback GPStatus::cancel_func(
     return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK);
 }
 
-void GPStatus::error_func(GPContext *, const char *format, va_list args, void *) {
-    char buf[4096] = "";
-    int nSize = vsnprintf( buf, 4096, format, args );
-    if(nSize > 4094) {
-	nSize = 4094;
-    }
-    buf[nSize] = '\0';
+void GPStatus::error_func(GPContext *, const char *text, void *) {
     QString error;
-    error = error.fromLocal8Bit(buf);
+    error = error.fromLocal8Bit(text);
     GPMessages::gpMessagesWrapper()->emit errorMessage(error);
 }
 
-void GPStatus::status_func (GPContext *, const char *format, va_list args, void *) {
-    char buf[4096] = "";
-    int nSize = vsnprintf( buf, 4096, format, args );
-    if(nSize > 4094) {
-	nSize = 4094;
-    }
-    buf[nSize] = '\0';
+void GPStatus::status_func (GPContext *, const char *text, void *) {
     QString status;
-    status = status.fromLocal8Bit(buf);
+    status = status.fromLocal8Bit(text);
     GPMessages::gpMessagesWrapper()->emit statusChanged(status);
 }
 
-unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) {
-    char buf[4096] = "";
-    int nSize = vsnprintf( buf, 4096, format, args );
-    if(nSize > 4094) {
-	nSize = 4094;
-    }
-    buf[nSize] = '\0';
+unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *text, void *) {
     QString prog;
-    prog = prog.fromLocal8Bit(buf);
+    prog = prog.fromLocal8Bit(text);
     target = _target;
     return GP_OK;
 }

$NetBSD: patch-kipi-plugins_kameraklient_gpstatus.h,v 1.1 2015/09/14 13:31:54 joerg Exp $

--- kipi-plugins/kameraklient/gpstatus.h.orig	2015-09-13 16:11:11.000000000 +0000
+++ kipi-plugins/kameraklient/gpstatus.h
@@ -48,9 +48,9 @@ class GPStatus : public QObject {
 
     private:
 	static GPContextFeedback cancel_func(GPContext *context, void *data);
-	static void error_func(GPContext *context, const char *format,  va_list args, void *data);
-	static void status_func(GPContext *context, const char *format, va_list args, void *data);
-	static unsigned int progress_start_func (GPContext *context, float target, const char *format, va_list args, void *data);
+	static void error_func(GPContext *context, const char *text, void *data);
+	static void status_func(GPContext *context, const char *text, void *data);
+	static unsigned int progress_start_func (GPContext *context, float target, const char *text, void *data);
 	static void progress_update_func (GPContext *context, unsigned int id, float current, void *data);
 	static void progress_stop_func(GPContext *context, unsigned int id, void *data);
 	static float target;