summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-03-24 01:17:14 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-03-24 01:17:14 +0000
commit02d8850ac54c56042496c1515b75862dbc7e5e78 (patch)
tree3e2582419dc6ef9ee26f6e79995423e04b07308f /x11-base
parentChanged strip to nostrip and changed virtua;/libc to sys-libs/glibc. (diff)
downloadgentoo-2-02d8850ac54c56042496c1515b75862dbc7e5e78.tar.gz
gentoo-2-02d8850ac54c56042496c1515b75862dbc7e5e78.tar.bz2
gentoo-2-02d8850ac54c56042496c1515b75862dbc7e5e78.zip
(#127333) Fix crashing of pretty much all gtk+-2 apps. We had the client-side updates to composite and fixes extensions, but we didn't let the server know about them, which resulted in lots of BadRequests.
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog10
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.0.2-r1 (renamed from x11-base/xorg-server/files/digest-xorg-server-1.0.2)3
-rw-r--r--x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.0.2.ebuild)9
3 files changed, 17 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 7ad89840f936..10831ec59190 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.91 2006/03/23 08:33:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.92 2006/03/24 01:17:14 spyderous Exp $
+
+*xorg-server-1.0.2-r1 (24 Mar 2006)
+
+ 24 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ -xorg-server-1.0.2.ebuild, +xorg-server-1.0.2-r1.ebuild:
+ (#127333) Fix crashing of pretty much all gtk+-2 apps. We had the
+ client-side updates to composite and fixes extensions, but we didn't let the
+ server know about them, which resulted in lots of BadRequests.
23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-server-1.0.2.ebuild:
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r1
index 50f9fbe7144d..b2e8218ffcfa 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r1
@@ -1,3 +1,6 @@
+MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
+RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
+SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
diff --git a/x11-base/xorg-server/xorg-server-1.0.2.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
index fda1b15755bd..2be04bcaee0d 100644
--- a/x11-base/xorg-server/xorg-server-1.0.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.0.2.ebuild,v 1.3 2006/03/23 08:33:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild,v 1.1 2006/03/24 01:17:14 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -18,10 +18,12 @@ MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
PATCHES="${FILESDIR}/${P}-Sbus.patch
${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
- ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch"
+ ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
+ ${DISTDIR}/${PV}-overlay-window.patch.bz2"
SRC_URI="${SRC_URI}
- mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"
+ mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+ http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2"
DESCRIPTION="X.Org X servers"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="dri ipv6 minimal xprint"
@@ -37,7 +39,6 @@ RDEPEND="x11-libs/libXfont
x11-libs/libXi
media-libs/freetype
>=media-libs/mesa-6
- media-fonts/font-adobe-75dpi
media-fonts/font-misc-misc
media-fonts/font-cursor-misc
x11-misc/xbitmaps