March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 04 Mar '09

04 Mar '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Wed Mar 4 15:02:02 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-03-03 05:06:15.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2009-03-04 13:43:04.590961252 +0100 @@ -1,0 +2,9 @@ +Wed Mar 4 13:28:06 CET 2009 - sndirsch(a)suse.de + +- removed randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff; + probably a wrong patch since this commit has been reverted right + after by commit b4193a2eee80895c5641e77488df0e72a73a3d99 again +- no longer overwrite xorg.conf with an obsolete one; obsoletes + disable-root-xorg_conf.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- disable-root-xorg_conf.diff randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff xorg.conf.man-070818.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.L15585/_old 2009-03-04 14:57:46.000000000 +0100 +++ /var/tmp/diff_new_pack.L15585/_new 2009-03-04 14:57:46.000000000 +0100 @@ -30,7 +30,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 29 +Release: 30 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -56,7 +56,6 @@ Source5: modprobe.nvidia %endif Source7: xorg-docs-1.4.tar.bz2 -Source8: xorg.conf.man-070818.tar Patch1: fpic.diff Patch2: p_default-module-path.diff Patch6: pu_fixes.diff @@ -65,7 +64,6 @@ Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff Patch18: p_ia64-console.diff -Patch22: disable-root-xorg_conf.diff Patch23: disable-fbblt-opt.diff Patch27: mouse.diff Patch29: xephyr.diff @@ -87,7 +85,6 @@ Patch45: bug-197858_dpms.diff Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch Patch67: xorg-docs.diff -Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff Patch77: fbdevhw.diff Patch79: edit_data_sanity_check.diff Patch83: ia64linuxPciInit.diff @@ -163,7 +160,7 @@ %endif %prep -%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8 +%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 %patch1 %patch2 %patch6 @@ -174,7 +171,6 @@ pushd hw/xfree86/os-support %patch18 popd -%patch22 %patch23 %patch27 %patch29 @@ -200,7 +196,6 @@ pushd xorg-docs-* %patch67 popd -%patch72 -p1 %patch77 %patch79 -p1 ### FIXME @@ -545,6 +540,12 @@ %endif %changelog +* Wed Mar 04 2009 sndirsch(a)suse.de +- removed randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff; + probably a wrong patch since this commit has been reverted right + after by commit b4193a2eee80895c5641e77488df0e72a73a3d99 again +- no longer overwrite xorg.conf with an obsolete one; obsoletes + disable-root-xorg_conf.diff * Tue Mar 03 2009 sndirsch(a)suse.de - regenerated xorg-server-xf4vnc.patch (still disabled) * Fri Feb 27 2009 sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 04 Mar '09

