diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-04 11:20:16 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-04 11:20:16 +0000 |
| commit | bf2b7859da7e7da2a422efaac66284441aa34c6f (patch) | |
| tree | 2eebb86388dad2683f5c4f2ac648039b17a56f75 /x11-base | |
| parent | old (diff) | |
| download | gentoo-2-bf2b7859da7e7da2a422efaac66284441aa34c6f.tar.gz gentoo-2-bf2b7859da7e7da2a422efaac66284441aa34c6f.tar.bz2 gentoo-2-bf2b7859da7e7da2a422efaac66284441aa34c6f.zip | |
old
(Portage version: 2.2.0_alpha30/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/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch | 35 |
2 files changed, 5 insertions, 36 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 2dee12028543..9f7e9e4f0060 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.581 2011/04/28 18:56:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.582 2011/05/04 11:20:16 scarabeus Exp $ + + 04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch: + old 28 Apr 2011; Markos Chandras <hwoarang@gentoo.org> xorg-server-1.9.5.ebuild: Stable on amd64 wrt bug #363965 diff --git a/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch b/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch deleted file mode 100644 index 8538bf35f302..000000000000 --- a/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7cf37a8247205335657dd7a644856bbaf619b7ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 4 Oct 2010 18:38:44 +0200 -Subject: [PATCH 1/2] Fix tslib check fallback to set TSLIB_LIBS. - -If pkg-config is unable to find tslib but the fallback check does find -it, the compilation continues with tslib support enabled though -TSLIB_LIBS is unset. Thus, the compilation fails with a linking error on -tslib functions. - -This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check -succeds. ---- - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c0bf98f..6d63663 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then - - PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) - if test "x$HAVE_TSLIB" = xno; then -- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) -+ AC_CHECK_LIB(ts, ts_open, [ -+ HAVE_TSLIB="yes" -+ TSLIB_LIBS="-lts" -+ ]) - fi - - if test "xTSLIB" = xauto; then --- -1.7.3.1 - |