Fix build with new libgphoto2. Compile-tested only.

5 files changed, 197 insertions, 1 deletions

diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo
index 4e95b9194e7..510f4e27687 100644
--- a/graphics/gtkam/distinfo
+++ b/graphics/gtkam/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 08:45:07 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/01/30 16:33:59 joerg Exp $
 
 SHA1 (gtkam-0.1.12.tar.gz) = d8ca0755d9dec48338fcfb0c7e97c90962b6d627
 RMD160 (gtkam-0.1.12.tar.gz) = 5de91892970ec54d334ef3ac574c025e1bbd4f92
 Size (gtkam-0.1.12.tar.gz) = 611323 bytes
+SHA1 (patch-aa) = 5ffcd4045c752f78d1c4f446458bf7bd74d3db2d
+SHA1 (patch-ab) = 8f50b9d65a80e0cd1b178a90d20825e4412f752a
+SHA1 (patch-ac) = c30e214c26ad8545be466eb7699a21ec85bbd2b2
+SHA1 (patch-ad) = 4dbb0d6ac3e647d8fcae78a6e4f3056787e5e008
diff --git a/graphics/gtkam/patches/patch-aa b/graphics/gtkam/patches/patch-aa
new file mode 100644
index 00000000000..2261aec0f1c
--- /dev/null
+++ b/graphics/gtkam/patches/patch-aa
@@ -0,0 +1,37 @@
+$NetBSD: patch-aa,v 1.6 2007/01/30 16:33:59 joerg Exp $
+
+--- src/gtkam-chooser.c.orig	2007-01-30 14:45:30.000000000 +0000
++++ src/gtkam-chooser.c
+@@ -428,18 +428,21 @@ static void
+ on_detect_clicked (GtkButton *button, GtkamChooser *chooser)
+ {
+ 	GtkWidget *d, *status;
+-	CameraList list;
++	CameraList *list;
+ 	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);
+ 	result = gp_abilities_list_detect (chooser->priv->al,
+-		chooser->priv->il, &list,
++		chooser->priv->il, list,
+ 		GTKAM_STATUS (status)->context->context);
+ 	switch (result) {
+ 	case GP_OK:
+-		if (!gp_list_count (&list)) {
++		if (!gp_list_count (list)) {
+ 			d = gtkam_close_new (_("No cameras detected."));
+ 			gtk_window_set_transient_for (GTK_WINDOW (d),
+ 						      GTK_WINDOW (chooser));
+@@ -461,6 +464,7 @@ on_detect_clicked (GtkButton *button, Gt
+ 		gtk_widget_show (d);
+ 		break;
+ 	}
++	gp_list_free(list);
+ 	gtk_object_destroy (GTK_OBJECT (status));
+ }
+ 
diff --git a/graphics/gtkam/patches/patch-ab b/graphics/gtkam/patches/patch-ab
new file mode 100644
index 00000000000..78efe7d04b3
--- /dev/null
+++ b/graphics/gtkam/patches/patch-ab
@@ -0,0 +1,71 @@
+$NetBSD: patch-ab,v 1.3 2007/01/30 16:33:59 joerg Exp $
+
+--- src/gtkam-delete.c.orig	2007-01-30 14:51:30.000000000 +0000
++++ src/gtkam-delete.c
+@@ -170,16 +170,25 @@ delete_all (GtkamDelete *delete, GtkamCa
+ {
+ 	GtkWidget *d, *s;
+ 	int result, r1, r2;
+-	CameraList l1, l2;
++	CameraList *l1, *l2;
+ 	const char *name;
+ 	GtkamDeleteAllDeletedData add;
+ 	GtkamDeleteFileDeletedData fdd;
+ 
++	result = gp_list_new(&l1);
++	if (result < GP_OK)
++		return FALSE;
++	result = gp_list_new(&l2);
++	if (result < GP_OK) {
++		gp_list_free(l1);
++		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);
+-	r1 = gp_camera_folder_list_files (camera->camera, folder, &l1, NULL);
++	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);
+ 	switch (result) {
+@@ -189,9 +198,13 @@ delete_all (GtkamDelete *delete, GtkamCa
+ 		g_signal_emit (G_OBJECT (delete),
+ 			signals[ALL_DELETED], 0, &add);
+ 		gtk_object_destroy (GTK_OBJECT (s));
++		gp_list_free(l1);
++		gp_list_free(l2);
+ 		return (TRUE);
+ 	case GP_ERROR_CANCEL:
+ 		gtk_object_destroy (GTK_OBJECT (s));
++		gp_list_free(l1);
++		gp_list_free(l2);
+ 		return (TRUE);
+ 	default:
+ 		d = gtkam_error_new (result, GTKAM_STATUS (s)->context,
+@@ -202,11 +215,11 @@ delete_all (GtkamDelete *delete, GtkamCa
+ 
+ 		/* See what files have been deleted */
+ 		r2 = gp_camera_folder_list_files (camera->camera, folder,
+-						  &l2, NULL);
++						  l2, NULL);
+ 		if ((r1 == GP_OK) && (r2 == GP_OK)) {
+-			for (r1 = 0; r1 < gp_list_count (&l1); r1++) {
+-				gp_list_get_name (&l1, r1, &name);
+-				if (gp_list_lookup_name (&l2, name) >= 0) {
++			for (r1 = 0; r1 < gp_list_count (l1); r1++) {
++				gp_list_get_name (l1, r1, &name);
++				if (gp_list_lookup_name (l2, name) >= 0) {
+ 					fdd.camera = camera;
+ 					fdd.folder = folder;
+ 					fdd.name = name;
+@@ -216,6 +229,8 @@ delete_all (GtkamDelete *delete, GtkamCa
+ 				}
+ 			}
+ 		}
++		gp_list_free(l1);
++		gp_list_free(l2);
+ 		return (FALSE);
+ 	}
+ }
diff --git a/graphics/gtkam/patches/patch-ac b/graphics/gtkam/patches/patch-ac
new file mode 100644
index 00000000000..14ea64ead19
--- /dev/null
+++ b/graphics/gtkam/patches/patch-ac
@@ -0,0 +1,62 @@
+$NetBSD: patch-ac,v 1.1 2007/01/30 16:33:59 joerg Exp $
+
+--- src/gtkam-list.c.orig	2007-01-30 14:54:54.000000000 +0000
++++ src/gtkam-list.c
+@@ -984,7 +984,7 @@ gtkam_list_add_folder (GtkamList *list, 
+ 		       const gchar *folder)
+ {
+ 	GtkWidget *dialog, *s;
+-	CameraList flist;
++	CameraList *flist;
+ 	int result;
+ 	const char *name;
+ 	gint i;
+@@ -992,9 +992,13 @@ gtkam_list_add_folder (GtkamList *list, 
+ 
+ 	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);
+-	result = gp_camera_folder_list_files (camera->camera, folder, &flist,
++	result = gp_camera_folder_list_files (camera->camera, folder, flist,
+ 					GTKAM_STATUS (s)->context->context);
+ 	switch (result) {
+ 	case GP_OK:
+@@ -1002,6 +1006,7 @@ gtkam_list_add_folder (GtkamList *list, 
+ 	case GP_ERROR_CANCEL:
+ 		if (camera->multi)
+ 			gp_camera_exit (camera->camera, NULL);
++		gp_list_free(flist);
+ 		gtk_object_destroy (GTK_OBJECT (s));
+ 		return;
+ 	default:
+@@ -1010,20 +1015,23 @@ gtkam_list_add_folder (GtkamList *list, 
+ 		dialog = gtkam_error_new (result, GTKAM_STATUS (s)->context,
+ 			NULL, _("Could not get file list for folder "
+ 			"'%s'"), folder);
++		gp_list_free(flist);
+ 		gtk_widget_show (dialog);
+ 		gtk_object_destroy (GTK_OBJECT (s));
+ 		return;
+ 	}
+ 	gtk_object_destroy (GTK_OBJECT (s));
+ 
+-	for (i = 0; i < gp_list_count (&flist); i++) {
+-		gp_list_get_name (&flist, i, &name);
++	for (i = 0; i < gp_list_count (flist); i++) {
++		gp_list_get_name (flist, i, &name);
+ 		gtk_list_store_append (list->priv->store, &iter);
+ 		gtk_list_store_set (list->priv->store, &iter,
+ 			NAME_COLUMN, name, FOLDER_COLUMN, folder,
+ 			CAMERA_COLUMN, camera, IS_EDITABLE_COLUMN, TRUE, -1);
+ 	}
+ 
++	gp_list_free(flist);
++
+ 	if (camera->multi)
+ 		gp_camera_exit (camera->camera, NULL);
+ 
diff --git a/graphics/gtkam/patches/patch-ad b/graphics/gtkam/patches/patch-ad
new file mode 100644
index 00000000000..16ec5633d7c
--- /dev/null
+++ b/graphics/gtkam/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2007/01/30 16:33:59 joerg Exp $
+
+--- help/C/gtkam.xml.orig	2007-01-30 14:59:21.000000000 +0000
++++ help/C/gtkam.xml
+@@ -183,7 +183,7 @@
+     		then press <keycap>Return</keycap>:</para>
+     		<para> 
+ 			<command>gtkam</command> 
+-			<!--FIXME comand line --switches -->
++			<!--FIXME comand line switches -->
+     		</para> 
+     		</listitem>
+     	</varlistentry>
+@@ -203,7 +203,7 @@
+ 		fileref="figures/gtkam_start_window.png" format="PNG"/> 
+ 	    </imageobject>
+ 	    <textobject> 
+-	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.
++	      <phrase>The &app; main window. On the left is the camera tree. The file list is on the right.</phrase>
+ 	    </textobject> 
+ 	  </mediaobject> 
+ 	</screenshot>