pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/time/gnotime Make this build under NetBSD 1.6.2 (C99-i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e552aee7d293
branches: trunk
changeset: 484090:e552aee7d293
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Wed Nov 24 22:35:25 2004 +0000
description:
Make this build under NetBSD 1.6.2 (C99-isms, and a missing header file).
diffstat:
time/gnotime/distinfo | 16 ++-
time/gnotime/patches/patch-aa | 63 +++++++++-
time/gnotime/patches/patch-ac | 38 ++++++
time/gnotime/patches/patch-ad | 64 ++++++++++
time/gnotime/patches/patch-ae | 172 ++++++++++++++++++++++++++++
time/gnotime/patches/patch-af | 27 ++++
time/gnotime/patches/patch-ag | 52 ++++++++
time/gnotime/patches/patch-ah | 24 +++
time/gnotime/patches/patch-ai | 103 ++++++++++++++++
time/gnotime/patches/patch-aj | 28 ++++
time/gnotime/patches/patch-ak | 18 ++
time/gnotime/patches/patch-al | 145 +++++++++++++++++++++++
time/gnotime/patches/patch-am | 255 ++++++++++++++++++++++++++++++++++++++++++
time/gnotime/patches/patch-an | 12 +
14 files changed, 1012 insertions(+), 5 deletions(-)
diffs (truncated from 1085 to 300 lines):
diff -r d54dd502dc34 -r e552aee7d293 time/gnotime/distinfo
--- a/time/gnotime/distinfo Wed Nov 24 20:45:10 2004 +0000
+++ b/time/gnotime/distinfo Wed Nov 24 22:35:25 2004 +0000
@@ -1,6 +1,18 @@
-$NetBSD: distinfo,v 1.2 2004/10/23 13:54:46 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/11/24 22:35:25 kristerw Exp $
SHA1 (gnotime-2.2.0.tar.gz) = 895a516a52b0cc7745183c0c8c909896dbda60ab
Size (gnotime-2.2.0.tar.gz) = 1197945 bytes
-SHA1 (patch-aa) = e54c704d3089587e4dd6a6f474088b22c809ffe4
+SHA1 (patch-aa) = a1332ebd600c4611533f5337dbc729af92f2d8d3
SHA1 (patch-ab) = 8ce9db0b1059ac45aab9681116ac86c331818847
+SHA1 (patch-ac) = d9523a1561cf7a57056a3670b1ebac4e28629fed
+SHA1 (patch-ad) = 060bddad8f1807823b6e2f65bec1bf12d4940fd9
+SHA1 (patch-ae) = 4ed3ab60c71caf8f078657a5bbac9caed3dc4e4a
+SHA1 (patch-af) = adc0c63aab58c5ac15be9c194b7d76ac7a37736c
+SHA1 (patch-ag) = 4816d594079adfdef51a7471b587db62167c9d57
+SHA1 (patch-ah) = 8683366be0995489347cb7f72e4a3ce3ac1204cb
+SHA1 (patch-ai) = 440941dfaa4454f7d5dee90c43e79c950704d3ad
+SHA1 (patch-aj) = 0494c00b312ac73ee4107ef8d761f2d1047559bb
+SHA1 (patch-ak) = c198f95978471a946e0008d4d80f5630716ac991
+SHA1 (patch-al) = 36e08dfe8ee0a38a27db99f1edcb05669a57f29c
+SHA1 (patch-am) = d23fb795a5f2c6774e11cd7ac22f478b8f7266a8
+SHA1 (patch-an) = 120164b440724278e4bb4d4bc97404b3e4e76481
diff -r d54dd502dc34 -r e552aee7d293 time/gnotime/patches/patch-aa
--- a/time/gnotime/patches/patch-aa Wed Nov 24 20:45:10 2004 +0000
+++ b/time/gnotime/patches/patch-aa Wed Nov 24 22:35:25 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/24 22:35:25 kristerw Exp $
---- src/main.c.orig 2004-10-22 21:53:30.000000000 +0200
-+++ src/main.c 2004-10-22 21:53:36.000000000 +0200
+--- src/main.c.orig Mon Apr 26 00:46:20 2004
++++ src/main.c Wed Nov 24 22:31:20 2004
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <utime.h>
@@ -11,3 +11,60 @@
#endif
#include <qof.h>
+@@ -299,6 +299,7 @@
+ char * xml_filepath;
+ gboolean read_is_ok;
+ char *errmsg, *qmsg;
++ GtkWidget *mb;
+
+ xml_filepath = resolve_old_path (config_data_url);
+
+@@ -347,7 +348,6 @@
+ _("Do you want to continue?"),
+ NULL);
+
+- GtkWidget *mb;
+ mb = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+@@ -398,13 +398,13 @@
+ {
+ const char *fp;
+ char *errmsg, *qmsg;
++ GtkWidget *mb;
+ fp = gtt_get_config_filepath();
+ errmsg = gtt_err_to_string (conf_errcode, fp);
+ qmsg = g_strconcat (errmsg,
+ _("Shall I setup a new configuration?"),
+ NULL);
+
+- GtkWidget *mb;
+ mb = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+@@ -724,6 +724,8 @@
+ memset(&reapchildren, 0, sizeof reapchildren);
+ #endif /* WNOHANG/SA_NOCLDWAIT */
+
++ {
++ GnomeClient *client;
+ static char *geometry_string = NULL;
+ static const struct poptOption geo_options[] =
+ {
+@@ -745,7 +747,7 @@
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ textdomain(GETTEXT_PACKAGE);
+
+- GnomeClient *client = gnome_master_client();
++ client = gnome_master_client();
+ g_signal_connect(G_OBJECT(client), "save_yourself",
+ G_CALLBACK(save_state), (gpointer) argv[0]);
+ g_signal_connect(G_OBJECT(client), "die",
+@@ -806,6 +808,7 @@
+
+ scm_boot_guile (argc, argv, guile_inner_main, NULL);
+ return 0; /* not reached !? */
++ }
+ }
+
+ /* ======================= END OF FILE =================== */
diff -r d54dd502dc34 -r e552aee7d293 time/gnotime/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-ac Wed Nov 24 22:35:25 2004 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-ac,v 1.1 2004/11/24 22:35:25 kristerw Exp $
+
+--- src/export.c.orig Wed Nov 24 18:55:31 2004
++++ src/export.c Wed Nov 24 18:57:12 2004
+@@ -124,12 +124,14 @@
+ export_really (GtkWidget *widget, export_format_t *xp)
+ {
+ gboolean rc;
++ GnomeVFSURI *parsed_uri;
++ gboolean exists;
++ GnomeVFSResult result;
+
+ xp->uri = gtk_file_selection_get_filename (xp->picker);
+
+- GnomeVFSURI *parsed_uri;
+ parsed_uri = gnome_vfs_uri_new (xp->uri);
+- gboolean exists = gnome_vfs_uri_exists (parsed_uri);
++ exists = gnome_vfs_uri_exists (parsed_uri);
+ if (exists)
+ {
+ GtkWidget *w;
+@@ -144,14 +146,14 @@
+ if (0 == gnome_dialog_run (GNOME_DIALOG (w))) goto done;
+ }
+
+- GnomeVFSResult result;
+ result = gnome_vfs_create (&xp->handle, xp->uri, GNOME_VFS_OPEN_WRITE,
+ FALSE, 0644);
+ if (GNOME_VFS_OK != result)
+ {
+ char *s;
++ GtkWidget *w;
+ s = g_strdup_printf (_("File %s dould not be opened"), xp->uri);
+- GtkWidget *w = gnome_error_dialog (s);
++ w = gnome_error_dialog (s);
+ gnome_dialog_set_parent (GNOME_DIALOG (w), GTK_WINDOW (xp->picker));
+ g_free (s);
+ goto done;
diff -r d54dd502dc34 -r e552aee7d293 time/gnotime/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-ad Wed Nov 24 22:35:25 2004 +0000
@@ -0,0 +1,64 @@
+$NetBSD: patch-ad,v 1.1 2004/11/24 22:35:25 kristerw Exp $
+
+--- src/ghtml.c.orig Wed Nov 24 18:57:51 2004
++++ src/ghtml.c Wed Nov 24 18:59:31 2004
+@@ -169,8 +169,9 @@
+ type = SCM_CDR (node);
+ if (SCM_SYMBOLP(type) || SCM_STRINGP (type))
+ {
++ char *buff;
+ cur_type = GTT_NONE;
+- char *buff = SCM_STRING_CHARS (type);
++ buff = SCM_STRING_CHARS (type);
+
+ if ((!strncmp (buff, "gtt-project-ptr",15)) ||
+ (!strncmp (buff, "gtt-project-list",16)))
+@@ -1255,6 +1256,8 @@
+ static SCM
+ my_catch_handler (void *data, SCM tag, SCM throw_args)
+ {
++ SCM fmt;
++ SCM s_str;
+ printf ("Error: GnoTime caught error during scheme parse\n");
+ if (SCM_SYMBOLP(tag))
+ {
+@@ -1263,8 +1266,8 @@
+ }
+ scm_backtrace();
+
+- SCM fmt = scm_makfrom0str ("~S");
+- SCM s_str = scm_simple_format (SCM_BOOL_F, fmt, SCM_LIST1(throw_args));
++ fmt = scm_makfrom0str ("~S");
++ s_str = scm_simple_format (SCM_BOOL_F, fmt, SCM_LIST1(throw_args));
+ printf ("\tthrow_args=%s\n", SCM_STRING_CHARS (s_str));
+
+ return SCM_EOL;
+@@ -1281,8 +1284,9 @@
+ /* no-op for now, just copy it into the window */
+ if (ghtml->write_stream)
+ {
++ size_t nr;
+ (ghtml->write_stream) (ghtml, "<link", 5, ghtml->user_data);
+- size_t nr = strlen (str);
++ nr = strlen (str);
+ (ghtml->write_stream) (ghtml, str, nr, ghtml->user_data);
+ (ghtml->write_stream) (ghtml, ">", 1, ghtml->user_data);
+ }
+@@ -1297,6 +1301,8 @@
+ GString *template;
+ char *start, *end, *scmstart, *comstart, *linkstart;
+ size_t nr;
++ GnomeVFSResult result;
++ GnomeVFSHandle *handle;
+
+ if (!ghtml) return;
+ if (prj) ghtml->prj = prj;
+@@ -1311,8 +1317,6 @@
+ }
+
+ /* Try to get the ghtml file ... */
+- GnomeVFSResult result;
+- GnomeVFSHandle *handle;
+ result = gnome_vfs_open (&handle, filepath, GNOME_VFS_OPEN_READ);
+ if ((GNOME_VFS_OK != result) && (0==ghtml->open_count))
+ {
diff -r d54dd502dc34 -r e552aee7d293 time/gnotime/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-ae Wed Nov 24 22:35:25 2004 +0000
@@ -0,0 +1,172 @@
+$NetBSD: patch-ae,v 1.1 2004/11/24 22:35:25 kristerw Exp $
+
+--- src/journal.c.orig Wed Nov 24 22:18:52 2004
++++ src/journal.c Wed Nov 24 22:26:45 2004
+@@ -195,11 +195,12 @@
+ static void
+ save_to_gnomevfs (Wiggy *wig, const char * filename)
+ {
+-
++ gboolean exists;
++ GnomeVFSResult result;
+ /* Don't clobber the file, ask user for permission */
+ GnomeVFSURI *parsed_uri;
+ parsed_uri = gnome_vfs_uri_new (filename);
+- gboolean exists = gnome_vfs_uri_exists (parsed_uri);
++ exists = gnome_vfs_uri_exists (parsed_uri);
+ gnome_vfs_uri_unref (parsed_uri);
+ if (exists)
+ {
+@@ -215,7 +216,6 @@
+ }
+
+ /* Try to open the file for writing */
+- GnomeVFSResult result;
+ result = gnome_vfs_create (&wig->handle, filename,
+ GNOME_VFS_OPEN_WRITE, FALSE, 0644);
+
+@@ -509,6 +509,7 @@
+ static void
+ task_delete_memo_clicked_cb(GtkWidget * w, gpointer data)
+ {
++ GList * ctl;
+ Wiggy *wig = (Wiggy *) data;
+
+ /* It is physically impossible to cut just the memo, without
+@@ -517,7 +518,7 @@
+
+ gtt_task_merge_up (wig->task);
+
+- GList * ctl = g_list_prepend(cutted_task_list, wig->task);
++ ctl = g_list_prepend(cutted_task_list, wig->task);
+ gtt_task_remove (wig->task);
+ cutted_task_list = ctl;
+ }
+@@ -697,10 +698,11 @@
+ static void
+ on_close_clicked_cb (GtkWidget *w, gpointer data)
+ {
++ GtkWidget *topper;
+ Wiggy *wig = (Wiggy *) data;
+
+ if (NULL == wig->top) return; /* avoid recursive double-free */
+- GtkWidget *topper = wig->top; /* avoid recursion */
++ topper = wig->top; /* avoid recursion */
+ wig->top = NULL;
+ gtk_widget_destroy (topper);
+
+@@ -786,19 +788,20 @@
+ html_url_requested_cb(GtkHTML *doc, const gchar * url,
+ GtkHTMLStream *handle, gpointer data)
+ {
++ GnomeVFSResult result;
++ GnomeVFSHandle *vfs;
++#define BSZ 16000
++ char buff[BSZ];
++ GnomeVFSFileSize bytes_read;
++
+ Wiggy *wig = data;
+ const char * path = gtt_ghtml_resolve_path (url, wig->filepath);
+ if (!path) return;
+
+- GnomeVFSResult result;
+- GnomeVFSHandle *vfs;
+ result = gnome_vfs_open (&vfs, path, GNOME_VFS_OPEN_READ);
+
+ if (GNOME_VFS_OK != result) return;
+
+-#define BSZ 16000
+- char buff[BSZ];
+- GnomeVFSFileSize bytes_read;
+ result = gnome_vfs_read (vfs, buff, BSZ, &bytes_read);
+ while (GNOME_VFS_OK == result)
+ {
+@@ -859,8 +862,10 @@
+ return msg;
+ }
+
Home |
Main Index |
Thread Index |
Old Index