Hello community, here is the log from the commit of package entangle for openSUSE:12.3 checked in at 2013-02-15 18:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/entangle (Old) and /work/SRC/openSUSE:12.3/.entangle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "entangle", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/entangle/entangle.changes 2013-01-31 01:15:40.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.entangle.new/entangle.changes 2013-02-15 18:43:58.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 14 21:05:38 UTC 2013 - meiss...@suse.com + +- entangle-libgphoto25.patch: libgphoto2 2.5 port. + +------------------------------------------------------------------- New: ---- entangle-libgphoto25.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ entangle.spec ++++++ --- /var/tmp/diff_new_pack.GKNmKq/_old 2013-02-15 18:43:59.000000000 +0100 +++ /var/tmp/diff_new_pack.GKNmKq/_new 2013-02-15 18:43:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package entangle # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,7 @@ Url: http://entangle-photo.org/ Source0: http://entangle-photo.org/download/sources/%name-%version.tar.gz Patch0: entangle-desktop.patch +Patch1: entangle-libgphoto25.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +63,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --disable-static @@ -127,7 +129,6 @@ %dir %{_libdir}/%{name}/plugins %dir %{_datadir}/%{name}/plugins - %files doc %doc README AUTHORS NEWS %defattr(-, root, root) ++++++ entangle-libgphoto25.patch ++++++ Index: entangle-0.4.1/src/backend/entangle-camera-list.c =================================================================== --- entangle-0.4.1.orig/src/backend/entangle-camera-list.c +++ entangle-0.4.1/src/backend/entangle-camera-list.c @@ -131,11 +131,9 @@ static void entangle_camera_list_udev_ev static void entangle_camera_list_gphoto_log(GPLogLevel level G_GNUC_UNUSED, const char *domain, - const char *format, - va_list args, + const char *msg, void *data G_GNUC_UNUSED) { - char *msg = g_strdup_vprintf(format, args); g_debug("%s: %s", domain, msg); } Index: entangle-0.4.1/src/backend/entangle-camera.c =================================================================== --- entangle-0.4.1.orig/src/backend/entangle-camera.c +++ entangle-0.4.1/src/backend/entangle-camera.c @@ -543,15 +543,14 @@ const char *entangle_camera_get_port(Ent static unsigned int do_entangle_camera_progress_start(GPContext *ctx G_GNUC_UNUSED, float target, - const char *format, - va_list args, + const char *msg, void *data) { EntangleCamera *cam = data; EntangleCameraPrivate *priv = cam->priv; if (priv->progress) - entangle_progress_start(priv->progress, target, format, args); + entangle_progress_start(priv->progress, target, msg); return 0; /* XXX what is this actually useful for ? */ } @@ -588,15 +587,14 @@ static void entangle_camera_reset_last_e } static void do_entangle_camera_error(GPContext *ctx G_GNUC_UNUSED, - const char *fmt, - va_list args, + const char *msg, void *data) { EntangleCamera *cam = data; EntangleCameraPrivate *priv = cam->priv; entangle_camera_reset_last_error(cam); - priv->lastError = g_strdup_vprintf(fmt, args); + priv->lastError = g_strdup(msg); ENTANGLE_DEBUG("Got error %s", priv->lastError); } Index: entangle-0.4.1/src/backend/entangle-progress.h =================================================================== --- entangle-0.4.1.orig/src/backend/entangle-progress.h +++ entangle-0.4.1/src/backend/entangle-progress.h @@ -38,14 +38,14 @@ typedef struct _EntangleProgressInterfac struct _EntangleProgressInterface { GTypeInterface parent; - void (*start) (EntangleProgress *prog, float target, const char *format, va_list args); + void (*start) (EntangleProgress *prog, float target, const char *msg); void (*update) (EntangleProgress *prog, float current); void (*stop) (EntangleProgress *prog); }; GType entangle_progress_get_type(void); -void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args); +void entangle_progress_start(EntangleProgress *prog, float target, const char *txt); void entangle_progress_update(EntangleProgress *prog, float current); void entangle_progress_stop(EntangleProgress *prog); Index: entangle-0.4.1/src/backend/entangle-progress.c =================================================================== --- entangle-0.4.1.orig/src/backend/entangle-progress.c +++ entangle-0.4.1/src/backend/entangle-progress.c @@ -23,11 +23,11 @@ #include "entangle-debug.h" #include "entangle-progress.h" -void entangle_progress_start(EntangleProgress *prog, float target, const char *format, va_list args) +void entangle_progress_start(EntangleProgress *prog, float target, const char *msg) { g_return_if_fail(ENTANGLE_IS_PROGRESS(prog)); - ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, format, args); + ENTANGLE_PROGRESS_GET_INTERFACE(prog)->start(prog, target, msg); } void entangle_progress_update(EntangleProgress *prog, float current) Index: entangle-0.4.1/src/frontend/entangle-camera-manager.c =================================================================== --- entangle-0.4.1.orig/src/frontend/entangle-camera-manager.c +++ entangle-0.4.1/src/frontend/entangle-camera-manager.c @@ -1000,7 +1000,7 @@ static void do_camera_file_preview(Entan } -static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *format, va_list args) +static void do_entangle_camera_progress_start(EntangleProgress *iface, float target, const char *msg) { g_return_if_fail(ENTANGLE_IS_CAMERA_MANAGER(iface)); @@ -1016,7 +1016,7 @@ static void do_entangle_camera_progress_ mtr = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-progress")); operation = GTK_WIDGET(gtk_builder_get_object(priv->builder, "toolbar-operation")); - txt = g_strdup_vprintf(format, args); + txt = g_strdup(msg); gtk_widget_set_tooltip_text(mtr, txt); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mtr), txt); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
