diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-03-11 13:36:51 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-03-11 13:36:51 +0000 |
| commit | 2b1070da3d62cb29601287c249ef64c4a97d52ee (patch) | |
| tree | aa47d0412a10ab22b508c2d87c3e72bef4b57e6c /x11-misc | |
| parent | Remove KDE Workspace 4.11.6 (diff) | |
| download | gentoo-2-2b1070da3d62cb29601287c249ef64c4a97d52ee.tar.gz gentoo-2-2b1070da3d62cb29601287c249ef64c4a97d52ee.tar.bz2 gentoo-2-2b1070da3d62cb29601287c249ef64c4a97d52ee.zip | |
Fixed compilation with >=freetype-2.5.1 (bug #498782)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xlockmore/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch | 18 | ||||
| -rw-r--r-- | x11-misc/xlockmore/xlockmore-5.43.ebuild | 7 |
3 files changed, 28 insertions, 5 deletions
diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog index 25355ea298a0..f8c4cdf701c1 100644 --- a/x11-misc/xlockmore/ChangeLog +++ b/x11-misc/xlockmore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xlockmore -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.138 2013/09/02 08:33:12 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.139 2014/03/11 13:36:51 polynomial-c Exp $ + + 11 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> xlockmore-5.43.ebuild, + +files/xlockmore-5.43-freetype251.patch: + Fixed compilation with >=freetype-2.5.1 (bug #498782). 02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> xlockmore-5.43.ebuild: Make PAM and xlockrc support mutually exclusive as defined in configure file, diff --git a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch new file mode 100644 index 000000000000..2d11bca086b1 --- /dev/null +++ b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch @@ -0,0 +1,18 @@ +Kludge to find >=freetyp2.5.1 + +--- xlockmore-5.43/configure.in ++++ xlockmore-5.43/configure.in +@@ -1983,6 +1983,13 @@ + fi + done + ++if test -z "$ac_freetype_includes" ; then ++ tt_inc=/usr/include/freetype2 ++ if test -r "$tt_inc/freetype.h" ; then ++ no_freetype= ac_freetype_includes=$tt_inc ++ fi ++fi ++ + # Check for the libraries. + # See if we find them without any special options. + # Do not add to $LIBS permanently. diff --git a/x11-misc/xlockmore/xlockmore-5.43.ebuild b/x11-misc/xlockmore/xlockmore-5.43.ebuild index 8d598541ba01..caedeb83de49 100644 --- a/x11-misc/xlockmore/xlockmore-5.43.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.43.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.9 2013/09/02 08:33:12 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.43.ebuild,v 1.10 2014/03/11 13:36:51 polynomial-c Exp $ EAPI=4 inherit autotools eutils flag-o-matic pam @@ -47,7 +47,8 @@ MAKEOPTS="${MAKEOPTS} -j1" src_prepare() { epatch \ "${FILESDIR}"/${PN}-5.31-configure.in.patch \ - "${FILESDIR}"/${PN}-5.31-ldflags.patch + "${FILESDIR}"/${PN}-5.31-ldflags.patch \ + "${FILESDIR}"/${PN}-5.43-freetype251.patch eautoreconf } |