pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/time/gnotime Added patches to enable building with gcc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1cc927ab460
branches:  trunk
changeset: 490610:c1cc927ab460
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Mar 16 12:48:49 2005 +0000

description:
Added patches to enable building with gcc-2.95.3. Approved by wiz.

diffstat:

 time/gnotime/distinfo         |   12 +-
 time/gnotime/patches/patch-ae |   82 +++++++++-
 time/gnotime/patches/patch-aj |   40 ++++-
 time/gnotime/patches/patch-ao |   17 ++
 time/gnotime/patches/patch-ap |   22 ++
 time/gnotime/patches/patch-aq |  158 +++++++++++++++++++++
 time/gnotime/patches/patch-ar |  209 +++++++++++++++++++++++++++
 time/gnotime/patches/patch-as |  314 ++++++++++++++++++++++++++++++++++++++++++
 time/gnotime/patches/patch-at |   57 +++++++
 9 files changed, 889 insertions(+), 22 deletions(-)

diffs (truncated from 1046 to 300 lines):

diff -r d35da5556392 -r c1cc927ab460 time/gnotime/distinfo
--- a/time/gnotime/distinfo     Wed Mar 16 12:41:51 2005 +0000
+++ b/time/gnotime/distinfo     Wed Mar 16 12:48:49 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 19:14:54 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/03/16 12:48:49 rillig Exp $
 
 SHA1 (gnotime-2.2.1.tar.gz) = 87f9f28aaad66597e0ba27d88f506602ac93963d
 RMD160 (gnotime-2.2.1.tar.gz) = b72f9d0e2e236a98983237d99b01f5a9c7258fc0
@@ -7,12 +7,18 @@
 SHA1 (patch-ab) = 8ce9db0b1059ac45aab9681116ac86c331818847
 SHA1 (patch-ac) = d9523a1561cf7a57056a3670b1ebac4e28629fed
 SHA1 (patch-ad) = 060bddad8f1807823b6e2f65bec1bf12d4940fd9
-SHA1 (patch-ae) = 4ed3ab60c71caf8f078657a5bbac9caed3dc4e4a
+SHA1 (patch-ae) = 13df9a08b372bbd9f491b2159151d8eaed58e6fd
 SHA1 (patch-af) = adc0c63aab58c5ac15be9c194b7d76ac7a37736c
 SHA1 (patch-ag) = 4816d594079adfdef51a7471b587db62167c9d57
 SHA1 (patch-ah) = 8683366be0995489347cb7f72e4a3ce3ac1204cb
 SHA1 (patch-ai) = 440941dfaa4454f7d5dee90c43e79c950704d3ad
-SHA1 (patch-aj) = 0494c00b312ac73ee4107ef8d761f2d1047559bb
+SHA1 (patch-aj) = fbae54ccfb5a195852006ec85ee3e1c484fe5998
 SHA1 (patch-ak) = c198f95978471a946e0008d4d80f5630716ac991
 SHA1 (patch-al) = 36e08dfe8ee0a38a27db99f1edcb05669a57f29c
 SHA1 (patch-an) = 120164b440724278e4bb4d4bc97404b3e4e76481
