From 055e2cd0495b2b32f22e83c9c048d87aca981fb6 Mon Sep 17 00:00:00 2001 From: matthieu Date: Thu, 3 Nov 2016 13:11:40 +0000 Subject: [PATCH] Update to xcb-util-cursor to 0.1.3. This will give applications using this library the same X cursor search path as the ones that use the legacy libXcursor. --- lib/xcb-util-cursor/ChangeLog | 16 ++++++++++ lib/xcb-util-cursor/Makefile.bsd-wrapper | 5 ++-- lib/xcb-util-cursor/NEWS | 5 ++++ lib/xcb-util-cursor/configure | 37 +++++++++++++++++------- lib/xcb-util-cursor/configure.ac | 10 ++++++- lib/xcb-util-cursor/cursor/load_cursor.c | 2 +- 6 files changed, 61 insertions(+), 14 deletions(-) diff --git a/lib/xcb-util-cursor/ChangeLog b/lib/xcb-util-cursor/ChangeLog index 9f9c76d93..23dd96f82 100644 --- a/lib/xcb-util-cursor/ChangeLog +++ b/lib/xcb-util-cursor/ChangeLog @@ -1,3 +1,19 @@ +commit 95b9a8fd876fdbbc854cdf3d90317be3846c7417 +Author: Michael Stapelberg +Date: Thu May 12 09:53:03 2016 +0200 + + set version to 0.1.3 + +commit 085606514a37726b2527d646cd022e06b1fb0d79 +Author: Uli Schlachter +Date: Tue May 10 12:01:47 2016 +0200 + + Add a --with-cursorpath option to configure + + This works (hopefully) the same way as the same option does for libXcursor. + + Signed-off-by: Uli Schlachter + commit 8eb844d39a06f42019dede515c70e7a0b155357d Author: Michael Stapelberg Date: Wed Mar 25 23:06:23 2015 +0100 diff --git a/lib/xcb-util-cursor/Makefile.bsd-wrapper b/lib/xcb-util-cursor/Makefile.bsd-wrapper index 5bbba3531..b7454f6fd 100644 --- a/lib/xcb-util-cursor/Makefile.bsd-wrapper +++ b/lib/xcb-util-cursor/Makefile.bsd-wrapper @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1.1.1 2014/04/14 19:28:44 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2016/11/03 13:11:40 matthieu Exp $ SHARED_LIBS= xcb-cursor 0.0 -CONFIGURE_ARGS= --without-doxygen +CONFIGURE_ARGS= --without-doxygen \ + --with-cursorpath="~/.icons:/usr/local/lib/X11/icons:/usr/local/share/icons:/usr/local/share/pixmaps:${X11BASE}/share/icons:${X11BASE}/share/pixmaps" .include diff --git a/lib/xcb-util-cursor/NEWS b/lib/xcb-util-cursor/NEWS index 5de201d53..ec111bea2 100644 --- a/lib/xcb-util-cursor/NEWS +++ b/lib/xcb-util-cursor/NEWS @@ -1,3 +1,8 @@ +Release 0.1.3 (2016-05-12) +=========================== + +- Add a --with-cursorpath option to configure + Release 0.1.2 (2015-03-35) =========================== diff --git a/lib/xcb-util-cursor/configure b/lib/xcb-util-cursor/configure index d0f34b457..5f39ff983 100644 --- a/lib/xcb-util-cursor/configure +++ b/lib/xcb-util-cursor/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xcb-util-cursor 0.1.2. +# Generated by GNU Autoconf 2.69 for xcb-util-cursor 0.1.3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xcb-util-cursor' PACKAGE_TARNAME='xcb-util-cursor' -PACKAGE_VERSION='0.1.2' -PACKAGE_STRING='xcb-util-cursor 0.1.2' +PACKAGE_VERSION='0.1.3' +PACKAGE_STRING='xcb-util-cursor 0.1.3' PACKAGE_BUGREPORT='xcb@lists.freedesktop.org' PACKAGE_URL='' @@ -811,6 +811,7 @@ enable_strict_compilation enable_silent_rules enable_devel_docs with_doxygen +with_cursorpath ' ac_precious_vars='build_alias host_alias @@ -1374,7 +1375,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xcb-util-cursor 0.1.2 to adapt to many kinds of systems. +\`configure' configures xcb-util-cursor 0.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1444,7 +1445,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xcb-util-cursor 0.1.2:";; + short | recursive ) echo "Configuration of xcb-util-cursor 0.1.3:";; esac cat <<\_ACEOF @@ -1485,6 +1486,8 @@ Optional Packages: (or the compiler's sysroot if not specified). --with-doxygen Use doxygen to regenerate documentation (default: auto) + --with-cursorpath= + Set default search path for cursors Some influential environment variables: CC C compiler command @@ -1583,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xcb-util-cursor configure 0.1.2 +xcb-util-cursor configure 0.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2052,7 +2055,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xcb-util-cursor $as_me 0.1.2, which was +It was created by xcb-util-cursor $as_me 0.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4194,7 +4197,7 @@ fi # Define the identity of the package. PACKAGE='xcb-util-cursor' - VERSION='0.1.2' + VERSION='0.1.3' cat >>confdefs.h <<_ACEOF @@ -18558,6 +18561,20 @@ $as_echo "yes" >&6; } fi +DEF_CURSORPATH="~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" + +# Check whether --with-cursorpath was given. +if test "${with_cursorpath+set}" = set; then : + withval=$with_cursorpath; XCURSORPATH="$withval" +else + XCURSORPATH="$DEF_CURSORPATH" +fi + +cat >>confdefs.h <<_ACEOF +#define XCURSORPATH "$XCURSORPATH" +_ACEOF + + ac_config_files="$ac_config_files Makefile cursor/Makefile cursor/xcb-cursor.pc xcb_util_intro" cat >confcache <<\_ACEOF @@ -19146,7 +19163,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xcb-util-cursor $as_me 0.1.2, which was +This file was extended by xcb-util-cursor $as_me 0.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19203,7 +19220,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xcb-util-cursor config.status 0.1.2 +xcb-util-cursor config.status 0.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/xcb-util-cursor/configure.ac b/lib/xcb-util-cursor/configure.ac index 89efe3957..828a1bd7a 100644 --- a/lib/xcb-util-cursor/configure.ac +++ b/lib/xcb-util-cursor/configure.ac @@ -1,6 +1,6 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62 AC_PREREQ(2.62) -AC_INIT([xcb-util-cursor],0.1.2,[xcb@lists.freedesktop.org]) +AC_INIT([xcb-util-cursor],0.1.3,[xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) @@ -26,6 +26,14 @@ PKG_CHECK_MODULES(XCB_RENDER, xcb-render) PKG_CHECK_MODULES(XCB_RENDERUTIL, xcb-renderutil) PKG_CHECK_MODULES(XCB_IMAGE, xcb-image) +DEF_CURSORPATH="~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons" +AC_ARG_WITH(cursorpath, + AS_HELP_STRING([--with-cursorpath=], + [Set default search path for cursors]), + [XCURSORPATH="$withval"], + [XCURSORPATH="$DEF_CURSORPATH"]) +AC_DEFINE_UNQUOTED([XCURSORPATH], ["$XCURSORPATH"]) + AC_OUTPUT([Makefile cursor/Makefile cursor/xcb-cursor.pc xcb_util_intro diff --git a/lib/xcb-util-cursor/cursor/load_cursor.c b/lib/xcb-util-cursor/cursor/load_cursor.c index 53da00930..e82fc63e9 100644 --- a/lib/xcb-util-cursor/cursor/load_cursor.c +++ b/lib/xcb-util-cursor/cursor/load_cursor.c @@ -48,7 +48,7 @@ static const char *cursor_path(struct xcb_cursor_context_t *c) { if (c->path == NULL) { c->path = getenv("XCURSOR_PATH"); if (c->path == NULL) - c->path = "~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons"; + c->path = XCURSORPATH; } return c->path; }