summaryrefslogtreecommitdiff
path: root/graphics/gtkam
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2007-08-19 10:53:18 +0000
committerobache <obache@pkgsrc.org>2007-08-19 10:53:18 +0000
commit824bcdf586fcdf7d516856486dbe2e6ba267573e (patch)
tree08ea2812aec78473931760387c5a4bbee3b9b63c /graphics/gtkam
parente1df00002e8aa3bd12809f4245de3da14a1a8295 (diff)
downloadpkgsrc-824bcdf586fcdf7d516856486dbe2e6ba267573e.tar.gz
Update gtkam to 0.1.14.
Based on patch provided in PR 36317. gtkam 0.1.14 * fix make distcheck * misc bug fixes. * always show capture/capture preview menu. * updated various translations * changed for some important fixes in libgphoto2
Diffstat (limited to 'graphics/gtkam')
-rw-r--r--graphics/gtkam/Makefile7
-rw-r--r--graphics/gtkam/PLIST20
-rw-r--r--graphics/gtkam/distinfo15
-rw-r--r--graphics/gtkam/patches/patch-aa33
-rw-r--r--graphics/gtkam/patches/patch-ab58
-rw-r--r--graphics/gtkam/patches/patch-ac49
-rw-r--r--graphics/gtkam/patches/patch-ad22
7 files changed, 59 insertions, 145 deletions
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 5903da22d16..303b8559bff 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:32 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/08/19 10:53:18 obache Exp $
#
-DISTNAME= gtkam-0.1.12
-PKGREVISION= 5
+DISTNAME= gtkam-0.1.14
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://gphoto.sourceforge.net/proj/gphoto2/
+HOMEPAGE= http://gphoto.sourceforge.net/proj/gtkam/
COMMENT= Digital camera access graphical client (GTK2)
USE_DIRS+= gnome2-1.5
diff --git a/graphics/gtkam/PLIST b/graphics/gtkam/PLIST
index 5d6baa97115..d7c754b6d35 100644
--- a/graphics/gtkam/PLIST
+++ b/graphics/gtkam/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/08/19 10:53:18 obache Exp $
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_save_all.png
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/fr/LC_MESSAGES/gtkam.mo
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/sl/LC_MESSAGES/gtkam.mo
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
diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo
index 510f4e27687..e35828da05e 100644
--- a/graphics/gtkam/distinfo
+++ b/graphics/gtkam/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2007/01/30 16:33:59 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/08/19 10:53:18 obache 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
+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) = 4e884fca60cde5f37aa699b567bc968f637072f5
+SHA1 (patch-ab) = 1a4d9f26121a9054b2c3fc325cc20d819f58a558
+SHA1 (patch-ac) = b4edf05ef2c55b48d803cde7e154310180422930
diff --git a/graphics/gtkam/patches/patch-aa b/graphics/gtkam/patches/patch-aa
index 2261aec0f1c..2f4c4f81ec9 100644
--- a/graphics/gtkam/patches/patch-aa
+++ b/graphics/gtkam/patches/patch-aa
@@ -1,37 +1,18 @@
-$NetBSD: patch-aa,v 1.6 2007/01/30 16:33:59 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2007/08/19 10:53:19 obache Exp $
---- src/gtkam-chooser.c.orig 2007-01-30 14:45:30.000000000 +0000
+--- src/gtkam-chooser.c.orig 2006-12-14 18:38:12.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;
+@@ -405,9 +405,12 @@ on_detect_clicked (GtkButton *button, Gt
int result;
const char *name;
-+ result = gp_list_new(&list);
++ 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,
-+ 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
index 78efe7d04b3..ed74eeb3d18 100644
--- a/graphics/gtkam/patches/patch-ab
+++ b/graphics/gtkam/patches/patch-ab
@@ -1,71 +1,43 @@
-$NetBSD: patch-ab,v 1.3 2007/01/30 16:33:59 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/08/19 10:53:19 obache Exp $
---- src/gtkam-delete.c.orig 2007-01-30 14:51:30.000000000 +0000
+--- src/gtkam-delete.c.orig 2006-12-14 18:38:12.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;
+@@ -178,11 +178,13 @@ delete_all (GtkamDelete *delete, GtkamCa
GtkamDeleteAllDeletedData add;
GtkamDeleteFileDeletedData fdd;
-+ result = gp_list_new(&l1);
++ 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);
+- 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);
- switch (result) {
-@@ -189,9 +198,13 @@ delete_all (GtkamDelete *delete, GtkamCa
+@@ -193,9 +195,11 @@ 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);
++ gp_list_unref(l1);
return (TRUE);
case GP_ERROR_CANCEL:
gtk_object_destroy (GTK_OBJECT (s));
-+ gp_list_free(l1);
-+ gp_list_free(l2);
++ gp_list_unref(l1);
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
+@@ -221,10 +225,10 @@ delete_all (GtkamDelete *delete, GtkamCa
}
}
}
-+ gp_list_free(l1);
-+ gp_list_free(l2);
++ gp_list_unref (l1);
+ gp_list_unref (l2);
return (FALSE);
}
+- gp_list_unref (l1);
}
+
+ static gboolean
diff --git a/graphics/gtkam/patches/patch-ac b/graphics/gtkam/patches/patch-ac
index 14ea64ead19..6b21a048b93 100644
--- a/graphics/gtkam/patches/patch-ac
+++ b/graphics/gtkam/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/01/30 16:33:59 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/19 10:53:19 obache Exp $
---- src/gtkam-list.c.orig 2007-01-30 14:54:54.000000000 +0000
+--- src/gtkam-list.c.orig 2006-12-14 18:38:12.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,
+@@ -966,6 +966,10 @@ gtkam_list_add_folder (GtkamList *list,
g_return_if_fail (GTKAM_IS_LIST (list));
@@ -21,42 +12,20 @@ $NetBSD: patch-ac,v 1.1 2007/01/30 16:33:59 joerg Exp $
+
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:
+ gp_list_new (&flist);
+@@ -978,6 +982,7 @@ gtkam_list_add_folder (GtkamList *list,
if (camera->multi)
gp_camera_exit (camera->camera, NULL);
-+ gp_list_free(flist);
gtk_object_destroy (GTK_OBJECT (s));
++ gp_list_unref(flist);
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 "
+ if (camera->multi)
+@@ -987,6 +992,7 @@ gtkam_list_add_folder (GtkamList *list,
"'%s'"), folder);
-+ gp_list_free(flist);
gtk_widget_show (dialog);
gtk_object_destroy (GTK_OBJECT (s));
++ gp_list_unref(flist);
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
deleted file mode 100644
index 16ec5633d7c..00000000000
--- a/graphics/gtkam/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$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>