commit libXcm for openSUSE:Factory
Hello community, here is the log from the commit of package libXcm for openSUSE:Factory checked in at 2012-05-31 17:06:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXcm (Old) and /work/SRC/openSUSE:Factory/.libXcm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXcm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libXcm/libXcm.changes 2012-04-12 09:39:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXcm.new/libXcm.changes 2012-05-31 17:06:37.000000000 +0200 @@ -2 +2,6 @@ -Tue Apr 03 12:00:01 UTC 2012 - Kai-Uwe Behrmann ku.b@gmx.de - 0.5.0 +Sat May 28 12:00:01 UTC 2012 - ku.b@gmx.de + +- Update to 0.5.1 + +------------------------------------------------------------------- +Tue Apr 03 12:00:01 UTC 2012 - ku.b@gmx.de @@ -12 +17 @@ -Mon Apr 02 12:00:01 UTC 2012 - Kai-Uwe Behrmann ku.b@gmx.de - 0.5.0 +Mon Apr 02 12:00:01 UTC 2012 - ku.b@gmx.de @@ -17 +22 @@ -Mon Apr 02 12:00:00 UTC 2012 - Kai-Uwe Behrmann ku.b@gmx.de - 0.5.0 +Mon Apr 02 12:00:00 UTC 2012 - ku.b@gmx.de @@ -22 +27 @@ -Fri Mar 09 12:00:00 UTC 2012 - Kai-Uwe Behrmann ku.b@gmx.de - 0.5.0 +Fri Mar 09 12:00:00 UTC 2012 - ku.b@gmx.de @@ -24 +29 @@ -- release 0.5.0 +- Update to 0.5.0 @@ -32 +37 @@ -Thu Sep 15 10:30:00 UTC 2011 - Kai-Uwe Behrmann ku.b@gmx.de - 0.4.2 +Thu Sep 15 10:30:00 UTC 2011 - ku.b@gmx.de @@ -37 +42 @@ -Fri Sep 9 10:30:00 UTC 2011 - Kai-Uwe Behrmann ku.b@gmx.de +Fri Sep 9 10:30:00 UTC 2011 - ku.b@gmx.de Old: ---- libXcm-0.5.0.tar.bz2 New: ---- libXcm-0.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXcm.spec ++++++ --- /var/tmp/diff_new_pack.dk5H32/_old 2012-05-31 17:06:39.000000000 +0200 +++ /var/tmp/diff_new_pack.dk5H32/_new 2012-05-31 17:06:39.000000000 +0200 @@ -16,9 +16,9 @@ # -Version: 0.5.0 +Version: 0.5.1 Release: 1 -Source: http://sourceforge.net/projects/oyranos/files/libXcm/libXcm-0.5/libXcm-0.5.0... +Source: http://sourceforge.net/projects/oyranos/files/libXcm/libXcm-0.5/libXcm-0.5.1... Summary: X Color Management Library Name: libXcm ++++++ libXcm-0.5.0.tar.bz2 -> libXcm-0.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/ChangeLog new/libXcm-0.5.1/ChangeLog --- old/libXcm-0.5.0/ChangeLog 2012-03-08 19:37:48.000000000 +0100 +++ new/libXcm-0.5.1/ChangeLog 2012-05-27 21:53:46.000000000 +0200 @@ -1,3 +1,15 @@ +Version libXcm-0.5.1 + +Kai-Uwe Behrmann (4): + * [core]: add XCM_ prefix to HAVE macros + * [core]: simplify varg allocation for messages + * [build]: depend on dist-bzip2 for make rpm target + * [conf]: fix DDC code linking + +Michael Weber (1): + * [conf]: add --disable-x11 configure option + + Version libXcm-0.5.0 Jan Engelhardt (7): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/Makefile.am new/libXcm-0.5.1/Makefile.am --- old/libXcm-0.5.0/Makefile.am 2012-02-16 20:37:26.000000000 +0100 +++ new/libXcm-0.5.1/Makefile.am 2012-03-10 08:08:18.000000000 +0100 @@ -28,7 +28,7 @@ RPMARCH=`rpmbuild --showrc | awk '/^build arch/ {print $$4}'` -rpm: dist +rpm: dist-bzip2 mkdir -p rpmdir/BUILD \ rpmdir/SPECS \ rpmdir/SOURCES \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/Makefile.in new/libXcm-0.5.1/Makefile.in --- old/libXcm-0.5.0/Makefile.in 2012-02-23 09:21:44.000000000 +0100 +++ new/libXcm-0.5.1/Makefile.in 2012-03-10 08:12:35.000000000 +0100 @@ -906,7 +906,7 @@ uninstall-pkgincludeHEADERS -rpm: dist +rpm: dist-bzip2 mkdir -p rpmdir/BUILD \ rpmdir/SPECS \ rpmdir/SOURCES \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/configure new/libXcm-0.5.1/configure --- old/libXcm-0.5.0/configure 2012-02-23 09:21:44.000000000 +0100 +++ new/libXcm-0.5.1/configure 2012-03-10 08:12:36.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libXcm 0.5.0. +# Generated by GNU Autoconf 2.68 for libXcm 0.5.1. # # Report bugs to <https://sourceforge.net/tracker/?group_id=177017&atid=879553>. # @@ -710,8 +710,8 @@ # Identity of this package. PACKAGE_NAME='libXcm' PACKAGE_TARNAME='libXcm' -PACKAGE_VERSION='0.5.0' -PACKAGE_STRING='libXcm 0.5.0' +PACKAGE_VERSION='0.5.1' +PACKAGE_STRING='libXcm 0.5.1' PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=177017&atid=879553' PACKAGE_URL='http://www.oyranos.org' @@ -755,6 +755,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAVE_LINUX_FALSE +HAVE_LINUX_TRUE RPMBUILD HAVE_X11_FALSE HAVE_X11_TRUE @@ -893,6 +895,7 @@ with_gnu_ld enable_libtool_lock enable_silent_rules +with_x11 ' ac_precious_vars='build_alias host_alias @@ -1454,7 +1457,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 libXcm 0.5.0 to adapt to many kinds of systems. +\`configure' configures libXcm 0.5.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1527,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXcm 0.5.0:";; + short | recursive ) echo "Configuration of libXcm 0.5.1:";; esac cat <<\_ACEOF @@ -1548,6 +1551,7 @@ --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-x11 enable x11 support Some influential environment variables: CC C compiler command @@ -1641,7 +1645,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXcm configure 0.5.0 +libXcm configure 0.5.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1919,7 +1923,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXcm $as_me 0.5.0, which was +It was created by libXcm $as_me 0.5.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2742,7 +2746,7 @@ # Define the identity of the package. PACKAGE='libXcm' - VERSION='0.5.0' + VERSION='0.5.1' cat >>confdefs.h <<_ACEOF @@ -4598,13 +4602,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4601: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4605: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4604: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4608: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4607: output\"" >&5) + (eval echo "\"\$as_me:4611: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5810,7 +5814,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5813 "configure"' > conftest.$ac_ext + echo '#line 5817 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7309,11 +7313,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7312: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7316: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7316: \$? = $ac_status" >&5 + echo "$as_me:7320: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7648,11 +7652,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7651: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7655: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7655: \$? = $ac_status" >&5 + echo "$as_me:7659: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7753,11 +7757,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7756: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7760: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7760: \$? = $ac_status" >&5 + echo "$as_me:7764: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7808,11 +7812,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7811: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7815: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7815: \$? = $ac_status" >&5 + echo "$as_me:7819: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10176,7 +10180,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10179 "configure" +#line 10183 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10272,7 +10276,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10275 "configure" +#line 10279 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10524,11 +10528,25 @@ XCM_PACKAGE_MAJOR=0 XCM_PACKAGE_MINOR=5 -XCM_PACKAGE_MICRO=0 +XCM_PACKAGE_MICRO=1 PACKAGE_RELEASE=0 LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking wether to enable x11 support" >&5 +$as_echo_n "checking wether to enable x11 support... " >&6; } + +# Check whether --with-x11 was given. +if test "${with_x11+set}" = set; then : + withval=$with_x11; with_x11=$withval +else + with_x11=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_x11" >&5 +$as_echo "$with_x11" >&6; } + +if test "$with_x11" = "yes"; then @@ -10930,7 +10948,7 @@ HAVE_X11_FALSE= fi - HAVE_X11="#define HAVE_X11 1" + HAVE_X11="#define XCM_HAVE_X11 1" PKG_CONFIG_PRIVATE_X11="xproto x11" else @@ -10950,6 +10968,21 @@ HAVE_X11= fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libX11" >&5 +$as_echo_n "checking for libX11... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if false; then + HAVE_X11_TRUE= + HAVE_X11_FALSE='#' +else + HAVE_X11_TRUE='#' + HAVE_X11_FALSE= +fi + + HAVE_X11= +fi for ac_prog in rpm do @@ -10998,7 +11031,28 @@ test -n "$RPMBUILD" || RPMBUILD=":" -HAVE_LINUX="`uname | grep Linux | wc -l`" +LINUX="`uname | grep Linux | wc -l`" +if [ $LINUX = "1" ]; then + HAVE_LINUX="#define XCM_HAVE_LINUX 1" + if true; then + HAVE_LINUX_TRUE= + HAVE_LINUX_FALSE='#' +else + HAVE_LINUX_TRUE='#' + HAVE_LINUX_FALSE= +fi + +else + HAVE_LINUX= + if false; then + HAVE_LINUX_TRUE= + HAVE_LINUX_FALSE='#' +else + HAVE_LINUX_TRUE='#' + HAVE_LINUX_FALSE= +fi + +fi ac_config_files="$ac_config_files Makefile src/Makefile xcm.pc Doxyfile libXcm.spec include/XcmVersion.h" @@ -11135,6 +11189,18 @@ as_fn_error $? "conditional \"HAVE_X11\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_X11_TRUE}" && test -z "${HAVE_X11_FALSE}"; then + as_fn_error $? "conditional \"HAVE_X11\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_LINUX_TRUE}" && test -z "${HAVE_LINUX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_LINUX_TRUE}" && test -z "${HAVE_LINUX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -11544,7 +11610,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXcm $as_me 0.5.0, which was +This file was extended by libXcm $as_me 0.5.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11611,7 +11677,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libXcm config.status 0.5.0 +libXcm config.status 0.5.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -13372,10 +13438,10 @@ else echo "HAVE_X11 = yes (X Color Management)" fi -if [ "$HAVE_LINUX" = "1" ]; then -echo "HAVE_LINUX = yes (DDC over i2c)" -else +if [ "$HAVE_LINUX" = "" ]; then echo "HAVE_LINUX = no, DDC over i2c support skipped" +else +echo "HAVE_LINUX = yes (DDC over i2c)" fi echo "CFLAGS = $CFLAGS" echo "CXXFLAGS = $CXXFLAGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/configure.ac new/libXcm-0.5.1/configure.ac --- old/libXcm-0.5.0/configure.ac 2012-02-23 09:21:39.000000000 +0100 +++ new/libXcm-0.5.1/configure.ac 2012-03-10 08:12:27.000000000 +0100 @@ -1,6 +1,6 @@ define([MAJOR],[0]) define([MINOR],[5]) -define([MICRO],[0]) +define([MICRO],[1]) AC_INIT([libXcm], [MAJOR.MINOR.MICRO], https://sourceforge.net/tracker/?group_id=177017&atid=879553, libXcm, @@ -37,12 +37,20 @@ LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE +AC_MSG_CHECKING([wether to enable x11 support]) +AC_ARG_WITH(x11, + [ --with-x11 enable x11 support], + with_x11=$withval, + with_x11=yes) +AC_MSG_RESULT($with_x11) + +if test "$with_x11" = "yes"; then PKG_CHECK_EXISTS([x11], [ PKG_CHECK_MODULES([libX11], [x11]) PKG_CHECK_MODULES([libXfixes], [xfixes]) PKG_CHECK_MODULES([libXmu], [xmu]) AM_CONDITIONAL([HAVE_X11], [true]) - HAVE_X11="#define HAVE_X11 1" + HAVE_X11="#define XCM_HAVE_X11 1" PKG_CONFIG_PRIVATE_X11="xproto x11" ], [ AC_MSG_CHECKING([for libX11]) @@ -50,10 +58,23 @@ AM_CONDITIONAL([HAVE_X11], [false]) HAVE_X11= ]) +else + AC_MSG_CHECKING([for libX11]) + AC_MSG_RESULT([no]) + AM_CONDITIONAL([HAVE_X11], [false]) + HAVE_X11= +fi AC_PATH_PROGS(RPMBUILD, rpm, :) -HAVE_LINUX="`uname | grep Linux | wc -l`" +LINUX="`uname | grep Linux | wc -l`" +if [[ $LINUX = "1" ]]; then + HAVE_LINUX="#define XCM_HAVE_LINUX 1" + AM_CONDITIONAL([HAVE_LINUX], [true]) +else + HAVE_LINUX= + AM_CONDITIONAL([HAVE_LINUX], [false]) +fi AC_CONFIG_FILES([Makefile src/Makefile xcm.pc Doxyfile libXcm.spec include/XcmVersion.h]) @@ -64,10 +85,10 @@ else echo "HAVE_X11 = yes (X Color Management)" fi -if [[ "$HAVE_LINUX" = "1" ]]; then -echo "HAVE_LINUX = yes (DDC over i2c)" -else +if [[ "$HAVE_LINUX" = "" ]]; then echo "HAVE_LINUX = no, DDC over i2c support skipped" +else +echo "HAVE_LINUX = yes (DDC over i2c)" fi echo "CFLAGS = $CFLAGS" echo "CXXFLAGS = $CXXFLAGS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/include/Xcm.h new/libXcm-0.5.1/include/Xcm.h --- old/libXcm-0.5.0/include/Xcm.h 2012-02-22 17:22:31.000000000 +0100 +++ new/libXcm-0.5.1/include/Xcm.h 2012-03-10 08:16:17.000000000 +0100 @@ -19,7 +19,7 @@ #define __XCOLOR_H__ #include "XcmVersion.h" -#ifdef HAVE_X11 +#ifdef XCM_HAVE_X11 #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -30,13 +30,13 @@ #include <stdlib.h> #include <string.h> -#endif /* HAVE_X11 */ +#endif /* XCM_HAVE_X11 */ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#ifdef HAVE_X11 +#ifdef XCM_HAVE_X11 /** \addtogroup Xcm X Color Management Core API's * @{ @@ -175,7 +175,7 @@ */ #define XCM_COLOR_DESKTOP "_ICC_COLOR_DESKTOP" -#endif /* HAVE_X11 */ +#endif /* XCM_HAVE_X11 */ /** * The XCM_COLOR_SERVER_ enums @@ -187,7 +187,7 @@ XCM_COLOR_SERVER_DISPLAY_ADVANCED = 0x04, /**< _ICC_COLOR_DISPLAY_ADVANCED */ XCM_COLOR_SERVER_OUTPUTS = 0x08 /**< _ICC_COLOR_OUTPUTS */ }; -#ifdef HAVE_X11 +#ifdef XCM_HAVE_X11 /** Function XcmColorServerCapabilities * @brief informs which colour server services are available * @@ -223,7 +223,7 @@ */ -#endif /* HAVE_X11 */ +#endif /* XCM_HAVE_X11 */ #ifdef __cplusplus } /* extern "C" */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/include/XcmDDC.h new/libXcm-0.5.1/include/XcmDDC.h --- old/libXcm-0.5.0/include/XcmDDC.h 2012-02-18 13:03:53.000000000 +0100 +++ new/libXcm-0.5.1/include/XcmDDC.h 2012-03-10 08:12:27.000000000 +0100 @@ -19,7 +19,7 @@ #include "XcmVersion.h" -#if HAVE_LINUX +#if XCM_HAVE_LINUX #ifdef __cplusplus extern "C" { @@ -62,6 +62,6 @@ } /* extern "C" */ #endif /* __cplusplus */ -#endif /* HAVE_LINUX */ +#endif /* XCM_HAVE_LINUX */ #endif /* XCM_DDC_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/include/XcmEvents.h new/libXcm-0.5.1/include/XcmEvents.h --- old/libXcm-0.5.0/include/XcmEvents.h 2012-02-16 20:37:26.000000000 +0100 +++ new/libXcm-0.5.1/include/XcmEvents.h 2012-03-10 08:18:51.000000000 +0100 @@ -13,6 +13,9 @@ #ifndef XCM_EVENTS_H #define XCM_EVENTS_H +#include "XcmVersion.h" +#ifdef XCM_HAVE_X11 + #ifdef __cplusplus extern "C" { #endif @@ -102,6 +105,7 @@ } /* extern "C" */ #endif /* __cplusplus */ +#endif /* XCM_HAVE_X11 */ #endif /* XCM_EVENTS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/include/XcmVersion.h new/libXcm-0.5.1/include/XcmVersion.h --- old/libXcm-0.5.0/include/XcmVersion.h 2012-02-23 09:21:47.000000000 +0100 +++ new/libXcm-0.5.1/include/XcmVersion.h 2012-05-27 21:50:21.000000000 +0200 @@ -16,14 +16,14 @@ #ifndef __XCM_VERSION_H__ #define __XCM_VERSION_H__ -#define HAVE_X11 1 -#define HAVE_LINUX 1 +#define XCM_HAVE_X11 1 +#define XCM_HAVE_LINUX 1 #define XCM_VERSION_MAJOR 0 #define XCM_VERSION_MINOR 5 -#define XCM_VERSION_MICRO 0 -#define XCM_VERSION 0.5.0 -#define XCM_VERSION_NUM (0*10000+5*100+0) +#define XCM_VERSION_MICRO 1 +#define XCM_VERSION 0.5.1 +#define XCM_VERSION_NUM (0*10000+5*100+1) #define XCM_LIB_VERSION 0:5:0 #endif /* __XCM_VERSION_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/include/XcmVersion.h.in new/libXcm-0.5.1/include/XcmVersion.h.in --- old/libXcm-0.5.0/include/XcmVersion.h.in 2012-02-16 20:37:26.000000000 +0100 +++ new/libXcm-0.5.1/include/XcmVersion.h.in 2012-03-10 08:12:27.000000000 +0100 @@ -17,7 +17,7 @@ #define __XCM_VERSION_H__ @HAVE_X11@ -#define HAVE_LINUX @HAVE_LINUX@ +@HAVE_LINUX@ #define XCM_VERSION_MAJOR @XCM_PACKAGE_MAJOR@ #define XCM_VERSION_MINOR @XCM_PACKAGE_MINOR@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/src/Makefile.am new/libXcm-0.5.1/src/Makefile.am --- old/libXcm-0.5.0/src/Makefile.am 2012-02-16 20:37:26.000000000 +0100 +++ new/libXcm-0.5.1/src/Makefile.am 2012-03-10 07:38:40.000000000 +0100 @@ -6,8 +6,11 @@ lib_LTLIBRARIES = libXcm.la libXcm_la_SOURCES = XcmEdidParse.c +if HAVE_LINUX +libXcm_la_SOURCES += XcmDDC.c +endif if HAVE_X11 -libXcm_la_SOURCES += Xcm.c XcmDDC.c XcmEvents.c +libXcm_la_SOURCES += Xcm.c XcmEvents.c endif libXcm_la_LIBADD = -lm ${libX11_LIBS} ${libXfixes_LIBS} ${libXmu_LIBS} # NOT supposed to be the same as ${PACKAGE_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/src/Makefile.in new/libXcm-0.5.1/src/Makefile.in --- old/libXcm-0.5.0/src/Makefile.in 2012-02-23 09:21:44.000000000 +0100 +++ new/libXcm-0.5.1/src/Makefile.in 2012-03-10 08:12:35.000000000 +0100 @@ -36,7 +36,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_X11_TRUE@am__append_1 = Xcm.c XcmDDC.c XcmEvents.c +@HAVE_LINUX_TRUE@am__append_1 = XcmDDC.c +@HAVE_X11_TRUE@am__append_2 = Xcm.c XcmEvents.c subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -76,9 +77,11 @@ am__DEPENDENCIES_1 = libXcm_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__libXcm_la_SOURCES_DIST = XcmEdidParse.c Xcm.c XcmDDC.c XcmEvents.c -@HAVE_X11_TRUE@am__objects_1 = Xcm.lo XcmDDC.lo XcmEvents.lo -am_libXcm_la_OBJECTS = XcmEdidParse.lo $(am__objects_1) +am__libXcm_la_SOURCES_DIST = XcmEdidParse.c XcmDDC.c Xcm.c XcmEvents.c +@HAVE_LINUX_TRUE@am__objects_1 = XcmDDC.lo +@HAVE_X11_TRUE@am__objects_2 = Xcm.lo XcmEvents.lo +am_libXcm_la_OBJECTS = XcmEdidParse.lo $(am__objects_1) \ + $(am__objects_2) libXcm_la_OBJECTS = $(am_libXcm_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -250,7 +253,7 @@ AM_CPPFLAGS = -I${top_srcdir}/include ${libX11_CFLAGS} ${libXfixes_CFLAGS} ${libXmu_CFLAGS} AM_CFLAGS = -Wall lib_LTLIBRARIES = libXcm.la -libXcm_la_SOURCES = XcmEdidParse.c $(am__append_1) +libXcm_la_SOURCES = XcmEdidParse.c $(am__append_1) $(am__append_2) libXcm_la_LIBADD = -lm ${libX11_LIBS} ${libXfixes_LIBS} ${libXmu_LIBS} # NOT supposed to be the same as ${PACKAGE_VERSION} libXcm_la_LDFLAGS = -version-info ${LIBTOOL_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/src/XcmDDC.c new/libXcm-0.5.1/src/XcmDDC.c --- old/libXcm-0.5.0/src/XcmDDC.c 2012-02-16 20:37:26.000000000 +0100 +++ new/libXcm-0.5.1/src/XcmDDC.c 2012-03-10 08:12:27.000000000 +0100 @@ -15,7 +15,7 @@ #include "XcmVersion.h" -#if HAVE_LINUX +#if XCM_HAVE_LINUX #include "XcmDDC.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libXcm-0.5.0/src/XcmEvents.c new/libXcm-0.5.1/src/XcmEvents.c --- old/libXcm-0.5.0/src/XcmEvents.c 2012-02-21 11:30:41.000000000 +0100 +++ new/libXcm-0.5.1/src/XcmEvents.c 2012-03-10 08:24:05.000000000 +0100 @@ -9,8 +9,6 @@ * */ -#include "XcmVersion.h" -#ifdef HAVE_X11 #ifdef __cplusplus extern "C" { @@ -110,27 +108,24 @@ char * text = 0; va_list list; int i,len; - size_t sz = 256; + size_t sz = 0; if(code == XCME_MSG_INFO) return 0; - text = calloc( sizeof(char), sz ); - if(!text) - { - fprintf(stderr, - "Xcm_events.c:93 XcmMessage() Could not allocate 256 byte of memory.\n"); - return 1; - } - - text[0] = 0; va_start( list, format); - len = vsnprintf( text, sz-1, format, list); + len = vsnprintf( text, sz, format, list); va_end ( list ); - if (len >= (sz - 1)) { - text = realloc( text, (len+1)*sizeof(char) ); + text = calloc( sizeof(char), len + 1 ); + if(!text) + { + fprintf(stderr, + "Xcm_events.c:93 XcmMessage() Could not allocate 256 byte of memory.\n"); + return 1; + } + va_start( list, format); len = vsnprintf( text, len+1, format, list); va_end ( list ); @@ -1188,4 +1183,3 @@ /** @} XcmEvents */ -#endif /* HAVE_X11 */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de