ports/156313: [patch][new port] astro/gkrellsun2 (Gkrellm2 Plugin)

Sun Apr 10 17:50:10 UTC 2011

>Number:         156313
>Category:       ports
>Synopsis:       [patch][new port] astro/gkrellsun2 (Gkrellm2 Plugin)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 10 17:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Teresa Johnson
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
FreeBSD www.redowl.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Sun Mar 6 13:13:12 PST 2011 monkey at naan.monkeybrains.net:/usr/obj/usr/src/sys/NAAN amd64
>Description:
Gkrellsun2 is a Gkrellm2 (sysutils/gkrellm2) plugin which displays the
sunrise/sunset times with the sun's path/location displayed. The option
to display the moon's altitude and phase is also included. It is an
updated version of astro/gkrellsun, a Gkrellm (sysutils/gkrellm) plugin.

Originally written by Norman Walsh to run under Gkrellm, this version
runs only under Gkrellm2 and is authored by Norman Walsh and Kurt Hindenburg.

Additional info:
Removed compiler warnings appearing on amd64 arch by utilizing Glib's macros.

Fixed segfault resulting from repeated enabling/disabling of plugin while
Gkrellm2 was running.

>How-To-Repeat:

>Fix:

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	gkrellsun2
#	gkrellsun2/files
#	gkrellsun2/files/patch-Makefile
#	gkrellsun2/files/patch-src20-gkrellsun.c
#	gkrellsun2/files/patch-src20-Makefile
#	gkrellsun2/pkg-descr
#	gkrellsun2/distinfo
#	gkrellsun2/Makefile
#	gkrellsun2/pkg-plist
#
echo c - gkrellsun2
mkdir -p gkrellsun2 > /dev/null 2>&1
echo c - gkrellsun2/files
mkdir -p gkrellsun2/files > /dev/null 2>&1
echo x - gkrellsun2/files/patch-Makefile
sed 's/^X//' >gkrellsun2/files/patch-Makefile << '92d7493b06532494a49b63644891e975'
X--- Makefile.orig	2011-04-07 01:26:41.000000000 -0700
X+++ Makefile	2011-04-07 01:27:42.000000000 -0700
X@@ -2,7 +2,7 @@
X TMP=.
X 
X all: comment
X-	cd src20; make; cd ..
X+	cd src20; gmake; cd ..
X 
X comment:
X 	@echo
X@@ -12,12 +12,12 @@
X 	@echo 
X 
X install: comment
X-	cd src20; make install; cd ..
X+	cd src20; gmake install; cd ..
X 
X distclean: clean
X 
X clean:
X-	cd src20; make clean; cd ..
X+	cd src20; gmake clean; cd ..
X 	rm -f gkrellsun*.zip gkrellsun*.tar.gz
X 
X dist:
92d7493b06532494a49b63644891e975
echo x - gkrellsun2/files/patch-src20-gkrellsun.c
sed 's/^X//' >gkrellsun2/files/patch-src20-gkrellsun.c << '87c568214b17d2decf19166fe87b3071'
X--- src20/gkrellsun.c.orig	2011-04-07 01:26:51.000000000 -0700
X+++ src20/gkrellsun.c	2011-04-09 17:27:09.000000000 -0700
X@@ -1160,7 +1160,7 @@
X    }
X    colorsCreated = FALSE;
X    colormap = NULL;
X-/*   textOptions.fontDesc = NULL;*/
X+   textOptions.fontDesc = NULL;
X }
X 
X /* Calculate height and width of text given a Pango Font */
X@@ -1388,8 +1388,8 @@
X    GdkColor color;
X    gint response;
X 
X-   gint whichTime = (gint)data % 10;
X-   gint whichSun = (gint)data / 10;
X+   gint whichTime = GPOINTER_TO_INT(data) % 10;
X+   gint whichSun = GPOINTER_TO_INT(data) / 10;
X 
X    w = gtk_color_selection_dialog_new(_("Pick a color"));
X 
X@@ -1545,7 +1545,7 @@
X          g_signal_connect(G_OBJECT (times_drawingarea[sun][time]),
X             "expose_event", G_CALLBACK (expose_event_callback), NULL);
X          gtk_widget_add_events((GtkWidget *)times_drawingarea[sun][time], GDK_BUTTON_PRESS_MASK );
X-         g_signal_connect(G_OBJECT(times_drawingarea[sun][time]), "button_press_event", G_CALLBACK(setTextColor_cb), (gpointer)((sun*10)+time) );
X+	 g_signal_connect(G_OBJECT(times_drawingarea[sun][time]), "button_press_event", G_CALLBACK(setTextColor_cb), GINT_TO_POINTER((sun*10)+time) );
X       }
X 
X       switch(sun)
X@@ -1578,7 +1578,7 @@
X    /* TODO: Add key shortcut for Alt-F */
X    font_button = (GtkWidget *)gtk_button_new_from_stock("gtk-select-font");
X    gtk_table_attach((GtkTable *)table, font_button, 8,8+1, sun-2, sun+1, GTK_SHRINK, GTK_FILL, 0,0);
X-   (void)g_signal_connect (G_OBJECT(font_button), "button_press_event", G_CALLBACK (setTextFont_cb), (gpointer)sun);
X+   (void)g_signal_connect (G_OBJECT(font_button), "button_press_event", G_CALLBACK (setTextFont_cb), GINT_TO_POINTER(sun));
X 
X    gtk_table_set_row_spacing((GtkTable *)table,0,10);
X    gtk_table_set_col_spacing((GtkTable *)table,3,20);
87c568214b17d2decf19166fe87b3071
echo x - gkrellsun2/files/patch-src20-Makefile
sed 's/^X//' >gkrellsun2/files/patch-src20-Makefile << '8b55d3c2de75f82ecd06829799da5758'
X--- src20/Makefile.orig	2006-03-16 10:59:17.000000000 -0800
X+++ src20/Makefile	2011-04-08 14:07:41.000000000 -0700
X@@ -8,7 +8,7 @@
X 
X PREFIX ?= /usr/local
X INSTALLDIR ?= $(DESTDIR)$(PREFIX)
X-PLUGINDIR ?= $(INSTALLDIR)/lib/gkrellm2/plugins
X+PLUGINDIR ?= $(INSTALLDIR)/libexec/gkrellm2/plugins
X LOCALEDIR ?= $(INSTALLDIR)/share/locale
X 
X FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
8b55d3c2de75f82ecd06829799da5758
echo x - gkrellsun2/pkg-descr
sed 's/^X//' >gkrellsun2/pkg-descr << '5e78906f5b2a1d5eb3f28a1b46868bcc'
Xgkrellsun displays sunrise and sunset times for the specified latitude and 
Xlongitude in the current timezone.
X
XThe port is based on:
X
XwmSun:
X        (C) Mike Henderson <mghenderson at lanl.gov>.
X
Xgkrellmoon:
X        (C) Dale P. Smith <dsmith at altustech.com>
X
Xglunarclock:
X        Josh Buhl <jbuhl at users.sourceforge.net>
X
XBased on:
X        wmMoonClock-1.27, (CalcEphem.c, Moon.c, MoonRise.c) 
X        (C) Mike Henderson <mghenderson at lanl.gov>.
X
X
XWWW: http://sourceforge.net/projects/gkrellsun/
XAuthor: Norman Walsh <ndw at nwalsh.com>,
X	Kurt V. Hindenburg <kvh009 at users.sourceforge.net>
5e78906f5b2a1d5eb3f28a1b46868bcc
echo x - gkrellsun2/distinfo
sed 's/^X//' >gkrellsun2/distinfo << '23b10421c62af5de88112ebb42d1e598'
XSHA256 (gkrellsun-1.0.0.tar.gz) = 7e1d930ff713c2344e618ca6ead7baf3b13efecb19af193119b09a8b7264f587
XSIZE (gkrellsun-1.0.0.tar.gz) = 96696
23b10421c62af5de88112ebb42d1e598
echo x - gkrellsun2/Makefile
sed 's/^X//' >gkrellsun2/Makefile << '34f35616c98c00b6c6b636a45fda4181'
X# New ports collection makefile for:    gkrellsun2
X# Date created:                         6 April 2011
X# Whom:                                 Teresa Johnson <tlj at redowl.net>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	gkrellsun2
XPORTVERSION=	1.0.0
XCATEGORIES=	astro
XMASTER_SITES=	http://sourceforge.net/projects/gkrellsun/
XDISTNAME=	gkrellsun-${PORTVERSION}
X
XMAINTAINER=	tlj at redowl.net
XCOMMENT=	A Gkrellm2-Plugin that displays the local sun rise and sun set times
X
XUSE_GNOME=	gtk20
X
XUSE_GMAKE=	yes
X
Xpost-install:
X.ifndef(NOPORTDOCS)
X	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
X		${PREFIX}/share/doc/${PORTNAME}
X	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
X.endif #NOPORTDOCS
X
X.include <bsd.port.mk>
34f35616c98c00b6c6b636a45fda4181
echo x - gkrellsun2/pkg-plist
sed 's/^X//' >gkrellsun2/pkg-plist << 'd659d79d28b41ff620d35a565af9c816'
Xlibexec/gkrellm2/plugins/gkrellsun.so
X%%PORTDOCS%%%%DOCSDIR%%/README
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
d659d79d28b41ff620d35a565af9c816
exit

>Release-Note:
>Audit-Trail:
>Unformatted: