July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit post-build-checks for openSUSE:Factory
by root＠Hilbert.suse.de 30 Jul '09

30 Jul '09

Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at Thu Jul 30 13:02:02 CEST 2009. -------- --- post-build-checks/post-build-checks.changes 2009-07-29 15:49:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/post-build-checks/post-build-checks.changes 2009-07-30 10:34:01.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 30 10:11:52 CEST 2009 - rguenther(a)suse.de + +- simplify and fix empty debuginfo/source deletion + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.tLCMBY/_old 2009-07-30 13:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.tLCMBY/_new 2009-07-30 13:01:40.000000000 +0200 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 63 +Release: 64 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 Source1: suse-buildsystem.sh ++++++ check-debuginfo.diff ++++++ --- /var/tmp/diff_new_pack.tLCMBY/_old 2009-07-30 13:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.tLCMBY/_new 2009-07-30 13:01:40.000000000 +0200 @@ -1,6 +1,8 @@ ---- checks/01-check-debuginfo.orig 2009-07-27 16:52:05.000000000 +0200 -+++ checks/01-check-debuginfo 2009-07-27 16:52:09.000000000 +0200 -@@ -5,7 +5,7 @@ +Index: checks/01-check-debuginfo +=================================================================== +--- checks/01-check-debuginfo.orig 2008-07-14 13:47:43.000000000 +0200 ++++ checks/01-check-debuginfo 2009-07-30 10:11:30.000000000 +0200 +@@ -5,7 +5,7 @@ echo "... testing for empty debuginfo pa fast= test -x /usr/lib/rpm/rpmi && fast="--nodigest --nosignature" @@ -9,3 +11,41 @@ test -z "$RPMS" && exit 0 for rpm in $RPMS ; do HAS_DEBUG= +@@ -16,34 +16,11 @@ for rpm in $RPMS ; do + /usr/src/debug/*) HAS_SRC=true ;; + esac + done +- if test -z "$HAS_DEBUG" ; then ++ if test -z "$HAS_DEBUG" -a -z "$HAS_SRC"; then + echo '!' +- echo "! ${rpm##*/}: no debug information, deleting package" +- echo '!' +- rm -f "$rpm" "${rpm/-debuginfo-/-debugsource-}" +- elif test -z "$HAS_SRC" ; then +- rpmsource=${rpm/-debuginfo-/-debugsource-} +- if test -s "${rpmsource}" ; then +-# for l in "$(rpm -qpl $fast ${rpmsource})" ; do +-# case "$l" in +-# /usr/src/debug/*) HAS_SRC=true ;; +-# "(contains no files)") HAS_SRC=""; break ;; +-# esac +-# done +- rpm -qpl $fast "${rpmsource}" | egrep -q "^/usr/src/debug/" && HAS_SRC=true +- if test -n "$HAS_SRC" ; then +- continue +- fi +- echo '!' +- echo "! ${rpmsource##*/}: no debug sources, deleting package" +- echo "! ${rpm##*/}: WARNING: this probably means the debug information is invalid" +- echo '!' +- rm -f "${rpmsource}" +- continue +- fi +- echo '!' +- echo "! ${rpm##*/}: WARNING: no sources in debuginfo package" ++ echo "! $rpm: empty debuginfo/debugsource package, deleting" + echo '!' ++ rm -f "$rpm" + fi + done + exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠Hilbert.suse.de 30 Jul '09

30 Jul '09

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Thu Jul 30 09:42:31 CEST 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-07-21 20:48:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-07-30 09:08:48.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Jul 30 09:07:37 CEST 2009 - sndirsch(a)suse.de + +- removed patches, which are no longer in use, from source package: + * Free-front-buffer-bo-when-X-exit.patch + * eeetop_sdvo_lvds.patch + +------------------------------------------------------------------- +Wed Jul 29 23:42:09 CEST 2009 - sndirsch(a)suse.de + +- xf86-video-vmware 10.16.7 + * Fix black screen after resume from hibernate. + * An imperfect fix for Xinerama state changes without a mode + change + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-video-vmware-10.16.6.tar.bz2 New: ---- xf86-video-vmware-10.16.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.GYNwIx/_old 2009-07-30 09:42:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GYNwIx/_new 2009-07-30 09:42:07.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 71 +Release: 72 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -64,7 +64,7 @@ Source37: xf86-video-v4l-0.2.0.tar.bz2 Source38: xf86-video-vesa-2.2.0.tar.bz2 Source39: xf86-video-vga-4.1.0_080718_97e2d12.tar.bz2 -Source41: xf86-video-vmware-10.16.6.tar.bz2 +Source41: xf86-video-vmware-10.16.7.tar.bz2 Source42: xf86-video-voodoo-1.2.2.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz ++++++ xf86-video-vmware-10.16.6.tar.bz2 -> xf86-video-vmware-10.16.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/aclocal.m4 new/xf86-video-vmware-10.16.7/aclocal.m4 --- old/xf86-video-vmware-10.16.6/aclocal.m4 2009-05-13 01:48:01.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/aclocal.m4 2009-07-21 02:59:57.000000000 +0200 @@ -6811,6 +6811,7 @@ fi[]dnl ])# PKG_CHECK_MODULES +dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. dnl @@ -6847,27 +6848,24 @@ # your configure.ac with the minimum required version, such as: # XORG_MACROS_VERSION(1.1) # -# To force at least a version with this macro defined, also add: -# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) +# To ensure that this macro is defined, also add: +# m4_ifndef([XORG_MACROS_VERSION], +# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])]) # # # See the "minimum version" comment for each macro you use to see what # version you require. -AC_DEFUN([XORG_MACROS_VERSION],[ - [XORG_MACROS_needed_version=$1 - XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` - XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.6 - XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` - XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then - AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) - fi - if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then - AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) - fi - AC_MSG_RESULT([yes, $XORG_MACROS_version]) +m4_defun([XORG_MACROS_VERSION],[ +m4_define([vers_have], [1.2.2]) +m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) +m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) +m4_if(m4_cmp(maj_have, maj_needed), 0,, + [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])]) +m4_if(m4_version_compare(vers_have, [$1]), -1, + [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])]) +m4_undefine([vers_have]) +m4_undefine([maj_have]) +m4_undefine([maj_needed]) ]) # XORG_MACROS_VERSION # XORG_PROG_RAWCPP() @@ -6892,6 +6890,10 @@ if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS=-undef AC_MSG_RESULT([yes]) + # under Cygwin unix is still defined even with -undef + elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS="-undef -ansi" + AC_MSG_RESULT([yes, with -ansi]) else AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) fi @@ -7004,7 +7006,9 @@ # Whether or not the necessary tools and files are found can be checked # with the AM_CONDITIONAL "BUILD_LINUXDOC" AC_DEFUN([XORG_CHECK_LINUXDOC],[ -XORG_SGML_PATH=$prefix/share/sgml +if test x$XORG_SGML_PATH = x ; then + XORG_SGML_PATH=$prefix/share/sgml +fi HAVE_DEFS_ENT= if test x"$cross_compiling" = x"yes" ; then @@ -7060,7 +7064,9 @@ # indicates whether the necessary tools and files are found and, if set, # $(MAKE_XXX) blah.sgml will produce blah.xxx. AC_DEFUN([XORG_CHECK_DOCBOOK],[ -XORG_SGML_PATH=$prefix/share/sgml +if test x$XORG_SGML_PATH = x ; then + XORG_SGML_PATH=$prefix/share/sgml +fi HAVE_DEFS_ENT= BUILDTXTDOC=no BUILDPDFDOC=no @@ -7237,55 +7243,31 @@ ]) # XORG_LINT_LIBRARY -dnl Copyright 2005 Red Hat, Inc -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -dnl - -# XORG_DRIVER_CHECK_EXT() -# -------------------------- -# Checks for the $1 define in xorg-server.h (from the sdk). If it -# is defined, then add $1 to $REQUIRED_MODULES. - -AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include "xorg-server.h" -#if !defined $1 -#error $1 not defined -#endif - ]])], - [_EXT_CHECK=yes], - [_EXT_CHECK=no]) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_CHECKING([if $1 is defined]) - AC_MSG_RESULT([$_EXT_CHECK]) - if test "$_EXT_CHECK" != no; then - REQUIRED_MODULES="$REQUIRED_MODULES $2" - fi -]) - +# XORG_CWARNFLAGS +# --------------- +# Minimum version: 1.2.0 +# +# Defines CWARNFLAGS to enable C compiler warnings. +# +AC_DEFUN([XORG_CWARNFLAGS], [ +AC_REQUIRE([AC_PROG_CC]) +if test "x$GCC" = xyes ; then + CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ +-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ +-Wbad-function-cast" + case `$CC -dumpversion` in + 3.4.* | 4.*) + CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" + ;; + esac +else + AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) + if test "x$SUNCC" = "xyes"; then + CWARNFLAGS="-v" + fi +fi +AC_SUBST(CWARNFLAGS) +]) # XORG_CWARNFLAGS dnl Copyright 2005 Red Hat, Inc dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -7348,6 +7330,72 @@ [Patch version of this package]) ]) +# XORG_CHANGELOG() +# ---------------- +# Minimum version: 1.2.0 +# +# Defines the variable CHANGELOG_CMD as the command to generate +# ChangeLog from git. +# +# Arrange that distcleancheck ignores ChangeLog left over by distclean. +# +AC_DEFUN([XORG_CHANGELOG], [ +CHANGELOG_CMD="(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)" +AC_SUBST([CHANGELOG_CMD]) +AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print']) +]) # XORG_CHANGELOG + +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_DRIVER_CHECK_EXT() +# -------------------------- +# Checks for the $1 define in xorg-server.h (from the sdk). If it +# is defined, then add $1 to $REQUIRED_MODULES. + +AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "xorg-server.h" +#if !defined $1 +#error $1 not defined +#endif + ]])], + [_EXT_CHECK=yes], + [_EXT_CHECK=no]) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_CHECKING([if $1 is defined]) + AC_MSG_RESULT([$_EXT_CHECK]) + if test "$_EXT_CHECK" != no; then + REQUIRED_MODULES="$REQUIRED_MODULES $2" + fi +]) + # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/configure new/xf86-video-vmware-10.16.7/configure --- old/xf86-video-vmware-10.16.6/configure 2009-05-13 01:48:03.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/configure 2009-07-21 02:59:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-video-vmware 10.16.6. +# Generated by GNU Autoconf 2.63 for xf86-video-vmware 10.16.7. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-vmware' PACKAGE_TARNAME='xf86-video-vmware' -PACKAGE_VERSION='10.16.6' -PACKAGE_STRING='xf86-video-vmware 10.16.6' +PACKAGE_VERSION='10.16.7' +PACKAGE_STRING='xf86-video-vmware 10.16.7' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1509,7 +1509,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 xf86-video-vmware 10.16.6 to adapt to many kinds of systems. +\`configure' configures xf86-video-vmware 10.16.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1580,7 +1580,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-vmware 10.16.6:";; + short | recursive ) echo "Configuration of xf86-video-vmware 10.16.7:";; esac cat <<\_ACEOF @@ -1699,7 +1699,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-vmware configure 10.16.6 +xf86-video-vmware configure 10.16.7 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1713,7 +1713,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-vmware $as_me 10.16.6, which was +It was created by xf86-video-vmware $as_me 10.16.7, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2434,7 +2434,7 @@ # Define the identity of the package. PACKAGE='xf86-video-vmware' - VERSION='10.16.6' + VERSION='10.16.7' cat >>confdefs.h <<_ACEOF @@ -22273,7 +22273,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-vmware $as_me 10.16.6, which was +This file was extended by xf86-video-vmware $as_me 10.16.7, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22336,7 +22336,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-video-vmware config.status 10.16.6 +xf86-video-vmware config.status 10.16.7 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/configure.ac new/xf86-video-vmware-10.16.7/configure.ac --- old/xf86-video-vmware-10.16.6/configure.ac 2009-05-13 01:47:37.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/configure.ac 2009-07-21 02:59:04.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vmware], - 10.16.6, + 10.16.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-vmware) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/src/vmware.c new/xf86-video-vmware-10.16.7/src/vmware.c --- old/xf86-video-vmware-10.16.6/src/vmware.c 2009-05-13 01:47:50.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/src/vmware.c 2009-07-21 02:59:17.000000000 +0200 @@ -83,7 +83,7 @@ #define VMWARE_DRIVER_NAME "vmware" #define VMWARE_MAJOR_VERSION 10 #define VMWARE_MINOR_VERSION 16 -#define VMWARE_PATCHLEVEL 6 +#define VMWARE_PATCHLEVEL 7 #define VMWARE_DRIVER_VERSION \ (VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL) #define VMWARE_DRIVER_VERSION_STRING \ @@ -306,7 +306,7 @@ vmwareWriteWordToFIFO(pVMWARE, pBB->y2 - pBB->y1); } -static void +void vmwareSendSVGACmdUpdateFullScreen(VMWAREPtr pVMWARE) { BoxRec BB; @@ -652,6 +652,7 @@ "No supported VMware SVGA found (read ID 0x%08x).\n", id); return FALSE; } + pVMWARE->suspensionSavedRegId = id; #if !XSERVER_LIBPCIACCESS pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device, @@ -1162,8 +1163,40 @@ vgaHWProtect(pScrn, FALSE); /* - * XXX -- If we want to check that we got the mode we asked for, this - * would be a good place. + * Push the new Xinerama state to X clients and the hardware, + * synchronously with the mode change. Note that this must happen + * AFTER we write the new width and height to the hardware + * registers, since updating the WIDTH and HEIGHT registers will + * reset the device's multimon topology. + */ + vmwareNextXineramaState(pVMWARE); + + return TRUE; +} + +void +vmwareNextXineramaState(VMWAREPtr pVMWARE) +{ + VMWARERegPtr vmwareReg = &pVMWARE->ModeReg; + + /* + * Switch to the next Xinerama state (from pVMWARE->xineramaNextState). + * + * This new state will be available to X clients via the Xinerama + * extension, and we push the new state to the virtual hardware, + * in order to configure a number of virtual monitors within the + * device's framebuffer. + * + * This function can be called at any time, but it should usually be + * called just after a mode switch. This is for two reasons: + * + * 1) We don't want X clients to see a Xinerama topology and a video + * mode that are inconsistent with each other, so we'd like to switch + * both at the same time. + * + * 2) We must set the host's display topology registers after setting + * the new video mode, since writes to WIDTH/HEIGHT will reset the + * hardware display topology. */ /* @@ -1177,7 +1210,14 @@ pVMWARE->xineramaNextState = NULL; pVMWARE->xineramaNextNumOutputs = 0; + } else { + /* + * There is no next state pending. Switch back to + * single-monitor mode. This is necessary for resetting the + * Xinerama state if we get a mode change which doesn't + * follow a VMwareCtrlDoSetTopology call. + */ VMWAREXineramaPtr basicState = (VMWAREXineramaPtr)xcalloc(1, sizeof (VMWAREXineramaRec)); if (basicState) { @@ -1194,7 +1234,8 @@ } /* - * Update host's view of guest topology. + * Update host's view of guest topology. This tells the device + * how we're carving up its framebuffer into virtual screens. */ if (pVMWARE->vmwareCapability & SVGA_CAP_DISPLAY_TOPOLOGY) { if (pVMWARE->xinerama) { @@ -1222,14 +1263,13 @@ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_IS_PRIMARY, TRUE); vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_X, 0); vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_POSITION_Y, 0); - vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_WIDTH, mode->HDisplay); - vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_HEIGHT, mode->VDisplay); + vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_WIDTH, vmwareReg->svga_reg_width); + vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_HEIGHT, vmwareReg->svga_reg_height); } + /* Done. */ vmwareWriteReg(pVMWARE, SVGA_REG_DISPLAY_ID, SVGA_INVALID_DISPLAY_ID); } - - return TRUE; } static void @@ -1435,6 +1475,7 @@ DisplayModeRec *mode; mode = xalloc(sizeof(DisplayModeRec)); + memset(mode, 0, sizeof *mode); mode->name = xalloc(strlen(name) + 1); strcpy(mode->name, name); @@ -1820,7 +1861,13 @@ ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - if (!pVMWARE->SavedReg.svga_fifo_enabled) { + /* + * After system resumes from hiberation, EnterVT will be called and this + * is a good place to restore the SVGA ID register. + */ + vmwareWriteReg(pVMWARE, SVGA_REG_ID, pVMWARE->suspensionSavedRegId); + + if (!pVMWARE->SavedReg.svga_fifo_enabled) { VMWAREInitFIFO(pScrn); } @@ -1831,6 +1878,14 @@ VMWARELeaveVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + VMWAREPtr pVMWARE = VMWAREPTR(pScrn); + + /* + * Before shutting down system for hibneration, LeaveVT will be called, + * we save the ID register value here and later restore it in EnterVT. + */ + pVMWARE->suspensionSavedRegId = vmwareReadReg(pVMWARE, SVGA_REG_ID); + VMWARERestore(pScrn); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/src/vmware.h new/xf86-video-vmware-10.16.7/src/vmware.h --- old/xf86-video-vmware-10.16.6/src/vmware.h 2009-05-13 01:46:25.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/src/vmware.h 2009-06-01 19:46:03.000000000 +0200 @@ -102,6 +102,7 @@ VMWARERegRec SavedReg; VMWARERegRec ModeReg; + CARD32 suspensionSavedRegId; DisplayModePtr dynModes[NUM_DYN_MODES]; @@ -244,6 +245,10 @@ VMWAREPtr pVMWARE, BoxPtr pBB ); +void vmwareSendSVGACmdUpdateFullScreen( + VMWAREPtr pVMWARE + ); + DisplayModeRec *VMWAREAddDisplayMode( ScrnInfoPtr pScrn, const char *name, @@ -256,6 +261,10 @@ const RegionPtr reg2 ); +void vmwareNextXineramaState( + VMWAREPtr pVMWARE + ); + /* vmwarecurs.c */ Bool vmwareCursorInit( ScreenPtr pScr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-vmware-10.16.6/src/vmwarectrl.c new/xf86-video-vmware-10.16.7/src/vmwarectrl.c --- old/xf86-video-vmware-10.16.6/src/vmwarectrl.c 2009-05-13 01:44:28.000000000 +0200 +++ new/xf86-video-vmware-10.16.7/src/vmwarectrl.c 2009-06-01 19:46:03.000000000 +0200 @@ -282,11 +282,59 @@ if (xineramaState) { memcpy(xineramaState, extents, number * sizeof (VMWAREXineramaRec)); + /* + * Make this the new pending Xinerama state. Normally we'll + * wait until the next mode switch in order to synchronously + * push this state out to X clients and the virtual hardware. + * + * However, if we're already in the right video mode, there + * will be no mode change. In this case, push it out + * immediately. + */ xfree(pVMWARE->xineramaNextState); pVMWARE->xineramaNextState = xineramaState; pVMWARE->xineramaNextNumOutputs = number; - return VMwareCtrlDoSetRes(pScrn, maxX, maxY, FALSE); + if (maxX == pVMWARE->ModeReg.svga_reg_width && + maxY == pVMWARE->ModeReg.svga_reg_height) { + + /* + * XXX: + * + * There are problems with trying to set a Xinerama state + * without a mode switch. The biggest one is that + * applications typically won't notice a topology change + * that occurs without a mode switch. If you run "xdpyinfo + * -ext XINERAMA" after one such topology change, it will + * report the new data, but apps (like the GNOME Panel) + * will not notice until the next mode change. + * + * I don't think there's any good solution to this... as + * far as I know, even on a non-virtualized machine + * there's no way for an app to find out if the Xinerama + * opology changes without a resolution change also + * occurring. There might be some cheats we can take, like + * swithcing to a new mode with the same resolution and a + * different (fake) refresh rate, or temporarily switching + * to an intermediate mode. Ick. + * + * The other annoyance here is that when we reprogram the + * SVGA device's monitor topology registers, it may + * rearrange those monitors on the host's screen, but they + * will still have the old contents. This might be + * correct, but it isn't guaranteed to match what's on X's + * framebuffer at the moment. So we'll send a + * full-framebuffer update rect afterwards. + */ + + vmwareNextXineramaState(pVMWARE); + vmwareSendSVGACmdUpdateFullScreen(pVMWARE); + + return TRUE; + } else { + return VMwareCtrlDoSetRes(pScrn, maxX, maxY, FALSE); + } + } else { return FALSE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠Hilbert.suse.de 30 Jul '09

