Bug 84560 - [patch] unbreak gkrelltop on 4.x
Summary: [patch] unbreak gkrelltop on 4.x
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Roman Bogorodskiy
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-08-04 20:30 UTC by Paweł Pękala
Modified: 2005-08-28 22:24 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Paweł Pękala 2005-08-04 20:30:15 UTC

Fix: 

-- 
Tylko w sierpniu Avanti tak¿e w wersji MINI - z ³atwo¶ci± zmie¶ci siê w torebce!
http://www.avantimoda.pl--gdL1DyVLLVx7GQCdvR7hxwOrWg67nzoz5rmJEh0iSyegdTMd
Content-Type: text/plain; name="gkrelltop.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gkrelltop.diff"

diff -Nru -x work /usr/ports/sysutils/gkrelltop/Makefile tmp/gkrelltop/Makefile
--- /usr/ports/sysutils/gkrelltop/Makefile	Thu Aug  4 21:01:57 2005
+++ tmp/gkrelltop/Makefile	Thu Aug  4 21:07:45 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrelltop
 PORTVERSION=	2.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
 DISTNAME=	${PORTNAME}_2.2-6
@@ -28,10 +28,6 @@
 		libexec/gkrellm2/plugins/gkrelltopd.so
 
 .include <bsd.port.pre.mk>
-
-#.if ${OSVERSION} < 500000
-#BROKEN=		"Does not compile on FreeBSD 4.x"
-#.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -Nru -x work /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c tmp/gkrelltop/files/patch-gkrelltop.c
--- /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c	Thu Jan  1 01:00:00 1970
+++ tmp/gkrelltop/files/patch-gkrelltop.c	Thu Aug  4 21:10:31 2005
@@ -0,0 +1,20 @@
+--- gkrelltop.c.orig	Thu Aug  4 21:08:58 2005
++++ gkrelltop.c	Thu Aug  4 21:09:34 2005
+@@ -324,7 +324,8 @@
+     TextStyle *ts, *ts_alt;
+     gint y;
+     gint i;
+-
++    GkrellmPiximage *krell_image = NULL;
++    
+     /* See comments about first create in demo2.c
+      */
+     if (first_create)
+@@ -335,7 +336,6 @@
+     ts = gkrellm_meter_textstyle(style_id); //smaller font e brighter col 
+     ts_alt = gkrellm_meter_alt_textstyle(style_id); //smaller font e brighter col 
+ 
+-    GkrellmPiximage *krell_image = NULL;
+     //krell_image = gkrellm_krell_meter_piximage(style_id);
+     gkrellm_load_piximage("krell_panel1", krell_panel1_xpm, &krell_image, STYLE_NAME);
+ /*
Comment 1 Roman Bogorodskiy freebsd_committer freebsd_triage 2005-08-28 14:07:21 UTC
Responsible Changed
From-To: freebsd-ports-bugs->novel

I'll take it.
Comment 2 Roman Bogorodskiy freebsd_committer freebsd_triage 2005-08-28 14:25:15 UTC
Dear maintainer of sysutils/gkrelltop, do you approve this update:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/84560 ?

Roman Bogorodskiy
Comment 3 Roman Bogorodskiy freebsd_committer freebsd_triage 2005-08-28 14:35:44 UTC
State Changed
From-To: open->feedback

Asked for maintainer's approval.
Comment 4 Roman Bogorodskiy freebsd_committer freebsd_triage 2005-08-28 22:24:37 UTC
State Changed
From-To: feedback->closed

Committed, thanks!