summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-05-04 12:53:24 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-05-04 12:53:24 +0000
commite07fdc26248f685b52aab2a8bacfa2f93094d064 (patch)
treed7484f2c4ac507b060d7ce2eb43efc8da099290e
parentmaintainer-needed, no bugs (diff)
downloadgentoo-2-e07fdc26248f685b52aab2a8bacfa2f93094d064.tar.gz
gentoo-2-e07fdc26248f685b52aab2a8bacfa2f93094d064.tar.bz2
gentoo-2-e07fdc26248f685b52aab2a8bacfa2f93094d064.zip
Drop already upstreamed patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.7.ebuild5
2 files changed, 6 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 542529d82359..ec213302f7f0 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.508 2010/05/04 09:04:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.509 2010/05/04 12:53:24 scarabeus Exp $
+
+ 04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.7.7.ebuild:
+ Drop already upstreamed patch.
*xorg-server-1.7.7 (04 May 2010)
diff --git a/x11-base/xorg-server/xorg-server-1.7.7.ebuild b/x11-base/xorg-server/xorg-server-1.7.7.ebuild
index 9f43527e6f8b..afd89e0d73ed 100644
--- a/x11-base/xorg-server/xorg-server-1.7.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7.ebuild
@@ -1,6 +1,6 @@
# 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.7.ebuild,v 1.1 2010/05/04 09:04:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $
EAPI="2"
@@ -121,9 +121,6 @@ EPATCH_SUFFIX="patch"
# These have been sent upstream
UPSTREAMED_PATCHES=(
#"${WORKDIR}/patches/"
-
- # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
- "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
# Fix for bug #304067
"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
)