summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2015-10-14 23:27:03 +0200
committerLars Wendler <polynomial-c@gentoo.org>2015-10-14 23:27:44 +0200
commit81dc29045a3d6ca711c589fbc44513cf5411cea8 (patch)
tree9491d304ce6a1670b19659da25140db8f7b95e3d /x11-misc
parentgnome-base/libgnomeprint: Fixed compilation with freetype-2.6.1 (diff)
downloadgentoo-81dc29045a3d6ca711c589fbc44513cf5411cea8.tar.gz
gentoo-81dc29045a3d6ca711c589fbc44513cf5411cea8.tar.bz2
gentoo-81dc29045a3d6ca711c589fbc44513cf5411cea8.zip
x11-misc/xlockmore: Fixed compilation with freetype-2.6.1 (bug #562342).
Package-Manager: portage-2.2.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch11
-rw-r--r--x11-misc/xlockmore/xlockmore-5.46.ebuild7
2 files changed, 17 insertions, 1 deletions
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 000000000000..5258121bbbea
--- /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 f3b9d0332a64..038393a175d7 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=""