30 Jul '09

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Thu Jul 30 08:50:20 CEST 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-07-09 15:54:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-07-30 04:41:37.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 30 04:34:23 CEST 2009 - sndirsch(a)suse.de + +- xf86-input-evdev 2.2.3 + * Long overdue, another release of evdev 2.2. Expect this to be + the last 2.2 release unless some grave issues are discovered. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-evdev-2.2.2.tar.bz2 New: ---- xf86-input-evdev-2.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.3I9Hk7/_old 2009-07-30 08:49:42.000000000 +0200 +++ /var/tmp/diff_new_pack.3I9Hk7/_new 2009-07-30 08:49:42.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 32 +Release: 33 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -66,7 +66,7 @@ Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 Source29: xf86-input-synaptics-1.1.2.tar.bz2 -Source30: xf86-input-evdev-2.2.2.tar.bz2 +Source30: xf86-input-evdev-2.2.3.tar.bz2 Source31: 11-x11-synaptics.fdi Source32: 11-mouse.fdi Patch2: xf86-input-jamstudio.diff ++++++ xf86-input-evdev-2.2.2.tar.bz2 -> xf86-input-evdev-2.2.3.tar.bz2 ++++++ ++++ 5527 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/ChangeLog new/xf86-input-evdev-2.2.3/ChangeLog --- old/xf86-input-evdev-2.2.2/ChangeLog 2009-04-30 08:41:18.000000000 +0200 +++ new/xf86-input-evdev-2.2.3/ChangeLog 2009-07-30 03:16:47.000000000 +0200 @@ -1,3 +1,165 @@ +commit c0bee1b4d6d3664322b2f35775675ac84354f702 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 30 11:08:59 2009 +1000 + + evdev 2.2.3 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 8acc999d404b9b6012588e2021324553dda9405d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 30 09:38:31 2009 +1000 + + Evdev doesn't require inputproto. + + None of the inputproto headers seem to be included anywhere. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 6f4634111a83808bc52e7e53733cf2d3bab0cccd) + + Conflicts: + + configure.ac + +commit 3cce7fa38a152ba66d379591e6e3ece60bd73fdd +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Jun 26 09:37:29 2009 +1000 + + If a device fails to initialize relative axes, init the abs. axes instead. + + Some devices have relative axes that don't count (scroll wheels). In this + case, don't claim we've initialized relative axes, continue with the + absolute axes instead. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit b07ab6ea97b779b26e7ae8326528c262cc9907a1) + +commit c793aa27381dc346d88a3e7d8bdb90dd8d3ed39c +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Jul 20 14:52:34 2009 +1000 + + Don't register middle mouse button emulation handlers for keyboards. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 2994825665790dc8e35b2944e0d411f3cc9f76fd) + +commit 9f3632c0b6c181706daf661646de5994217c0bb2 +Author: Oliver McFadden <oliver.mcfadden(a)nokia.com> +Date: Thu Jul 16 18:25:37 2009 +0300 + + Coverity Prevent: NO_EFFECT in EvdevWheelEmuSetProperty: + + Event unsigned_compare: Comparing unsigned less than zero is never true. "pEvdev->emulateWheel.timeout < 0UL" + 342 if (pEvdev->emulateWheel.timeout < 0) + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 9bfd9e8a3683f14860149ae9f842e88828cc0960) + +commit 06b303f26d5fab17b7d82dbf2bda3f77dad2364c +Author: Asbj�rn Sannes <ace(a)sannes.org> +Date: Wed Jul 1 09:51:12 2009 +0200 + + evdev: Fix spelling of property in man page to match source code. #22571 + + Signed-off-by: Asbj�rn Sannes <ace(a)sannes.org> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit db8b1ca5cffbc48f7d9c5c166489c714ac92ea86) + +commit 4dda242d56a7830d5b44d7e58cf6a95f62a617ce +Author: Derek Upham <sand(a)blarg.net> +Date: Thu May 21 00:15:28 2009 -0700 + + evdev: Prevent driver from processing motion events that it has not configured. #21832 + + The current implementation initializes itself to support relative + motion events, or absolute motion events, or neither. But the + event-handling code attempts to process all events, no matter what the + initialization was. This patch reproduces the flag tests found during + init, to skip events that the driver doesn't support. + + Signed-off-by: Derek Upham <sand(a)blarg.net> + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 0a3657d2ee62f4086e9687218cb33835ba61a0b3) + +commit 4efe0d272ed6ef7bda4cc005ad6033f2b1916fdc +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu May 21 13:30:10 2009 +1000 + + Deal with BTN_3 to BTN_9 buttons. + + These buttons were previously mapped to 0, i.e. inactive. This patch + slightly improves things in that the buttons are now mapped to 8+. + + Devices that have both BTN_3 and BTN_SIDE (or a similar pair in that + sequence) have both mapped to the same button number though. + Devices that have BTN_LEFT, BTN_0, BTN_3 and BTN_SIDE have the last three + mapped to 8 (and their followers have double-mappings too). We'll fix that + once we actually see devices affected by this. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit dc2191285e799be891787e1f64d10c1cba271240) + +commit 1432b5153ec2666845c2017eedc3c166fd8c8e3c +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu May 21 10:23:37 2009 +1000 + + Only initialize the number of buttons we actually have. + + This takes into account driver-configured button mappings, i.e. if device + with one button has this button mapped to 25 through the ButtonMapping + option, the X server will think the device has result 25 buttons. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 255b9f6bbf374a315750019c6fadc5f82fb7d41d) + +commit b8519930e415043545e87ea660f6f0b3109537bf +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed May 20 11:57:01 2009 +1000 + + Ensure enough buttons are advertised to pass the button mapping. + + Some buttons are mapped to higher button numbers. For example, BTN_0 is + posted as button 8 if BTN_LEFT is present. On top of that, the + driver-specific button mapping may map the button to something else again. + We need to take these mappings into account when counting the number of + buttons on the device. + + Example: A device with BTN_LEFT and BTN_0 and a mapping from 1 -> 7 and 8 -> + 2. + + BTN_LEFT is mapped to 1. 1 is mapped to 7. num_buttons is 7. + BTN_0 is mapped to 8. 8 is mapped to 2. num_buttons remains 7. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit b358f1eb3a4ef8fdee099114d6c70d6ea06eba95) + +commit 6d43a45b99e07325c74cbe1d20b04094ba99950d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed May 20 11:47:37 2009 +1000 + + Up the number of button labels atoms to EVDEV_MAXBUTTONS. + + Button labels would smash memory if the device had less than 4 buttons and + did not advertise a wheel event. In this case the hard-coded wheel button + labels would write past the atoms[] boundary. + + Potential memory smash if a device had a BTN_LEFT and BTN_0, since the + latter would map to 8, regardless of the the number of actual buttons + (same with BTN_MIDDLE and BTN_1 or BTN_RIGHT and BTN_2). + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 33cc112ca1af377a85cfeb05dfb72f07d3850a95) + +commit 40d3ad3ac00fc21f2561c906d1246648a9f74087 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed May 20 11:42:35 2009 +1000 + + Only label axes and buttons if the device has axes or buttons. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + (cherry picked from commit 3c43d880f13725a04fcd7c0c8d5978a36208e373) + commit cf887a2b7cff9eb99c872a9cf5a9382ff6317899 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Thu Apr 30 16:39:15 2009 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/configure.ac new/xf86-input-evdev-2.2.3/configure.ac --- old/xf86-input-evdev-2.2.2/configure.ac 2009-04-30 08:39:11.000000000 +0200 +++ new/xf86-input-evdev-2.2.3/configure.ac 2009-07-30 03:08:55.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 2.2.2, + 2.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-evdev) @@ -68,9 +68,6 @@ AC_SUBST([DLOPEN_LIBS]) fi -# Checks for extensions -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) - # Checks for pkg-config packages. We need to be able to override sdkdir # to satisfy silly distcheck requirements. PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/man/evdev.man new/xf86-input-evdev-2.2.3/man/evdev.man --- old/xf86-input-evdev-2.2.2/man/evdev.man 2009-03-23 07:35:13.000000000 +0100 +++ new/xf86-input-evdev-2.2.3/man/evdev.man 2009-07-30 01:44:33.000000000 +0200 @@ -171,7 +171,7 @@ .BI "Evdev Axis Inversion" 2 boolean values (8 bit, 0 or 1), order X, Y. 1 inverts the axis. .TP 7 -.BI "Evdev Axis Swap" +.BI "Evdev Axes Swap" 1 boolean value (8 bit, 0 or 1). 1 swaps x/y axes. .TP 7 .BI "Evdev Drag Lock Buttons" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/src/emuMB.c new/xf86-input-evdev-2.2.3/src/emuMB.c --- old/xf86-input-evdev-2.2.2/src/emuMB.c 2009-03-23 07:35:13.000000000 +0100 +++ new/xf86-input-evdev-2.2.3/src/emuMB.c 2009-07-30 01:44:34.000000000 +0200 @@ -327,6 +327,9 @@ void EvdevMBEmuOn(InputInfoPtr pInfo) { + if (!pInfo->dev->button) /* don't init for keyboards */ + return; + RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler, EvdevMBEmuWakeupHandler, (pointer)pInfo); @@ -335,6 +338,9 @@ void EvdevMBEmuFinalize(InputInfoPtr pInfo) { + if (!pInfo->dev->button) /* don't cleanup for keyboards */ + return; + RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler, EvdevMBEmuWakeupHandler, (pointer)pInfo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/src/emuWheel.c new/xf86-input-evdev-2.2.3/src/emuWheel.c --- old/xf86-input-evdev-2.2.2/src/emuWheel.c 2009-03-23 07:35:13.000000000 +0100 +++ new/xf86-input-evdev-2.2.3/src/emuWheel.c 2009-07-30 03:08:41.000000000 +0200 @@ -337,15 +337,6 @@ 16, PropModeReplace, 1, &pEvdev->emulateWheel.inertia, TRUE); } - - /* Don't enable with negative timeout */ - if (pEvdev->emulateWheel.timeout < 0) - { - pEvdev->emulateWheel.timeout = 200; - XIChangeDeviceProperty(dev, prop_wheel_timeout, XA_INTEGER, 16, - PropModeReplace, 1, - &pEvdev->emulateWheel.timeout, TRUE); - } } } else if (atom == prop_wheel_button) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.2/src/evdev.c new/xf86-input-evdev-2.2.3/src/evdev.c --- old/xf86-input-evdev-2.2.2/src/evdev.c 2009-04-30 08:38:43.000000000 +0200 +++ new/xf86-input-evdev-2.2.3/src/evdev.c 2009-07-30 03:08:41.000000000 +0200 @@ -362,6 +362,10 @@ switch (ev->type) { case EV_REL: + /* Ignore EV_REL events if we never set up for them. */ + if (!(pEvdev->flags & EVDEV_RELATIVE_EVENTS)) + break; + /* Handle mouse wheel emulation */ if (EvdevWheelEmuFilterMotion(pInfo, ev)) break; @@ -392,6 +396,10 @@ break; case EV_ABS: + /* Ignore EV_ABS events if we never set up for them. */ + if (!(pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)) + break; + if (ev->code > ABS_MAX) break; pEvdev->vals[pEvdev->axis_map[ev->code]] = value; @@ -1053,6 +1061,9 @@ if (TestBit(REL_DIAL, pEvdev->rel_bitmask)) num_axes--; + if (num_axes <= 0) + return !Success; + pEvdev->num_vals = num_axes; memset(pEvdev->vals, 0, num_axes * sizeof(int)); @@ -1095,9 +1106,7 @@ pInfo = device->public.devicePrivate; pEvdev = pInfo->private; - /* FIXME: count number of actual buttons */ - if (!InitButtonClassDeviceStruct(device, ArrayLength(pEvdev->btnmap), - pEvdev->btnmap)) + if (!InitButtonClassDeviceStruct(device, pEvdev->buttons, pEvdev->btnmap)) return !Success; return Success; @@ -1181,9 +1190,18 @@ FIXME: somebody volunteer to fix this. */ - if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) - EvdevAddRelClass(device); - else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) + if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) { + if (EvdevAddRelClass(device) == Success) + { + if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) + xf86Msg(X_INFO,"%s: relative axes found, ignoring absolute " + "axes.\n", device->name); + pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS; + } else + pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS; + } + + if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) EvdevAddAbsClass(device); #ifdef HAVE_PROPERTIES @@ -1466,8 +1484,14 @@ /* count all buttons */ for (i = BTN_MISC; i < BTN_JOYSTICK; i++) { + int mapping = 0; if (TestBit(i, pEvdev->key_bitmask)) - num_buttons++; + { + mapping = + pEvdev->btnmap[EvdevUtilButtonEventToButtonNumber(pEvdev, i)]; + if (mapping > num_buttons) + num_buttons = mapping; + } } if (num_buttons) @@ -1763,6 +1787,17 @@ button = (TestBit(BTN_RIGHT, pEvdev->key_bitmask)) ? 10 : 3; break; + /* FIXME: BTN_3.. and BTN_SIDE.. have the same button mapping */ + case BTN_3: + case BTN_4: + case BTN_5: + case BTN_6: + case BTN_7: + case BTN_8: + case BTN_9: + button = (code - BTN_0 + 5); + break; + case BTN_SIDE: case BTN_EXTRA: case BTN_FORWARD: @@ -1982,7 +2017,7 @@ #ifdef HAVE_LABELS /* Axis labelling */ - if ((prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) + if ((pEvdev->num_vals > 0) && (prop_axis_label = XIGetKnownProperty(AXIS_LABEL_PROP))) { Atom atom, atoms[pEvdev->num_vals]; int natoms = pEvdev->num_vals; @@ -2026,14 +2061,14 @@ XISetDevicePropertyDeletable(dev, prop_axis_label, FALSE); } /* Button labelling */ - if ((prop_btn_label = XIGetKnownProperty(BTN_LABEL_PROP))) + if ((pEvdev->buttons > 0) && (prop_btn_label = XIGetKnownProperty(BTN_LABEL_PROP))) { - Atom atom, atoms[pEvdev->buttons]; + Atom atom, atoms[EVDEV_MAXBUTTONS]; int button, bmap; /* First, make sure all atoms are initialized */ atom = XIGetKnownProperty(BTN_LABEL_PROP_BTN_UNKNOWN); - for (button = 0; button < pEvdev->buttons; button++) + for (button = 0; button < ArrayLength(atoms); button++) atoms[button] = atom; for (button = BTN_MISC; button < BTN_JOYSTICK; button++) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 30 Jul '09

