>Number:         36317
>Category:       pkg
>Synopsis:       upgrade gtkam to latest release
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 13 17:40:00 +0000 2007
>Originator:     simon@bigblue.demon.co.uk
>Release:        NetBSD 4.0_BETA2
>Organization:
>Environment:
System: NetBSD magnet.clubs 4.0_BETA2 NetBSD 4.0_BETA2 (XEN3_DOM0) #0: Sun Dec 10 07:18:41 UTC 2006 builds@pb:/home/builds/ab/netbsd-4/i386/200612080000Z-obj/home/builds/ab/netbsd-4/src/sys/arch/i386/compile/XEN3_DOM0 i386
Architecture: i386
Machine: i386
>Description:
	latest release is 0.1.14
	I attempted to retain the error checking and resource leak prevention
	found in the previous netbsd patches.
>How-To-Repeat:
>Fix:
	patch files:  Makefile, PLIST
	replacement files: distinfo, patch-aa, patch-ab, patch-ac
	remove patch-ad

----------------------------------------------------------
diff -u Makefile.orig Makefile
--- Makefile.orig   2006-04-18 08:07:49.000000000 +0100
+++ Makefile    2007-05-13 17:44:35.000000000 +0100
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.32 2006/04/17 13:46:32 wiz Exp $
 #
 
-DISTNAME=      gtkam-0.1.12
-PKGREVISION=   5
+DISTNAME=      gtkam-0.1.14
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gphoto/}
 
----------------------------------------------------------
diff -u PLIST.orig PLIST
--- PLIST.orig	2007-05-13 15:36:30.000000000 +0100
+++ PLIST	2007-05-13 17:06:24.000000000 +0100
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:21 jlam Exp $
+@comment $NetBSD$
 bin/gtkam
 man/man1/gtkam.1
 share/applications/gtkam.desktop
 share/doc/gtkam/AUTHORS
+share/doc/gtkam/CHANGES
 share/doc/gtkam/COPYING
 share/doc/gtkam/NEWS
 share/doc/gtkam/README
@@ -16,6 +17,15 @@
 share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 share/gnome/help/gtkam/C/gtkam.xml
 share/gnome/help/gtkam/C/legal.xml
+share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
+share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
+share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
+share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
+share/gnome/help/gtkam/ru/figures/gtkam_save.png
+share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
+share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
+share/gnome/help/gtkam/ru/gtkam.xml
+share/gnome/help/gtkam/ru/legal.xml
 share/gtkam/pixmaps/camera.xpm
 share/gtkam/pixmaps/configure.xpm
 share/gtkam/pixmaps/delete_images.xpm
@@ -36,7 +46,8 @@
 share/locale/hu/LC_MESSAGES/gtkam.mo
 share/locale/it/LC_MESSAGES/gtkam.mo
 share/locale/ja/LC_MESSAGES/gtkam.mo
-share/locale/no/LC_MESSAGES/gtkam.mo
+share/locale/nb/LC_MESSAGES/gtkam.mo
+share/locale/pl/LC_MESSAGES/gtkam.mo
 share/locale/pt_BR/LC_MESSAGES/gtkam.mo
 share/locale/pt_PT/LC_MESSAGES/gtkam.mo
 share/locale/ru/LC_MESSAGES/gtkam.mo
@@ -44,15 +55,20 @@
 share/locale/sv/LC_MESSAGES/gtkam.mo
 share/locale/uk/LC_MESSAGES/gtkam.mo
 share/omf/gtkam/gtkam-C.omf
+share/omf/gtkam/gtkam-ru.omf
 share/pixmaps/gtkam.png
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gtkam
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/images/gtkam
 @comment in xdg-dirs: @dirrm share/images
 @dirrm share/gtkam/pixmaps
 @dirrm share/gtkam
+@dirrm share/gnome/help/gtkam/ru/figures
+@dirrm share/gnome/help/gtkam/ru
 @dirrm share/gnome/help/gtkam/C/figures
 @dirrm share/gnome/help/gtkam/C
 @dirrm share/gnome/help/gtkam
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/doc/gtkam
 @comment in xdg-dirs: @dirrm share/applications
----------------------------------------------------------

