From 2d83e42badcbd2a1db72905501f5b02916040fc8 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 19 Apr 2006 02:25:09 +0000 Subject: * Add a missing prototype for calendar_get_type() to fix a crash on 64-bit platforms [1] * Correct the return type for strptime() Reported by: Pascal Hofstee git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6087 df743ca5-7f9a-e211-a948-0013205c9059 --- deskutils/gnome-utils/Makefile | 3 ++- .../gnome-utils/files/patch-logview_calendar.h | 10 ++++++++++ deskutils/gnome-utils/files/patch-logview_misc.c | 21 +++++++++++++++++++++ deskutils/gnomeutils2/Makefile | 3 ++- .../gnomeutils2/files/patch-logview_calendar.h | 10 ++++++++++ deskutils/gnomeutils2/files/patch-logview_misc.c | 21 +++++++++++++++++++++ 6 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 deskutils/gnome-utils/files/patch-logview_calendar.h create mode 100644 deskutils/gnome-utils/files/patch-logview_misc.c create mode 100644 deskutils/gnomeutils2/files/patch-logview_calendar.h create mode 100644 deskutils/gnomeutils2/files/patch-logview_misc.c diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 332526fe8..3cb9a31a8 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.88 2006/03/13 20:48:58 marcus Exp $ +# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.89 2006/04/13 07:52:31 bland Exp $ # PORTNAME= gnomeutils2 PORTVERSION= 2.14.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnome-utils/files/patch-logview_calendar.h b/deskutils/gnome-utils/files/patch-logview_calendar.h new file mode 100644 index 000000000..3aefb999f --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_calendar.h @@ -0,0 +1,10 @@ +--- logview/calendar.h.orig Tue Apr 18 22:20:35 2006 ++++ logview/calendar.h Tue Apr 18 22:20:58 2006 +@@ -45,6 +45,7 @@ typedef struct CalendarClass + GtkCalendarClass parent_class; + }CalendarClass; + ++GType calendar_get_type (void); + GtkWidget *calendar_new (void); + void calendar_select_date (Calendar *calendar, GDate *date); + void calendar_init_data (Calendar *calendar, LogviewWindow *logview); diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c new file mode 100644 index 000000000..1a0f54cfe --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_misc.c @@ -0,0 +1,21 @@ +--- logview/misc.c.orig Tue Apr 18 21:28:07 2006 ++++ logview/misc.c Tue Apr 18 21:28:30 2006 +@@ -135,15 +135,15 @@ string_get_date (char *line) + { + GDate *date; + struct tm tp; +- int cp; ++ char *cp; + + if (line == NULL || line[0] == 0) + return NULL; + + cp = strptime (line, "%b %d", &tp); +- if (cp == 0) { ++ if (cp == NULL) { + cp = strptime (line, "%F", &tp); +- if (cp == 0) { ++ if (cp == NULL) { + return NULL; + } + } diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 332526fe8..3cb9a31a8 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.88 2006/03/13 20:48:58 marcus Exp $ +# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.89 2006/04/13 07:52:31 bland Exp $ # PORTNAME= gnomeutils2 PORTVERSION= 2.14.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnomeutils2/files/patch-logview_calendar.h b/deskutils/gnomeutils2/files/patch-logview_calendar.h new file mode 100644 index 000000000..3aefb999f --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_calendar.h @@ -0,0 +1,10 @@ +--- logview/calendar.h.orig Tue Apr 18 22:20:35 2006 ++++ logview/calendar.h Tue Apr 18 22:20:58 2006 +@@ -45,6 +45,7 @@ typedef struct CalendarClass + GtkCalendarClass parent_class; + }CalendarClass; + ++GType calendar_get_type (void); + GtkWidget *calendar_new (void); + void calendar_select_date (Calendar *calendar, GDate *date); + void calendar_init_data (Calendar *calendar, LogviewWindow *logview); diff --git a/deskutils/gnomeutils2/files/patch-logview_misc.c b/deskutils/gnomeutils2/files/patch-logview_misc.c new file mode 100644 index 000000000..1a0f54cfe --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_misc.c @@ -0,0 +1,21 @@ +--- logview/misc.c.orig Tue Apr 18 21:28:07 2006 ++++ logview/misc.c Tue Apr 18 21:28:30 2006 +@@ -135,15 +135,15 @@ string_get_date (char *line) + { + GDate *date; + struct tm tp; +- int cp; ++ char *cp; + + if (line == NULL || line[0] == 0) + return NULL; + + cp = strptime (line, "%b %d", &tp); +- if (cp == 0) { ++ if (cp == NULL) { + cp = strptime (line, "%F", &tp); +- if (cp == 0) { ++ if (cp == NULL) { + return NULL; + } + } -- cgit