cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gkrellsun-1.0.0.

Browse Source
This commit is contained in:
ajacoutot 2015-06-26 18:27:33 +00:00
parent 809b3f0fcc
commit e9eb0d3ae4
4 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/gkrellm/plugins/sun/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2015/06/26 18:08:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2015/06/26 18:27:33 ajacoutot Exp $
COMMENT= GkrellM2 plugin to display sun rise/set times
DISTNAME= gkrellsun-0.12.1
REVISION= 18
DISTNAME= gkrellsun-1.0.0
CATEGORIES= astro
HOMEPAGE= http://gkrellsun.sourceforge.net/

4
sysutils/gkrellm/plugins/sun/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gkrellsun-0.12.1.tar.gz) = 9CC6Xi6TXyym05auBWDB5heaQDWC6R6hKuU8EZ31wJA=
SIZE (gkrellsun-0.12.1.tar.gz) = 91995
SHA256 (gkrellsun-1.0.0.tar.gz) = qfvyPGn7rsewOV6a33jpivP56CY6AcAxL6onwod1dgg=
SIZE (gkrellsun-1.0.0.tar.gz) = 96970

12
sysutils/gkrellm/plugins/sun/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $
--- Makefile.orig Tue Jun 1 15:01:47 2004
+++ Makefile Mon Oct 11 14:34:03 2004
$OpenBSD: patch-Makefile,v 1.4 2015/06/26 18:27:33 ajacoutot Exp $
--- Makefile.orig Thu Mar 16 19:59:17 2006
+++ Makefile Fri Jun 26 20:20:03 2015
@@ -1,8 +1,8 @@
PACKAGE ?= gkrellsun
@ -33,9 +33,9 @@ $OpenBSD: patch-Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $
-CC = gcc $(CFLAGS) $(FLAGS)
-
OBJS = gkrellsun.o CalcEphem.o Moon.o
OBJS = gkrellsun.o CalcEphem.o Moon.o MoonRise.o
+
+CFLAGS += $(FLAGS)
#IMAGES = ../images/osun.xpm ../images/uvsun.xpm \
# ../images/star.xpm ../images/dot.xpm
IMAGES = ../images/osun.xpm ../images/uvsun.xpm \
../images/star.xpm ../images/dot.xpm \

54
sysutils/gkrellm/plugins/sun/patches/patch-gkrellsun_c
View File

@ -1,35 +1,25 @@
$OpenBSD: patch-gkrellsun_c,v 1.4 2004/10/16 16:33:56 sturm Exp $
--- gkrellsun.c.orig Sun Jun 6 06:34:21 2004
+++ gkrellsun.c Mon Oct 11 14:34:03 2004
@@ -214,8 +214,8 @@ struct _Sun
SunData data;
};
$OpenBSD: patch-gkrellsun_c,v 1.5 2015/06/26 18:27:33 ajacoutot Exp $
--- gkrellsun.c.orig Fri Jun 26 20:21:26 2015
+++ gkrellsun.c Fri Jun 26 20:24:21 2015
@@ -1388,8 +1388,8 @@ setTextColor_cb(/*@unused@*/GtkWidget *widget, /*@unus
GdkColor color;
gint response;
-extern long CurrentGMTTime;
-/*long CurrentGMTTime = 0;*/
+extern time_t CurrentGMTTime;
+/*time_t CurrentGMTTime = 0;*/
static Sun sununit;
- gint whichTime = (gint)data % 10;
- gint whichSun = (gint)data / 10;
+ gint whichTime = (glong)data % 10;
+ gint whichSun = (glong)data / 10;
static gchar *sun_data_dir;
@@ -231,9 +231,9 @@ static void update_sun_data(Sun * sun)
glong date;
gint day_of_month, month, year;
w = gtk_color_selection_dialog_new(_("Pick a color"));
- CurrentGMTTime = (long) time(NULL);
+ CurrentGMTTime = time(NULL);
- time_struc = gmtime(&(time_t)CurrentGMTTime);
+ time_struc = gmtime(&CurrentGMTTime);
/* It may return NULL when the year does not fit into an integer.*/
if (time_struc == NULL) {
g_message("Error: gmtime returned NULL\n"); exit(EXIT_FAILURE);
@@ -258,7 +258,7 @@ static void update_sun_data(Sun * sun)
year, month, day_of_month, date);
}
- time_struc = localtime(&(time_t)CurrentGMTTime);
+ time_struc = localtime(&CurrentGMTTime);
if (time_struc == NULL) {
g_message("Error: localtime returned NULL\n"); exit(EXIT_FAILURE);
}
@@ -1459,8 +1459,8 @@ sun_create_tab(GtkWidget *tab_vbox)
GtkWidget *ll_vbox, *ll_frame;
GtkWidget *long_hbox, *lat_hbox;
GtkWidget *table1;
- gint time;
- guint sun;
+ glong time;
+ gulong sun;
GtkWidget *font_button;
guint x;
GtkSizeGroup *ll_size_group;