summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Nigbur <pyrania@gentoo.org>2004-12-05 15:41:00 +0000
committerMarkus Nigbur <pyrania@gentoo.org>2004-12-05 15:41:00 +0000
commitdea4523d9b40c23a92f05b1b7c54367e36f8b2a7 (patch)
treee5dae45a1e8e776b57042c2aeae178baa6dffe56 /x11-misc
parentFixed ChangeLog header. (Manifest recommit) (diff)
downloadgentoo-2-dea4523d9b40c23a92f05b1b7c54367e36f8b2a7.tar.gz
gentoo-2-dea4523d9b40c23a92f05b1b7c54367e36f8b2a7.tar.bz2
gentoo-2-dea4523d9b40c23a92f05b1b7c54367e36f8b2a7.zip
Fixed bug #48457.
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xlockmore/ChangeLog6
-rw-r--r--x11-misc/xlockmore/files/XLock.ad.patch17
-rw-r--r--x11-misc/xlockmore/xlockmore-5.12.ebuild6
3 files changed, 26 insertions, 3 deletions
diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index a306e2a5a0ed..9b8f941af652 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xlockmore
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.16 2004/10/19 09:06:21 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.17 2004/12/05 15:41:00 pyrania Exp $
+
+ 05 Dec 2004; Markus Nigbur <pyrania@gentoo.org> +files/XLock.ad.patch,
+ xlockmore-5.12.ebuild:
+ Fixed bug #48457.
19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xlockmore-5.12.ebuild:
Stable on amd64.
diff --git a/x11-misc/xlockmore/files/XLock.ad.patch b/x11-misc/xlockmore/files/XLock.ad.patch
new file mode 100644
index 000000000000..b16bfa2b5471
--- /dev/null
+++ b/x11-misc/xlockmore/files/XLock.ad.patch
@@ -0,0 +1,17 @@
+--- xlock/XLock.ad 2004-04-12 10:33:03.000000000 -0400
++++ xlock/XLock.ad.new 2004-05-26 13:33:39.553577432 -0400
+@@ -43,10 +43,10 @@
+ !XLock.icongeometry: 256x256
+
+ ! For sound
+-XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
+-XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
+-XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
+-XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
++XLock.locksound: /usr/share/xlockmore/sounds/thank-you.au
++XLock.infosound: /usr/share/xlockmore/sounds/identify-please.au
++XLock.validsound: /usr/share/xlockmore/sounds/complete.au
++XLock.invalidsound: /usr/share/xlockmore/sounds/not-programmed.au
+ !XLock.locksound: complete.au
+ !XLock.infosound: identify-please.au
+ !XLock.validsound: thank-you.au
diff --git a/x11-misc/xlockmore/xlockmore-5.12.ebuild b/x11-misc/xlockmore/xlockmore-5.12.ebuild
index 951946997ddf..9c2c6e014be9 100644
--- a/x11-misc/xlockmore/xlockmore-5.12.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.12.ebuild,v 1.9 2004/10/19 09:06:21 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.12.ebuild,v 1.10 2004/12/05 15:41:00 pyrania Exp $
inherit gnuconfig
@@ -25,7 +25,7 @@ DEPEND="virtual/x11
src_compile() {
gnuconfig_update
-
+
local myconf
myconf="--enable-vtlock"
use pam && myconf="${myconf} --enable-pam" \
@@ -38,6 +38,8 @@ src_compile() {
use motif || myconf="${myconf} --without-motif"
use gtk || myconf="${myconf} --without-gtk"
+ epatch ${FILESDIR}/XLock.ad.patch || die "epatch failed"
+
./configure \
--prefix=/usr \
--mandir=${prefix}/share/man/man1 \