rpms/metacity/devel metacity-2.11.0-xcursor.patch, NONE, 1.1 metacity.spec, 1.31, 1.32

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7233

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.11.0-xcursor.patch 
Log Message:
fix xcursor detection


metacity-2.11.0-xcursor.patch:
 configure    |   41 +++++++++++++++++++++++++++++++----------
 configure.in |   17 ++++++++++++++++-
 2 files changed, 47 insertions(+), 11 deletions(-)

--- NEW FILE metacity-2.11.0-xcursor.patch ---
--- metacity-2.11.0/configure.in.xcursor	2005-07-18 00:15:35.189075000 -0400
+++ metacity-2.11.0/configure.in	2005-07-18 00:15:59.654585000 -0400
@@ -2,7 +2,7 @@
 
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.11.0],
+AC_INIT([metacity], [2.11.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
 AC_CONFIG_SRCDIR(src/display.c)
@@ -258,6 +258,20 @@
   AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
 fi
 
+AC_MSG_CHECKING([Xcursor])
+if $PKG_CONFIG xcursor; then
+     have_xcursor=yes
+  else
+     have_xcursor=no
+  fi
+  AC_MSG_RESULT($have_xcursor)
+
+if test x$have_xcursor = xyes; then
+  echo "Building with Xcursor"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
+  AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support]) 
+fi
+
 PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
 
 AC_PATH_XTRA
@@ -498,6 +512,7 @@
 	Resize-and-rotate:        ${found_randr}
 	Xsync:                    ${found_xsync}
 	Render:                   ${have_xrender}
+	Xcursor:                  ${have_xcursor}
 "
 echo "This is the UNSTABLE branch of metacity"
 echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"
--- metacity-2.11.0/configure.xcursor	2005-07-18 00:15:45.415839000 -0400
+++ metacity-2.11.0/configure	2005-07-18 00:16:08.604627000 -0400
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for metacity 2.11.0.
+# Generated by GNU Autoconf 2.59 for metacity 2.11.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=metacity>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='metacity'
 PACKAGE_TARNAME='metacity'
-PACKAGE_VERSION='2.11.0'
-PACKAGE_STRING='metacity 2.11.0'
+PACKAGE_VERSION='2.11.1'
+PACKAGE_STRING='metacity 2.11.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=metacity'
 
 ac_unique_file="src/display.c"
@@ -954,7 +954,7 @@
   # 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 metacity 2.11.0 to adapt to many kinds of systems.
+\`configure' configures metacity 2.11.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1024,7 +1024,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of metacity 2.11.0:";;
+     short | recursive ) echo "Configuration of metacity 2.11.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1184,7 +1184,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-metacity configure 2.11.0
+metacity configure 2.11.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1198,7 +1198,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by metacity $as_me 2.11.0, which was
+It was created by metacity $as_me 2.11.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1846,7 +1846,7 @@
 
 # Define the identity of the package.
  PACKAGE='metacity'
- VERSION='2.11.0'
+ VERSION='2.11.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25820,6 +25820,26 @@
 
 fi
 
+echo "$as_me:$LINENO: checking Xcursor" >&5
+echo $ECHO_N "checking Xcursor... $ECHO_C" >&6
+if $PKG_CONFIG xcursor; then
+     have_xcursor=yes
+  else
+     have_xcursor=no
+  fi
+  echo "$as_me:$LINENO: result: $have_xcursor" >&5
+echo "${ECHO_T}$have_xcursor" >&6
+
+if test x$have_xcursor = xyes; then
+  echo "Building with Xcursor"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcursor"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XCURSOR
+_ACEOF
+
+fi
+
 
   succeeded=no
 
@@ -29294,7 +29314,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by metacity $as_me 2.11.0, which was
+This file was extended by metacity $as_me 2.11.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29357,7 +29377,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-metacity config.status 2.11.0
+metacity config.status 2.11.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -30502,6 +30522,7 @@
 	Resize-and-rotate:        ${found_randr}
 	Xsync:                    ${found_xsync}
 	Render:                   ${have_xrender}
+	Xcursor:                  ${have_xcursor}
 "
 echo "This is the UNSTABLE branch of metacity"
 echo "Use 2.10.x for stable (gnome-2-10 branch in CVS)"


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- metacity.spec	13 Jul 2005 04:12:45 -0000	1.31
+++ metacity.spec	18 Jul 2005 04:18:36 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.11.0
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -24,6 +24,8 @@
 
 Patch0: metacity-2.3.987-default-theme.patch
 Patch1: metacity-2.4.13.90-ctrlaltdel.patch
+# fixed in cvs post-2.11.0
+Patch2: metacity-2.11.0-xcursor.patch
 
 %description
 
@@ -108,6 +110,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 18 2005 Matthias Clasen <mclasen redhat com> 2.11.0-2
+- fix xcursor detection
+
 * Wed Jul 13 2005 Matthias Clasen <mclasen redhat com> 2.11.0-1
 - newer upstream version