From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 6 19:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BBE416A417 for ; Sun, 6 Jan 2008 19:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 512E813C4CC for ; Sun, 6 Jan 2008 19:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m06Je1dS085798 for ; Sun, 6 Jan 2008 19:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m06Je1hf085797; Sun, 6 Jan 2008 19:40:01 GMT (envelope-from gnats) Resent-Date: Sun, 6 Jan 2008 19:40:01 GMT Resent-Message-Id: <200801061940.m06Je1hf085797@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, Bernhard Froehlich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5581716A417 for ; Sun, 6 Jan 2008 19:34:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 5530A13C43E for ; Sun, 6 Jan 2008 19:34:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m06JY0Un032873 for ; Sun, 6 Jan 2008 19:34:00 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m06JY0kC032872; Sun, 6 Jan 2008 19:34:00 GMT (envelope-from nobody) Message-Id: <200801061934.m06JY0kC032872@www.freebsd.org> Date: Sun, 6 Jan 2008 19:34:00 GMT From: Bernhard Froehlich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/119393: sysutils/xfce4-battery-plugin: Fix build on amd64 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: Sun, 06 Jan 2008 19:40:02 -0000 >Number: 119393 >Category: ports >Synopsis: sysutils/xfce4-battery-plugin: Fix build on amd64 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 06 19:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Bernhard Froehlich >Release: FreeBSD 7.0-RC1/AMD64 >Organization: >Environment: FreeBSD chii.bluelife.at 7.0-RC1 FreeBSD 7.0-RC1 #1: Sat Dec 29 12:29:16 CET 2007 decke@chii.bluelife.at:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The battery plugin is currently i386 only and failes to build on amd64 because apm is not available there. This patch enables apm only for i386 and fixes some apm variable declarations which makes it build and usable on amd64. >How-To-Repeat: >Fix: Patch attached with submission follows: --- panel-plugin/battery.c (revision 3756) +++ panel-plugin/battery.c (working copy) @@ -25,7 +25,7 @@ #include #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__)) #include #elif __OpenBSD__ #include @@ -163,7 +163,9 @@ except that is does not work on FreeBSD */ +#ifdef APMDEVICE struct apm_info apm; +#endif int fd; /* First check to see if ACPI is available */ @@ -310,7 +312,9 @@ acline = apm.ac_state ? TRUE : FALSE; #else +#ifdef APMDEVICE struct apm_info apm; +#endif DBG ("Updating battery status..."); if(battmon->method == BM_BROKEN) { >Release-Note: >Audit-Trail: >Unformatted: