libxcursor: Changes to 'upstream-unstable'
.gitignore | 8 +
ChangeLog | 276 -------------------------------------------------------
Makefile.am | 14 ++
README | 25 ++++
configure.ac | 14 +-
man/.gitignore | 2
src/.gitignore | 6 -
src/cursor.c | 2
src/display.c | 2
src/file.c | 2
src/library.c | 6 -
src/xcursorint.h | 2
src/xlib.c | 2
13 files changed, 53 insertions(+), 308 deletions(-)
New commits:
commit fbf229879370a96a070ebf087426f6f6c0dbe5a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:49:15 2009 +1000
libXcursor 1.1.10
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 7ce8c04..4228db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl version. This same version number must appear in Xcursor.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h
dnl
-AC_INIT([libXcursor],1.1.9,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
+AC_INIT([libXcursor],1.1.10,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
commit 59e3f6520f4d1682d3242d1d5656e7972cf11944
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:32 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..a60d8fe 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXcursor - X Window System Cursor management library
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXcursor
+
+ http://cgit.freedesktop.org/xorg/lib/libXcursor
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit f00ae32322d2b3c5d97724b80c72d3e2d0812935
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:34:11 2009 -0200
Janitor: make distcheck, compiler warnings, extra .gitignore files.
diff --git a/.gitignore b/.gitignore
index 81a8fd1..e6535b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
@@ -20,3 +22,9 @@ stamp-h1
xcursor.pc
*~
*.o
+*.3
+*.la
+*.lo
+libXcursor-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index c3cd863..545fa16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
-EXTRA_DIST = xcursor.pc.in autogen.sh
+EXTRA_DIST = xcursor.pc.in
if LINT
lint:
@@ -39,6 +39,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 7cd2cd1..7ce8c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,13 +34,14 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
AC_ARG_WITH(icondir,
AC_HELP_STRING([--with-icondir=<path>],
@@ -67,12 +68,13 @@ AC_SUBST([XCURSORPATH_LIST])
# Check for X
PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto)
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])
-
+XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS"
AC_SUBST(XCURSOR_CFLAGS)
AC_SUBST(XCURSOR_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 5fa7496..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libXcursor.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/library.c b/src/library.c
index c5aeef4..86f2d76 100644
--- a/src/library.c
+++ b/src/library.c
@@ -232,7 +232,7 @@ XcursorScanTheme (const char *theme, const char *name)
* Scan this theme
*/
for (path = XcursorLibraryPath ();
- path && f == 0;
+ path && f == NULL;
path = _XcursorNextPath (path))
{
dir = _XcursorBuildThemeDir (path, theme);
@@ -259,7 +259,7 @@ XcursorScanTheme (const char *theme, const char *name)
/*
* Recurse to scan inherited themes
*/
- for (i = inherits; i && f == 0; i = _XcursorNextPath (i))
+ for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
f = XcursorScanTheme (i, name);
if (inherits != NULL)
free (inherits);
commit 04641d3cc3e2f7389c5a3ea6e1d55543e033153f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:34:36 2008 +0100
nuke RCS Ids
diff --git a/Makefile.am b/Makefile.am
index 21da648..c3cd863 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index 25e63f0..7cd2cd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/cursor.c b/src/cursor.c
index e4efe93..ac1b2c4 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/display.c b/src/display.c
index d3e2953..c296807 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/file.c b/src/file.c
index 559eb9b..6c4f1bb 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/library.c b/src/library.c
index 7c02faf..c5aeef4 100644
--- a/src/library.c
+++ b/src/library.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xcursorint.h b/src/xcursorint.h
index 7887bbb..c2eec32 100644
--- a/src/xcursorint.h
+++ b/src/xcursorint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xlib.c b/src/xlib.c
index d1809f9..0475d11 100644
--- a/src/xlib.c
+++ b/src/xlib.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 94531dc8f6eff9c9f5cbb18ca6b3d4ff79eec752
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:25 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index b5f4352..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,276 +0,0 @@
-2006-06-03 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- * include/X11/Xcursor/Xcursor.h:
- Bump to 1.1.7.
-
- * src/file.c:
- Bug #5268: Fix small memory leak. (Matthias Clasen)
- Change some return 0's to NULL.
-
-2006-04-27 Eric Anholt <anholt@FreeBSD.org>
-
- * configure.ac:
- Look for cursors in datadir, not always /usr/share
-
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * include/X11/Xcursor/Xcursor.h:
- Bump to 1.1.6
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * src/display.c:
- Coverity #159: Prevent a possible NULL chase.
-
-2006-03-04 Daniel Stone <daniel@freedesktop.org>
-
- * include/X11/Xcursor/Xcursor.h:
- Bug #4439: Include Xlib.h.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xcursor.pc.in:
- Add icondir to xcursor.pc to be used when installing cursors.
-
-2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- * src/Makefile.am:
- Add configure options to allow hard-coded paths to be changed.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xcursor.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
-
-2005-11-13 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * configure.ac:
- * man/Makefile.am:
- Use $(LIB_MAN_SUFFIX) instead of forcing man page into section 3.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
-2005-07-07 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * src/Makefile.am:
- * xcursor.pc.in:
- Make sure XFIXES appears in LIBS line, fix up
- other pkg-config usage.
-
-Wed Jun 8 16:43:45 2005 S�Sandmann <sandmann@redhat.com>
-
- * configure.ac: Remove all the "not found with pkgconfig" stuff
-
-Tue Feb 8 14:26:32 2005 Owen Taylor <otaylor@redhat.com>
-
- * configure.ac: Remove AC_CONFIG_AUX_DIR()
-
-2004-04-13 Daniel Stone <daniel@freedesktop.org>
-
- * ChangeLog:
- Tag 1.1.3, for xlibs 1.0.1.
-
-2004-04-07 Keith Packard <keithp@keithp.com>
-
- reviewed by: Michel Dänzer <michel@daenzer.net>
-
- * configure.ac:
- Make sure X_CFLAGS/X_LIBS are substituted in the xcursor.pc file
-
-2004-02-24 Fredrik H�nd <fredrik@kde.org>
-
- * configure.ac:
- * xcursorint.h:
- Make the Xfixes code actually work by including the Xfixes.h
- header file.
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Add contents to author's file
-
-2004-01-17 Daniel Stone <daniel@fooishbar.org>
- * Xcursor.h:
- * configure.ac:
- Bump package version to 1.1.2, slated for first fd.o platform release.
-
-2004-01-15 Harold L Hunt II <huntharo@msu.edu>
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
-
-2003-11-10 Keith Packard <keithp@keithp.com>
-
- * library.c: (_XcursorBuildThemeDir):
- Make sure the allocated path has space for directory separators
-
-2003-10-29 Keith Packard <keithp@keithp.com>
-
- * Xcursor.h:
- * configure.ac:
- Bump package version to 1.1.1 and library info to 1.2.0 as
- the library exports new name-based APIs and uses Xfixes
-
-2003-10-28 Keith Packard <keithp@keithp.com>
-
- * Makefile.am:
- * Xcursor.h:
- * configure.ac:
- * cursor.c: (XcursorImagesLoadCursor):
- * file.c: (XcursorImagesCreate), (XcursorImagesDestroy),
- (XcursorImagesSetName):
- * library.c: (XcursorLibraryLoadImages),
- (XcursorLibraryLoadCursor):
- Add support for XFixes version 2 cursor naming functions
-
-2003-10-16 23:45 fredrik
-
- * Xcursor-def.cpp, Xcursor.h, configure.ac, library.c:
- Rename _XcursorLibraryPath() to XcursorLibraryPath() and make
- it a public function, since it's useful for theme selectors.
- Bump version to 1.1.0
-
-2003-05-21 10:21 keithp
-
- * Makefile.am, Xcursor.h, configure.ac, xcursorint.h: Package
- Xcursor.3, bump version to 1.0.2
-
-2003-05-06 11:20 keithp
-
- * ChangeLog: Add initial change log
-
-2003-05-06 11:09 keithp
-
- * .cvsignore, Makefile.am, Xcursor-def.cpp, Xcursor.3, Xcursor.h,
- Xcursor.man, cursor.c, display.c, file.c, library.c, xcursorint.h,
- xlib.c: Update .cvsignore, move manual and install, fix CVS ident
- lines
-
-2003-05-06 11:00 keithp
-
- * configure.ac: replace Xrender test with fragment from Xft
-
-2003-05-06 10:52 keithp
-
- * Makefile.am: Add xcursorint.h to library sources list
-
-2003-05-06 10:49 keithp
-
- * Imakefile, Makefile.am, Xcursor.h, autogen.sh, configure.ac,
- file.c, xcursor.pc.in: Convert Xcursor to autotools
-
-2003-02-21 22:16 dawes
-
- * xlib.c: 941. Fix a problem where a malformed Ximage can cause
- Xcursor to step
- outside the image data (#A.1636, Keith Packard, reported by
- Michel D�er).
-
-2003-02-19 19:13 dawes
-
- * display.c: 924. Fix a memory leak in XCloseDisplay, and a
- potential race condition
- when multiple threads attempt to initialize the Xcursor
- library
- simultaneously (#A.1623, Keith Packard).
-
-2003-02-12 19:09 dawes
-
- * Xcursor.man: 880. Fix the Xcursor include path in the man page
- (#5617, Kevin Brosius).
-
-2003-01-25 19:22 eich
-
- * Xcursor.h, cursor.c, library.c, xcursorint.h: 787. Add "core"
- theme to Xcursor to force old behaviour (Keith Packard).
-
-2002-11-26 21:35 keithp
-
- * display.c: Fix XcursorSetTheme to permit NULL theme
-
-2002-11-22 18:34 keithp
-
- * Xcursor.h, cursor.c, display.c, xcursorint.h, xlib.c: Add animate
- cursor support, client side
-
-2002-10-11 10:06 keithp
-
- * cursor.c: Off by one in XcursorAnimateNext (from Anders Carlsson)
-
-2002-09-30 15:02 alanh
-
- * Xcursor-def.cpp: add Xv-def.cpp file add $XFree86$ tags
-
-2002-09-26 00:52 alanh
-
- * Imakefile: #elif -> #else
-
-2002-09-25 16:27 alanh
-
- * Xcursor-def.cpp: #5350, add Xcursor-def.cpp
-
-2002-09-25 09:10 torrey
-
- * Imakefile: Add SharedXcursorReqs for operating systems that
- require it.
-
-2002-09-18 10:11 tsi
-
- * file.c: Pacify gcc 3.2
-
-2002-09-05 00:55 keithp
-
- * display.c: Clean up parsing of option that forces use of core
- cursors
-
-2002-09-05 00:29 keithp
-
- * Xcursor.h, cursor.c, display.c, xcursorint.h, xlib.c: Add
- themeable app-specific cursors. Add dithers for core cursors.
- Dont theme servers without Render by default
-
-2002-08-28 21:40 keithp
-
- * Imakefile, Xcursor.h, Xcursor.man, config-subst, cursor.c,
- display.c, file.c, library.c, xcursor-config.in, xcursor.pc.in,
- xcursorint.h, xlib.c: Add Xcursor library and Xlib hooks for it
-
diff --git a/Makefile.am b/Makefile.am
index 0050eb2..21da648 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,3 +34,13 @@ if LINT
lint:
(cd src && $(MAKE) $(MFLAGS) lint)
endif LINT
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
Reply to: