--- a/patches/gtkam-01-menu-entry.diff Thu Mar 18 16:19:40 2004 +0000
+++ b/patches/gtkam-01-menu-entry.diff Thu Mar 18 17:06:00 2004 +0000
@@ -1,5 +1,5 @@
---- ../gtkam-0.1.10.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./gtkam.desktop.in 2003-08-14 10:27:25.000000000 +0100
+--- ../gtkam-0.1.11.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 +0100
++++ ./gtkam.desktop.in 2004-03-18 16:01:13.000000000 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -11,20 +11,8 @@
+Type=Application
+Categories=Application;AudioVideo;
+StartupNotify=true
---- ../gtkam-0.1.10.old/configure.in 2003-08-14 10:16:36.000000000 +0100
-+++ ./configure.in 2003-08-14 10:55:12.000000000 +0100
-@@ -27,6 +27,9 @@
- AC_ERROR([You need pkg-config for gtkam.])
- fi
-
-+AC_PROG_INTLTOOL
-+AC_PROG_LIBTOOL
-+
- dnl ---------------------------------------------------------------------------
- dnl Libraries we need for gtkam
- dnl ---------------------------------------------------------------------------
---- ../gtkam-0.1.10.old/intltool-extract.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-extract.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-extract.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-extract.in 2004-03-18 16:01:36.000000000 +0000
@@ -0,0 +1,389 @@
+#!@INTLTOOL_PERL@ -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -415,8 +403,8 @@
+ }
+}
+
---- ../gtkam-0.1.10.old/intltool-merge.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-merge.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-merge.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-merge.in 2004-03-18 16:01:45.000000000 +0000
@@ -0,0 +1,916 @@
+#!@INTLTOOL_PERL@ -w
+
@@ -1334,8 +1322,8 @@
+ return @list;
+}
+
---- ../gtkam-0.1.10.old/intltool-update.in 1970-01-01 01:00:00.000000000 +0100
-+++ ./intltool-update.in 2003-08-14 10:58:02.000000000 +0100
+--- ../gtkam-0.1.11.old/intltool-update.in 1970-01-01 01:00:00.000000000 +0100
++++ ./intltool-update.in 2004-03-18 16:01:54.000000000 +0000
@@ -0,0 +1,642 @@
+#!@INTLTOOL_PERL@ -w
+
@@ -1979,15 +1967,15 @@
+ "Make sure to run this script inside the po directory.\n";
+ exit;
+}
---- ../gtkam-0.1.10.old/Makefile.am 2003-08-14 10:16:36.000000000 +0100
-+++ ./Makefile.am 2003-08-15 15:54:51.000000000 +0100
-@@ -28,4 +28,21 @@
+--- ../gtkam-0.1.11.old/Makefile.am 2004-03-18 16:00:30.000000000 +0000
++++ ./Makefile.am 2004-03-18 16:04:07.000000000 +0000
+@@ -15,8 +15,24 @@
+ INCLUDES = \
+ -DDATADIR=\""$(datadir)"\"
- ACLOCAL_AMFLAGS = -I m4
+-EXTRA_DIST = config.rpath mkinstalldirs gtkam.desktop gtkam.png
++@INTLTOOL_DESKTOP_RULE@
--EXTRA_DIST = config.rpath mkinstalldirs
-+@INTLTOOL_DESKTOP_RULE@
-+
+DESKTOP_IN_FILES=gtkam.desktop.in
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+
@@ -2004,17 +1992,41 @@
+ $(DESKTOP_IN_FILES) \
+ $(DESKTOP_FILES)
+
---- ../gtkam-0.1.10.old/art/Makefile.am 2003-08-14 10:16:36.000000000 +0100
-+++ ./art/Makefile.am 2003-08-15 16:33:43.000000000 +0100
-@@ -7,4 +7,10 @@
+ if ENABLE_RPM
+
+ # create RPM packages
+--- ../gtkam-0.1.11.old/art/Makefile.am 2004-03-18 16:00:30.000000000 +0000
++++ ./art/Makefile.am 2004-03-18 16:04:57.000000000 +0000
+@@ -7,4 +7,9 @@
gtkam-lock.png \
gtkam-new.png
-EXTRA_DIST = $(images_DATA)
+icondir = $(datadir)/pixmaps
+icon_DATA = gtkam-camera.png
++EXTRA_DIST = \
++ $(images_DATA) \
++ $(icon_DATA)
+
-+EXTRA_DIST = \
-+ $(images_DATA) \
-+ $(icon_DATA)
-+
+--- ../gtkam-0.1.11.old/configure.in 2004-03-18 16:42:38.000000000 +0000
++++ ./configure.in 2004-03-18 16:43:24.000000000 +0000
+@@ -27,6 +27,10 @@
+ AC_ERROR([You need pkg-config for gtkam.])
+ fi
+
++AC_PROG_INTLTOOL
++AC_PROG_LIBTOOL
++AC_SUBST(POMAKEFILEDEPS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl Libraries we need for gtkam
+ dnl ---------------------------------------------------------------------------
+@@ -82,7 +86,7 @@
+ dnl omf/scrollkeper/gnome-style docs
+ dnl ---------------------------------------------------------------------------
+
+-GTKAM_C_IDENTIFIER="file:/usr/local/share/gnome/help/gtkam/C/gtkam.xml"
++GTKAM_C_IDENTIFIER="file:/usr/share/gnome/help/gtkam/C/gtkam.xml"
+ AC_SUBST(GTKAM_C_IDENTIFIER)
+
+ dnl ---------------------------------------------------------------------------
--- a/patches/gtkam-03-g11n-i18n-ui.diff Thu Mar 18 16:19:40 2004 +0000
+++ b/patches/gtkam-03-g11n-i18n-ui.diff Thu Mar 18 17:06:00 2004 +0000
@@ -1,222 +1,24 @@
-diff -urN gtkam-0.1.10-orig/configure.in gtkam-0.1.10/configure.in
---- gtkam-0.1.10-orig/configure.in 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/configure.in 2004-03-04 21:12:32.000000000 +0900
+--- ../gtkam-0.1.11.old/configure.in 2004-03-18 16:24:22.000000000 +0000
++++ ./configure.in 2004-03-18 16:25:43.000000000 +0000
@@ -16,7 +16,7 @@
AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using])
dnl Add the languages which your application supports here.
--ALL_LINGUAS="da de es fr hu it ja no pt_BR pt_PT ru sl sv uk"
-+ALL_LINGUAS="da de es fr hu it ja ko no pl pt_BR pt_PT ru sl sv uk zh_CN zh_HK zh_TW"
+-ALL_LINGUAS="cs da de es fr hu it ja no pt_BR pt_PT ru sl sv uk"
++ALL_LINGUAS="cs da de es fr hu it ja ko no pl pt_BR pt_PT ru sl sv uk zh_CN zh_HK zh_TW"
AM_GNU_GETTEXT
dnl ---------------------------------------------------------------------------
-diff -urN gtkam-0.1.10-orig/po/POTFILES.in gtkam-0.1.10/po/POTFILES.in
---- gtkam-0.1.10-orig/po/POTFILES.in 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/po/POTFILES.in 2004-03-04 21:08:23.000000000 +0900
-@@ -1,6 +1,6 @@
- # List of source files containing translatable strings.
-
--src/main.c
+--- ../gtkam-0.1.11.old/po/POTFILES.in 2004-03-18 16:24:22.000000000 +0000
++++ ./po/POTFILES.in 2004-03-18 16:26:14.000000000 +0000
+@@ -1,3 +1,4 @@
+gtkam.desktop.in
src/gtkam-cancel.c
src/gtkam-chooser.c
src/gtkam-close.c
-@@ -22,4 +22,6 @@
- src/gtkam-status.c
- src/gtkam-tree.c
- src/gtkam-util.c
-+src/gtkam-version.c
- src/gtkam-viewer.c
-+src/main.c
-diff -urN gtkam-0.1.10-orig/src/gtkam-chooser.c gtkam-0.1.10/src/gtkam-chooser.c
---- gtkam-0.1.10-orig/src/gtkam-chooser.c 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/src/gtkam-chooser.c 2004-03-04 21:16:33.000000000 +0900
-@@ -585,7 +585,6 @@
- {
- GtkamChooser *chooser;
- GtkWidget *table, *label, *button, *combo, *vbox, *check;
-- gchar *t;
-
- chooser = g_object_new (GTKAM_TYPE_CHOOSER, NULL);
-
-@@ -599,9 +598,7 @@
- gp_port_info_list_new (&(chooser->priv->il));
- gp_port_info_list_load (chooser->priv->il);
-
-- t = g_locale_to_utf8 (_("Select Camera"), -1, NULL, NULL, NULL);
-- gtk_window_set_title (GTK_WINDOW (chooser), t);
-- g_free (t);
-+ gtk_window_set_title (GTK_WINDOW (chooser), _("Select Camera"));
- gtk_container_set_border_width (GTK_CONTAINER (chooser), 5);
-
- vbox = gtk_vbox_new (FALSE, 0);
-@@ -629,9 +626,7 @@
- gtk_entry_set_editable (chooser->priv->entry_model, FALSE);
- #endif
-
-- t = g_locale_to_utf8 (_("Detect"), -1, NULL, NULL, NULL);
-- button = gtk_button_new_with_label (t);
-- g_free (t);
-+ button = gtk_button_new_with_label (_("Detect"));
- gtk_widget_show (button);
- gtk_table_attach_defaults (GTK_TABLE (table), button, 2, 3, 0, 1);
- g_signal_connect (GTK_OBJECT (button), "clicked",
-@@ -674,19 +669,14 @@
- gtk_entry_set_editable (chooser->priv->entry_speed, FALSE);
- #endif
-
-- t = g_locale_to_utf8 (_("Allow multiple frontends"), -1,
-- NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Allow multiple frontends"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), check, 0, 2, 3, 4);
- g_signal_connect (GTK_OBJECT (check), "toggled",
- GTK_SIGNAL_FUNC (on_multi_toggled), chooser);
- chooser->priv->check_multi = check;
-
-- t = g_locale_to_utf8 (_("Enhanced"), -1, NULL, NULL, NULL);
-- button = gtk_toggle_button_new_with_label (t);
-- g_free (t);
-+ button = gtk_toggle_button_new_with_label (_("Enhanced"));
- gtk_widget_show (button);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (chooser)->action_area),
- button);
-diff -urN gtkam-0.1.10-orig/src/gtkam-main.c gtkam-0.1.10/src/gtkam-main.c
---- gtkam-0.1.10-orig/src/gtkam-main.c 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/src/gtkam-main.c 2004-03-04 21:19:01.000000000 +0900
-@@ -653,16 +653,7 @@
- static gchar *
- translate_func (const gchar *path, gpointer data)
- {
-- gchar *result;
-- GError *e = NULL;
--
-- result = g_locale_to_utf8 (_(path), -1, NULL, NULL, &e);
-- if (e) {
-- g_warning ("Could not convert '%s' to UTF-8: '%s'", path,
-- e->message);
-- g_error_free (e);
-- }
-- return (result);
-+ return _(path);
- }
-
- #endif
-diff -urN gtkam-0.1.10-orig/src/gtkam-save.c gtkam-0.1.10/src/gtkam-save.c
---- gtkam-0.1.10-orig/src/gtkam-save.c 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/src/gtkam-save.c 2004-03-04 21:33:14.000000000 +0900
-@@ -477,7 +477,6 @@
- GtkWidget *hbox, *frame, *check, *label, *entry;
- GtkObject *a;
- GtkTooltips *tooltips;
-- gchar *t;
-
- save = g_object_new (GTKAM_TYPE_SAVE, NULL);
-
-@@ -497,9 +496,7 @@
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (frame), hbox);
-
-- t = g_locale_to_utf8 (_("Save photos"), -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Save photos"));
- gtk_widget_show (check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
-@@ -507,36 +504,28 @@
- "this is checked"), NULL);
- save->priv->toggle_normal = GTK_TOGGLE_BUTTON (check);
-
-- t = g_locale_to_utf8 (_("Save raw data"), -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Save raw data"));
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, check, _("Raw data will be "
- "saved if this is checked"), NULL);
- save->priv->toggle_raw = GTK_TOGGLE_BUTTON (check);
-
-- t = g_locale_to_utf8 (_("Save audio data"), -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Save audio data"));
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, check, _("Audio data will be "
- "saved if this is checked"), NULL);
- save->priv->toggle_audio = GTK_TOGGLE_BUTTON (check);
-
-- g_locale_to_utf8 (_("Save thumbnails"), -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Save thumbnails"));
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, check, _("Thumbnails will be "
- "saved if this is checked"), NULL);
- save->priv->toggle_preview = GTK_TOGGLE_BUTTON (check);
-
-- t = g_locale_to_utf8 (_("Save EXIF data"), -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Save EXIF data"));
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
- gtk_tooltips_set_tip (tooltips, check, _("EXIF data will be "
-@@ -548,9 +537,7 @@
- gtk_box_pack_start (GTK_BOX (GTK_FILE_SELECTION (save)->main_vbox),
- hbox, TRUE, TRUE, 0);
-
-- t = g_locale_to_utf8 (_("Open image(s) with: "), -1, NULL, NULL, NULL);
-- label = gtk_label_new (t);
-- g_free (t);
-+ label = gtk_label_new (_("Open image(s) with: "));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-@@ -563,10 +550,7 @@
- save->priv->program = GTK_ENTRY (entry);
-
- /* Filenames provided by camera */
-- t = g_locale_to_utf8 (_("Use filename(s) provided by the camera"),
-- -1, NULL, NULL, NULL);
-- check = gtk_check_button_new_with_label (t);
-- g_free (t);
-+ check = gtk_check_button_new_with_label (_("Use filename(s) provided by the camera"));
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (GTK_FILE_SELECTION (save)->main_vbox),
- check, TRUE, TRUE, 0);
-@@ -585,9 +569,7 @@
- hbox, 256);
- save->priv->hbox_prefix = hbox;
-
-- t = g_locale_to_utf8 (_("Filename prefix: "), -1, NULL, NULL, NULL);
-- label = gtk_label_new (t);
-- g_free (t);
-+ label = gtk_label_new (_("Filename prefix: "));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-@@ -596,10 +578,7 @@
- gtk_box_pack_start (GTK_BOX (hbox), save->priv->prefix_entry,
- TRUE, TRUE, 0);
-
-- t = g_locale_to_utf8 (_("Start numbering with: "),
-- -1, NULL, NULL, NULL);
-- label = gtk_label_new (t);
-- g_free (t);
-+ label = gtk_label_new (_("Start numbering with: "));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-diff -urN gtkam-0.1.10-orig/src/gtkam-tree.c gtkam-0.1.10/src/gtkam-tree.c
---- gtkam-0.1.10-orig/src/gtkam-tree.c 2004-03-04 21:07:38.000000000 +0900
-+++ gtkam-0.1.10/src/gtkam-tree.c 2004-03-04 21:08:23.000000000 +0900
-@@ -1144,9 +1144,10 @@
+--- ../gtkam-0.1.11.old/src/gtkam-tree.c 2004-03-18 16:24:22.000000000 +0000
++++ ./src/gtkam-tree.c 2004-03-18 16:32:07.000000000 +0000
+@@ -1143,9 +1143,10 @@
strcmp (model, "Directory Browse")) {
p = gp_port_info_list_lookup_path (il, port);
if (p < 0) {
@@ -230,3 +32,14 @@
gp_camera_unref (camera);
continue;
}
+--- ../gtkam-0.1.11.old/po/Makefile.in.in 2004-03-18 16:42:38.000000000 +0000
++++ ./po/Makefile.in.in 2004-03-18 16:58:01.000000000 +0000
+@@ -29,7 +29,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++mkinstalldirs = $(SHELL) $(top_srcdir)/$(MKINSTALLDIRS)
+
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@