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 9DDD4138239 for ; Sun, 29 Mar 2020 11:36:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 306E2E0AB8; Sun, 29 Mar 2020 11:36:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 8DE2FE0AA2 for ; Sun, 29 Mar 2020 11:36:02 +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 69C7D34FAFF for ; Sun, 29 Mar 2020 11:36:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 731B01A3 for ; Sun, 29 Mar 2020 11:35:59 +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: <1585481724.583b4210a0e3aff5c029a3d569aa18e0ee2bfb2c.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-r2.ebuild X-VCS-Directories: x11-plugins/wmacpi/files/ x11-plugins/wmacpi/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 583b4210a0e3aff5c029a3d569aa18e0ee2bfb2c X-VCS-Branch: master Date: Sun, 29 Mar 2020 11:35:59 +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: bb626ee5-f181-483e-9d26-b6e61f9426f8 X-Archives-Hash: c969c9f441476de6ef1a32b579d73596 commit: 583b4210a0e3aff5c029a3d569aa18e0ee2bfb2c Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Mar 29 11:13:14 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Mar 29 11:35:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583b4210 x11-plugins/wmacpi: fix build with -fno-common Latest libdockapp revbump now defines a global variable as extern Closes: https://bugs.gentoo.org/715260 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli gentoo.org> .../wmacpi/files/wmacpi-2.3-fno-common.patch | 11 ++++++++ x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild | 33 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) 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..068c00c592f --- /dev/null +++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch @@ -0,0 +1,11 @@ +diff -Naur dockapps.orig/wmacpi.c dockapps/wmacpi.c +--- dockapps.orig/wmacpi.c 2015-01-12 11:24:15.000000000 +0100 ++++ dockapps/wmacpi.c 2020-03-29 13:11:56.712022800 +0200 +@@ -72,6 +72,7 @@ + + /* globals */ + struct dockapp *dockapp; ++Display *display; + /* global_t *globals; */ + + /* this gives us a variable scroll rate, depending on the importance of the diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild new file mode 100644 index 00000000000..25640e9e028 --- /dev/null +++ b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="DockApp ACPI status monitor for laptops" +HOMEPAGE="https://www.dockapps.net/wmacpi" +SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 -ppc -sparc ~x86" + +DEPEND=">=x11-libs/libdockapp-0.7-r1:= + x11-libs/libX11" + +S=${WORKDIR}/dockapps + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-fno-common.patch + ) + +src_prepare() { + default + + sed -e 's###' -i *.c || die +} + +src_compile() { + emake CC="$(tc-getCC)" +}