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 40053138350 for ; Sat, 25 Jan 2020 10:48:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70ED0E0831; Sat, 25 Jan 2020 10:48:18 +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 53869E0821 for ; Sat, 25 Jan 2020 10:48:18 +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 0C5C834E2A7 for ; Sat, 25 Jan 2020 10:48:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD1DAE5 for ; Sat, 25 Jan 2020 10:48:14 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1579949287.09411e9512455df329ebd9fee8d1fd1b709d124e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/i3lock/, x11-misc/i3lock/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/i3lock/files/i3lock-2.12-fno-common.patch x11-misc/i3lock/i3lock-2.12-r2.ebuild X-VCS-Directories: x11-misc/i3lock/files/ x11-misc/i3lock/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 09411e9512455df329ebd9fee8d1fd1b709d124e X-VCS-Branch: master Date: Sat, 25 Jan 2020 10:48:14 +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: 6c5f9636-24cb-4626-9281-9ec69ad8692b X-Archives-Hash: 7b815e5fe95cd02590666e63cd9b4695 commit: 09411e9512455df329ebd9fee8d1fd1b709d124e Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jan 25 10:35:25 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jan 25 10:48:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09411e95 x11-misc/i3lock: Fix compiling with -fno-common Package-Manager: Portage-2.3.85, Repoman-2.3.20 Closes: https://bugs.gentoo.org/706286 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/i3lock/files/i3lock-2.12-fno-common.patch | 11 +++++ x11-misc/i3lock/i3lock-2.12-r2.ebuild | 47 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch b/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch new file mode 100644 index 00000000000..09003b16591 --- /dev/null +++ b/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch @@ -0,0 +1,11 @@ +--- a/unlock_indicator.c ++++ b/unlock_indicator.c +@@ -35,7 +35,7 @@ + + /* The current position in the input buffer. Useful to determine if any + * characters of the password have already been entered or not. */ +-int input_position; ++extern int input_position; + + /* The lock window. */ + extern xcb_window_t win; diff --git a/x11-misc/i3lock/i3lock-2.12-r2.ebuild b/x11-misc/i3lock/i3lock-2.12-r2.ebuild new file mode 100644 index 00000000000..07a68eb55c2 --- /dev/null +++ b/x11-misc/i3lock/i3lock-2.12-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Simple screen locker" +HOMEPAGE="https://i3wm.org/i3lock/" +SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +RDEPEND=" + >=x11-libs/libxkbcommon-0.5.0[X] + dev-libs/libev + sys-libs/pam + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-xrm +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +DOCS=( CHANGELOG README.md ) +PATCHES=( + "${FILESDIR}"/${PN}-2.12-fno-common.patch +) + +src_prepare() { + default + + sed -i -e 's:login:system-auth:g' pam/${PN} || die +} + +src_configure() { + tc-export CC + default +} + +src_install() { + default + doman ${PN}.1 +}