Date: Thu, 4 Aug 2005 21:22:14 +0200 From: "Pawel Pekala" <c0rn@gazeta.pl> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: david@pinko.net Subject: ports/84560: [patch] unbreak gkrelltop on 4.x Message-ID: <1123183334.0@ph240.swidnica.sdi.tpnet.pl> Resent-Message-ID: <200508041930.j74JUFWY028324@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84560
>Category: ports
>Synopsis: [patch] unbreak gkrelltop on 4.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 04 19:30:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Pawel Pekala
>Release: FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
System: FreeBSD 4.11-RELEASE-p11 #9: Thu Jun 30 20:16:52 CEST 2005
root@ph240.swidnica.sdi.tpnet.pl:/usr/obj/usr/src/sys/CORN
>Description:
>How-To-Repeat:
>Fix:
--- gkrelltop.diff begins here ---
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);
+ /*
--- gkrelltop.diff ends here ---
--
Tylko w sierpniu Avanti także w wersji MINI - z łatwością zmieści się w torebce!
http://www.avantimoda.pl
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1123183334.0>