+SHA1 (patch-ao) = 18df822656eb97273b496eb2476ecd39f6df2251
+SHA1 (patch-ap) = a37c79e17986963ffc3cecd4207270ff95cd16bf
+SHA1 (patch-aq) = 1584c3e958137c2755de8d801488a755f51d3d82
+SHA1 (patch-ar) = 6b20a5786f29a7d8f66f1245a4a8b55dfb1cf84b
+SHA1 (patch-as) = cf0ba3a29f2b5f5d96df667e94f803ac86bfc7b4
+SHA1 (patch-at) = 27db86b595055c31706c246fc1eeb94f54acb555
diff -r d35da5556392 -r c1cc927ab460 time/gnotime/patches/patch-ae
--- a/time/gnotime/patches/patch-ae     Wed Mar 16 12:41:51 2005 +0000
+++ b/time/gnotime/patches/patch-ae     Wed Mar 16 12:48:49 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/11/24 22:35:25 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2005/03/16 12:48:49 rillig 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 @@
+--- src/journal.c.orig Sat May  8 18:14:49 2004
++++ src/journal.c      Wed Mar 16 11:03:07 2005
+@@ -197,11 +197,12 @@ remember_uri (Wiggy *wig, const char * f
  static void 
  save_to_gnomevfs (Wiggy *wig, const char * filename)
  {
@@ -17,7 +17,7 @@
        gnome_vfs_uri_unref (parsed_uri);
        if (exists)
        {
-@@ -215,7 +216,6 @@
+@@ -217,7 +218,6 @@ save_to_gnomevfs (Wiggy *wig, const char
        }
                
        /* Try to open the file for writing */
@@ -25,7 +25,61 @@
        result = gnome_vfs_create (&wig->handle, filename, 
                             GNOME_VFS_OPEN_WRITE, FALSE, 0644);
  
-@@ -509,6 +509,7 @@
+@@ -392,12 +392,14 @@ interval_move_up_clicked_cb(GtkWidget * 
+       GttTask *tsk = gtt_interval_get_parent (wig->interval);
+       GttProject *prj = gtt_task_get_parent (tsk);
+       GList *tasks = gtt_project_get_tasks (prj);
++      GList *this_task, *prev_task;
++      GttTask *newtask;
+       if (!tasks) return;
+-      GList *this_task = g_list_find (tasks, tsk);
++      this_task = g_list_find (tasks, tsk);
+       if (!this_task) return;
+-      GList *prev_task = this_task->prev;
+-      if (!prev_task) return;
+-      GttTask *newtask = prev_task->data;
++      prev_task = this_task->prev;
++      if (!prev_task) return; /* FIXME: Memory leak */
++      newtask = prev_task->data;
+       gtt_task_append_interval (newtask, wig->interval);
+ }
+ 
+@@ -408,12 +410,14 @@ interval_move_down_clicked_cb(GtkWidget 
+       GttTask *tsk = gtt_interval_get_parent (wig->interval);
+       GttProject *prj = gtt_task_get_parent (tsk);
+       GList *tasks = gtt_project_get_tasks (prj);
++      GList *this_task, *next_task;
++      GttTask *newtask;
+       if (!tasks) return;
+-      GList *this_task = g_list_find (tasks, tsk);
++      this_task = g_list_find (tasks, tsk);
+       if (!this_task) return;
+-      GList *next_task = this_task->next;
++      next_task = this_task->next;
+       if (!next_task) return;
+-      GttTask *newtask = next_task->data;
++      newtask = next_task->data;
+       gtt_task_add_interval (newtask, wig->interval);
+ }
+ 
+@@ -461,6 +465,7 @@ interval_paste_memo_cb(GtkWidget * w, gp
+ static void
+ interval_popup_cb (Wiggy *wig)
+ {
++      GttTask *tsk;
+       gtk_menu_popup(GTK_MENU(wig->interval_popup), 
+               NULL, NULL, NULL, wig, 1, 0);
+       if (cutted_task_list)
+@@ -494,7 +499,7 @@ interval_popup_cb (Wiggy *wig)
+               gtk_widget_set_sensitive (wig->interval_move_down, FALSE);
+       }
+ 
+-      GttTask *tsk = gtt_interval_get_parent(wig->interval);
++      tsk = gtt_interval_get_parent(wig->interval);
+       if (gtt_task_is_first_task (tsk))
+       {
+               gtk_widget_set_sensitive (wig->interval_move_up, FALSE);
+@@ -558,6 +563,7 @@ task_edit_task_clicked_cb(GtkWidget * w,
  static void
  task_delete_memo_clicked_cb(GtkWidget * w, gpointer data) 
  {
@@ -33,7 +87,7 @@
        Wiggy *wig = (Wiggy *) data;
  
        /* It is physically impossible to cut just the memo, without
-@@ -517,7 +518,7 @@
+@@ -566,7 +572,7 @@ task_delete_memo_clicked_cb(GtkWidget * 
  
        gtt_task_merge_up (wig->task);
  
@@ -42,7 +96,7 @@
        gtt_task_remove (wig->task);
        cutted_task_list = ctl;
  }
-@@ -697,10 +698,11 @@
+@@ -747,10 +753,11 @@ on_save_clicked_cb (GtkWidget *w, gpoint
  static void 
  on_close_clicked_cb (GtkWidget *w, gpointer data)
  {
@@ -55,7 +109,7 @@
        wig->top = NULL;
        gtk_widget_destroy (topper);
  
-@@ -786,19 +788,20 @@
+@@ -836,19 +843,20 @@ static void
  html_url_requested_cb(GtkHTML *doc, const gchar * url, 
                        GtkHTMLStream *handle, gpointer data) 
  {
@@ -81,7 +135,7 @@
        result = gnome_vfs_read (vfs, buff, BSZ, &bytes_read);
        while (GNOME_VFS_OK == result)
        {
-@@ -859,8 +862,10 @@
+@@ -909,8 +917,10 @@ get_hover_msg (const gchar *url)
                return msg;
        }
  
@@ -92,7 +146,7 @@
  }
  
  static gint
-@@ -922,8 +927,13 @@
+@@ -972,8 +982,13 @@ html_on_url_cb(GtkHTML *doc, const gchar
        /* Create and initialize the hover-help window */
        if (!wig->hover_help_window)
        {
@@ -107,7 +161,7 @@
                gtk_window_set_decorated (wino, FALSE);
                gtk_window_set_destroy_with_parent (wino, TRUE);
                gtk_window_set_transient_for (wino, GTK_WINDOW(wig->top));
-@@ -931,19 +941,19 @@
+@@ -981,19 +996,19 @@ html_on_url_cb(GtkHTML *doc, const gchar
                gtk_window_set_resizable (wino, FALSE);  /* FALSE to enable auto-resize */
  
                /* There must be a better way to draw a line around the box ?? */
@@ -130,7 +184,7 @@
                wig->hover_label = GTK_LABEL (label);
                gtk_container_add(GTK_CONTAINER(align), label);
                gtk_widget_show (label);
-@@ -952,7 +962,6 @@
+@@ -1002,7 +1017,6 @@ html_on_url_cb(GtkHTML *doc, const gchar
                gtk_window_set_focus (GTK_WINDOW(wig->top), GTK_WIDGET(wig->html));
  
                /* Set up in initial default, so later move works. */
@@ -138,7 +192,7 @@
                gtk_widget_get_pointer (GTK_WIDGET(wig->top), &px, &py);
                gtk_window_get_position (GTK_WINDOW(wig->top), &rx, &ry);
                gtk_window_move (wino, rx+px, ry+py);
-@@ -1003,25 +1012,28 @@
+@@ -1053,25 +1067,28 @@ static GList *
  perform_form_query (KvpFrame *kvpf)
  {
        GList *results, *n;
diff -r d35da5556392 -r c1cc927ab460 time/gnotime/patches/patch-aj
--- a/time/gnotime/patches/patch-aj     Wed Mar 16 12:41:51 2005 +0000
+++ b/time/gnotime/patches/patch-aj     Wed Mar 16 12:48:49 2005 +0000
@@ -1,8 +1,38 @@
-$NetBSD: patch-aj,v 1.1 2004/11/24 22:35:25 kristerw Exp $
+$NetBSD: patch-aj,v 1.2 2005/03/16 12:48:49 rillig Exp $
 
---- src/proj.c.orig    Wed Nov 24 22:40:26 2004
-+++ src/proj.c Wed Nov 24 22:41:13 2004
-@@ -2306,10 +2306,10 @@
+--- src/proj.c.orig    Sat May 22 16:27:59 2004
++++ src/proj.c Wed Mar 16 11:12:06 2005
+@@ -1948,8 +1948,6 @@ prj_obj_get_latest (GttProject *prj)
+ gboolean 
+ gtt_project_obj_register (void)
+ {
+-      global_book = qof_book_new();
+-
+ /* Associate an ASCII name to each getter, as well as the return type */
+ static QofParam params[] = {
+               { GTT_PROJECT_EARLIEST, QOF_TYPE_DATE, (QofAccessFunc)prj_obj_get_earliest, NULL},
+@@ -1957,6 +1955,8 @@ static QofParam params[] = {
+               { NULL },
+       };
+ 
++      global_book = qof_book_new();
++
+       qof_class_register (GTT_PROJECT_ID, (QofSortFunc)prj_obj_order, params);
+       return qof_object_register (&prj_object_def);
+ }
+@@ -2290,9 +2290,10 @@ gtt_task_is_first_task (GttTask *tsk)
+ gboolean
+ gtt_task_is_last_task (GttTask *tsk)
+ {
++      GList *last;
+       if (!tsk || !tsk->parent || !tsk->parent->task_list) return TRUE;
+       
+-      GList *last = g_list_last (tsk->parent->task_list);
++      last = g_list_last (tsk->parent->task_list);
+       if ((GttTask *) last->data == tsk) return TRUE;
+       return FALSE;
+ }
+@@ -2354,10 +2355,10 @@ time_t
  gtt_task_get_secs_earliest (GttTask *tsk)
  {
        GList *node;
@@ -15,7 +45,7 @@
        for (node=tsk->interval_list; node; node=node->next)
        {
                GttInterval * ivl = node->data;
-@@ -2322,9 +2322,8 @@
+@@ -2370,9 +2371,8 @@ time_t
  gtt_task_get_secs_latest (GttTask *tsk)
  {
        GList *node;
diff -r d35da5556392 -r c1cc927ab460 time/gnotime/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-ao     Wed Mar 16 12:48:49 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2005/03/16 12:48:49 rillig Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+
+--- lib/qof/qofid.c.orig       Sun May 23 22:57:30 2004
++++ lib/qof/qofid.c    Wed Mar 16 09:26:50 2005
+@@ -182,8 +182,9 @@ qof_collection_get_type (QofCollection *
+ static void
+ qof_collection_remove_entity (QofEntity *ent)
+ {
++  QofCollection *col;
+   if (!ent) return;
+-  QofCollection *col = ent->collection;
++  col = ent->collection;
+   if (!col) return;
+   g_hash_table_remove (col->hash_of_entities, &ent->guid);
+   ent->collection = NULL;
diff -r d35da5556392 -r c1cc927ab460 time/gnotime/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-ap     Wed Mar 16 12:48:49 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2005/03/16 12:48:49 rillig Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+
+--- lib/qof/qofquery.c.orig    Sun May 23 22:57:30 2004
++++ lib/qof/qofquery.c Wed Mar 16 09:28:08 2005
+@@ -1216,13 +1216,14 @@ void qof_query_add_guid_match (QofQuery 
+ 
+ void qof_query_set_book (QofQuery *q, QofBook *book)
+ {
++  GSList *slist;
+   if (!q || !book) return;
+ 
+   /* Make sure this book is only in the list once */
+   if (g_list_index (q->books, book) == -1)
+     q->books = g_list_prepend (q->books, book);
+ 
+-  GSList *slist = NULL;
++  slist = NULL;
+   g_slist_prepend (slist, QOF_PARAM_GUID);
+   g_slist_prepend (slist, QOF_PARAM_BOOK);
+   qof_query_add_guid_match (q, slist,
diff -r d35da5556392 -r c1cc927ab460 time/gnotime/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/time/gnotime/patches/patch-aq     Wed Mar 16 12:48:49 2005 +0000
@@ -0,0 +1,158 @@
+$NetBSD: patch-aq,v 1.1 2005/03/16 12:48:49 rillig Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+



Home | Main Index | Thread Index | Old Index