04 Mar '09

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Wed Mar 4 14:57:35 CET 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-02 15:30:14.000000000 +0100 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-03-04 11:05:10.060175507 +0100 @@ -1,0 +2,9 @@ +Wed Mar 4 11:04:03 CET 2009 - sndirsch(a)suse.de + +- xf86-input-synaptics 1.0.99.3 + * Another snapshot before the release since a number of fixes + went into this one. Most notably, syndaemon updated to use + device properties by default. And a fix that caused synclient + with properties to fail on 64-bit machines. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-synaptics-1.0.99.2.tar.bz2 New: ---- xf86-input-synaptics-1.0.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.E11166/_old 2009-03-04 14:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.E11166/_new 2009-03-04 14:55:05.000000000 +0100 @@ -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: 20 +Release: 21 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -61,7 +61,7 @@ Source26: xf86-input-vmmouse-12.6.3.tar.bz2 Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 -Source29: xf86-input-synaptics-1.0.99.2.tar.bz2 +Source29: xf86-input-synaptics-1.0.99.3.tar.bz2 Source30: xf86-input-evdev-2.1.99.1.tar.bz2 Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff @@ -225,6 +225,12 @@ %endif %changelog +* Wed Mar 04 2009 sndirsch(a)suse.de +- xf86-input-synaptics 1.0.99.3 + * Another snapshot before the release since a number of fixes + went into this one. Most notably, syndaemon updated to use + device properties by default. And a fix that caused synclient + with properties to fail on 64-bit machines. * Mon Mar 02 2009 sndirsch(a)suse.de - xf86-input-evdev 2.1.99.1 * Fri Feb 27 2009 sndirsch(a)suse.de ++++++ xf86-input-synaptics-1.0.99.2.tar.bz2 -> xf86-input-synaptics-1.0.99.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/config.h.in new/xf86-input-synaptics-1.0.99.3/config.h.in --- old/xf86-input-synaptics-1.0.99.2/config.h.in 2009-02-27 04:19:17.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/config.h.in 2009-03-04 06:20:38.000000000 +0100 @@ -1,7 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -#include "xorg-server.h" - /* Optional backend eventcomm enabled */ #undef BUILD_EVENTCOMM diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/configure new/xf86-input-synaptics-1.0.99.3/configure --- old/xf86-input-synaptics-1.0.99.2/configure 2009-02-27 04:19:10.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/configure 2009-03-04 06:20:27.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.0.99.2. +# Generated by GNU Autoconf 2.63 for xf86-input-synaptics 1.0.99.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ # Identity of this package. PACKAGE_NAME='xf86-input-synaptics' PACKAGE_TARNAME='xf86-input-synaptics' -PACKAGE_VERSION='1.0.99.2' -PACKAGE_STRING='xf86-input-synaptics 1.0.99.2' +PACKAGE_VERSION='1.0.99.3' +PACKAGE_STRING='xf86-input-synaptics 1.0.99.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1520,7 +1520,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-input-synaptics 1.0.99.2 to adapt to many kinds of systems. +\`configure' configures xf86-input-synaptics 1.0.99.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1591,7 +1591,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-synaptics 1.0.99.2:";; + short | recursive ) echo "Configuration of xf86-input-synaptics 1.0.99.3:";; esac cat <<\_ACEOF @@ -1714,7 +1714,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-synaptics configure 1.0.99.2 +xf86-input-synaptics configure 1.0.99.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1728,7 +1728,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-input-synaptics $as_me 1.0.99.2, which was +It was created by xf86-input-synaptics $as_me 1.0.99.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2446,7 +2446,7 @@ # Define the identity of the package. PACKAGE='xf86-input-synaptics' - VERSION='1.0.99.2' + VERSION='1.0.99.3' cat >>confdefs.h <<_ACEOF @@ -20777,9 +20777,6 @@ - - - { $as_echo "$as_me:$LINENO: checking which optional backends will be build" >&5 $as_echo_n "checking which optional backends will be build... " >&6; } case "${host}" in @@ -22189,7 +22186,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-synaptics $as_me 1.0.99.2, which was +This file was extended by xf86-input-synaptics $as_me 1.0.99.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22252,7 +22249,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xf86-input-synaptics config.status 1.0.99.2 +xf86-input-synaptics config.status 1.0.99.3 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-input-synaptics-1.0.99.2/configure.ac new/xf86-input-synaptics-1.0.99.3/configure.ac --- old/xf86-input-synaptics-1.0.99.2/configure.ac 2009-02-27 04:18:09.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/configure.ac 2009-03-04 06:20:00.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-synaptics], - 1.0.99.2, + 1.0.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-synaptics) @@ -42,8 +42,6 @@ AC_PROG_LIBTOOL AC_PROG_CC -AH_TOP([#include "xorg-server.h"]) - AC_MSG_CHECKING([which optional backends will be build]) case "${host}" in *linux*) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/man/syndaemon.man new/xf86-input-synaptics-1.0.99.3/man/syndaemon.man --- old/xf86-input-synaptics-1.0.99.2/man/syndaemon.man 2009-02-26 05:20:07.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/man/syndaemon.man 2009-03-04 02:26:52.000000000 +0100 @@ -8,14 +8,12 @@ .SH "SYNTAX" .LP syndaemon [\fI\-i idle\-time\fP] [\fI\-d\fP] [\fI\-p pid\-file\fP] -[\fI\-t\fP] [\fI\-k\fP] [\fI\-K\fP] +[\fI\-t\fP] [\fI\-k\fP] [\fI\-K\fP] [\fI\-R\fP] [\fI\-s\fP] .SH "DESCRIPTION" .LP Disabling the touchpad while typing avoids unwanted movements of the pointer that could lead to giving focus to the wrong window. . -This program needs SHMConfig "on" in your XOrg/XFree86 Synaptics -Touchpad configuration. .SH "OPTIONS" .LP .TP @@ -51,8 +49,15 @@ .LP .TP \fB\-R\fP -Disable the use of the XRecord extension for detecting keyboard activity. -This will force the use of polling the keyboard state. +Use the XRecord extension for detecting keyboard activity instead of polling +the keyboard state. +.LP +.TP +\fB\-s\fP +Use a shared memory area to enable/disable the touchpad instead of device +properties. WARNING: The SHM mechanism is not secure if you are in an untrusted multiuser +environment. All local users can change the parameters at any time. This +option requires the driver Option "SHMConfig" to be enabled. .SH "ENVIRONMENT VARIABLES" .LP .TP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/src/synaptics.c new/xf86-input-synaptics-1.0.99.3/src/synaptics.c --- old/xf86-input-synaptics-1.0.99.2/src/synaptics.c 2009-02-26 05:20:07.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/src/synaptics.c 2009-03-04 06:17:01.000000000 +0100 @@ -72,6 +72,7 @@ #include "mipointer.h" #endif +#include "xorg-server.h" #include "synaptics.h" #include "synapticsstr.h" #include "synaptics-properties.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/tools/Makefile.am new/xf86-input-synaptics-1.0.99.3/tools/Makefile.am --- old/xf86-input-synaptics-1.0.99.2/tools/Makefile.am 2009-02-26 05:32:18.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/tools/Makefile.am 2009-03-04 06:17:01.000000000 +0100 @@ -28,4 +28,4 @@ synclient_LDFLAGS = -lm $(XLIB_LIBS) $(XI_LIBS) syndaemon_SOURCES = syndaemon.c -syndaemon_LDFLAGS = $(XLIB_LIBS) $(XRECORD_LIBS) +syndaemon_LDFLAGS = $(XLIB_LIBS) $(XRECORD_LIBS) $(XI_LIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/tools/Makefile.in new/xf86-input-synaptics-1.0.99.3/tools/Makefile.in --- old/xf86-input-synaptics-1.0.99.2/tools/Makefile.in 2009-02-27 04:19:09.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/tools/Makefile.in 2009-03-04 06:20:28.000000000 +0100 @@ -232,7 +232,7 @@ synclient_SOURCES = synclient.c synclient_LDFLAGS = -lm $(XLIB_LIBS) $(XI_LIBS) syndaemon_SOURCES = syndaemon.c -syndaemon_LDFLAGS = $(XLIB_LIBS) $(XRECORD_LIBS) +syndaemon_LDFLAGS = $(XLIB_LIBS) $(XRECORD_LIBS) $(XI_LIBS) all: all-am .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/tools/synclient.c new/xf86-input-synaptics-1.0.99.3/tools/synclient.c --- old/xf86-input-synaptics-1.0.99.2/tools/synclient.c 2009-02-27 03:46:20.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/tools/synclient.c 2009-03-04 07:34:50.000000000 +0100 @@ -217,7 +217,6 @@ printf(" This is normal if you are running linux kernel 2.6.\n"); printf(" Check the kernel log for touchpad hardware information.\n"); } - printf("Driver version: %d\n", (PACKAGE_VERSION_MAJOR*10000+PACKAGE_VERSION_MINOR*100+PACKAGE_VERSION_PATCHLEVEL)); } static void @@ -445,7 +444,7 @@ unwind: XFree(v); - if (error) + if (error && dpy) { XCloseDisplay(dpy); dpy = NULL; @@ -508,7 +507,9 @@ unwind: XFree(properties); XFreeDeviceList(info); - if (error && dev) + if (!dev) + fprintf(stderr, "Unable to find a synaptics device.\n"); + else if (error && dev) { XCloseDevice(dpy, dev); dev = NULL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-synaptics-1.0.99.2/tools/syndaemon.c new/xf86-input-synaptics-1.0.99.3/tools/syndaemon.c --- old/xf86-input-synaptics-1.0.99.2/tools/syndaemon.c 2009-02-26 05:20:07.000000000 +0100 +++ new/xf86-input-synaptics-1.0.99.3/tools/syndaemon.c 2009-03-04 06:19:58.000000000 +0100 @@ -29,6 +29,8 @@ #endif #include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/extensions/XInput.h> #ifdef HAVE_XRECORD #include <X11/Xproto.h> #include <X11/extensions/record.h> @@ -45,6 +47,14 @@ #include <sys/stat.h> #include "synaptics.h" +#include "synaptics-properties.h" + +enum TouchpadState { + TouchpadOn = 0, + TouchpadOff = 1, + TappingOff = 2 +}; + static SynapticsSHM *synshm; static int pad_disabled; @@ -53,6 +63,10 @@ static int ignore_modifier_keys; static int background; static const char *pid_file; +static int use_shm; +static Display *display; +static XDevice *dev; +static Atom touchpad_off_prop; #define KEYMAP_SIZE 32 static unsigned char keyboard_mask[KEYMAP_SIZE]; @@ -65,31 +79,49 @@ fprintf(stderr, " enabling the touchpad. (default is 2.0s)\n"); fprintf(stderr, " -m How many milli-seconds to wait until next poll.\n"); fprintf(stderr, " (default is 200ms)\n"); - fprintf(stderr, " -d Start as a daemon, ie in the background.\n"); + fprintf(stderr, " -d Start as a daemon, i.e. in the background.\n"); fprintf(stderr, " -p Create a pid file with the specified name.\n"); fprintf(stderr, " -t Only disable tapping and scrolling, not mouse movements.\n"); fprintf(stderr, " -k Ignore modifier keys when monitoring keyboard activity.\n"); fprintf(stderr, " -K Like -k but also ignore Modifier+Key combos.\n"); - fprintf(stderr, " -R Don't use the XRecord extension.\n"); + fprintf(stderr, " -R Use the XRecord extension.\n"); exit(1); } -static int -enable_touchpad(void) +/** + * Toggle touchpad enabled/disabled state, decided by value. + */ +static void +toggle_touchpad(enum TouchpadState value) { - int ret = 0; - if (pad_disabled) { - synshm->touchpad_off = 0; - pad_disabled = 0; - ret = 1; + if (pad_disabled && !value) + { + if (!background) + printf("Enable\n"); + } else if (!pad_disabled && value) + { + if (!background) + printf("Disable\n"); + } else + return; + + pad_disabled = value; + if (use_shm) + synshm->touchpad_off = value; + else { + unsigned char data = value; + /* This potentially overwrites a different client's setting, but ...*/ + XChangeDeviceProperty(display, dev, touchpad_off_prop, XA_INTEGER, 8, + PropModeReplace, &data, 1); + XFlush(display); } - return ret; } static void signal_handler(int signum) { - enable_touchpad(); + toggle_touchpad(TouchpadOn); + if (pid_file) unlink(pid_file); kill(getpid(), signum); @@ -198,24 +230,13 @@ current_time = get_time(); if (keyboard_activity(display)) last_activity = current_time; - if (touchpad_buttons_active()) + if (use_shm && touchpad_buttons_active()) last_activity = 0.0; if (current_time > last_activity + idle_time) { /* Enable touchpad */ - if (enable_touchpad()) { - if (!background) - printf("Enable\n"); - } + toggle_touchpad(TouchpadOn); } else { /* Disable touchpad */ - if (!pad_disabled && !synshm->touchpad_off) { - if (!background) - printf("Disable\n"); - pad_disabled = 1; - if (disable_taps_only) - synshm->touchpad_off = 2; - else - synshm->touchpad_off = 1; - } + toggle_touchpad(disable_taps_only ? TappingOff : TouchpadOff); } usleep(poll_delay); @@ -418,17 +439,11 @@ timeout.tv_sec = (int)idle_time; timeout.tv_usec = (idle_time-(double)timeout.tv_sec) * 1.e6; - if (!pad_disabled) { - pad_disabled=1; - if (!background) printf("disable touchpad\n"); - - if (!synshm->touchpad_off) - synshm->touchpad_off = disable_taps_only ? 2 : 1; - } + toggle_touchpad(disable_taps_only ? TappingOff : TouchpadOff); } if (ret == 0 && pad_disabled) { /* timeout => enable event */ - enable_touchpad(); + toggle_touchpad(TouchpadOn); if (!background) printf("enable touchpad\n"); } @@ -438,16 +453,100 @@ } #endif /* HAVE_XRECORD */ +static XDevice * +dp_get_device(Display *dpy) +{ + XDevice* dev = NULL; + XDeviceInfo *info = NULL; + int ndevices = 0; + Atom touchpad_type = 0; + Atom synaptics_property = 0; + Atom *properties = NULL; + int nprops = 0; + int error = 0; + + touchpad_type = XInternAtom(dpy, XI_TOUCHPAD, True); + touchpad_off_prop = XInternAtom(dpy, SYNAPTICS_PROP_OFF, True); + info = XListInputDevices(dpy, &ndevices); + + while(ndevices--) { + if (info[ndevices].type == touchpad_type) { + dev = XOpenDevice(dpy, info[ndevices].id); + if (!dev) { + fprintf(stderr, "Failed to open device '%s'.\n", + info[ndevices].name); + error = 1; + goto unwind; + } + + properties = XListDeviceProperties(dpy, dev, &nprops); + if (!properties || !nprops) + { + fprintf(stderr, "No properties on device '%s'.\n", + info[ndevices].name); + error = 1; + goto unwind; + } + + while(nprops--) + { + if (properties[nprops] == synaptics_property) + break; + } + if (!nprops) + { + fprintf(stderr, "No synaptics properties on device '%s'.\n", + info[ndevices].name); + error = 1; + goto unwind; + } + + break; /* Yay, device is suitable */ + } + } + +unwind: + XFree(properties); + XFreeDeviceList(info); + if (!dev) + fprintf(stderr, "Unable to find a synaptics device.\n"); + else if (error && dev) + { + XCloseDevice(dpy, dev); + dev = NULL; + } + return dev; +} + +static int +shm_init() +{ + int shmid; + + /* Connect to the shared memory area */ + if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) { + if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) { + fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n"); + return 0; + } else { + fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n"); + return 0; + } + } + if ((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) { + perror("shmat"); + return 0; + } + return 1; +} + int main(int argc, char *argv[]) { double idle_time = 2.0; int poll_delay = 200000; /* 200 ms */ - Display *display; int c; - int shmid; - int use_xrecord = 1; - + int use_xrecord = 0; /* Parse command line parameters */ while ((c = getopt(argc, argv, "i:m:dtp:kKR?")) != EOF) { @@ -474,8 +573,11 @@ ignore_modifier_combos = 1; ignore_modifier_keys = 1; break; + case 's': + use_shm = 1; + break; case 'R': - use_xrecord = 0; + use_xrecord = 1; break; default: usage(); @@ -492,20 +594,10 @@ exit(2); } - /* Connect to the shared memory area */ - if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) { - if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) { - fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n"); - exit(2); - } else { - fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n"); - exit(2); - } - } - if ((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) { - perror("shmat"); + if (use_shm && !shm_init()) + exit(2); + else if (!use_shm && !(dev = dp_get_device(display))) exit(2); - } /* Install a signal handler to restore synaptics parameters on exit */ install_signal_handler(); @@ -533,8 +625,15 @@ } } #ifdef HAVE_XRECORD - if (use_xrecord && check_xrecord(display)) { - record_main_loop(display, idle_time); + if (use_xrecord) + { + if(check_xrecord(display)) + record_main_loop(display, idle_time); + else { + fprintf(stderr, "Use of XRecord requested, but failed to " + " initialize.\n"); + exit(2); + } } else #endif /* HAVE_XRECORD */ { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠Hilbert.suse.de 04 Mar '09

