From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C429613888F for ; Wed, 14 Oct 2015 21:27:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68FD0E07C2; Wed, 14 Oct 2015 21:27:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5ADEE07C2 for ; Wed, 14 Oct 2015 21:27:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 148C8340A9C for ; Wed, 14 Oct 2015 21:27:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7643610C5 for ; Wed, 14 Oct 2015 21:27:48 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1444858064.81dc29045a3d6ca711c589fbc44513cf5411cea8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch x11-misc/xlockmore/xlockmore-5.46.ebuild X-VCS-Directories: x11-misc/xlockmore/ x11-misc/xlockmore/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 81dc29045a3d6ca711c589fbc44513cf5411cea8 X-VCS-Branch: master Date: Wed, 14 Oct 2015 21:27:48 +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-Archives-Salt: c5dcb4c3-c976-44d3-87e4-e6a1845589c4 X-Archives-Hash: 4dcb24d0fff4d6093ab35022abdabe82 commit: 81dc29045a3d6ca711c589fbc44513cf5411cea8 Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 14 21:27:03 2015 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 14 21:27:44 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dc2904 x11-misc/xlockmore: Fixed compilation with freetype-2.6.1 (bug #562342). Package-Manager: portage-2.2.23 Signed-off-by: Lars Wendler gentoo.org> x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch | 11 +++++++++++ x11-misc/xlockmore/xlockmore-5.46.ebuild | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch new file mode 100644 index 0000000..5258121 --- /dev/null +++ b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch @@ -0,0 +1,11 @@ +--- xlockmore-5.46/configure.ac ++++ xlockmore-5.46/configure.ac +@@ -1912,7 +1912,7 @@ + AC_DEFUN([AC_PATH_FREETYPE_DIRECT], + [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype + test -z "$freetype_direct_test_function" && freetype_direct_test_function=FT_Init_FreeType +-test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype.h ++test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/ft2build.h + for ac_dir in \ + /usr/X11R6.5.1/include \ + /usr/X11R6.4/include \ diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild index f3b9d03..038393a 100644 --- a/x11-misc/xlockmore/xlockmore-5.46.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit flag-o-matic pam +inherit autotools eutils flag-o-matic pam DESCRIPTION="Just another screensaver application for X" HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html" @@ -44,6 +44,11 @@ DEPEND=" x11-proto/xineramaproto " +src_prepare() { + epatch "${FILESDIR}"/${PN}-5.46-freetype261.patch + eautoreconf +} + src_configure() { local myconf=""