30 Jul '09

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Thu Jul 30 08:36:13 CEST 2009. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2009-06-23 20:51:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2009-07-29 11:18:24.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 29 11:17:08 CEST 2009 - dmueller(a)suse.de + +- update to 1.2.0: + * Fix attribute joining in collection list results. + - Buildsystem fixes for Mac OS. + - Do not show a console window for akonadi_control on Windows. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.1.95.tar.bz2 New: ---- akonadi-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.o6P5Ra/_old 2009-07-30 08:35:56.000000000 +0200 +++ /var/tmp/diff_new_pack.o6P5Ra/_new 2009-07-30 08:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.1.95) +# spec file for package akonadi-runtime (Version 1.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -Version: 1.1.95 +Version: 1.2.0 Release: 1 %define rversion %version License: LGPL v2.1 or later ++++++ akonadi-1.1.95.tar.bz2 -> akonadi-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/CMakeLists.txt new/akonadi-1.2.0/CMakeLists.txt --- old/akonadi-1.1.95/CMakeLists.txt 2009-06-23 20:40:58.000000000 +0200 +++ new/akonadi-1.2.0/CMakeLists.txt 2009-07-28 18:52:13.000000000 +0200 @@ -28,8 +28,8 @@ ############### The Akonadi version (used in AkonadiConfig.cmake) ############### set(AKONADI_VERSION_MAJOR "1") -set(AKONADI_VERSION_MINOR "1") -set(AKONADI_VERSION_PATCH "95") +set(AKONADI_VERSION_MINOR "2") +set(AKONADI_VERSION_PATCH "0") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") # If Subversion is installed, and a '.svn' directory is found, @@ -53,6 +53,8 @@ find_package(Qt4 REQUIRED) # We need QtDBus and QtSql +set(QT_USE_QTDBUS TRUE) +set(QT_USE_QTSQL TRUE) if (NOT QT_QTDBUS_FOUND) message(FATAL_ERROR "Akonadi requires Qt4 with QtDBus module in order to built.") endif(NOT QT_QTDBUS_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/ChangeLog new/akonadi-1.2.0/ChangeLog --- old/akonadi-1.1.95/ChangeLog 2009-06-23 20:40:58.000000000 +0200 +++ new/akonadi-1.2.0/ChangeLog 2009-07-28 18:52:13.000000000 +0200 @@ -1,3 +1,43 @@ +2009-07-28 16:34 +0000 [r1003699] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.2/CMakeLists.txt, + branches/akonadi/1.2/cmake/modules/FindQt4.cmake: Backport SVN + commit 993358 by mikearthur from trunk: Add QT_USE_* options to + fix building on OSX with Qt SDK. Backport SVN commit 993403 by + mikearthur from trunk: Add missing QtDBus Framework include for + Qt SDK compilation on OSX. Backported from CMake 2.6.4. + +2009-07-28 16:31 +0000 [r1003694] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.2/server/control/CMakeLists.txt: Backport SVN + commit 992351 by pokrzywka from trunk: run akonadi_control + silently on windows (no console popup) Backport SVN commit 992355 + by pokrzywka: one WIN32 flag is enough + +2009-07-28 16:27 +0000 [r1003692] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.2/server/src/handlerhelper.cpp: Backport SVN + commit 986123 by vkrause from trunk: Join collection attributes + correctly. Not that it makes any difference for the parser, but + it's much less confusing to read for humans in the akonadiconsole + debugger. + +2009-07-28 16:24 +0000 [r1003689] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.2/makechangelog: Create changelog for the + correct branch. + +2009-06-23 19:13 +0000 [r985928] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.2 (added): Create Akonadi 1.2 branch. + +2009-06-23 18:27 +0000 [r985910] Volker Krause vkrause(a)kde.org + + * trunk/kdesupport/akonadi/ChangeLog, + trunk/kdesupport/akonadi/NEWS, + trunk/kdesupport/akonadi/CMakeLists.txt: Prepare for the 1.1.95 + release. + 2009-06-23 16:03 +0000 [r985873] Volker Krause vkrause(a)kde.org * trunk/kdesupport/akonadi/server/src/handlerhelper.cpp, @@ -403,8 +443,8 @@ * trunk/kdesupport/akonadi/server/src/handler/store.cpp, trunk/kdesupport/akonadi/server/tests/unittest/handlertest.h, trunk/kdesupport/akonadi/server/src/handler.cpp, - trunk/kdesupport/akonadi/server/src/handler/uid.cpp (removed), trunk/kdesupport/akonadi/server/src/handler/store.h, + trunk/kdesupport/akonadi/server/src/handler/uid.cpp (removed), trunk/kdesupport/akonadi/server/src/handler.h, trunk/kdesupport/akonadi/server/src/handler/uid.h (removed), trunk/kdesupport/akonadi/server/CMakeLists.txt, @@ -617,8 +657,8 @@ trunk/kdesupport/akonadi/libs/protocol_p.h, trunk/kdesupport/akonadi/server/src/akonadiconnection.cpp, trunk/kdesupport/akonadi/server/src/storage/itemqueryhelper.cpp, - trunk/kdesupport/akonadi/server/src/handler/scope.h (added), trunk/kdesupport/akonadi/server/src/akonadiconnection.h, + trunk/kdesupport/akonadi/server/src/handler/scope.h (added), trunk/kdesupport/akonadi/server/src/handler/select.cpp, trunk/kdesupport/akonadi/server/src/storage/itemqueryhelper.h, trunk/kdesupport/akonadi/server/src/handler/uid.cpp, @@ -632,8 +672,8 @@ 2009-04-06 13:13 +0000 [r950045] Volker Krause vkrause(a)kde.org - * trunk/kdesupport/akonadi/server/src/handler/aklist.h, - trunk/kdesupport/akonadi/server/src/handler/store.cpp, + * trunk/kdesupport/akonadi/server/src/handler/store.cpp, + trunk/kdesupport/akonadi/server/src/handler/aklist.h, trunk/kdesupport/akonadi/server/src/handler/link.cpp, trunk/kdesupport/akonadi/server/src/handler/fetch.h, trunk/kdesupport/akonadi/server/src/handler.cpp, @@ -648,15 +688,15 @@ trunk/kdesupport/akonadi/server/src/handler/expunge.cpp, trunk/kdesupport/akonadi/server/src/handler/list.cpp, trunk/kdesupport/akonadi/server/src/handler/select.cpp, - trunk/kdesupport/akonadi/server/src/handler/uid.cpp, trunk/kdesupport/akonadi/server/src/handler/subscribe.cpp, - trunk/kdesupport/akonadi/server/src/handler/status.cpp, + trunk/kdesupport/akonadi/server/src/handler/uid.cpp, trunk/kdesupport/akonadi/server/src/handler/akappend.cpp, + trunk/kdesupport/akonadi/server/src/handler/status.cpp, trunk/kdesupport/akonadi/server/src/handler/transaction.cpp, - trunk/kdesupport/akonadi/server/src/handler/subscribe.h, trunk/kdesupport/akonadi/server/src/handler/searchpersistent.cpp, - trunk/kdesupport/akonadi/server/src/handler/aklist.cpp, + trunk/kdesupport/akonadi/server/src/handler/subscribe.h, trunk/kdesupport/akonadi/server/src/handler/modify.cpp, + trunk/kdesupport/akonadi/server/src/handler/aklist.cpp, trunk/kdesupport/akonadi/server/src/handler/fetch.cpp, trunk/kdesupport/akonadi/server/src/handler/transaction.h: Avoid the re-insertion of command names in the input stream. Also, get @@ -723,8 +763,8 @@ (added), trunk/kdesupport/akonadi/server/src/search/result.cpp (added), trunk/kdesupport/akonadi/server/queryserver (removed), trunk/kdesupport/akonadi/server/src/search (added), + trunk/kdesupport/akonadi/server/src/search/result.h (added), trunk/kdesupport/akonadi/server/src/search/querymetatype.h - (added), trunk/kdesupport/akonadi/server/src/search/result.h (added), trunk/kdesupport/akonadi/server/src/search/queryserviceclient.cpp (added), @@ -860,21 +900,21 @@ trunk/kdesupport/akonadi/server/src/handler/logout.cpp, trunk/kdesupport/akonadi/server/src/akonadiconnection.cpp, trunk/kdesupport/akonadi/server/src/handler/copy.cpp, - trunk/kdesupport/akonadi/server/src/handler/list.cpp, trunk/kdesupport/akonadi/server/src/handler/noop.cpp, + trunk/kdesupport/akonadi/server/src/handler/list.cpp, trunk/kdesupport/akonadi/server/src/handler/colcopy.h, trunk/kdesupport/akonadi/server/src/handler/expunge.h, trunk/kdesupport/akonadi/server/src/handler/uid.cpp, trunk/kdesupport/akonadi/server/src/handler/select.h, trunk/kdesupport/akonadi/server/src/handler/transaction.cpp, - trunk/kdesupport/akonadi/server/src/handler/capability.h, trunk/kdesupport/akonadi/server/src/handler/subscribe.h, + trunk/kdesupport/akonadi/server/src/handler/capability.h, trunk/kdesupport/akonadi/server/src/handler/modify.cpp, - trunk/kdesupport/akonadi/server/src/handler/akappend.h, trunk/kdesupport/akonadi/server/src/handler/status.h, + trunk/kdesupport/akonadi/server/src/handler/akappend.h, trunk/kdesupport/akonadi/server/src/handler/searchpersistent.h, - trunk/kdesupport/akonadi/server/src/handler/aklist.h, trunk/kdesupport/akonadi/server/src/handler/store.cpp, + trunk/kdesupport/akonadi/server/src/handler/aklist.h, trunk/kdesupport/akonadi/server/src/handler/link.cpp, trunk/kdesupport/akonadi/server/src/handler/fetch.h, trunk/kdesupport/akonadi/server/src/handler.cpp, @@ -1097,7 +1137,7 @@ * trunk/kdesupport/akonadi/CMakeLists.txt: support gcov compiling -2009-03-03 11:34 +0000 [r934526] Dario Freddi drf54321(a)gmail.com +2009-03-03 11:34 +0000 [r934526] Dario Freddi drf(a)kde.org * trunk/kdesupport/akonadi/README: Fix typo @@ -1245,18 +1285,18 @@ trunk/kdesupport/akonadi/server/src/handler/link.h, trunk/kdesupport/akonadi/server/src/handler/delete.h, trunk/kdesupport/akonadi/server/src/handler/create.h, - trunk/kdesupport/akonadi/server/src/handler/rename.h, trunk/kdesupport/akonadi/server/src/handler/append.h, - trunk/kdesupport/akonadi/server/src/handler/login.h, + trunk/kdesupport/akonadi/server/src/handler/rename.h, trunk/kdesupport/akonadi/server/src/handler/colcopy.h, + trunk/kdesupport/akonadi/server/src/handler/login.h, trunk/kdesupport/akonadi/server/src/handler/logout.h, trunk/kdesupport/akonadi/server/src/handler/copy.h, - trunk/kdesupport/akonadi/server/src/handler/noop.h, - trunk/kdesupport/akonadi/server/src/handler/list.h, trunk/kdesupport/akonadi/server/src/handler/expunge.h, + trunk/kdesupport/akonadi/server/src/handler/list.h, + trunk/kdesupport/akonadi/server/src/handler/noop.h, trunk/kdesupport/akonadi/server/src/handler/select.h, - trunk/kdesupport/akonadi/server/src/handler/subscribe.h, trunk/kdesupport/akonadi/server/src/handler/capability.h, + trunk/kdesupport/akonadi/server/src/handler/subscribe.h, trunk/kdesupport/akonadi/server/src/handler/akappend.h, trunk/kdesupport/akonadi/server/src/handler/status.h, trunk/kdesupport/akonadi/server/src/handler/transaction.h, @@ -1557,17 +1597,17 @@ trunk/kdesupport/akonadi/server/src/storage/datastore.h, trunk/kdesupport/akonadi/server/src/handler/modify.cpp, trunk/kdesupport/akonadi/server/src/storage/notificationcollector.h, - trunk/kdesupport/akonadi/server/src/nepomukmanager.cpp, trunk/kdesupport/akonadi/server/src/handler/aklist.h, - trunk/kdesupport/akonadi/server/src/handler/link.cpp, + trunk/kdesupport/akonadi/server/src/nepomukmanager.cpp, trunk/kdesupport/akonadi/server/src/storage/dbupdate.xml, + trunk/kdesupport/akonadi/server/src/handler/link.cpp, trunk/kdesupport/akonadi/server/tests/unittest/teststoragebackend.h, - trunk/kdesupport/akonadi/server/src/handler.cpp, trunk/kdesupport/akonadi/server/src/xesammanager.h, + trunk/kdesupport/akonadi/server/src/handler.cpp, trunk/kdesupport/akonadi/server/src/handler/delete.cpp, trunk/kdesupport/akonadi/server/src/handler/create.cpp, - trunk/kdesupport/akonadi/server/src/intervalcheck.cpp, trunk/kdesupport/akonadi/server/src/handlerhelper.h, + trunk/kdesupport/akonadi/server/src/intervalcheck.cpp, trunk/kdesupport/akonadi/server/src/handler/colcopy.cpp, trunk/kdesupport/akonadi/server/src/handler/expunge.cpp, trunk/kdesupport/akonadi/server/src/abstractsearchmanager.h, @@ -1784,8 +1824,8 @@ 2008-12-02 10:14 +0000 [r891498] Alexander Neundorf neundorf(a)kde.org - * trunk/kdesupport/akonadi/cmake/CMakeLists.txt (removed), - trunk/kdesupport/akonadi/CMakeLists.txt, + * trunk/kdesupport/akonadi/CMakeLists.txt, + trunk/kdesupport/akonadi/cmake/CMakeLists.txt (removed), trunk/kdesupport/akonadi/cmake/modules/FindAutomoc4.cmake, trunk/kdesupport/akonadi/server/CMakeLists.txt: -proper RPATH handling (see comments in CMakeLists.txt) -remove LIB_DESTINATION @@ -2163,8 +2203,8 @@ trunk/KDE/kdepimlibs/akonadi/agentinstance.h, trunk/KDE/kdepimlibs/akonadi/agentbase.cpp, trunk/KDE/kdepim/akonadi/migration/kres/kresmigrator.cpp (added), - trunk/KDE/kdepim/akonadi/migration/kres/kabcmigrator.h (added), trunk/kdesupport/akonadi/interfaces/org.freedesktop.Akonadi.Agent.Control.xml, + trunk/KDE/kdepim/akonadi/migration/kres/kabcmigrator.h (added), trunk/KDE/kdepim/akonadi/migration (added), trunk/KDE/kdepimlibs/akonadi/agentbase.h, trunk/KDE/kdepim/akonadi/migration/kres/kresmigrator.h (added), @@ -2403,20 +2443,20 @@ * trunk/kdesupport/akonadi/server/control/org.freedesktop.Akonadi.Control.service.cmake (added), - trunk/kdesupport/akonadi/server/interfaces/org.kde.Akonadi.SearchQueryIterator.xml - (removed), trunk/kdesupport/akonadi/server/interfaces/org.kde.Akonadi.Search.xml (removed), + trunk/kdesupport/akonadi/server/interfaces/org.kde.Akonadi.SearchQueryIterator.xml + (removed), trunk/kdesupport/akonadi/server/interfaces/org.kde.Akonadi.Server.xml (removed), trunk/kdesupport/akonadi/interfaces/org.kde.Akonadi.Agent.Control.xml (removed), trunk/kdesupport/akonadi/server/src/nepomukmanager.h, trunk/kdesupport/akonadi/interfaces/org.kde.Akonadi.Tracer.xml (removed), trunk/kdesupport/akonadi/libs/protocol_p.h, + trunk/kdesupport/akonadi/server/control/agentmanager.cpp, trunk/kdesupport/akonadi/interfaces/org.kde.Akonadi.NotificationManager.xml (removed), trunk/kdesupport/akonadi/server/src/resourcemanager.cpp, - trunk/kdesupport/akonadi/server/control/agentmanager.cpp, trunk/kdesupport/akonadi/server/src/main.cpp, trunk/kdesupport/akonadi/server/src/notificationmanager.h, trunk/kdesupport/akonadi/interfaces/org.kde.Akonadi.Resource.xml @@ -2558,8 +2598,9 @@ (removed), trunk/kdesupport/akonadi/server/akonadictl/CMakeLists.txt, trunk/kdesupport/akonadi/server/src/tests/CMakeLists.txt, + trunk/kdesupport/akonadi/CMakeLists.txt, trunk/kdesupport/akonadi/cmake/modules/kde4automoc.files.in - (removed), trunk/kdesupport/akonadi/CMakeLists.txt, + (removed), trunk/kdesupport/akonadi/cmake/modules/KDE4Macros.cmake (removed), trunk/kdesupport/akonadi/server/CMakeLists.txt, trunk/kdesupport/akonadi/server/control/CMakeLists.txt, @@ -2589,8 +2630,8 @@ * trunk/kdesupport/akonadi/server/src/nepomukmanager.cpp, trunk/kdesupport/akonadi/server/queryserver/query.cpp, trunk/kdesupport/akonadi/server/src/handlerhelper.cpp, - trunk/kdesupport/akonadi/server/src/handler/create.cpp, trunk/kdesupport/akonadi/server/src/storage/querybuilder.cpp, + trunk/kdesupport/akonadi/server/src/handler/create.cpp, trunk/kdesupport/akonadi/server/src/notificationmanager.cpp, trunk/kdesupport/akonadi/server/control/agentmanager.cpp, trunk/kdesupport/akonadi/server/src/handler/append.cpp, @@ -2784,8 +2825,8 @@ 2008-04-23 19:23 +0000 [r800264] Will Stephenson wstephenson(a)kde.org * trunk/kdesupport/akonadi/libs/akonadiprotocolinternals_export.h, - trunk/kdesupport/akonadi/kdemacros.h.cmake (removed), trunk/kdesupport/akonadi/CMakeLists.txt, + trunk/kdesupport/akonadi/kdemacros.h.cmake (removed), trunk/kdesupport/akonadi/server/src/akonadiprivate_export.h: Last few kdemacros.h dependencies; thanks Allen @@ -2868,8 +2909,8 @@ 2008-04-23 17:25 +0000 [r800213] Will Stephenson wstephenson(a)kde.org - * trunk/kdesupport/akonadi/libs/notificationmessage_p.h (added), - trunk/kdesupport/akonadi/server/interfaces (added), + * trunk/kdesupport/akonadi/server/interfaces (added), + trunk/kdesupport/akonadi/libs/notificationmessage_p.h (added), trunk/KDE/kdepim/akonadi/config-akonadi.h.cmake (removed), trunk/KDE/kdepim/akonadi/server/akonadictl (removed), trunk/KDE/kdepim/akonadi/server/Mainpage.dox (removed), @@ -2891,8 +2932,8 @@ trunk/KDE/kdepim/akonadi/server/queryserver (removed), trunk/kdesupport/akonadi/server/akonadictl (added), trunk/kdesupport/akonadi/server/Mainpage.dox (added), - trunk/KDE/kdepim/akonadi/server/templates (removed), trunk/kdesupport/akonadi/cmake (added), + trunk/KDE/kdepim/akonadi/server/templates (removed), trunk/kdesupport/akonadi/server/src/handler/modify.cpp, trunk/kdesupport/akonadi/interfaces (added), trunk/kdesupport/akonadi/server/akonadictl/main.cpp, @@ -2903,10 +2944,10 @@ (removed), trunk/kdesupport/akonadi/server/src/handler/delete.cpp, trunk/KDE/kdepimlibs/akonadi/imapset_p.h (removed), - trunk/KDE/kdepim/akonadi/server/control (removed), trunk/kdesupport/akonadi/server/queryserver (added), - trunk/kdesupport/akonadi/server/control/CMakeLists.txt, + trunk/KDE/kdepim/akonadi/server/control (removed), trunk/kdesupport/akonadi/server/src/handler/colcopy.cpp, + trunk/kdesupport/akonadi/server/control/CMakeLists.txt, trunk/kdesupport/akonadi/server/templates (added), trunk/kdesupport/akonadi/libs/notificationmessage.cpp (added), trunk/kdesupport/akonadi/server/src/storage/datastore.cpp, @@ -2933,8 +2974,8 @@ (added), trunk/kdesupport/akonadi (added), trunk/kdesupport/akonadi/server/src/handler/rename.cpp, trunk/KDE/kdepimlibs/akonadi/notificationmessage.cpp (removed), - trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt, trunk/kdesupport/akonadi/server/src/handler/login.cpp, + trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt, trunk/kdesupport/akonadi/server/src/akonadiconnection.cpp, trunk/KDE/kdepim/akonadi/akonadi-mime.xml (removed), trunk/kdesupport/akonadi/server/src/handler/list.cpp, @@ -2948,10 +2989,10 @@ (removed), trunk/KDE/kdepimlibs/akonadi/interfaces/org.kde.Akonadi.NotificationManager.xml (removed), trunk/kdesupport/akonadi/server/src/handler/store.cpp, - trunk/kdesupport/akonadi/server/src/handler/fetch.h, trunk/KDE/kdepim/akonadi/CMakeLists.txt, - trunk/KDE/kdepimlibs/akonadi/xdgbasedirs_p.h (removed), + trunk/kdesupport/akonadi/server/src/handler/fetch.h, trunk/kdesupport/akonadi/akonadi-mime.xml (added), + trunk/KDE/kdepimlibs/akonadi/xdgbasedirs_p.h (removed), trunk/kdesupport/akonadi/server/src/handler.cpp, trunk/kdesupport/akonadi/server/akonadictl/CMakeLists.txt, trunk/kdesupport/akonadi/server/src/handler/create.cpp, @@ -2965,10 +3006,10 @@ trunk/KDE/kdepim/akonadi/server/src (removed), trunk/kdesupport/akonadi/server/src/handler/select.cpp, trunk/kdesupport/akonadi/server/src/handler/subscribe.cpp, - trunk/kdesupport/akonadi/server/src/handler/status.cpp, trunk/kdesupport/akonadi/server/src/handler/akappend.cpp, - trunk/kdesupport/akonadi/server/src/handler/searchpersistent.cpp, + trunk/kdesupport/akonadi/server/src/handler/status.cpp, trunk/kdesupport/akonadi/server/control/agentinfo.cpp, + trunk/kdesupport/akonadi/server/src/handler/searchpersistent.cpp, trunk/KDE/kdepim/akonadi/server/tests (removed), trunk/kdesupport/akonadi/server/src/handler/fetch.cpp, trunk/KDE/kdepimlibs/akonadi/interfaces/org.kde.Akonadi.Agent.Status.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/NEWS new/akonadi-1.2.0/NEWS --- old/akonadi-1.1.95/NEWS 2009-06-23 20:40:58.000000000 +0200 +++ new/akonadi-1.2.0/NEWS 2009-07-28 18:52:13.000000000 +0200 @@ -1,3 +1,9 @@ +1.2.0 28-June-2009 +--------------------------------------------- +- Fix attribute joining in collection list results. +- Buildsystem fixes for Mac OS. +- Do not show a console window for akonadi_control on Windows. + 1.1.95 23-June-2009 --------------------------------------------- - Fix item size handling. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/cmake/modules/FindQt4.cmake new/akonadi-1.2.0/cmake/modules/FindQt4.cmake --- old/akonadi-1.1.95/cmake/modules/FindQt4.cmake 2009-06-23 20:40:47.000000000 +0200 +++ new/akonadi-1.2.0/cmake/modules/FindQt4.cmake 2009-07-28 18:51:58.000000000 +0200 @@ -623,6 +623,7 @@ PATHS ${QT_INCLUDE_DIR}/QtDBus ${QT_HEADERS_DIR}/QtDBus + ${QT_LIBRARY_DIR}/QtDBus.framework/Headers NO_DEFAULT_PATH ) # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/server/control/CMakeLists.txt new/akonadi-1.2.0/server/control/CMakeLists.txt --- old/akonadi-1.1.95/server/control/CMakeLists.txt 2009-06-23 20:40:50.000000000 +0200 +++ new/akonadi-1.2.0/server/control/CMakeLists.txt 2009-07-28 18:52:03.000000000 +0200 @@ -36,6 +36,10 @@ automoc4_add_executable(akonadi_control ${control_SRCS}) set_target_properties(akonadi_control PROPERTIES OUTPUT_NAME akonadi_control) +if (WIN32) + set_target_properties(akonadi_control PROPERTIES WIN32_EXECUTABLE TRUE) + target_link_libraries(akonadi_control ${QT_QTMAIN_LIBRARY}) +endif (WIN32) target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.1.95/server/src/handlerhelper.cpp new/akonadi-1.2.0/server/src/handlerhelper.cpp --- old/akonadi-1.1.95/server/src/handlerhelper.cpp 2009-06-23 20:40:58.000000000 +0200 +++ new/akonadi-1.2.0/server/src/handlerhelper.cpp 2009-07-28 18:52:13.000000000 +0200 @@ -206,9 +206,13 @@ b += HandlerHelper::cachePolicyToByteArray( col ) + ' '; - CollectionAttribute::List attrs = col.attributes(); - foreach ( const CollectionAttribute &attr, attrs ) + const CollectionAttribute::List attrs = col.attributes(); + for ( int i = 0; i < attrs.size(); ++i ) { + const CollectionAttribute &attr = attrs[i]; b += attr.type() + ' ' + ImapParser::quote( attr.value() ); + if ( i != attrs.size() - 1 ) + b += ' '; + } b+= ')'; return b; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bwidget for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package bwidget for openSUSE:Factory checked in at Wed Jul 29 17:59:05 CEST 2009. -------- --- bwidget/bwidget.changes 2008-04-17 11:01:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/bwidget/bwidget.changes 2009-07-29 17:41:55.000000000 +0200 @@ -1,0 +2,18 @@ +Wed Jul 29 17:37:47 CEST 2009 - max(a)suse.de + +- Bugfix release: 1.9.0. + * MainFrame: getmenustate method + * ScrollFrame: follows much better when contents size changes + * ComboBox: Posting, Keyboard, not unique contents return, + Mac X11 and aqua, text selection handling. + * Listbox: item deletion error + * PasswdDlg: disabled password handling + * Balloon Help: Placement on borders and on multiple screens + (as far as possible) + +- Potential incompatibilities: + * Option data base entry for "MessageDlg -text" changed + from "*MessageDlg.frame.msg.message" + to "*MessageDlg.frame.msg.text" + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bwidget-1.8.0-20071031.tar.bz2 New: ---- BWidget-1.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bwidget.spec ++++++ --- /var/tmp/diff_new_pack.zhz3ZR/_old 2009-07-29 17:58:42.000000000 +0200 +++ /var/tmp/diff_new_pack.zhz3ZR/_new 2009-07-29 17:58:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bwidget (Version 1.8.0) +# spec file for package bwidget (Version 1.9.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,16 +20,16 @@ Name: bwidget BuildRequires: tcl -License: BSD 3-Clause -Version: 1.8.0 -Release: 39 +License: BSD 3-clause (or similar) +Version: 1.9.0 +Release: 1 Summary: A Set of Megawidgets for Tcl/Tk Group: Development/Libraries/Tcl BuildArch: noarch Requires: tk AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-%{version}-20071031.tar.bz2 +Source0: BWidget-%{version}.tar.bz2 %description Add useful and nice-looking widgets to your interfaces with the BWidget @@ -48,7 +48,8 @@ Bob Techentin <techentin.robert(a)mayo.edu> %prep -%setup -q +%setup -q -n BWidget-%version +rm -rf images/CVS %build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Wed Jul 29 17:58:21 CEST 2009. -------- --- yast2/yast2.changes 2009-07-16 14:19:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2009-07-29 14:51:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 14:44:48 CEST 2009 - jsrain(a)suse.cz + +- select kernel-desktop by default if exists +- 2.18.22 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.21.tar.bz2 New: ---- yast2-2.18.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6BeBpB/_old 2009-07-29 17:57:24.000000000 +0200 +++ /var/tmp/diff_new_pack.6BeBpB/_new 2009-07-29 17:57:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.21) +# spec file for package yast2 (Version 2.18.22) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2 -Version: 2.18.21 +Version: 2.18.22 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.21.tar.bz2 +Source0: yast2-2.18.22.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -109,7 +109,7 @@ installation with YaST2. %prep -%setup -n yast2-2.18.21 +%setup -n yast2-2.18.22 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.18.21.tar.bz2 -> yast2-2.18.22.tar.bz2 ++++++ ++++ 5842 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.21/VERSION new/yast2-2.18.22/VERSION --- old/yast2-2.18.21/VERSION 2009-07-16 14:17:12.000000000 +0200 +++ new/yast2-2.18.22/VERSION 2009-07-29 14:44:45.000000000 +0200 @@ -1 +1 @@ -2.18.21 +2.18.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.21/configure.in new/yast2-2.18.22/configure.in --- old/yast2-2.18.21/configure.in 2009-07-16 14:17:27.000000000 +0200 +++ new/yast2-2.18.22/configure.in 2009-07-29 14:45:53.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.21, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.22, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.21" +VERSION="2.18.22" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.21/library/modules/Version.ycp new/yast2-2.18.22/library/modules/Version.ycp --- old/yast2-2.18.21/library/modules/Version.ycp 2009-07-16 14:17:36.000000000 +0200 +++ new/yast2-2.18.22/library/modules/Version.ycp 2009-07-29 14:46:09.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.21"; +global string yast2 = "2.18.22"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.21/library/system/src/Kernel.ycp new/yast2-2.18.22/library/system/src/Kernel.ycp --- old/yast2-2.18.21/library/system/src/Kernel.ycp 2009-06-01 12:30:03.000000000 +0200 +++ new/yast2-2.18.22/library/system/src/Kernel.ycp 2009-07-29 14:45:37.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf(a)suse.de> * Arvin Schnell <arvin(a)suse.de> * - * $Id: Kernel.ycp 57325 2009-05-26 17:03:58Z juhliarik $ + * $Id: Kernel.ycp 58202 2009-07-29 12:45:13Z jsrain $ * * <ul> * <li>determine kernel rpm</li> @@ -91,6 +91,7 @@ */ map<string, string> fallbacks = $[ "kernel-pae" : "kernel-default", + "kernel-desktop" : "kernel-default", // fallback for PPC (#302246) "kernel-iseries64" : "kernel-ppc64" ]; @@ -352,6 +353,11 @@ */ global define void ProbeKernel () { + boolean kernel_desktop_exists = + ((Mode::normal () || Mode::repair()) && Pkg::PkgInstalled("kernel-desktop")) || + Pkg::PkgAvailable("kernel-desktop"); + y2milestone ("Desktop kernel available: %1", kernel_desktop_exists); + kernel_packages = ["kernel-default"]; // add Xen paravirtualized drivers to a full virtualized host @@ -400,13 +406,26 @@ if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); - kernel_packages = ["kernel-pae"]; + if (kernel_desktop_exists && true) { // FIXME: check whether it is really desktop + kernel_packages = ["kernel-desktop"]; - // add PV drivers - if (xen) + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-pae"); - kernel_packages = add(kernel_packages, "xen-kmp-pae"); + kernel_packages = ["kernel-pae"]; + + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-pae"); + kernel_packages = add(kernel_packages, "xen-kmp-pae"); + } } } else @@ -421,10 +440,21 @@ } else if (Arch::x86_64()) { - if (xen) + if (kernel_desktop_exists && true) { // FIXME: detect desktop + kernel_packages = ["kernel-desktop"]; + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-default"); - kernel_packages = add(kernel_packages, "xen-kmp-default"); + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-default"); + kernel_packages = add(kernel_packages, "xen-kmp-default"); + } } } else if (Arch::ppc ()) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tcllib for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package tcllib for openSUSE:Factory checked in at Wed Jul 29 17:57:09 CEST 2009. -------- --- tcllib/tcllib.changes 2008-10-24 17:57:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/tcllib/tcllib.changes 2009-07-29 17:33:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 29 17:32:47 CEST 2009 - max(a)suse.de + +- New version: 1.11.1, which adds the modules cache and map. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tcllib-1.11.tar.bz2 New: ---- tcllib-1.11.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcllib.spec ++++++ --- /var/tmp/diff_new_pack.xA4EDU/_old 2009-07-29 17:56:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xA4EDU/_new 2009-07-29 17:56:56.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package tcllib (Version 1.11) +# spec file for package tcllib (Version 1.11.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: tcllib Url: http://tcllib.sf.net BuildRequires: tcl -Version: 1.11 +Version: 1.11.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/Tcl -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: Tcl Standard Library BuildArch: noarch Source0: %name-%version.tar.bz2 ++++++ tcllib-1.11.tar.bz2 -> tcllib-1.11.1.tar.bz2 ++++++ ++++ 11023 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snack for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package snack for openSUSE:Factory checked in at Wed Jul 29 17:56:26 CEST 2009. -------- --- snack/snack.changes 2007-05-25 15:31:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/snack/snack.changes 2009-07-29 17:18:37.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 3 17:22:59 CEST 2009 - max(a)suse.de + +- Don't build the MP3 decoder. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snack.spec ++++++ --- /var/tmp/diff_new_pack.XEvOX0/_old 2009-07-29 17:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.XEvOX0/_new 2009-07-29 17:54:18.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: fdupes libvorbis-devel python tk-devel xorg-x11-devel Summary: Sound Extension for Tcl/Tk and Python Version: 2.2.10 -Release: 188 +Release: 189 Group: Development/Libraries/Tcl Requires: tcl tk %{py_requires} ++++++ snack.patch ++++++ --- /var/tmp/diff_new_pack.XEvOX0/_old 2009-07-29 17:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.XEvOX0/_new 2009-07-29 17:54:18.000000000 +0200 @@ -17,6 +17,22 @@ LIBSO = -lc @ALIB@ @TCL_LIB_SPEC@ +@@ -43,13 +44,13 @@ + all: libsound${SHLIB_SUFFIX} libsnack${SHLIB_SUFFIX} @DOSTUBLIB@ @LIBNIST@ @LIBOGG@ editversion + + OBJSO = sound.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \ +- g711.o @AOBJ@ jkFormatMP3.o jkSoundProc.o ffa.o jkPitchCmd.o \ ++ g711.o @AOBJ@ jkSoundProc.o ffa.o jkPitchCmd.o \ + @STUBINITOBJ@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o \ + jkFilterIIR.o jkGetF0.o sigproc.o jkFormant.o sigproc2.o + + OBJSN = snack.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \ + jkCanvSpeg.o jkCanvWave.o jkCanvSect.o ffa.o g711.o @AOBJ@ \ +- jkFormatMP3.o jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \ ++ jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \ + jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \ + jkGetF0.o sigproc.o jkFormant.o sigproc2.o + @@ -309,11 +310,11 @@ chmod 755 ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}; \ else true; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sat4j for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package sat4j for openSUSE:Factory checked in at Wed Jul 29 17:54:02 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/sat4j/sat4j.changes 2009-07-29 15:48:57.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 29 15:48:25 CEST 2009 - mvyskocil(a)suse.cz + +- Don't use release date to make number of Factory rebuilds smaller + +------------------------------------------------------------------- +Tue Jun 2 14:22:34 CEST 2009 - mvyskocil(a)suse.cz + +- Initial packaging of sat4j 2.0.3 in openSUSE + calling whatdependson for head-i586 New: ---- sat4j-2.0.3.tar.bz2 sat4j.changes sat4j.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sat4j.spec ++++++ # # spec file for package sat4j (Version 2.0.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define eclipse_base %{_libdir}/eclipse # We want the version to match that shipped in Eclipse's Orbit project %define qualifier 20081021 Name: sat4j Version: 2.0.3 Release: 2 Summary: A library of SAT solvers written in Java Group: Development/Libraries License: EPL and LGPLv2 Url: http://www.sat4j.org/ # svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/2_0_3 sat4j-2.0.3 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-devel >= 1.6 BuildRequires: ant Requires: java >= 1.6 Requires: jpackage-utils BuildArch: noarch %description The aim of the SAT4J library is to provide an efficient library of SAT solvers in Java. The SAT4J library targets first users of SAT "black boxes", those willing to embed SAT technologies into their application without worrying about the details. %prep %setup -q # Only used for the tests rm lib/commons-cli.jar %build #ant -Drelease=%{version} -DBUILD_DATE=`LC_ALL=C date +'%Y%m%d'` p2 ant -Drelease=%{version} p2 %install %{__install} -d -m 755 %{buildroot}%{_javadir} %{__install} -m 0644 dist/%{version}/org.sat4j.core.jar %{buildroot}%{_javadir}/org.sat4j.core-%{version}.jar %{__install} -m 0644 dist/%{version}/org.sat4j.pb.jar %{buildroot}%{_javadir}/org.sat4j.pb-%{version}.jar (cd %{buildroot}%{_javadir}/ && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_javadir}/org.%{name}*.jar %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sax2 for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package sax2 for openSUSE:Factory checked in at Wed Jul 29 17:53:17 CEST 2009. -------- --- sax2/sax2.changes 2009-07-12 14:24:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2009-07-29 16:31:29.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jul 29 16:27:03 CEST 2009 - sndirsch(a)suse.de + +- added 1600 x 900 to vesa list (bnc #524724) +- obsoletes special entry for "CMO N156O6-L01" monitor in + api/data/cdb/Monitors + +------------------------------------------------------------------- +Fri Jul 24 05:56:07 CEST 2009 - sndirsch(a)suse.de + +- fixed hsync values for CMO N156O6-L01 monitor to allow also lower + resolutions than 1600x900 (bnc #524724) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.yKHnEs/_old 2009-07-29 17:52:54.000000000 +0200 +++ /var/tmp/diff_new_pack.yKHnEs/_new 2009-07-29 17:52:54.000000000 +0200 @@ -50,7 +50,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 578 +Release: 579 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 ++++++ sax2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax/api/data/cdb/Monitors new/sax/api/data/cdb/Monitors --- old/sax/api/data/cdb/Monitors 2009-07-03 06:16:37.000000000 +0200 +++ new/sax/api/data/cdb/Monitors 2009-07-29 16:19:58.000000000 +0200 @@ -42363,14 +42363,3 @@ Resolution=1920x1080 Vsync=56-76 } - -#============================================== -# CMO N156O6-L01 LCD Monitor -#---------------------------------------------- -CMO:N156O6-L01 { - DDC=CMO1574 - Hsync=54-57 - Vsync=59-61 - Resolution=1600x900 - Modeline "1600x900" 97.50 1600 1648 1680 1760 900 903 908 926 +hsync -vsync -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2009-07-09 13:26:02.000000000 +0200 +++ new/sax/svnbuild 2009-07-29 16:30:31.000000000 +0200 @@ -1 +1 @@ -1876 +1881 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax/sysp/xstuff.c new/sax/sysp/xstuff.c --- old/sax/sysp/xstuff.c 2009-05-27 22:51:35.000000000 +0200 +++ new/sax/sysp/xstuff.c 2009-07-29 16:14:27.000000000 +0200 @@ -20,7 +20,7 @@ #include "mouse.h" #include "xstuff.h" -#define VESA_LIST 27 +#define VESA_LIST 28 //====================================== // ScanXStuff: constructor... @@ -202,18 +202,19 @@ vesaStandard[12].x = 1366; vesaStandard[12].y = 768; vesaStandard[13].x = 1400; vesaStandard[13].y = 1050; vesaStandard[14].x = 1440; vesaStandard[14].y = 900; - vesaStandard[15].x = 1600; vesaStandard[15].y = 1000; - vesaStandard[16].x = 1600; vesaStandard[16].y = 1024; - vesaStandard[17].x = 1600; vesaStandard[17].y = 1200; - vesaStandard[18].x = 1680; vesaStandard[18].y = 1050; - vesaStandard[19].x = 1900; vesaStandard[19].y = 1200; - vesaStandard[20].x = 1920; vesaStandard[20].y = 1200; - vesaStandard[21].x = 1920; vesaStandard[21].y = 1440; - vesaStandard[22].x = 2048; vesaStandard[22].y = 1536; - vesaStandard[23].x = 2560; vesaStandard[23].y = 1600; - vesaStandard[24].x = 2560; vesaStandard[24].y = 2048; - vesaStandard[25].x = 2800; vesaStandard[25].y = 2100; - vesaStandard[26].x = 3200; vesaStandard[26].y = 2400; + vesaStandard[15].x = 1600; vesaStandard[15].y = 900; + vesaStandard[16].x = 1600; vesaStandard[16].y = 1000; + vesaStandard[17].x = 1600; vesaStandard[17].y = 1024; + vesaStandard[18].x = 1600; vesaStandard[18].y = 1200; + vesaStandard[19].x = 1680; vesaStandard[19].y = 1050; + vesaStandard[20].x = 1900; vesaStandard[20].y = 1200; + vesaStandard[21].x = 1920; vesaStandard[21].y = 1200; + vesaStandard[22].x = 1920; vesaStandard[22].y = 1440; + vesaStandard[23].x = 2048; vesaStandard[23].y = 1536; + vesaStandard[24].x = 2560; vesaStandard[24].y = 1600; + vesaStandard[25].x = 2560; vesaStandard[25].y = 2048; + vesaStandard[26].x = 2800; vesaStandard[26].y = 2100; + vesaStandard[27].x = 3200; vesaStandard[27].y = 2400; //====================================== // lookup framebuffer timing ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0