--- kdegraphics-3.5.10/kamera/kcontrol/kameradevice.cpp.orig    2006-07-22 08:10:31.000000000 +0000
+++ kdegraphics-3.5.10/kamera/kcontrol/kameradevice.cpp 2015-09-11 20:08:11.000000000 +0000
@@ -118,9 +118,9 @@
                gp_port_info_list_new(&il);
                gp_port_info_list_load(il);
                gp_port_info_list_get_info(il, gp_port_info_list_lookup_path(il, m_path.local8Bit().data()), &info);
-               gp_port_info_list_free(il);
                gp_camera_set_abilities(m_camera, m_abilities);
                gp_camera_set_port_info(m_camera, info);
+               gp_port_info_list_free(il);

                // this might take some time (esp. for non-existant camera) - better be done asynchronously
                result = gp_camera_init(m_camera, glob_context);
@@ -346,7 +346,9 @@
        }
        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 *xpath;
+                       gp_port_info_get_path (info, &xpath);
+                       if (strncmp(xpath, "serial:", 7) == 0)
+                               m_serialPortCombo->insertItem(QString::fromLatin1(xpath).mid(7));
                }
        }
--- kdegraphics-3.5.10/kamera/kioslave/kamera.cpp.orig  2007-10-08 09:48:41.000000000 +0000
+++ kdegraphics-3.5.10/kamera/kioslave/kamera.cpp       2015-09-11 20:20:04.000000000 +0000
@@ -55,10 +55,10 @@
 {
        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 *status, void *data);
        static unsigned int frontendProgressStart(
-               GPContext *context, float totalsize, const char *format,
-               va_list args, void *data
+               GPContext *context, float totalsize, const char *status,
+               void *data
        );
        static void frontendProgressUpdate(
                GPContext *context, unsigned int id, float current, void *data
@@ -785,11 +785,12 @@
                        return;
                }
                gp_port_info_list_get_info(port_info_list, idx, &port_info);
-               gp_port_info_list_free(port_info_list);
+

                // create a new camera object
                gpr = gp_camera_new(&m_camera);
                if(gpr != GP_OK) {
+                       gp_port_info_list_free(port_info_list);
                        error(KIO::ERR_UNKNOWN, gp_result_as_string(gpr));
                        return;
                }
@@ -805,6 +806,8 @@
                gp_camera_set_port_speed(m_camera, 0); // TODO: the value needs to be configurable
                kdDebug(7123) << "Opening camera model " << user << " at " << host << endl;

+               gp_port_info_list_free(port_info_list);
+
                QString errstr;
                if (!openCamera(errstr)) {
                        kdDebug(7123) << "Unable to init camera: " << gp_result_as_string(gpr) << endl;
@@ -857,10 +860,7 @@
        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,10 +986,12 @@
 }

 unsigned int frontendProgressStart(
-       GPContext * /*context*/, float totalsize, const char *format, va_list args,
+       GPContext * /*context*/, float totalsize, const char *status,
        void *data
 ) {
        KameraProtocol *object = (KameraProtocol*)data;
+
+#if 0
        char *status;

        /* We must copy the va_list to walk it twice, or all hell
@@ -1023,14 +1025,23 @@

        object->infoMessage(QString::fromLocal8Bit(status));
        delete [] status;
+
+#endif
+       /* libgphoto2 2.5 has resolved this already, no need for print */
+       object->infoMessage(QString::fromLocal8Bit(status));
+
        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 *status,
+       void *data
+) {
        KameraProtocol *object = (KameraProtocol*)data;
+#if 0
        char *status;

        /* We must copy the va_list to walk it twice, or all hell
@@ -1063,4 +1074,8 @@
 #endif
        object->infoMessage(QString::fromLocal8Bit(status));
        delete [] status;
+#endif
+       object->infoMessage(QString::fromLocal8Bit(status));
 }
+
+

1
11
12
13
2
21
22
23
3
и т.д.

@@ -130,6 +130,9 @@
 pushd klaptopdaemon/linux
 %patch16
 popd
+sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/snmp.cpp
+sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/value.cpp
+sed -i 1i\ '#define HAVE_STRLCAT' ksim/monitors/snmp/session.cpp
 
 %ifarch s390 s390x
 rm -rf kfloppy doc/kfloppy