[gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.3.0.0-r2.ebuild

[Donnie Berkholz (dberkholz)]

dberkholz    07/11/07 08:52:12

  Modified:             ChangeLog xorg-server-1.3.0.0-r2.ebuild
  Log:
  (#197104) Fix a 100% CPU hang on openoffice. (#196019) Don't create a redundant file with USE=xprint.
  (Portage version: 2.1.3.17)

Revision  Changes    Path
1.293                x11-base/xorg-server/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.293&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.293&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.292&r2=1.293

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- ChangeLog	5 Nov 2007 18:42:34 -0000	1.292
+++ ChangeLog	7 Nov 2007 08:52:11 -0000	1.293
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.292 2007/11/05 18:42:34 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.293 2007/11/07 08:52:11 dberkholz Exp $
+
+  07 Nov 2007; Donnie Berkholz <dberkholz@g.o>;
+  +files/1.3.0.0-fix-xkb-openoffice-hangs.patch,
+  xorg-server-1.3.0.0-r2.ebuild:
+  (#197104) Fix a 100% CPU hang on openoffice. (#196019) Don't create a
+  redundant file with USE=xprint.
 
   05 Nov 2007; Donnie Berkholz <dberkholz@g.o>;
   xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild,



1.2                  x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild?r1=1.1&r2=1.2

Index: xorg-server-1.3.0.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-server-1.3.0.0-r2.ebuild	13 Oct 2007 20:52:35 -0000	1.1
+++ xorg-server-1.3.0.0-r2.ebuild	7 Nov 2007 08:52:11 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.0.0-r2.ebuild,v 1.1 2007/10/13 20:52:35 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r2.ebuild,v 1.2 2007/11/07 08:52:11 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -263,6 +263,7 @@
 LICENSE="${LICENSE} MIT"
 
 PATCHES="
+	${FILESDIR}/${PV}-fix-xkb-openoffice-hangs.patch
 	${FILESDIR}/${PV}-fix-dual-head-screen-resolutions.patch
 	${FILESDIR}/${PV}-fix-randr-resizing.patch
 	${FILESDIR}/${PV}-fix-xephyr-amd64-segfault.patch
@@ -354,6 +355,12 @@
 		fi
 	fi
 	x-modular_reconf_source
+	#do not install xprint's Xsession.d files, we'll do it later
+	if use xprint; then
+		sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \
+		    -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \
+		    || die "sed of Xsession.d makefile failed"
+	fi
 }
 
 src_install() {



-- 
gentoo-commits@g.o mailing list