04 Mar '09

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Mar 4 14:53:51 CET 2009. -------- --- aaa_base/aaa_base.changes 2009-02-23 15:34:55.000000000 +0100 +++ aaa_base/aaa_base.changes 2009-03-04 11:30:21.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 4 11:30:08 CET 2009 - meissner(a)suse.de + +- MALLOC_CHECK_=3 (bnc#481582) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.LQ8876/_old 2009-03-04 14:53:09.000000000 +0100 +++ /var/tmp/diff_new_pack.LQ8876/_new 2009-03-04 14:53:09.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.2 -Release: 13 +Release: 14 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,8 @@ %defattr(-,root,root) %changelog +* Wed Mar 04 2009 meissner(a)suse.de +- MALLOC_CHECK_=3 (bnc#481582) * Mon Feb 23 2009 ro(a)suse.de - remove only content of tmpdirs, not the tmpdirs themselves in boot.cleanup (bnc#470511) ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/malloc-debug.csh new/aaa_base/etc/profile.d/malloc-debug.csh --- old/aaa_base/etc/profile.d/malloc-debug.csh 2009-02-19 10:18:12.000000000 +0100 +++ new/aaa_base/etc/profile.d/malloc-debug.csh 2009-03-04 11:29:55.000000000 +0100 @@ -1,3 +1,3 @@ # malloc debugging helpers (see man malloc), remove again for RC1 - meissner(a)suse.de -setenv MALLOC_CHECK_ 2 +setenv MALLOC_CHECK_ 3 setenv MALLOC_PERTURB_ E diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/malloc-debug.sh new/aaa_base/etc/profile.d/malloc-debug.sh --- old/aaa_base/etc/profile.d/malloc-debug.sh 2009-02-19 10:17:45.000000000 +0100 +++ new/aaa_base/etc/profile.d/malloc-debug.sh 2009-03-04 11:29:57.000000000 +0100 @@ -1,3 +1,3 @@ # malloc debugging helpers (see man malloc), remove again for RC1 - meissner(a)suse.de -export MALLOC_CHECK_=2 +export MALLOC_CHECK_=3 export MALLOC_PERTURB_=E ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 alsa for openSUSE:Factory
by root＠Hilbert.suse.de 04 Mar '09

04 Mar '09

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Wed Mar 4 14:52:59 CET 2009. -------- --- alsa/alsa.changes 2009-02-17 17:04:06.000000000 +0100 +++ alsa/alsa.changes 2009-03-04 11:28:26.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 4 11:27:27 CET 2009 - tiwai(a)suse.de + +- alsa-lib git as of 2009.03.03: + * fix typos in documents + * change "%b" semantics for PCM file plugin +- updated alsa-info.sh to ver.0.4.56 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.to6751/_old 2009-03-04 14:52:31.000000000 +0100 +++ /var/tmp/diff_new_pack.to6751/_new 2009-03-04 14:52:31.000000000 +0100 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.18 -Release: 17 +Release: 18 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -244,6 +244,11 @@ %{_datadir}/alsa %changelog +* Wed Mar 04 2009 tiwai(a)suse.de +- alsa-lib git as of 2009.03.03: + * fix typos in documents + * change "%%b" semantics for PCM file plugin +- updated alsa-info.sh to ver.0.4.56 * Tue Feb 17 2009 tiwai(a)suse.de - set the ctl numids properly with external plugins (bnc#462032) - fix oxygen driver config (removal of softfloat again) ++++++ alsa-info.sh ++++++ --- /var/tmp/diff_new_pack.to6751/_old 2009-03-04 14:52:31.000000000 +0100 +++ /var/tmp/diff_new_pack.to6751/_new 2009-03-04 14:52:31.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.51 +SCRIPT_VERSION=0.4.56 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" ################################################################################# @@ -26,6 +26,9 @@ # 1. Remove the need for the devs/helpers to ask several questions before we can easily help the user. # 2. Allow newer/inexperienced ALSA users to give us all the info we need to help them. +#Set the locale (this may or may not be a good idea.. let me know) +export LC_ALL=C + #Change the PATH variable, so we can run lspci (needed for some distros) PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin BGTITLE="ALSA-Info v $SCRIPT_VERSION" @@ -41,35 +44,67 @@ } update() { - wget -O /tmp/alsa-info.sh "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1 - REMOTE_VERSION=`grep SCRIPT_VERSION /tmp/alsa-info.sh |head -n1 |sed 's/.*=//'` + SHFILE=`mktemp -p /tmp alsa-info.XXXXXXXXXX` + wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1 + REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'` if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then if [[ -n $DIALOG ]] then - dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?" 0 0 - DIALOG_EXIT_CODE=$? + OVERWRITE= + if [ -w $0 ]; then + dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?\nNOTICE: The original file $0 will be overwritten!" 0 0 + DIALOG_EXIT_CODE=$? + if [[ $DIALOG_EXIT_CODE = 0 ]]; then + OVERWRITE=yes + fi + fi + if [ -z "$OVERWRITE" ]; then + dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to download it?" 0 0 + DIALOG_EXIT_CODE=$? + fi if [[ $DIALOG_EXIT_CODE = 0 ]] then - cp /tmp/alsa-info.sh $0 - echo "ALSA-Info script has been updated to v $REMOTE_VERSION" + echo "Newer version detected: $REMOTE_VERSION" echo "To view the ChangeLog, please visit $CHANGELOG" - echo "Please re-run the script" + if [ "$OVERWRITE" = "yes" ]; then + cp $SHFILE $0 + echo "ALSA-Info script has been updated to v $REMOTE_VERSION" + echo "Please re-run the script" + rm $SHFILE 2>/dev/null + else + mv $SHFILE /tmp/alsa-info.sh || exit 1 + echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh." + echo "Please re-run the script from new location." + fi exit + else + rm $SHFILE 2>/dev/null fi else - cp /tmp/alsa-info.sh $0 echo "Newer version detected: $REMOTE_VERSION" echo "To view the ChangeLog, please visit $CHANGELOG" - echo "ALSA-Info script has been updated. Please re-run it." - + if [ -w $0 ]; then + echo "The original file $0 will be overwritten!" + echo -n "If you do not like to proceed, press Ctrl-C now.." ; read inp + cp $SHFILE $0 + echo "ALSA-Info script has been updated. Please re-run it." + rm $SHFILE 2>/dev/null + else + mv $SHFILE /tmp/alsa-info.sh || exit 1 + echo "ALSA-Info script has been downloaded as /tmp/alsa-info.sh." + echo "Please, re-run it from new location." + fi exit fi + else + rm $SHFILE 2>/dev/null fi - rm /tmp/alsa-info.sh 2>/dev/null } cleanup() { - rm -r $TEMPDIR 2>/dev/null + if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then + rm -r "$TEMPDIR" 2>/dev/null + fi } @@ -101,7 +136,7 @@ echo "!!-------------" >> $FILE echo "" >> $FILE for i in `grep "]: " /proc/asound/cards | awk -F ' ' '{ print $1} '` ; do - CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}` + CARD_NAME=`grep "^ *$i " $TEMPDIR/alsacards.tmp|awk {'print $2'}` echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE echo "" >>$FILE amixer -c$i info>> $FILE 2>&1 @@ -125,9 +160,9 @@ if [ -z "$exe" ]; then exe=`whereis alsactl | cut -d ' ' -f 2` fi - $exe -f /tmp/alsainfo/alsactl.tmp store + $exe -f $TEMPDIR/alsactl.tmp store echo "--startcollapse--" >> $FILE - cat /tmp/alsainfo/alsactl.tmp >> $FILE + cat $TEMPDIR/alsactl.tmp >> $FILE echo "--endcollapse--" >> $FILE echo "" >> $FILE echo "" >> $FILE @@ -263,15 +298,18 @@ fi # question #Set the output file -TEMPDIR="/tmp/alsainfo/" -FILE="/tmp/alsa-info.txt" +TEMPDIR=`mktemp -p /tmp -d alsa-info.XXXXXXXXXX` +FILE="$TEMPDIR/alsa-info.txt" +NFILE="/tmp/alsa-info.txt" + +trap cleanup 0 if [ "$PROCEED" = "yes" ]; then if [[ -z "$LSPCI" ]] - then +then echo "This script requires lspci. Please install it, and re-run this script." -exit 0 + exit 0 fi #Create the temporary work dir. @@ -287,19 +325,25 @@ ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'` ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'` ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}` -VENDOR_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $3}'|awk {'print substr($0, 2);}' >/tmp/alsainfo/vendor_id.tmp` -DEVICE_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $4}'|awk {'print $1'} >/tmp/alsainfo/device_id.tmp` +VENDOR_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $3}'|awk {'print substr($0, 2);}' >$TEMPDIR/vendor_id.tmp` +DEVICE_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $4}'|awk {'print $1'} >$TEMPDIR/device_id.tmp` LAST_CARD=$((`grep "]: " /proc/asound/cards | wc -l` - 1 )) -cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>/tmp/alsainfo/alsamodules.tmp -cat /proc/asound/cards >/tmp/alsainfo/alsacards.tmp -lspci |grep -i "multi\|audio">/tmp/alsainfo/lspci.tmp + +ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) +JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) + +cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp +cat /proc/asound/cards >$TEMPDIR/alsacards.tmp +lspci |grep -i "multi\|audio">$TEMPDIR/lspci.tmp #Check for HDA-Intel cards codec#* -cat /proc/asound/card*/codec\#* > /tmp/alsainfo/alsa-hda-intel.tmp 2> /dev/null +cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null #Check for AC97 cards codec -cat /proc/asound/card*/codec97\#0/ac97\#0-0 > /tmp/alsainfo/alsa-ac97.tmp 2> /dev/null -cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > /tmp/alsainfo/alsa-ac97-regs.tmp 2> /dev/null +cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null +cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null #Fetch the info, and put it in $FILE in a nice readable format. if [[ -z $PASTEBIN ]]; then @@ -311,7 +355,7 @@ echo "!!ALSA Information Script v $SCRIPT_VERSION" >> $FILE echo "!!################################" >> $FILE echo "" >> $FILE -echo "!!Script ran on: `LANG=C date`" >> $FILE +echo "!!Script ran on: `LANG=C TZ=UTC date`" >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Linux Distribution" >> $FILE @@ -341,19 +385,55 @@ echo "!!Loaded ALSA modules" >> $FILE echo "!!-------------------" >> $FILE echo "" >> $FILE -cat /tmp/alsainfo/alsamodules.tmp >> $FILE +cat $TEMPDIR/alsamodules.tmp >> $FILE +echo "" >> $FILE echo "" >> $FILE +echo "!!Sound Servers on this system" >> $FILE +echo "!!----------------------------" >> $FILE +echo "" >> $FILE +if [[ -n $PAINST ]];then +[[ `pgrep '^(.*/)?pulseaudio$'` ]] && PARUNNING="Yes" || PARUNNING="No" +echo "Pulseaudio:" >> $FILE +echo " Installed - Yes ($PAINST)" >> $FILE +echo " Running - $PARUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -n $ESDINST ]];then +[[ `pgrep '^(.*/)?esd$'` ]] && ESDRUNNING="Yes" || ESDRUNNING="No" +echo "ESound Daemon:" >> $FILE +echo " Installed - Yes ($ESDINST)" >> $FILE +echo " Running - $ESDRUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -n $ARTSINST ]];then +[[ `pgrep '^(.*/)?artsd$'` ]] && ARTSRUNNING="Yes" || ARTSRUNNING="No" +echo "aRts:" >> $FILE +echo " Installed - Yes ($ARTSINST)" >> $FILE +echo " Running - $ARTSRUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -n $JACKINST ]];then +[[ `pgrep '^(.*/)?jackd$'` ]] && JACKRUNNING="Yes" || JACKRUNNING="No" +echo "Jack:" >> $FILE +echo " Installed - Yes ($JACKINST)" >> $FILE +echo " Running - $JACKRUNNING" >> $FILE +echo "" >> $FILE +fi +if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" ]];then +echo "No sound servers found." >> $FILE +echo "" >> $FILE +fi echo "" >> $FILE echo "!!Soundcards recognised by ALSA" >> $FILE echo "!!-----------------------------" >> $FILE echo "" >> $FILE -cat /tmp/alsainfo/alsacards.tmp >> $FILE +cat $TEMPDIR/alsacards.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!PCI Soundcards installed in the system" >> $FILE echo "!!--------------------------------------" >> $FILE echo "" >> $FILE -cat /tmp/alsainfo/lspci.tmp >> $FILE +cat $TEMPDIR/lspci.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Advanced information - PCI Vendor/Device/Susbsystem ID's" >> $FILE @@ -386,27 +466,27 @@ echo "" >> $FILE fi -if [ -s "/tmp/alsainfo/alsa-hda-intel.tmp" ] +if [ -s "$TEMPDIR/alsa-hda-intel.tmp" ] then echo "!!HDA-Intel Codec information" >> $FILE echo "!!---------------------------" >> $FILE echo "--startcollapse--" >> $FILE echo "" >> $FILE - cat /tmp/alsainfo/alsa-hda-intel.tmp >> $FILE + cat $TEMPDIR/alsa-hda-intel.tmp >> $FILE echo "--endcollapse--" >> $FILE echo "" >> $FILE echo "" >> $FILE fi -if [ -s "/tmp/alsainfo/alsa-ac97.tmp" ] +if [ -s "$TEMPDIR/alsa-ac97.tmp" ] then echo "!!AC97 Codec information" >> $FILE echo "!!---------------------------" >> $FILE echo "--startcollapse--" >> $FILE echo "" >> $FILE - cat /tmp/alsainfo/alsa-ac97.tmp >> $FILE + cat $TEMPDIR/alsa-ac97.tmp >> $FILE echo "" >> $FILE - cat /tmp/alsainfo/alsa-ac97-regs.tmp >> $FILE + cat $TEMPDIR/alsa-ac97-regs.tmp >> $FILE echo "--endcollapse--" >> $FILE echo "" >> $FILE echo "" >> $FILE @@ -450,7 +530,6 @@ ;; --no-upload) NOUPLOAD="yes" - KEEP_FILES="yes" withdevices withconfigs withaplay @@ -525,7 +604,6 @@ echo " gnubien - Various script ideas / Testing" echo " GrueMaster - HDA Intel specific items / Testing" echo " olegfink - Script update function" - cleanup exit 0 ;; *) @@ -546,7 +624,6 @@ echo " --about (show some information about the script)" echo " --debug (will run the script as normal, but will not" echo " delete $FILE)" - cleanup exit 0 ;; esac @@ -554,127 +631,123 @@ done fi -if [ "$PROCEED" = "yes" ]; then +if [ "$PROCEED" = "no" ]; then + exit 1 +fi + +if [ -n "$NOUPLOAD" ]; then + + mv $FILE $NFILE || exit 1 + + if [[ -n $DIALOG ]] + then + if [[ -n $PBERROR ]]; then + dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 + else + dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $NFILE" 10 100 + fi + else + echo + + if [[ -n $PBERROR ]]; then + echo "An error occurred while contacting the $WWWSERVICE. Your information was NOT automatically uploaded." + echo "" + echo "Your ALSA information can be seen by looking in $NFILE" + echo "" + else + echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE" + echo "" + echo "Your ALSA information can be seen by looking in $NFILE" + echo "" + fi + fi + + exit + +fi # noupload #Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. if WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]] then -if [[ -n "$DIALOG" ]] + +if [[ -n $DIALOG ]] then - if [[ -z $NOUPLOAD ]]; then - if [[ -z $PASTEBIN ]]; then - wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://www.alsa-project.org/cardinfo-db/" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit" + +if [[ -z $PASTEBIN ]]; then + wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit" { for i in 10 20 30 40 50 60 70 80 90; do echo $i sleep 0.2 done echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0 - else - wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=bla…" &>/tmp/alsainfo/wget.tmp || echo "Upload failed; exit" +else + wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=bla…" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit" { for i in 10 20 30 40 50 60 70 80 90; do echo $i sleep 0.2 done echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0 - fi - fi +fi + +dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 +DIALOG_EXIT_CODE=$? +if [ $DIALOG_EXIT_CODE = 0 ]; then + grep -v "alsa-info.txt" $FILE >$TEMPDIR/uploaded.txt + dialog --backtitle "$BGTITLE" --textbox $TEMPDIR/uploaded.txt 0 0 +fi + +clear + +# no dialog else - if [[ -z $NOUPLOAD ]]; then - if [[ -z $PASTEBIN ]]; then +if [[ -z $PASTEBIN ]]; then echo -n "Uploading information to www.alsa-project.org ... " - wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://www.alsa-project.org/cardinfo-db/ &>/tmp/alsainfo/wget.tmp & - else + wget -O - --tries=5 --timeout=60 --post-file=$FILE http://www.alsa-project.org/cardinfo-db/ &>$TEMPDIR/wget.tmp & +else echo -n "Uploading information to www.pastebin.ca ... " - wget -O - --tries=5 --timeout=60 --post-file=/tmp/alsa-info.txt http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>/tmp/alsainfo/wget.tmp & - fi - fi + wget -O - --tries=5 --timeout=60 --post-file=$FILE http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>$TEMPDIR/wget.tmp & fi + #Progess spinner for wget transfer. -if [[ -z "$DIALOG" ]] -then - i=1 - sp="/-\|" - echo -n ' ' - while pgrep wget &>/dev/null - do +i=1 +sp="/-\|" +echo -n ' ' +while pgrep wget &>/dev/null +do echo -en "\b${sp:i++%${#sp}:1}" - done -fi +done + +echo -e "\b Done!" +echo "" + +fi #dialog #See if tput is available, and use it if it is. -if [[ -z $NOUPLOAD ]]; then - if [[ -n "$TPUT" ]] - then - if [[ -z $PASTEBIN ]]; then - FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2 ; tput sgr0` - else - FINAL_URL=`tput setaf 1; grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:$[0-9]\+$.*/http:\/\/pastebin.ca\/\1/p';tput sgr0` - fi - else - if [[ -z $PASTEBIN ]]; then - FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp | cut -d ' ' -f 2` - else - FINAL_URL=`grep "SUCCESS:" /tmp/alsainfo/wget.tmp |sed -n 's/.*\:$[0-9]\+$.*/http:\/\/pastebin.ca\/\1/p'` - fi - fi -fi -#Output the URL of the uploaded file. -if [[ -z $DIALOG ]] +if [[ -n "$TPUT" ]] then - echo -e "\b Done!" - echo "" - if [[ -z $NOUPLOAD ]]; then - echo "Your ALSA information is located at $FINAL_URL" - echo "Please inform the person helping you." - echo "" - fi -fi -if [[ -n $DIALOG ]] -then - if [[ -n $NOUPLOAD ]]; then - if [[ -n $PBERROR ]]; then - dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100 - else - dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the $WWWSERVICE\n\nYour ALSA information can be seen by looking in $FILE" 10 100 - fi + if [[ -z $PASTEBIN ]]; then + FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0` else - dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 - DIALOG_EXIT_CODE=$? - if [ $DIALOG_EXIT_CODE = 0 ]; then - grep -v "alsa-info.txt" /tmp/alsa-info.txt >/tmp/alsainfo/uploaded.txt - dialog --backtitle "$BGTITLE" --textbox /tmp/alsainfo/uploaded.txt 0 0 - fi + FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:$[0-9]\+$.*/http:\/\/pastebin.ca\/\1/p';tput sgr0` fi -fi -clear -if [[ -n $NOUPLOAD ]]; then - if [[ -n $PBERROR ]]; then - echo "An error occured while contacting the $WWWSERVICE. Your information was NOT automatically uploaded." - echo "" - echo "Your ALSA information can be seen by looking in $FILE" - echo "" +else + if [[ -z $PASTEBIN ]]; then + FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2` else - echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE" - echo "" - echo "Your ALSA information can be seen by looking in $FILE" - echo "" + FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp |sed -n 's/.*\:$[0-9]\+$.*/http:\/\/pastebin.ca\/\1/p'` fi fi -if [[ -z $NOUPLOAD ]]; then + +#Output the URL of the uploaded file. echo "Your ALSA information is located at $FINAL_URL" echo "Please inform the person helping you." echo "" -fi - #We posted the file , so we dont need it anymore. delete it. - if [ -z $KEEP_FILES ] - then - rm $FILE - fi #We couldnt find a suitable wget, so tell the user to upload manually. else + mv $FILE $NFILE || exit 1 if [[ -z $DIALOG ]] then if [[ -z $PASTEBIN ]]; then @@ -684,7 +757,7 @@ echo " 1. Couldnt find 'wget' in your PATH" echo " 2. Your version of wget is less than 1.8.2" echo "" - echo "Please manually upload $FILE to http://www.alsa-project.org/cardinfo-db/ and submit your post." + echo "Please manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post." echo "" else echo "" @@ -693,23 +766,16 @@ echo " 1. Couldnt find 'wget' in your PATH" echo " 2. Your version of wget is less than 1.8.2" echo "" - echo "Please manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." + echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." echo "" fi - fi - if [[ -n $DIALOG ]] - then + else if [[ -z $PASTEBIN ]]; then - dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100 + dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100 else - dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $FILE to http://www.pastebin.ca/upload.php and submit your post." 25 100 + dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." 25 100 fi fi fi -#Clean up the temp files -if [ -z $KEEP_FILES ] -then - cleanup -fi -fi # proceed + ++++++ alsa-lib-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.to6751/_old 2009-03-04 14:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.to6751/_new 2009-03-04 14:52:32.000000000 +0100 @@ -324,7 +324,7 @@ */ int snd_pcm_set_params(snd_pcm_t *pcm, diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c -index 82823a0..6ddf14f 100644 +index 82823a0..bfa1cc8 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -29,6 +29,7 @@ @@ -440,7 +440,7 @@ + + case BWIDTH_KEY: + snprintf(value, sizeof(value), "%d", -+ pcm->frame_bits/(8 * pcm->channels)); ++ pcm->frame_bits/pcm->channels); + err = snd_pcm_file_append_value(&new_fname, + &new_index_ch, &new_len, value); + if (err < 0) @@ -688,7 +688,7 @@ + # real values corresponding to the stream: + # %r rate (replaced with: 48000) + # %c channels (replaced with: 2) -+ # %b bytes per sample (replaced with: 2) ++ # %b bits per sample (replaced with: 16) + # %f sample format string + # (replaced with: S16_LE) + # %% replaced with % @@ -763,3 +763,214 @@ return 0; #else return -EINVAL; +diff --git a/src/seq/seq.c b/src/seq/seq.c +index feb9733..7b777a1 100644 +--- a/src/seq/seq.c ++++ b/src/seq/seq.c +@@ -30,7 +30,7 @@ + + /*! \page seq Sequencer interface + +-\section seq_general Genral ++\section seq_general General + + The ALSA sequencer interface is designed to deliver the MIDI-like + events between clients/ports. +@@ -76,10 +76,10 @@ A client can have one or more ports to communicate between other + clients. A port is corresponding to the MIDI port in the case of MIDI device, + but in general it is nothing but the access point between other clients. + Each port may have capability flags, which specify the read/write +-accessbility and subscription permissions of the port. ++accessibility and subscription permissions of the port. + For creation of a port, call #snd_seq_create_port() +-with the appropirate port attribute specified in #snd_seq_port_info_t +-reocrd. ++with the appropriate port attribute specified in #snd_seq_port_info_t ++record. + + For creating a port for the normal use, there is a helper function + #snd_seq_create_simple_port(). An example with this function is like below. +@@ -102,7 +102,7 @@ Here, input and output mean + input (read) from other clients and output (write) to others, respectively. + Since memory pool of each client is independent from others, + it avoids such a situation that a client eats the whole events pool +-and interfere other clients' responce. ++and interfere other clients' response. + + The all scheduled output events or input events from dispatcher are stored + on these pools until delivered to other clients or extracted to user space. +@@ -171,7 +171,7 @@ the MIDI events like program, velocity or chorus effects. + This application can accept arbitrary MIDI input + and send to arbitrary port, just like a Unix pipe application using + stdin and stdout files. +-We can even connect several filter applictions which work individually ++We can even connect several filter applications which work individually + in order to process the MIDI events. + Subscription can be used for this purpose. + The connection between ports can be done also by the "third" client. +@@ -199,7 +199,7 @@ All the sequencer events are stored in a sequencer event record, + #snd_seq_event_t type. + Application can send and receive these event records to/from other + clients via sequencer. +-An event has several stroage types according to its usage. ++An event has several storage types according to its usage. + For example, a SYSEX message is stored on the variable length event, + and a large synth sample data is delivered using a user-space data pointer. + +@@ -227,7 +227,7 @@ The type field contains the type of the event + (1 byte). + The flags field consists of bit flags which + describe several conditions of the event (1 byte). +-It includes the time-stamp mode, data storage type, and scheduling prority. ++It includes the time-stamp mode, data storage type, and scheduling priority. + The tag field is an arbitrary tag. + This tag can used for removing a distinct event from the event queue + via #snd_seq_remove_events(). +@@ -240,7 +240,7 @@ The data field is a union of event data. + An event can be delivered either on scheduled or direct dispatch mode. + On the scheduling mode, an event is once stored on the priority queue + and delivered later (or even immediately) to the destination, +-whereas on the direct disatch mode, an event is passed to the destination ++whereas on the direct dispatch mode, an event is passed to the destination + without any queue. + + For a scheduled delivery, a queue to process the event must exist. +@@ -284,7 +284,7 @@ The time stored in an event record is a union of these two different + time values. + + Note that the time format used for real time events is very similar to +-timeval struct used for unix system time. ++timeval struct used for Unix system time. + The absurd resolution of the timestamps allows us to perform very accurate + conversions between songposition and real time. Round-off errors can be + neglected. +@@ -299,7 +299,7 @@ counted from the moment when the queue started. + An client that relies on these relative timestamps is the MIDI input port. + As each sequencer queue has it's own clock the only way to deliver events at + the right time is by using the relative timestamp format. When the event +-arrives at the queue it is normalised to absolute format. ++arrives at the queue it is normalized to absolute format. + + The timestamp format is specified in the flag bitfield masked by + #SND_SEQ_TIME_STAMP_MASK. +@@ -320,7 +320,7 @@ fill the port id of source.port and + both client and port of dest field. + + If an existing address is set to the destination, +-the event is simplly delivered to it. ++the event is simply delivered to it. + When #SND_SEQ_ADDRESS_SUBSCRIBERS is set to the destination client id, + the event is delivered to all the clients connected to the source port. + +@@ -346,7 +346,7 @@ an announcement is sent to subscribers from this port. + + Some events like SYSEX message, however, need larger data space + than the standard data. +-For such events, ALSA sequencer provides seveal different data storage types. ++For such events, ALSA sequencer provides several different data storage types. + The data type is specified in the flag bits masked by #SND_SEQ_EVENT_LENGTH_MASK. + The following data types are available: + +@@ -359,7 +359,7 @@ A macro #snd_seq_ev_set_fixed() is provided to set this type. + \par Variable length data + SYSEX or a returned error use this type. + The actual data is stored on an extra allocated space. +-On sequecer kernel, the whole extra-data is duplicated, so that the event ++On sequencer kernel, the whole extra-data is duplicated, so that the event + can be scheduled on queue. + The data contains only the length and the + pointer of extra-data. +@@ -430,7 +430,7 @@ Note that PPQ cannot be changed while the queue is running. + It must be set before the queue is started. + + On the other hand, in the case of realtime queue, the +-time resolution is fixed to nanosecononds. There is, however, ++time resolution is fixed to nanoseconds. There is, however, + a parameter to change the speed of this queue, called skew. + You can make the queue faster or slower by setting the skew value + bigger or smaller. In the API, the skew is defined by two values, +@@ -488,7 +488,7 @@ special settings. + In the above example, the tempo is changed immediately after + the buffer is flushed by #snd_seq_drain_output() call. + You can schedule the event in a certain queue so that the tempo +-change happes at the scheduled time, too. ++change happens at the scheduled time, too. + + \subsection seq_ev_start Starting and stopping a queue + +@@ -515,7 +515,7 @@ Each ALSA port can have capability flags. + The most basic capability flags are + #SND_SEQ_PORT_CAP_READ and #SND_SEQ_PORT_CAP_WRITE. + The former means that the port allows to send events to other ports, +-whereas the latter capability menas ++whereas the latter capability means + that the port allows to receive events from other ports. + You may have noticed that meanings of \c READ and \c WRITE + are permissions of the port from the viewpoint of other ports. +@@ -536,7 +536,7 @@ Obviously, these flags have no influence + if \c READ or \c WRITE> capability is not set. + + Note that these flags are not necessary if the client subscribes itself +-to the spcified port. ++to the specified port. + For example, when a port makes READ subscription + to MIDI input port, this port must have #SND_SEQ_PORT_CAP_WRITE capability, + but no #SND_SEQ_PORT_CAP_SUBS_WRITE capability is required. +@@ -610,7 +610,7 @@ if #SND_SEQ_PORT_CAP_NO_EXPORT capability is set in either sender or receiver po + + Assume MIDI input port = 64:0, application port = 128:0, and + queue for timestamp = 1 with real-time stamp. +-The application port must have capabilty #SND_SEQ_PORT_CAP_WRITE. ++The application port must have capability #SND_SEQ_PORT_CAP_WRITE. + \code + void capture_keyboard(snd_seq_t *seq) + { +@@ -633,7 +633,7 @@ void capture_keyboard(snd_seq_t *seq) + \subsection seq_subs_ex_out Output to MIDI device + + Assume MIDI output port = 65:1 and application port = 128:0. +-The application port must have capabilty #SND_SEQ_PORT_CAP_READ. ++The application port must have capability #SND_SEQ_PORT_CAP_READ. + \code + void subscribe_output(snd_seq_t *seq) + { +@@ -790,7 +790,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) + /** + * \brief get identifier of sequencer handle + * \param seq sequencer handle +- * \return ascii identifier of sequencer handle ++ * \return ASCII identifier of sequencer handle + * + * Returns the ASCII identifier of the given sequencer handle. It's the same + * identifier specified in snd_seq_open(). +@@ -1610,7 +1610,7 @@ void snd_seq_client_info_event_filter_del(snd_seq_client_info_t *info, int event + * \param event_type event type to be checked + * \return 1 if the event type is present, 0 otherwise + * +- * Test if the event type is in the filter bitamp of this client_info container. ++ * Test if the event type is in the filter bitmap of this client_info container. + * + * \sa snd_seq_get_client_info(), + * snd_seq_set_client_info(), +diff --git a/src/seq/seqmid.c b/src/seq/seqmid.c +index 3b0960d..86a4970 100644 +--- a/src/seq/seqmid.c ++++ b/src/seq/seqmid.c +@@ -317,7 +317,7 @@ int snd_seq_set_client_pool_input(snd_seq_t *seq, size_t size) + * \param seq sequencer handle + * \return 0 on success or negative error code + * +- * So far, this works ideically like #snd_seq_drop_output(). ++ * So far, this works identically like #snd_seq_drop_output(). + */ + int snd_seq_reset_pool_output(snd_seq_t *seq) + { +@@ -329,7 +329,7 @@ int snd_seq_reset_pool_output(snd_seq_t *seq) + * \param seq sequencer handle + * \return 0 on success or negative error code + * +- * So far, this works ideically like #snd_seq_drop_input(). ++ * So far, this works identically like #snd_seq_drop_input(). + */ + int snd_seq_reset_pool_input(snd_seq_t *seq) + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bash for openSUSE:Factory
by root＠Hilbert.suse.de 04 Mar '09

04 Mar '09

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Wed Mar 4 14:52:22 CET 2009. -------- --- bash/bash.changes 2009-02-27 17:39:15.000000000 +0100 +++ bash/bash.changes 2009-03-04 14:44:40.732002154 +0100 @@ -1,0 +2,10 @@ +Wed Mar 4 13:10:02 CET 2009 - werner(a)suse.de + +- My last patch for bnc#470548 send to bug-bash(a)gnu.org was not + fully applied and this had caused a memory corruption on tab + completion. +- Enable the parser to find closing parenthesis at the end of + an argument of a command even if backslash is used (bnc#481817) +- Correct link of shared libraries of devel readline package + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bash-4.0-complete.dif bash-4.0-parenthese.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.RI5076/_old 2009-03-04 14:51:23.000000000 +0100 +++ /var/tmp/diff_new_pack.RI5076/_new 2009-03-04 14:51:23.000000000 +0100 @@ -27,7 +27,7 @@ Suggests: command-not-found AutoReqProv: on Version: 4.0 -Release: 2 +Release: 3 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -52,6 +52,8 @@ Patch14: bash-3.2-sigrestart.patch Patch15: bash-3.2-longjmp.dif Patch16: bash-4.0-setlocale.dif +Patch17: bash-4.0-complete.dif +Patch18: bash-4.0-parenthese.dif Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif Patch22: readline-6.0-wrap.patch @@ -84,7 +86,7 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.0 -Release: 2 +Release: 3 AutoReqProv: on %description -n bash-doc @@ -104,7 +106,7 @@ Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.0 -Release: 2 +Release: 3 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -133,7 +135,7 @@ Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.0 -Release: 2 +Release: 3 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -162,7 +164,7 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.0 -Release: 2 +Release: 3 AutoReqProv: on %description -n readline-doc @@ -197,6 +199,8 @@ %patch14 -p0 -b .sigrestart %patch15 -p0 -b .longjmp %patch16 -p0 -b .setlocale +%patch17 -p0 -b .complete +%patch18 -p0 -b .parenthese %patch21 -p0 -b .zerotty %patch22 -p0 -b .wrap %patch23 -p0 -b .conf @@ -377,10 +381,12 @@ mkdir -p %{buildroot}%{_defaultdocdir}/bash chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers} chmod 0755 %{buildroot}/%{_lib}/libreadline.so.%{rl_vers} - rm -f %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old - rm -f %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old - rm -f %{buildroot}/%{_lib}/libhistory.so - rm -f %{buildroot}/%{_lib}/libreadline.so + rm -vf %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}*old + rm -vf %{buildroot}/%{_lib}/libreadline.so.%{rl_vers}*old + rm -vf %{buildroot}/%{_lib}/libhistory.so + rm -vf %{buildroot}/%{_lib}/libreadline.so + ln -sf /%{_lib}/libhistory.so.%{rl_vers} %{buildroot}/%{_libdir}/libhistory.so + ln -sf /%{_lib}/libreadline.so.%{rl_vers} %{buildroot}/%{_libdir}/libreadline.so cd ../bash-%{bash_vers} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/bin @@ -503,6 +509,13 @@ %doc %{_defaultdocdir}/readline/ %changelog +* Wed Mar 04 2009 werner(a)suse.de +- My last patch for bnc#470548 send to bug-bash(a)gnu.org was not + fully applied and this had caused a memory corruption on tab + completion. +- Enable the parser to find closing parenthesis at the end of + an argument of a command even if backslash is used (bnc#481817) +- Correct link of shared libraries of devel readline package * Fri Feb 27 2009 werner(a)suse.de - Update bash 4.0 to patch level 0 - Update readline 6.0 to patch level 0 ++++++ bash-4.0-complete.dif ++++++ --- pcomplete.c +++ pcomplete.c 2009-03-04 11:58:05.296254166 +0000 @@ -1032,6 +1032,7 @@ gen_shell_function_matches (cs, text, li cmdlist = build_arg_list (funcname, text, lwords, cw); pps = &ps; + save_parser_state (pps); begin_unwind_frame ("gen-shell-function-matches"); add_unwind_protect (restore_parser_state, (char *)pps); add_unwind_protect (dispose_words, (char *)cmdlist); ++++++ bash-4.0-parenthese.dif ++++++ --- parse.y +++ parse.y 2009-03-04 13:05:43.128904662 +0000 @@ -3420,6 +3420,11 @@ eof_error: RESIZE_MALLOCED_BUFFER (ret, retind, 2, retsize, 64); if MBTEST(ch == CTLESC || ch == CTLNUL) ret[retind++] = CTLESC; + else if MBTEST(ch == close && (tflags & LEX_INCASE) == 0) +{ + count--; +/*itrace("parse_comsub:%d: found close: count = %d", line_number, count);*/ +} ret[retind++] = ch; continue; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 powertop for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package powertop for openSUSE:Factory checked in at Wed Mar 4 00:58:55 CET 2009. -------- --- powertop/powertop.changes 2008-06-16 10:56:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/powertop/powertop.changes 2009-03-04 00:45:06.455584000 +0100 @@ -1,0 +2,13 @@ +Wed Mar 4 00:44:47 CET 2009 - ro(a)suse.de + +- Update to PowerTOP 1.11 +- Changes: + * Fix compilation with PIC + * polling hint now refers to /dev/cdrom instead of /dev/scd0 + * fix calculations for systems that vary in power draw proc info + * Display mwait usage + * fix EOF at input + * add --version|-v option + * spelling error in tips. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- powertop-1.10.tar.gz New: ---- powertop-1.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.v13077/_old 2009-03-04 00:58:44.000000000 +0100 +++ /var/tmp/diff_new_pack.v13077/_new 2009-03-04 00:58:44.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package powertop (Version 1.10) +# spec file for package powertop (Version 1.11) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# 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/ # @@ -13,7 +20,7 @@ Name: powertop Url: http://www.linuxpowertop.org Summary: PowerTOP is a Linux Tool to Find out What is Using Power on a Laptop -Version: 1.10 +Version: 1.11 Release: 1 License: GPL v2 or later Group: System/Monitoring @@ -54,6 +61,16 @@ %{_mandir}/man*/%{name}.1.gz %changelog +* Wed Mar 04 2009 ro(a)suse.de +- Update to PowerTOP 1.11 +- Changes: + * Fix compilation with PIC + * polling hint now refers to /dev/cdrom instead of /dev/scd0 + * fix calculations for systems that vary in power draw proc info + * Display mwait usage + * fix EOF at input + * add --version|-v option + * spelling error in tips. * Mon Jun 16 2008 thoenig(a)suse.de - Update to PowerTOP 1.10 - Changes: ++++++ powertop-1.10.tar.gz -> powertop-1.11.tar.gz ++++++ ++++ 7968 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 yast2-online-update for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package yast2-online-update for openSUSE:Factory checked in at Wed Mar 4 00:46:27 CET 2009. -------- --- yast2-online-update/yast2-online-update.changes 2009-01-12 16:00:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-online-update/yast2-online-update.changes 2009-03-03 16:02:35.118656000 +0100 @@ -2 +2,30 @@ -Mon Jan 12 15:53:31 CET 2009 - jsuchome(a)suse.cz +Tue Mar 3 15:53:55 CET 2009 - jsuchome(a)suse.cz + +- inst_you: generic message for reboot (bnc#479835) +- after reboot during installation, return `reboot_same_step, if + there are remaining patches (bnc#475650) +- 2.18.0 + +------------------------------------------------------------------- +Tue Feb 17 15:47:08 CET 2009 - ug(a)suse.de + +- fixed autoyast client + +------------------------------------------------------------------- +Fri Feb 13 15:59:20 CET 2009 - jsuchome(a)suse.cz + +- correct placing of solver call (bnc#474601) + +------------------------------------------------------------------- +Wed Feb 11 17:47:24 CET 2009 - locilka(a)suse.cz + +- Calling solver if some patches are selected during second stage + installation (bnc #474601). + +------------------------------------------------------------------- +Wed Feb 11 15:02:14 CET 2009 - jsuchome(a)suse.cz + +- refresh the source data which were possibly cleared (bnc#474711) + +------------------------------------------------------------------- +Mon Jan 19 13:00:46 CET 2009 - jsuchome(a)suse.cz @@ -6 +34,0 @@ -- 2.17.15 @@ -9 +37 @@ -Fri Jan 9 11:40:31 CET 2009 - ug(a)suse.de +Fri Jan 9 11:37:25 CET 2009 - ug(a)suse.de @@ -12 +39,0 @@ -- 2.17.14 calling whatdependson for head-i586 Old: ---- yast2-online-update-2.17.15.tar.bz2 New: ---- yast2-online-update-2.18.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.w14909/_old 2009-03-04 00:46:15.000000000 +0100 +++ /var/tmp/diff_new_pack.w14909/_new 2009-03-04 00:46:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.17.15) +# spec file for package yast2-online-update (Version 2.18.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-online-update -Version: 2.17.15 -Release: 2 +Version: 2.18.0 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.17.15.tar.bz2 +Source0: yast2-online-update-2.18.0.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -59,7 +59,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-online-update-2.17.15 +%setup -n yast2-online-update-2.18.0 %build %{prefix}/bin/y2tool y2autoconf @@ -114,14 +114,27 @@ %files frontend %defattr(-,root,root) %{prefix}/share/applications/YaST2/online_update.desktop + %changelog -* Mon Jan 12 2009 jsuchome(a)suse.cz +* Tue Mar 03 2009 jsuchome(a)suse.cz +- inst_you: generic message for reboot (bnc#479835) +- after reboot during installation, return `reboot_same_step, if + there are remaining patches (bnc#475650) +- 2.18.0 +* Tue Feb 17 2009 ug(a)suse.de +- fixed autoyast client +* Fri Feb 13 2009 jsuchome(a)suse.cz +- correct placing of solver call (bnc#474601) +* Wed Feb 11 2009 locilka(a)suse.cz +- Calling solver if some patches are selected during second stage + installation (bnc #474601). +* Wed Feb 11 2009 jsuchome(a)suse.cz +- refresh the source data which were possibly cleared (bnc#474711) +* Mon Jan 19 2009 jsuchome(a)suse.cz - added option to open Repository management and Online Update Configuration from the package selector (bnc#459540, fate#303458) -- 2.17.15 * Fri Jan 09 2009 ug(a)suse.de - removed from autoyast UI (bnc#464789) -- 2.17.14 * Mon Dec 08 2008 jsuchome(a)suse.cz - do not return integer value to let YOU restart itself (bnc#457167) - 2.17.13 ++++++ yast2-online-update-2.17.15.tar.bz2 -> yast2-online-update-2.18.0.tar.bz2 ++++++ ++++ 57970 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-online-update-2.17.15/config.h.in new/yast2-online-update-2.18.0/config.h.in --- old/yast2-online-update-2.17.15/config.h.in 2009-01-09 11:43:07.000000000 +0100 +++ new/yast2-online-update-2.18.0/config.h.in 2009-03-03 15:56:43.000000000 +0100 @@ -45,6 +45,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE 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-online-update-2.17.15/configure.in new/yast2-online-update-2.18.0/configure.in --- old/yast2-online-update-2.17.15/configure.in 2009-01-09 11:42:50.000000000 +0100 +++ new/yast2-online-update-2.18.0/configure.in 2009-03-03 15:56:34.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-online-update dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-online-update, 2.17.14, http://bugs.opensuse.org/, yast2-online-update) +AC_INIT(yast2-online-update, 2.18.0, http://bugs.opensuse.org/, yast2-online-update) 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.17.14" +VERSION="2.18.0" RPMNAME="yast2-online-update" MAINTAINER="Jiri Suchomel <jsuchome(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-online-update-2.17.15/src/do_online_update_auto.ycp new/yast2-online-update-2.18.0/src/do_online_update_auto.ycp --- old/yast2-online-update-2.17.15/src/do_online_update_auto.ycp 2008-12-16 07:58:55.000000000 +0100 +++ new/yast2-online-update-2.18.0/src/do_online_update_auto.ycp 2009-02-17 16:00:18.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Run online update during autoinstallation * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: do_online_update_auto.ycp 49142 2008-07-16 08:57:44Z jsuchome $ + * $Id: do_online_update_auto.ycp 55559 2009-02-17 14:48:23Z ug $ */ { @@ -35,7 +35,7 @@ Pkg::TargetInit ("/", false); Pkg::SourceStartManager (true); - Pkg::PkgEstablish (); + Pkg::PkgSolve (true); integer selected = Pkg::ResolvablePreselectPatches (`all); y2milestone ("All preselected patches: %1", selected); 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-online-update-2.17.15/src/inst_you.ycp new/yast2-online-update-2.18.0/src/inst_you.ycp --- old/yast2-online-update-2.17.15/src/inst_you.ycp 2008-12-16 07:58:55.000000000 +0100 +++ new/yast2-online-update-2.18.0/src/inst_you.ycp 2009-03-03 11:30:25.000000000 +0100 @@ -104,10 +104,6 @@ if (after_restart || Hack ("init-target-and-sources")) { Pkg::TargetInit ("/", false); - Pkg::SourceStartManager(true); - // compute ResStatus::EstablishField (only after restart, - // otherwise it was already done in inst_ask_online_update.ycp) - Pkg::PkgEstablish (); } else // reinitialize target after release notes were read (#232247) { @@ -115,6 +111,9 @@ Pkg::TargetInitialize ("/"); Pkg::TargetLoad (); } + // source data are cleared in registration client, and + // inst_ask_online_update.ycp may not be called + Pkg::SourceStartManager (true); integer selected = 0; boolean check_licenses = false; @@ -138,7 +137,8 @@ "ignoreAlreadyRecommended" : true, "onlyRequires" : true ]); - boolean solved = Pkg::PkgSolve (true); + // first solver run, so preselecting works well + Pkg::PkgSolve (true); // select the patches affecting pkg management selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); @@ -154,6 +154,8 @@ selected = Pkg::ResolvablePreselectPatches (`all); y2milestone ("All preselected patches: %1", selected); } + // solver must be run after preselction (bnc#474601) + boolean solved = Pkg::PkgSolve (true); // run package selector to allow user interaction if (!solved || @@ -287,6 +289,7 @@ } } } + // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); @@ -294,9 +297,16 @@ if (ret == `reboot) { // message popup - Popup::Message (_("The kernel has been updated. The system will + Popup::Message (_("Some application requiring restart has been updated. The system will reboot now then continue the installation. ")); + if (more_patches_needed) + { + y2milestone ("there are more patches to install after reboot..."); + // after reboot, run the online update again + ret = `reboot_same_step; + SCR::Write (.target.ycp, restarted_path, 1); + } } else if (ret == `restart_same_step) { 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-online-update-2.17.15/VERSION new/yast2-online-update-2.18.0/VERSION --- old/yast2-online-update-2.17.15/VERSION 2009-01-12 15:54:37.000000000 +0100 +++ new/yast2-online-update-2.18.0/VERSION 2009-03-03 15:56:21.000000000 +0100 @@ -1 +1 @@ -2.17.15 +2.18.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 libqt4 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Tue Mar 3 23:18:53 CET 2009. -------- --- libqt4/libqt4.changes 2009-03-03 10:48:42.000000000 +0100 +++ libqt4/libqt4.changes 2009-03-03 22:40:23.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 22:38:50 CET 2009 - beineri(a)opensuse.org + +- fix build + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.y26368/_old 2009-03-03 23:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.y26368/_new 2009-03-03 23:17:40.000000000 +0100 @@ -35,7 +35,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.5.0 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.0 @@ -190,6 +190,8 @@ /usr/share/doc/packages/%base_name/src %changelog +* Tue Mar 03 2009 beineri(a)opensuse.org +- fix build * Tue Mar 03 2009 dmueller(a)suse.de - update to 4.5.0 final: * licensing change. LGPLv2.1 or later is a new option ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.y26368/_old 2009-03-03 23:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.y26368/_new 2009-03-03 23:17:40.000000000 +0100 @@ -47,7 +47,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN Version: 4.5.0 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.0 @@ -359,7 +359,7 @@ %files %defattr(-,root,root,755) -%doc changes-* *.TXT LICENSE.GPL3 +%doc changes-* *.txt LICENSE.GPL3 %dir %_libdir/qt4 %dir %plugindir %if %suse_version > 910 @@ -497,6 +497,8 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Mar 03 2009 beineri(a)opensuse.org +- fix build * Tue Mar 03 2009 dmueller(a)suse.de - update to 4.5.0 final: * licensing change. LGPLv2.1 or later is a new option ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.y26368/_old 2009-03-03 23:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.y26368/_new 2009-03-03 23:17:40.000000000 +0100 @@ -34,7 +34,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.5.0 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.0 @@ -253,6 +253,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Mar 03 2009 beineri(a)opensuse.org +- fix build * Tue Mar 03 2009 dmueller(a)suse.de - update to 4.5.0 final: * licensing change. LGPLv2.1 or later is a new option ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.y26368/_old 2009-03-03 23:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.y26368/_new 2009-03-03 23:17:40.000000000 +0100 @@ -38,7 +38,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.5.0 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.0 @@ -307,6 +307,8 @@ /usr/bin/qt4-browser %changelog +* Tue Mar 03 2009 beineri(a)opensuse.org +- fix build * Tue Mar 03 2009 dmueller(a)suse.de - update to 4.5.0 final: * licensing change. LGPLv2.1 or later is a new option ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libotf for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libotf for openSUSE:Factory checked in at Tue Mar 3 23:15:38 CET 2009. -------- --- libotf/libotf.changes 2008-10-31 16:30:49.000000000 +0100 +++ libotf/libotf.changes 2009-03-03 22:30:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 22:29:54 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libotf.spec ++++++ --- /var/tmp/diff_new_pack.p20016/_old 2009-03-03 23:15:02.000000000 +0100 +++ /var/tmp/diff_new_pack.p20016/_new 2009-03-03 23:15:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libotf (Version 0.9.7) # -# 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,7 +21,7 @@ Name: libotf BuildRequires: freetype2-devel xorg-x11-devel Version: 0.9.7 -Release: 2 +Release: 3 License: LGPL v2.1 or later Group: System/I18n/Japanese AutoReqProv: on @@ -59,21 +59,20 @@ Kenichi Handa <handa(a)m17n.org> %prep -%setup -q -n %{name}-%{version} +%setup -q %build ./autogen.sh autoreconf --force --install --verbose -./configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ - --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} +%configure --disable-static --with-pic make %{?jobs:-j%jobs} %install make DESTDIR=${RPM_BUILD_ROOT} install +%{__rm} -f %{buildroot}%{_libdir}/*.la %clean +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -89,13 +88,14 @@ %defattr(-, root, root) /usr/include/* %{_libdir}/libotf.so -%{_libdir}/libotf.*a %{_libdir}/pkgconfig/libotf.pc %changelog +* Tue Mar 03 2009 crrodriguez(a)suse.de +- remove static libraries and "la" files * Fri Oct 31 2008 schwab(a)suse.de - Don't disable strict aliasing. -* Sat Apr 19 2008 schwab(a)suse.de +* Fri Apr 18 2008 schwab(a)suse.de - Update to libotf 0.9.7. * src/otfdrive.c (gstring_subst): If a glyph is changed, set the character code to 0, and update GlyphClass. @@ -113,7 +113,7 @@ • src/otfdrive.c (gstring_subst): Remove a glyph if it is ignored because of 0 glyph ID. - added ldconfig to post scripts. -* Wed Jan 10 2007 mfabian(a)suse.de +* Tue Jan 09 2007 mfabian(a)suse.de - update to 0.9.5.20070109: make it possible to link with C++ programs (Ed Trager, Kenichi Handa). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libhangul for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libhangul for openSUSE:Factory checked in at Tue Mar 3 23:14:55 CET 2009. -------- --- libhangul/libhangul.changes 2009-02-11 20:48:34.000000000 +0100 +++ libhangul/libhangul.changes 2009-03-03 22:38:19.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 22:37:46 CET 2009 - crrodriguez(a)suse.de + +- fix -devel package dependencies +- add missing %clean section to the spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhangul.spec ++++++ --- /var/tmp/diff_new_pack.U18127/_old 2009-03-03 23:13:51.000000000 +0100 +++ /var/tmp/diff_new_pack.U18127/_new 2009-03-03 23:13:51.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: pkg-config #BuildRequires: python python-devel Version: 0.0.9 -Release: 2 +Release: 3 License: LGPL v2.1 or later Group: System/I18n/Korean AutoReqProv: on @@ -46,7 +46,7 @@ License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: System/I18n/Korean -Requires: %{name} = %{version} +Requires: %{name} = %{version} glibc-devel %description -n libhangul-devel This package contains all necessary include files and libraries needed @@ -60,14 +60,14 @@ Joon-cheol Park <jooncheol(a)gmail.com> %prep -%setup -q -n %{name}-%{version} +%setup -q %build autoreconf --force --install --verbose export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %configure --disable-static --with-pic -make +%{__make} %{?jobs:-j%jobs} #pushd bindings/python # make #popd @@ -77,6 +77,10 @@ #pushd bindings/python # make DESTDIR=${RPM_BUILD_ROOT} install #popd +%{__rm} -f %{buildroot}%{_libdir}/*.la + +%clean +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -95,9 +99,11 @@ /usr/include/hangul-1.0/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/libhangul.pc -%exclude %{_libdir}/*.la %changelog +* Tue Mar 03 2009 crrodriguez(a)suse.de +- fix -devel package dependencies +- add missing %%clean section to the spec file * Wed Feb 11 2009 ro(a)suse.de - added baselibs.conf (needed by imhangul) * Fri Jan 09 2009 mfabian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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