From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6FA261382C5 for ; Fri, 29 May 2020 20:48:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0EF6E0831; Fri, 29 May 2020 20:48:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90F75E08EC for ; Fri, 29 May 2020 20:48:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9702634F003 for ; Fri, 29 May 2020 20:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47EBD26E for ; Fri, 29 May 2020 20:48:09 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1590785151.08bd26cc0c8e46eb41df8e6ddb2b0b6070c6c25f.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpi/files/, x11-plugins/wmacpi/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild X-VCS-Directories: x11-plugins/wmacpi/ x11-plugins/wmacpi/files/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 08bd26cc0c8e46eb41df8e6ddb2b0b6070c6c25f X-VCS-Branch: master Date: Fri, 29 May 2020 20:48:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b702a0b-2e9c-49a6-9a18-7faaeb911221 X-Archives-Hash: 9940adb7b020dd392fa5e95a4b4ec4f8 commit: 08bd26cc0c8e46eb41df8e6ddb2b0b6070c6c25f Author: Bernard Cafarelli gentoo org> AuthorDate: Fri May 29 20:35:54 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Fri May 29 20:45:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08bd26cc x11-plugins/wmacpi: fix build with -fno-common Application needed a specific fix in addition to libdockapp one Closes: https://bugs.gentoo.org/723168 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli gentoo.org> .../wmacpi/files/wmacpi-2.3-fno-common.patch | 27 ++++++++++++++++++++++ x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild | 8 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch new file mode 100644 index 00000000000..49ee8446fc4 --- /dev/null +++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch @@ -0,0 +1,27 @@ +diff -Naur dockapps.orig/libacpi.c dockapps/libacpi.c +--- dockapps.orig/libacpi.c 2015-01-12 11:24:15.000000000 +0100 ++++ dockapps/libacpi.c 2020-05-29 22:33:52.526826841 +0200 +@@ -17,6 +17,9 @@ + #define SYSFS_DATA_SOURCE 1 + static int data_source; + ++battery_t batteries[MAXBATT]; ++int verbosity; ++ + /* local proto */ + int acpi_get_design_cap(int batt); + +diff -Naur dockapps.orig/libacpi.h dockapps/libacpi.h +--- dockapps.orig/libacpi.h 2015-01-12 11:24:15.000000000 +0100 ++++ dockapps/libacpi.h 2020-05-29 22:33:36.393811163 +0200 +@@ -128,8 +128,8 @@ + + + /* Since these /are/ needed here . . . */ +-battery_t batteries[MAXBATT]; +-int verbosity; ++extern battery_t batteries[MAXBATT]; ++extern int verbosity; + + /* check if apm/acpi is enabled, etc */ + int power_init(global_t *globals); diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild index 5a0d2945eb4..9ee992963ca 100644 --- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild +++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,9 +17,13 @@ DEPEND=">=x11-libs/libdockapp-0.7:= S=${WORKDIR}/dockapps +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-fno-common.patch + ) + src_prepare() { default - eapply "${FILESDIR}"/${P}-makefile.patch sed -e 's###' -i *.c || die }