distinfo
----------------------------------------------------------
SHA1 (gtkam-0.1.14.tar.gz) = 7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba
RMD160 (gtkam-0.1.14.tar.gz) = 7cab97cf3da2a87b23d854e615ac9be9d5d47ae6
Size (gtkam-0.1.14.tar.gz) = 1301806 bytes
SHA1 (patch-aa) = c2011be2a7d7905cee342dc595e5203959b75fb3
SHA1 (patch-ab) = ab522b7d6d577516e84683d0ac5541a2e5a96e10
SHA1 (patch-ac) = 150ec8fb768ccacab1ac452ada1312790c99beff
----------------------------------------------------------

patches/patch-aa                                  
----------------------------------------------------------
--- src/gtkam-chooser.c.orig	2007-05-13 16:49:06.000000000 +0100
+++ src/gtkam-chooser.c	2007-05-13 16:50:55.000000000 +0100
@@ -405,9 +405,12 @@
 	int result;
 	const char *name;
 
+	result = gp_list_new (&list);
+	if (result < GP_OK)
+		return;
+
 	status = gtkam_status_new (_("Detecting cameras..."));
 	gtkam_dialog_add_status (GTKAM_DIALOG (chooser), status);
-	gp_list_new (&list);
 	result = gp_abilities_list_detect (chooser->priv->al,
 		chooser->priv->il, list,
 		GTKAM_STATUS (status)->context->context);
----------------------------------------------------------

patches/patch-ab
----------------------------------------------------------
--- src/gtkam-delete.c.orig	2007-05-13 16:49:06.000000000 +0100
+++ src/gtkam-delete.c	2007-05-13 16:50:55.000000000 +0100
@@ -178,11 +178,13 @@
 	GtkamDeleteAllDeletedData add;
 	GtkamDeleteFileDeletedData fdd;
 
+	result = gp_list_new (&l1);
+	if (result < GP_OK)
+		return FALSE;
 	s = gtkam_status_new (_("Deleting all files in '%s'..."), folder);
 	gtk_widget_show (s);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (delete)->vbox), s,
 			    FALSE, FALSE, 0);
-	gp_list_new (&l1);
 	r1 = gp_camera_folder_list_files (camera->camera, folder, l1, NULL);
 	result = gp_camera_folder_delete_all (camera->camera, folder,
 					GTKAM_STATUS (s)->context->context);
@@ -193,9 +195,11 @@
 		g_signal_emit (G_OBJECT (delete),
 			signals[ALL_DELETED], 0, &add);
 		gtk_object_destroy (GTK_OBJECT (s));
+                gp_list_unref(l1);
 		return (TRUE);
 	case GP_ERROR_CANCEL:
 		gtk_object_destroy (GTK_OBJECT (s));
+                gp_list_unref(l1);
 		return (TRUE);
 	default:
 		d = gtkam_error_new (result, GTKAM_STATUS (s)->context,
@@ -221,10 +225,10 @@
 				}
 			}
 		}
+		gp_list_unref (l1);
 		gp_list_unref (l2);
 		return (FALSE);
 	}
-	gp_list_unref (l1);
 }
 
 static gboolean
----------------------------------------------------------

patches/patch-ac
----------------------------------------------------------
--- src/gtkam-list.c.orig	2007-05-13 16:49:06.000000000 +0100
+++ src/gtkam-list.c	2007-05-13 16:50:55.000000000 +0100
@@ -966,6 +966,10 @@
 
 	g_return_if_fail (GTKAM_IS_LIST (list));
 
+	result = gp_list_new(&flist);
+	if (result < GP_OK)
+		return;
+
 	s = gtkam_status_new (_("Listing files in folder '%s'..."), folder);
 	g_signal_emit (G_OBJECT (list), signals[NEW_STATUS], 0, s);
 	gp_list_new (&flist);
@@ -978,6 +982,7 @@
 		if (camera->multi)
 			gp_camera_exit (camera->camera, NULL);
 		gtk_object_destroy (GTK_OBJECT (s));
+		gp_list_unref(flist);
 		return;
 	default:
 		if (camera->multi)
@@ -987,6 +992,7 @@
 			"'%s'"), folder);
 		gtk_widget_show (dialog);
 		gtk_object_destroy (GTK_OBJECT (s));
+		gp_list_unref(flist);
 		return;
 	}
 	gtk_object_destroy (GTK_OBJECT (s));
----------------------------------------------------------