From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 4 19:30:16 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1E8E16A41F for ; Thu, 4 Aug 2005 19:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E335D43D49 for ; Thu, 4 Aug 2005 19:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j74JUFja028325 for ; Thu, 4 Aug 2005 19:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j74JUFWY028324; Thu, 4 Aug 2005 19:30:15 GMT (envelope-from gnats) Resent-Date: Thu, 4 Aug 2005 19:30:15 GMT Resent-Message-Id: <200508041930.j74JUFWY028324@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B59E716A41F for ; Thu, 4 Aug 2005 19:21:11 +0000 (GMT) (envelope-from c0rn@gazeta.pl) Received: from imail1.gazeta.pl (imail1.gazeta.pl [193.42.231.143]) by mx1.FreeBSD.org (Postfix) with ESMTP id D100143D45 for ; Thu, 4 Aug 2005 19:21:10 +0000 (GMT) (envelope-from c0rn@gazeta.pl) Received: from poczta.gazeta.pl (unverified [193.42.231.60]) by (imail1.gazeta.pl) with ESMTP id 31589944 for ; Thu, 04 Aug 2005 21:21:09 +0300 Received: from ph240.swidnica.sdi.tpnet.pl (unverified [212.160.3.240]) by mailic01.gazeta.pl (mailic01.gazeta.pl) with ESMTP id 284452 for multiple; Thu, 04 Aug 2005 21:21:07 +0200 Message-Id: <1123183334.0@ph240.swidnica.sdi.tpnet.pl> Date: Thu, 4 Aug 2005 21:22:14 +0200 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.5 Cc: david@pinko.net Subject: ports/84560: [patch] unbreak gkrelltop on 4.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2005 19:30:16 -0000 >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 - -#.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: