Hello community,
here is the log from the commit of package kdegraphics3 for openSUSE:Factory
checked in at 2012-12-14 09:26:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdegraphics3 (Old)
and /work/SRC/openSUSE:Factory/.kdegraphics3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdegraphics3", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdegraphics3/kdegraphics3.changes
2012-07-04 09:08:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdegraphics3.new/kdegraphics3.changes
2012-12-14 09:26:14.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Dec 9 12:51:40 UTC 2012 - meiss...@suse.com
+
+- fixed build with libgphoto2 2.5 fully
+
+-------------------------------------------------------------------
+Wed Oct 10 23:00:46 UTC 2012 - an...@opensuse.org
+
+- fix gpcamera build for opensuse 12.3
+
+-------------------------------------------------------------------
New:
----
gpcamera-fix-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics3.spec ++++++
--- /var/tmp/diff_new_pack.NZZgS7/_old 2012-12-14 09:26:17.000000000 +0100
+++ /var/tmp/diff_new_pack.NZZgS7/_new 2012-12-14 09:26:17.000000000 +0100
@@ -78,6 +78,7 @@
Patch16: kdegraphics-trinity-kpdf-rotate.diff
Patch17: kdegraphics-3.5.13-fix_gcc47_compilation.patch
Patch18: kdegraphics-trinity-temporary.patch
+Patch19: gpcamera-fix-build.patch
Requires: ghostscript-x11
%if 0%{?suse_version} <= 1120
Provides: kdegraphics3-viewer:/opt/kde3/bin/kuickshow
@@ -276,6 +277,9 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%if %{?suse_version} > 1220
+%patch19 -p1
+%endif
# gift is not maintained anymore and broken
rm -rf kmrml
++++++ gpcamera-fix-build.patch ++++++
Index: kdegraphics-3.5.10/kamera/kcontrol/kameradevice.cpp
===================================================================
--- kdegraphics-3.5.10.orig/kamera/kcontrol/kameradevice.cpp
+++ kdegraphics-3.5.10/kamera/kcontrol/kameradevice.cpp
@@ -273,6 +273,7 @@ CameraAbilities KCamera::abilities()
KameraDeviceSelectDialog::KameraDeviceSelectDialog(QWidget *parent, KCamera
*device)
: KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera
Device"), Ok | Cancel, Ok, true)
{
+ char *xpath;
m_device = device;
connect(m_device, SIGNAL(error(const QString &)),
SLOT(slot_error(const QString &)));
@@ -346,8 +347,9 @@ 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));
+ gp_port_info_get_name (info, &xpath);
+ if (strncmp(xpath, "serial:", 7) == 0)
+
m_serialPortCombo->insertItem(QString::fromLatin1(xpath).mid(7));
}
}
gp_port_info_list_free(list);
Index: kdegraphics-3.5.10/kamera/kioslave/kamera.cpp
===================================================================
--- kdegraphics-3.5.10.orig/kamera/kioslave/kamera.cpp
+++ kdegraphics-3.5.10/kamera/kioslave/kamera.cpp
@@ -55,10 +55,10 @@ 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
*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
@@ -857,10 +857,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 +983,21 @@ void frontendProgressUpdate(
}
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;
- 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->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;
- 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;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
