diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2005-08-16 02:26:56 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-08-16 02:26:56 +0000 |
commit | 57370ca032fc7ab7d6bebce31b612b9e56e24cda (patch) | |
tree | f84944ca08756809f5f3e369f2d22f6eddea9875 /x11-libs | |
parent | Make cursors install to the same directory as they did in monolith. Patch fro... (diff) | |
download | historical-57370ca032fc7ab7d6bebce31b612b9e56e24cda.tar.gz historical-57370ca032fc7ab7d6bebce31b612b9e56e24cda.tar.bz2 historical-57370ca032fc7ab7d6bebce31b612b9e56e24cda.zip |
Look in the same directories as the monolith. Patch from Christophe Saout <christophe@saout.de>.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/libXcursor/ChangeLog | 9 | ||||
-rw-r--r-- | x11-libs/libXcursor/Manifest | 15 | ||||
-rw-r--r-- | x11-libs/libXcursor/files/digest-libXcursor-1.1.3-r1 | 1 | ||||
-rw-r--r-- | x11-libs/libXcursor/files/make-icondir-configurable.patch | 63 | ||||
-rw-r--r-- | x11-libs/libXcursor/libXcursor-1.1.3-r1.ebuild | 25 |
5 files changed, 101 insertions, 12 deletions
diff --git a/x11-libs/libXcursor/ChangeLog b/x11-libs/libXcursor/ChangeLog index f959c37e9116..6456903dd067 100644 --- a/x11-libs/libXcursor/ChangeLog +++ b/x11-libs/libXcursor/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/libXcursor # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/ChangeLog,v 1.3 2005/08/15 18:03:25 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/ChangeLog,v 1.4 2005/08/16 02:26:56 spyderous Exp $ + +*libXcursor-1.1.3-r1 (16 Aug 2005) + + 16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/make-icondir-configurable.patch, +libXcursor-1.1.3-r1.ebuild: + Look in the same directories as the monolith. Patch from Christophe Saout + <christophe@saout.de>. 15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> libXcursor-1.1.3.ebuild: Marked ~amd64. diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest index 1db9472bd307..ad457a00b89c 100644 --- a/x11-libs/libXcursor/Manifest +++ b/x11-libs/libXcursor/Manifest @@ -1,13 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 3ec2ea4d8689eb43d31e5baf924a6817 libXcursor-1.1.3.ebuild 573 -MD5 1d749119b3526e4349dba13e4856cc6c ChangeLog 571 +MD5 63b226f6424e131ae31b4a7d7aed64dd ChangeLog 839 +MD5 0ececa2de9859d34a810f6a3ec136be0 libXcursor-1.1.3-r1.ebuild 829 MD5 8701bf076c08a0b51249fd0bf4ddeb01 files/digest-libXcursor-1.1.3 69 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDANkH2G5bA0cA/ScRAr04AJ9agPH6v3SATmmQ/x6Ujfe+oOfVvQCcDRnQ -b+FqZepIJ67D3bsuR5M6uag= -=nWCf ------END PGP SIGNATURE----- +MD5 8701bf076c08a0b51249fd0bf4ddeb01 files/digest-libXcursor-1.1.3-r1 69 +MD5 c52c14e65991d908a0869502dd0b8a02 files/make-icondir-configurable.patch 2180 diff --git a/x11-libs/libXcursor/files/digest-libXcursor-1.1.3-r1 b/x11-libs/libXcursor/files/digest-libXcursor-1.1.3-r1 new file mode 100644 index 000000000000..8fdca97d7c5d --- /dev/null +++ b/x11-libs/libXcursor/files/digest-libXcursor-1.1.3-r1 @@ -0,0 +1 @@ +MD5 c794209ce7dcbbdca5d6cb9e5c24a5dd libXcursor-1.1.3.tar.bz2 211428 diff --git a/x11-libs/libXcursor/files/make-icondir-configurable.patch b/x11-libs/libXcursor/files/make-icondir-configurable.patch new file mode 100644 index 000000000000..5ba2a3712c11 --- /dev/null +++ b/x11-libs/libXcursor/files/make-icondir-configurable.patch @@ -0,0 +1,63 @@ +diff -Nur libXcursor-1.1.3.orig/acinclude.m4 libXcursor-1.1.3/acinclude.m4 +--- libXcursor-1.1.3.orig/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 ++++ libXcursor-1.1.3/acinclude.m4 2005-08-16 03:37:56.000000000 +0200 +@@ -0,0 +1,11 @@ ++AC_DEFUN([AC_DEFINE_DIR], [ ++ prefix_NONE= ++ exec_prefix_NONE= ++ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix ++ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix ++ eval ac_define_dir="\"[$]$2\"" ++ AC_SUBST($1, "$ac_define_dir") ++ AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) ++ test "$prefix_NONE" && prefix=NONE ++ test "$exec_prefix_NONE" && exec_prefix=NONE ++]) +diff -Nur libXcursor-1.1.3.orig/configure.ac libXcursor-1.1.3/configure.ac +--- libXcursor-1.1.3.orig/configure.ac 2005-08-01 22:15:27.000000000 +0200 ++++ libXcursor-1.1.3/configure.ac 2005-08-16 03:37:56.000000000 +0200 +@@ -46,6 +46,19 @@ + AC_SUBST(DEP_CFLAGS) + AC_SUBST(DEP_LIBS) + ++# Customizable X cursor search directories ++DEFAULT_ICONDIR="\${prefix}/lib/X11/icons" ++DEFAULT_XCURSORPATH="~/.icons:$datadir/icons:$datadir/pixmaps" ++ ++AC_ARG_WITH(icondir, [ --with-icondir=DIR ], ++ [ ICONDIR="$withval" ], ++ [ ICONDIR="$DEFAULT_ICONDIR" ]) ++AC_ARG_WITH(xcursor-path, AS_HELP_STRING([--with-xcursorpath=DIRLIST],[default X cursor search path, colon-delimited]), ++ [ XCURSORPATH="$withval:$ICONDIR" ], ++ [ XCURSORPATH="$DEFAULT_XCURSORPATH:$ICONDIR" ]) ++ ++AC_DEFINE_DIR(XCURSORPATH, XCURSORPATH, [Default X cursor search path]) ++ + XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile +diff -Nur libXcursor-1.1.3.orig/src/library.c libXcursor-1.1.3/src/library.c +--- libXcursor-1.1.3.orig/src/library.c 2005-08-01 22:15:43.000000000 +0200 ++++ libXcursor-1.1.3/src/library.c 2005-08-16 03:37:56.000000000 +0200 +@@ -26,12 +26,6 @@ + #include <stdlib.h> + #include <string.h> + +-#ifndef ICONDIR +-#define ICONDIR "/usr/X11R6/lib/X11/icons" +-#endif +- +-#define CURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR +- + const char * + XcursorLibraryPath (void) + { +@@ -41,7 +35,7 @@ + { + path = getenv ("XCURSOR_PATH"); + if (!path) +- path = CURSORPATH; ++ path = XCURSORPATH; + } + return path; + } diff --git a/x11-libs/libXcursor/libXcursor-1.1.3-r1.ebuild b/x11-libs/libXcursor/libXcursor-1.1.3-r1.ebuild new file mode 100644 index 000000000000..672eae4acd0e --- /dev/null +++ b/x11-libs/libXcursor/libXcursor-1.1.3-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.3-r1.ebuild,v 1.1 2005/08/16 02:26:56 spyderous Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular + +PATCHES="${FILESDIR}/make-icondir-configurable.patch" + +DESCRIPTION="X.Org Xcursor library" +#HOMEPAGE="http://foo.bar.com/" +#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2" +#LICENSE="" +#SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +#IUSE="X gnome" +RDEPEND="x11-libs/libXrender + x11-libs/libXfixes + x11-libs/libX11" +DEPEND="${RDEPEND}" + +CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11 + --with-xcursor-path=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/share/cursors/xorg-x11:/usr/share/pixmaps/xorg-x11" |