[packages/gtkam] - updated to 0.2.0 - fixed building with automake 1.13 - fixed format string errors

[baggins]

commit efab2ab67ed0e40dc6adcd022a07220af4068cb8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jun 12 18:49:13 2013 +0200

    - updated to 0.2.0
    - fixed building with automake 1.13
    - fixed format string errors

 am.patch              | 10 +++++++
 format-security.patch | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gtkam.spec            | 11 +++++---
 3 files changed, 94 insertions(+), 4 deletions(-)
---
diff --git a/gtkam.spec b/gtkam.spec
index 53225a7..1851a12 100644
--- a/gtkam.spec
+++ b/gtkam.spec
@@ -7,14 +7,16 @@
 Summary:	GTKam - graphical frontend for gphoto2
 Summary(pl.UTF-8):	GTKam - graficzny interfejs do gphoto2
 Name:		gtkam
-Version:	0.1.18
-Release:	3
+Version:	0.2.0
+Release:	1
 License:	LGPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	ae37003f1f2a8f66e9a03e221d73060c
+# Source0-md5:	a94e8615efb2c975695401af6e13ef63
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-link.patch
+Patch2:		am.patch
+Patch3:		format-security.patch
 URL:		http://www.gphoto.org/proj/gtkam/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -64,6 +66,8 @@ gphoto2.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
@@ -102,7 +106,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gtkam.1*
 %{_desktopdir}/gtkam.desktop
 %{_pixmapsdir}/gtkam*.png
-%{_omf_dest_dir}/%{name}
 
 %if %{with gimp}
 %files -n gimp-plugin-gtkam
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..7f09540
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,10 @@
+--- gtkam-0.1.18/configure.ac~	2013-06-12 18:41:36.041601085 +0200
++++ gtkam-0.1.18/configure.ac	2013-06-12 18:41:57.871823760 +0200
+@@ -32,7 +32,6 @@
+ dnl Some programs we need
+ dnl ---------------------------------------------------------------------------
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..1d2d4f3
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,77 @@
+--- gtkam-0.1.18/src/gtkam-port.c.orig	2008-10-04 16:04:40.000000000 +0200
++++ gtkam-0.1.18/src/gtkam-port.c	2013-06-12 18:44:34.930092331 +0200
+@@ -133,7 +133,6 @@
+ 	GPPortInfoList *list;
+ 	int index;
+ 	const gchar *path;
+-	gchar *msg;
+ 	GtkWidget *d;
+ 
+ 	gp_port_info_list_new (&list);
+@@ -143,10 +142,8 @@
+ 	gp_port_info_list_free (list);
+ 
+ 	if (index < 0) {
+-		msg = g_strdup_printf (_("The port '%s' could not be found. Please make sure "
++		d = gtkam_error_new (index, NULL, GTK_WIDGET (port), _("The port '%s' could not be found. Please make sure "
+ 		        "that the port exists."), path);
+-		d = gtkam_error_new (index, NULL, GTK_WIDGET (port), msg);
+-		g_free (msg);
+ 		gtk_window_set_transient_for (GTK_WINDOW (d),
+ 					      GTK_WINDOW (port));
+ 		gtk_widget_show (d);
+--- gtkam-0.2.0/src/gtkam-save.c~	2010-07-10 11:51:36.000000000 +0200
++++ gtkam-0.2.0/src/gtkam-save.c	2013-06-12 18:46:54.274846517 +0200
+@@ -252,7 +252,7 @@
+ static int
+ save_file (GtkamSave *save, const char *filename, CameraFile *file, CameraFileType type, guint n)
+ {
+-	gchar *full_path, *full_filename, *dirname, *msg, *number_filename;
++	gchar *full_path, *full_filename, *dirname, *number_filename;
+ 	const char *mime_type;
+ 	const gchar *fsel_filename, *fsel_path, *prefix, *suffix;
+ 	GtkWidget *dialog;
+@@ -296,14 +296,12 @@
+ 
+ 	/* FIXME Check which is user, and prompt the user */
+ 	if (!save->priv->quiet && file_exists (full_path)) {
+-		msg = g_strdup_printf (_("The file '%s' already exists."),
+-				       full_path);
+ 		if (!save->priv->err_shown) {
+-			dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save), msg);
++			dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save),
++					_("The file '%s' already exists."), full_path);
+ 			gtk_window_set_transient_for (GTK_WINDOW (dialog),
+ 						      save->priv->main_window);
+ 			gtk_widget_show (dialog);
+-			g_free (msg);
+ 			g_free (full_path);
+ 			save->priv->err_shown = TRUE;
+ 		}
+--- gtkam-0.2.0/src/gtkam-tree.c~	2012-07-10 09:08:30.000000000 +0200
++++ gtkam-0.2.0/src/gtkam-tree.c	2013-06-12 18:47:53.498783732 +0200
+@@ -607,7 +607,7 @@
+ tree_save_file (CameraFile *file, const char *dest_path, const char *name,
+ 		GtkWindow *save)
+ {
+-	gchar *full_path, *msg;
++	gchar *full_path;
+ 	GtkWidget *dialog;
+ 	int result;
+ 
+@@ -616,12 +616,11 @@
+ 
+ 	/* FIXME Check which is user, and prompt the user */
+ 	if (file_exists (full_path)) {
+-		msg = g_strdup_printf (_("The file '%s' already exists."),
+-				       full_path);
+ 		dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL,
+-					  GTK_WIDGET (save), msg);
++					  GTK_WIDGET (save),
++					  _("The file '%s' already exists."),
++					  full_path);
+ 		gtk_widget_show (dialog);
+-		g_free (msg);
+ 		g_free (full_path);
+ 		return -1;
+ 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtkam.git/commitdiff/efab2ab67ed0e40dc6adcd022a07220af4068cb8