diff options
| author |   Ned Ludd <solar@gentoo.org> | 2010-03-16 01:21:03 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2010-03-16 01:21:03 +0000 |
| commit | cd1ed2ca1c9a68d213ca0ec92571781b8a81fdca (patch) | |
| tree | 7ceac44fe9a13e33b66cc46b28cd886174288796 /x11-base | |
| parent | Revbump for new lxsession. Remove old versions. (diff) | |
| download | gentoo-2-cd1ed2ca1c9a68d213ca0ec92571781b8a81fdca.tar.gz gentoo-2-cd1ed2ca1c9a68d213ca0ec92571781b8a81fdca.tar.bz2 gentoo-2-cd1ed2ca1c9a68d213ca0ec92571781b8a81fdca.zip | |
tslib changed the tslib-0.0.pc to tslib.pc; We check for both. Bug #304067
(Portage version: 2.1.8.2/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/tslib-1.0-check.patch | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.5.902.ebuild | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index d7e060285e2c..4063b46fe0eb 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.490 2010/03/15 13:01:30 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.491 2010/03/16 01:21:03 solar Exp $ + + 16 Mar 2010; <solar@gentoo.org> +files/tslib-1.0-check.patch, + xorg-server-1.7.5.902.ebuild: + tslib changed the tslib-0.0.pc to tslib.pc; We check for both. Bug #304067 *xorg-server-1.7.5.902 (15 Mar 2010) diff --git a/x11-base/xorg-server/files/tslib-1.0-check.patch b/x11-base/xorg-server/files/tslib-1.0-check.patch new file mode 100644 index 000000000000..fb3d3189bc3c --- /dev/null +++ b/x11-base/xorg-server/files/tslib-1.0-check.patch @@ -0,0 +1,10 @@ +--- configure.ac 2010-03-16 00:52:03.000000000 +0000 ++++ configure.ac 2010-03-16 00:53:30.000000000 +0000 +@@ -1913,6 +1913,7 @@ + + + PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) ++ PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"]) + if test "x$HAVE_TSLIB" = xno; then + AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) + fi diff --git a/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild index a17408762c65..fca484086d9f 100644 --- a/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild +++ b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild,v 1.1 2010/03/15 13:01:30 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild,v 1.2 2010/03/16 01:21:03 solar Exp $ EAPI="2" # Must be before x-modular eclass is inherited -#SNAPSHOT="yes" +SNAPSHOT="yes" inherit x-modular multilib versionator @@ -128,6 +128,7 @@ UPSTREAMED_PATCHES=( PATCHES=( "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}/tslib-1.0-check.patch" ) pkg_setup() { |