diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-12-09 15:32:42 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-09 15:32:42 +0000 |
| commit | dfc2d746b955b011505fd620047521fdc4dd9857 (patch) | |
| tree | 339b0301dea05d1088e7938e55205d0149566659 /x11-libs | |
| parent | Marked ppc stable for bug #84142. (diff) | |
| download | gentoo-2-dfc2d746b955b011505fd620047521fdc4dd9857.tar.gz gentoo-2-dfc2d746b955b011505fd620047521fdc4dd9857.tar.bz2 gentoo-2-dfc2d746b955b011505fd620047521fdc4dd9857.zip | |
Unused file.
(Portage version: 2.0.53)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libXcursor/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libXcursor/files/make-icondir-configurable.patch | 63 |
2 files changed, 5 insertions, 64 deletions
diff --git a/x11-libs/libXcursor/ChangeLog b/x11-libs/libXcursor/ChangeLog index b481baad521e..fe6dbc59f027 100644 --- a/x11-libs/libXcursor/ChangeLog +++ b/x11-libs/libXcursor/ChangeLog @@ -1,6 +1,10 @@ # 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.14 2005/12/09 06:10:11 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/ChangeLog,v 1.15 2005/12/09 15:32:02 spyderous Exp $ + + 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/make-icondir-configurable.patch: + Unused file. 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -libXcursor-1.1.4.ebuild, -libXcursor-1.1.5.ebuild: diff --git a/x11-libs/libXcursor/files/make-icondir-configurable.patch b/x11-libs/libXcursor/files/make-icondir-configurable.patch deleted file mode 100644 index 5ba2a3712c11..000000000000 --- a/x11-libs/libXcursor/files/make-icondir-configurable.patch +++ /dev/null @@ -1,63 +0,0 @@ -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; - } |