diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2005-10-20 22:21:26 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-10-20 22:21:26 +0000 |
commit | a5de01e95b38416da23b5ef3f2d91164ea8ca034 (patch) | |
tree | 3cef4c6d967f40c0e38adb330a888682c7d4c201 /x11-apps | |
parent | Need to get nxcomp's NX.h from /usr/NX/include (diff) | |
download | historical-a5de01e95b38416da23b5ef3f2d91164ea8ca034.tar.gz historical-a5de01e95b38416da23b5ef3f2d91164ea8ca034.tar.bz2 historical-a5de01e95b38416da23b5ef3f2d91164ea8ca034.zip |
Make setxkbmap work.
Package-Manager: portage-2.0.53_rc6
Diffstat (limited to 'x11-apps')
-rw-r--r-- | x11-apps/setxkbmap/ChangeLog | 8 | ||||
-rw-r--r-- | x11-apps/setxkbmap/Manifest | 5 | ||||
-rw-r--r-- | x11-apps/setxkbmap/files/digest-setxkbmap-0.99.1-r1 | 1 | ||||
-rw-r--r-- | x11-apps/setxkbmap/files/use-right-xkb-config-root.patch | 13 | ||||
-rw-r--r-- | x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild | 16 |
5 files changed, 41 insertions, 2 deletions
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog index 08ea7cea655a..9b3b20274673 100644 --- a/x11-apps/setxkbmap/ChangeLog +++ b/x11-apps/setxkbmap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-apps/setxkbmap # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.4 2005/10/20 00:45:21 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.5 2005/10/20 22:21:26 spyderous Exp $ + +*setxkbmap-0.99.1-r1 (20 Oct 2005) + + 20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/use-right-xkb-config-root.patch, +setxkbmap-0.99.1-r1.ebuild: + Make setxkbmap work. *setxkbmap-0.99.1 (20 Oct 2005) diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest index 3e87644b58ab..c872878adcd4 100644 --- a/x11-apps/setxkbmap/Manifest +++ b/x11-apps/setxkbmap/Manifest @@ -1,6 +1,9 @@ -MD5 01b9775e912236294ac3ebdb1e8439e6 ChangeLog 705 +MD5 965757e5edbe30cd8fcbb9de43d53cd2 ChangeLog 891 MD5 c053d339c7b79917597fe46183919047 files/digest-setxkbmap-0.99.0 68 MD5 f0304b55b1842a33be29c71f5a5fb008 files/digest-setxkbmap-0.99.1 68 +MD5 f0304b55b1842a33be29c71f5a5fb008 files/digest-setxkbmap-0.99.1-r1 68 +MD5 19019a10aba86e28761af7a5f789f503 files/use-right-xkb-config-root.patch 441 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 MD5 479f9250b44aa02474611e44cc5f8c91 setxkbmap-0.99.0.ebuild 457 +MD5 322d09f5ee084d02f74207f91f689773 setxkbmap-0.99.1-r1.ebuild 517 MD5 d815b47f6259d0f5cd404e5a7a72ed76 setxkbmap-0.99.1.ebuild 460 diff --git a/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.1-r1 b/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.1-r1 new file mode 100644 index 000000000000..7b0ccf1f06a4 --- /dev/null +++ b/x11-apps/setxkbmap/files/digest-setxkbmap-0.99.1-r1 @@ -0,0 +1 @@ +MD5 08dd611eb87b4501004c6661107a046d setxkbmap-0.99.1.tar.bz2 78017 diff --git a/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch b/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch new file mode 100644 index 000000000000..3180c8a46c2f --- /dev/null +++ b/x11-apps/setxkbmap/files/use-right-xkb-config-root.patch @@ -0,0 +1,13 @@ +--- setxkbmap-0.99.1.orig/Makefile.am 2005-10-17 16:56:20.000000000 -0700 ++++ setxkbmap-0.99.1/Makefile.am 2005-10-20 15:12:51.000000000 -0700 +@@ -21,7 +21,9 @@ + + bin_PROGRAMS = setxkbmap + +-setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) -D__XKBDEFRULES__='"xorg"' ++setxkbmap_CFLAGS = $(SETXKBMAP_CFLAGS) \ ++ -D__XKBDEFRULES__='"xorg"' \ ++ -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"' + setxkbmap_LDADD = $(SETXKBMAP_LIBS) + + setxkbmap_SOURCES = \ diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild new file mode 100644 index 000000000000..553fef460283 --- /dev/null +++ b/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild,v 1.1 2005/10/20 22:21:26 spyderous Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular + +PATCHES="${FILESDIR}/use-right-xkb-config-root.patch" + +DESCRIPTION="X.Org setxkbmap application" +KEYWORDS="~arm ~mips ~s390 ~sparc ~x86" +RDEPEND="x11-libs/libxkbfile + x11-libs/libX11" +DEPEND="${RDEPEND}" |