November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit qt3 for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at Mon Nov 23 14:30:44 CET 2009. -------- --- KDE/qt3/qt3.changes 2009-11-03 20:22:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2009-11-13 14:29:22.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 13 14:28:47 CET 2009 - dmueller(a)suse.de + +- fix patches to apply with fuzz=0 + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change calling whatdependson for head-i586 New: ---- attributes update_spec.pl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:32.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:32.000000000 +0100 @@ -21,12 +21,12 @@ Name: qt3-devel-doc BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig qt3-devel update-desktop-files Url: http://www.trolltech.com/ -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL AutoReqProv: on -Summary: Qt 3 Development Kit +Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8b -Release: 93 +Release: 94 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -107,65 +107,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. +This package contains the documentation for the Qt 3 Development Kit. -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. - - - -Authors: --------- - Troll Tech AS, Norway - - -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. - - - -Authors: --------- - Troll Tech AS, Norway +This package contains the documentation for the Qt 3 Development Kit. +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial @@ -242,65 +192,15 @@ # COMMON-END %description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. - - - -Authors: --------- - Troll Tech AS, Norway - - -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -You need this package if you want to compile programs with Qt 3. It -contains the "Qt Crossplatform Development Kit 2". You will find -include files, documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3. - +This package contains the documentation for the Qt 3 Development Kit. +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. -Authors: --------- - Troll Tech AS, Norway +This package contains the documentation for the Qt 3 Development Kit. +You will find documentation, precompiled examples, and a tutorial for +getting started with Qt in /usr/lib/qt3/doc. %build export VERSION=%suse_version ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:32.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:32.000000000 +0100 @@ -23,9 +23,9 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Version: 3.3.8b -Release: 96 +Release: 97 AutoReqProv: on Requires: qt3 = %version Group: Development/Tools/Other @@ -105,45 +105,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. +This package contains extension libraries for Qt 3, such as the +Netscape plug-in modules. -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -qt3 - -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -qt3 +This package contains extension libraries for Qt 3, such as the +Netscape plug-in modules. %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial @@ -221,48 +187,14 @@ %patch50 %description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. +This package contains extension libraries for Qt 3, such as the +Netscape plug-in modules. -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -qt3 - -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -qt3 +This package contains extension libraries for Qt 3, such as the +Netscape plug-in modules. %package -n qt3-devel-examples -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: Programming Examples for Qt 3 AutoReqProv: on Group: Development/Sources @@ -270,46 +202,53 @@ Obsoletes: qt3-examples %description -n qt3-devel-examples -examples +This package contains small executables with code to demonstrate Qt +programming. + +Have a look in /usr/share/doc/packages/qt3/examples/. %package -n qt3-mysql -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: MySQL Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-mysql -mysql +Plug-in for using the MySQL database with the generic Qt database +interface. %package -n qt3-unixODBC -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: A UnixODBC Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-unixODBC -unix +A plug-in for using UnixODBC supported databases with the generic Qt +database interface. %package -n qt3-postgresql -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: A PostgreSQL Plug-In for Qt Provides: qt3_database_plugin Group: Productivity/Databases/Clients %description -n qt3-postgresql -postgres +A Plug-in for using the PostgreSQL database with the generic Qt +database interface. %package -n qt3-sqlite -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: SQLite Database Plug-In for Qt Provides: qt3_database_plugin Group: Development/Tools/Other %description -n qt3-sqlite - Troll Tech AS, Norway +The Qt database supports SQLite with this plug-in. (No configured and +running daemon is required.) %package -n qt3-devel-tools -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: User Interface Builder and other tools (designer, assistant, linguist) AutoReqProv: on Requires: qt3-devel = %version @@ -318,10 +257,12 @@ Group: Development/Tools/GUI Builders %description -n qt3-devel-tools - Troll Tech <info(a)troll.no> +The designer creates .ui files. The uic generates C++ code from these +files. The package also contains the Qt Assistant (Qt documentation +browser) and the Qt Linguist (for translations). %package -n qt3-man -License: GPL v2 only ; GPL v3 only ; QPL .. +License: GPL, QPL Summary: Qt 3 Man Pages AutoReqProv: on Requires: qt3-devel = %version @@ -329,7 +270,7 @@ Group: Documentation/Man %description -n qt3-man - Troll Tech AS <info(a)troll.no> +This package contains all the man pages for all the Qt 3 classes. %build export QTDIR=/usr/lib/qt3/ ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:33.000000000 +0100 @@ -32,7 +32,7 @@ # Summary: A library for developing applications with graphical user interfaces Version: 3.3.8b -Release: 93 +Release: 94 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- ++++++ attributes ++++++ summary.qt3 A library for developing applications with graphical user interfaces summary.qt3-devel Include Files and Libraries mandatory for Development summary.qt3-devel-doc Documentation for the Qt 3 Development Kit summary.qt3-devel-examples Programming Examples for Qt 3 summary.qt3-devel-tools User Interface Builder and other tools (designer, assistant, linguist) summary.qt3-extensions Qt3 Extensions summary.qt3-man Qt 3 Man Pages summary.qt3-mysql MySQL Plug-In for Qt summary.qt3-postgresql A PostgreSQL Plug-In for Qt summary.qt3-sqlite SQLite Database Plug-In for Qt summary.qt3-unixODBC A UnixODBC Plug-In for Qt +description.qt3 Qt is a program library for developing applications with graphical user interfaces. It allows you to rapidly develop professional programs. The Qt library is available not only for Linux but for a great number of Unices and even for Windows. Thus it is possible to write programs that may be easily ported to those platforms. You need a license for using Qt with a non-GPL application, which can be acquired from sales(a)trolltech.com. See /usr/share/doc/packages/qt3 for details about the new features of the current Qt library! -description.qt3 +description.qt3-devel You need this package if you want to compile programs with Qt 3. It contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3 you will find include files. You need a license for using Qt with a non-GPL application. A license can be acquired at sales(a)trolltech.com. -description.qt3-devel +description.qt3-devel-doc This package contains the documentation for the Qt 3 Development Kit. You will find documentation, precompiled examples, and a tutorial for getting started with Qt in /usr/lib/qt3/doc. -description.qt3-devel-doc +description.qt3-devel-examples This package contains small executables with code to demonstrate Qt programming. Have a look in /usr/share/doc/packages/qt3/examples/. -description.qt3-devel-examples +description.qt3-devel-tools The designer creates .ui files. The uic generates C++ code from these files. The package also contains the Qt Assistant (Qt documentation browser) and the Qt Linguist (for translations). -description.qt3-devel-tools +description.qt3-extensions This package contains extension libraries for Qt 3, such as the Netscape plug-in modules. -description.qt3-extensions +description.qt3-man This package contains all the man pages for all the Qt 3 classes. -description.qt3-man +description.qt3-mysql Plug-in for using the MySQL database with the generic Qt database interface. -description.qt3-mysql +description.qt3-postgresql A Plug-in for using the PostgreSQL database with the generic Qt database interface. -description.qt3-postgresql +description.qt3-sqlite The Qt database supports SQLite with this plug-in. (No configured and running daemon is required.) -description.qt3-sqlite +description.qt3-unixODBC A plug-in for using UnixODBC supported databases with the generic Qt database interface. -description.qt3-unixODBC ++++++ enable-designer-plugins.diff ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:33.000000000 +0100 @@ -1,8 +1,8 @@ --- tools/designer/plugins/plugins.pro -+++ tools/designer/plugins/plugins.pro 2003/01/26 13:05:01 -@@ -3,6 +3,7 @@ - cppeditor \ ++++ tools/designer/plugins/plugins.pro +@@ -4,6 +4,7 @@ dlg \ + glade \ rc \ - kdevdlg + kdevdlg \ ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:33.000000000 +0100 @@ -7,10 +7,6 @@ for spec in qt3-extensions.spec qt3-devel-doc.spec; do { sed -n -e '1,/COMMON-BEGIN/p' $spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' qt3.spec - sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec -# assuming hilbert has no such dir -if test -x /mounts/work/src/bin/tools/prepare_spec; then - /mounts/work/src/bin/tools/prepare_spec $spec > $spec.tmp && mv $spec.tmp $spec -fi + sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && perl update_spec.pl $spec.tmp attributes > $spec && rm $spec.tmp done ++++++ qt3-extensions.spec.in ++++++ --- /var/tmp/diff_new_pack.3OvW7E/_old 2009-11-23 14:29:33.000000000 +0100 +++ /var/tmp/diff_new_pack.3OvW7E/_new 2009-11-23 14:29:33.000000000 +0100 @@ -29,7 +29,22 @@ %patch50 %description -qt3 +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway %package -n qt3-devel-examples Summary: Programming Examples for Qt 3 @@ -39,7 +54,23 @@ Obsoletes: qt3-examples %description -n qt3-devel-examples -examples +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway + %package -n qt3-mysql Summary: MySQL Plug-In for Qt @@ -47,7 +78,23 @@ Group: Productivity/Databases/Clients %description -n qt3-mysql -mysql +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway + %package -n qt3-unixODBC Summary: A UnixODBC Plug-In for Qt @@ -55,7 +102,23 @@ Group: Productivity/Databases/Clients %description -n qt3-unixODBC -unix +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway + %package -n qt3-postgresql Summary: A PostgreSQL Plug-In for Qt @@ -63,7 +126,22 @@ Group: Productivity/Databases/Clients %description -n qt3-postgresql -postgres +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway %package -n qt3-sqlite Summary: SQLite Database Plug-In for Qt @@ -71,8 +149,24 @@ Group: Development/Tools/Other %description -n qt3-sqlite +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- Troll Tech AS, Norway + %package -n qt3-devel-tools Summary: User Interface Builder and other tools (designer, assistant, linguist) Autoreqprov: on @@ -82,7 +176,23 @@ Group: Development/Tools/GUI Builders %description -n qt3-devel-tools - Troll Tech <info(a)troll.no> +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway + %package -n qt3-man Summary: Qt 3 Man Pages @@ -92,7 +202,22 @@ Group: Documentation/Man %description -n qt3-man - Troll Tech AS <info(a)troll.no> +Qt is a program library for developing applications with graphical user +interfaces. It allows you to rapidly develop professional programs. The +Qt library is available not only for Linux but for a great number of +Unices and even for Windows. Thus it is possible to write programs that +may be easily ported to those platforms. + +You need a license for using Qt with a non-GPL application, which can +be acquired from sales(a)trolltech.com. + +See /usr/share/doc/packages/qt3 for details about the new features of +the current Qt library! + + +Authors: +--------- + Troll Tech AS, Norway %build export QTDIR=/usr/lib/qt3/ ++++++ update_spec.pl ++++++ #! /usr/bin/perl my $name = $ARGV[0]; $name =~ s,.*/,,; $name =~ s,\.spec.*,,; my %attributes = (); open(FILE, $ARGV[1]) || die 'no attributes'; my $pack = undef; my $text = undef; while ( <FILE> ) { if (/^\+(.*)$/) { $pack = $1; $text = ''; next } if (/^-(.*)$/) { if ($pack ne $1) { die "$pack and $1 do not match"; } $text =~ s,^\s*,,; $text =~ s,\s*$,,; $attributes{$pack} = $text; $text = undef; $pack = undef; next; } if (defined $text) { $text .= $_; } elsif (/^(\S*)\s*(.*)$/) { my $attr = $1; my $string = $2; $string =~ s,^\s*,,; $string =~ s,\s*$,,; $attributes{$attr} = $string; } } close(FILE); open(FILE, $ARGV[0]); sub description() { if (/^%description\s*(.*)\s*/) { my $suffix = $1; my $pname = $name; if ($suffix =~ m/-n\s*(.*)/) { $pname = $1; } else { $pname = "$name-$suffix" if ($suffix); } if (defined $attributes{"description.$pname"}) { print $_; my $descr = $attributes{"description.$pname"}; print "$descr\n"; $_ = ''; do { $_ = <FILE>; } while ( $_ !~ /^%/ && $_ !~ /^@/ ); print "\n"; description(); } } } # current subpackage my $pname = $name; while ( <FILE> ) { if (/^Name:\s*(.*)/) { $name = $1; $pname = $1; } description(); if (/^%package\s*(.*)/) { my $suffix = $1; if ($suffix =~ m/-n\s*(.*)/) { $pname = $1; } else { $pname = "$name-$1"; } } if (/^(Summary:\s*)(.*)$/) { if (defined $attributes{"summary.$pname"}) { print $1 . $attributes{"summary.$pname"} ."\n"; next; } } if (/^(License:\s*)(.*)$/) { if (defined $attributes{"license.$pname"}) { print $1 . $attributes{"license.$pname"} ."\n"; next; } } if (/^(Group:\s*)(.*)$/) { if (defined $attributes{"group.$pname"}) { print $1 . $attributes{"group.$pname"} ."\n"; next; } } print $_; } close(FILE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-sound for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package yast2-sound for openSUSE:Factory checked in at Mon Nov 23 14:22:43 CET 2009. -------- --- yast2-sound/yast2-sound.changes 2009-10-16 13:21:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-sound/yast2-sound.changes 2009-11-20 15:52:56.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 20 15:44:03 CET 2009 - lslezak(a)suse.cz + +- unified usage of "SoundFont" term (bnc#548898) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-sound-2.18.4.tar.bz2 New: ---- yast2-sound-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sound.spec ++++++ --- /var/tmp/diff_new_pack.BzwDuE/_old 2009-11-23 14:20:11.000000000 +0100 +++ /var/tmp/diff_new_pack.BzwDuE/_new 2009-11-23 14:20:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-sound (Version 2.18.4) +# spec file for package yast2-sound (Version 2.19.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-sound -Version: 2.18.4 +Version: 2.19.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-sound-2.18.4.tar.bz2 +Source0: yast2-sound-2.19.0.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -42,7 +42,7 @@ This package contains the YaST2 component for sound card configuration. %prep -%setup -n yast2-sound-2.18.4 +%setup -n yast2-sound-2.19.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-sound-2.18.4.tar.bz2 -> yast2-sound-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/configure new/yast2-sound-2.19.0/configure --- old/yast2-sound-2.18.4/configure 2009-10-16 13:12:35.000000000 +0200 +++ new/yast2-sound-2.19.0/configure 2009-11-20 15:50:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-sound 2.18.4. +# Generated by GNU Autoconf 2.63 for yast2-sound 2.19.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-sound' PACKAGE_TARNAME='yast2-sound' -PACKAGE_VERSION='2.18.4' -PACKAGE_STRING='yast2-sound 2.18.4' +PACKAGE_VERSION='2.19.0' +PACKAGE_STRING='yast2-sound 2.19.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1537,7 +1537,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 yast2-sound 2.18.4 to adapt to many kinds of systems. +\`configure' configures yast2-sound 2.19.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1608,7 +1608,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-sound 2.18.4:";; + short | recursive ) echo "Configuration of yast2-sound 2.19.0:";; esac cat <<\_ACEOF @@ -1723,7 +1723,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-sound configure 2.18.4 +yast2-sound configure 2.19.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1737,7 +1737,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-sound $as_me 2.18.4, which was +It was created by yast2-sound $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2717,7 +2717,7 @@ # Define the identity of the package. PACKAGE='yast2-sound' - VERSION='2.18.4' + VERSION='2.19.0' cat >>confdefs.h <<_ACEOF @@ -2839,7 +2839,7 @@ -VERSION="2.18.4" +VERSION="2.19.0" RPMNAME="yast2-sound" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -17536,7 +17536,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-sound $as_me 2.18.4, which was +This file was extended by yast2-sound $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17599,7 +17599,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-sound config.status 2.18.4 +yast2-sound config.status 2.19.0 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/yast2-sound-2.18.4/configure.in new/yast2-sound-2.19.0/configure.in --- old/yast2-sound-2.18.4/configure.in 2009-10-16 13:12:20.000000000 +0200 +++ new/yast2-sound-2.19.0/configure.in 2009-11-20 15:50:38.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sound, 2.18.4, http://bugs.opensuse.org/, yast2-sound) +AC_INIT(yast2-sound, 2.19.0, http://bugs.opensuse.org/, yast2-sound) 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.4" +VERSION="2.19.0" RPMNAME="yast2-sound" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/sound/src/complex.ycp new/yast2-sound-2.19.0/sound/src/complex.ycp --- old/yast2-sound-2.18.4/sound/src/complex.ycp 2009-07-08 14:30:11.000000000 +0200 +++ new/yast2-sound-2.19.0/sound/src/complex.ycp 2009-11-20 15:50:33.000000000 +0100 @@ -16,7 +16,7 @@ * String corrections by Christian Steinruecken <cstein(a)suse.de>, 2001/08/01 * * - * $Id: complex.ycp 55105 2009-01-28 09:06:00Z lslezak $ + * $Id: complex.ycp 59676 2009-11-20 14:50:32Z lslezak $ * */ @@ -468,8 +468,8 @@ if (show_fonts) { - // menu item - extra_buttons = add(extra_buttons, [ `fonts, _("&Install soundfonts...") ]); + // menu item, do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font) + extra_buttons = add(extra_buttons, [ `fonts, _("&Install SoundFonts...") ]); } // dialog title diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/sound/src/routines.ycp new/yast2-sound-2.19.0/sound/src/routines.ycp --- old/yast2-sound-2.18.4/sound/src/routines.ycp 2009-10-01 11:17:27.000000000 +0200 +++ new/yast2-sound-2.19.0/sound/src/routines.ycp 2009-11-20 15:50:33.000000000 +0100 @@ -12,7 +12,7 @@ * Dan Vesely <dan(a)suse.cz> * Dan Meszaros <dmeszar(a)suse.cz> * - * $Id: routines.ycp 58861 2009-10-01 09:17:26Z lslezak $ + * $Id: routines.ycp 59676 2009-11-20 14:50:32Z lslezak $ * */ @@ -835,7 +835,7 @@ } /** - * checks whether sound fonts have already been installed + * checks whether SoundFonts have already been installed * @return boolean already installed/not installed * */ @@ -845,7 +845,7 @@ } /** - * return true if the sound card supports sound fonts + * return true if the sound card supports SoundFonts * @param save_entry save entry * @return boolean card supports fonts/it doesn't */ @@ -853,7 +853,7 @@ define boolean HasFonts(map save_entry) ``{ if (Mode::config()) { - // don't install sound fonts during autoinstallation config + // don't install SoundFonts during autoinstallation config return false; } @@ -865,7 +865,7 @@ } /** - * this small wizard will install sound fonts for soundblaster live/awe + * this small wizard will install SoundFonts for soundblaster live/awe * @param symlink is path to default.sf2 that is to be created * @param dontask if true, skip the first messagebox * @return void @@ -933,7 +933,7 @@ string mpoint = mount_device(cdrom_device); y2milestone("Device mounted: %1", mpoint); - // number of found sound font files + // number of found SoundFont files integer cnt = 0; if (mpoint != nil) { @@ -946,7 +946,7 @@ y2milestone("Device unmounted: %1", umount_device(mpoint)); - // restart ALSA after sound font copy + // restart ALSA after SoundFont copy y2milestone("Restarting ALSA: %1", SCR::Execute(.target.bash, "/etc/init.d/alsasound reload")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/sound/src/texts.ycp new/yast2-sound-2.19.0/sound/src/texts.ycp --- old/yast2-sound-2.18.4/sound/src/texts.ycp 2008-10-23 16:48:01.000000000 +0200 +++ new/yast2-sound-2.19.0/sound/src/texts.ycp 2009-11-20 15:50:33.000000000 +0100 @@ -13,7 +13,7 @@ * Summary: * Text constants for sound module * - * $Id: texts.ycp 52467 2008-10-23 14:48:00Z lslezak $ + * $Id: texts.ycp 59676 2009-11-20 14:50:32Z lslezak $ * */ { @@ -211,10 +211,12 @@ ], "soundFontTitle": - _("Install Soundfonts"), + // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font) + _("Install SoundFonts"), "soundFontQuestion": -_("Should YaST2 install the wavetable sound fonts from + // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font) +_("Should YaST2 install the wavetable SoundFont-files from your Soundblaster Live! or AWE driver CD?\n"), "soundFontAppeal": @@ -223,11 +225,13 @@ "), "soundFontFinal": - // To translators: the messaage below will look like this: "14 soundfont-files have been installed in /usr/lli/asdf" -_("%1 soundfont-files have been installed in %2."), + // To translators: the message below will look like this: "14 SoundFont-files have been installed in /usr/share/..." + // do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font) +_("%1 SoundFont-files have been installed in %2."), "soundFontNotFound": -_("No Soundfont-files found."), +// do not translate "SoundFont" term (see http://en.wikipedia.org/wiki/Sound_font) +_("No SoundFont-files found."), "soundFontRetry": _("Would you like to change the CD and retry ?"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/sound/src/volume.ycp new/yast2-sound-2.19.0/sound/src/volume.ycp --- old/yast2-sound-2.18.4/sound/src/volume.ycp 2009-02-26 14:20:05.000000000 +0100 +++ new/yast2-sound-2.19.0/sound/src/volume.ycp 2009-11-20 15:50:33.000000000 +0100 @@ -15,7 +15,7 @@ * Dan Meszaros <dmeszar(a)suse.cz> * * - * $Id: volume.ycp 55790 2009-02-26 13:20:05Z lslezak $ + * $Id: volume.ycp 59676 2009-11-20 14:50:32Z lslezak $ * * Steps: * 1. try to insert kernel module @@ -132,7 +132,7 @@ if (HasFonts(save_entry) && !FontsInstalled()) { - /* Sound fonts installation */ + /* SoundFonts installation */ InstallFonts("", false); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-2.18.4/VERSION new/yast2-sound-2.19.0/VERSION --- old/yast2-sound-2.18.4/VERSION 2009-10-14 19:09:32.000000000 +0200 +++ new/yast2-sound-2.19.0/VERSION 2009-11-20 15:43:51.000000000 +0100 @@ -1 +1 @@ -2.18.4 +2.19.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 dhcpcd for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at Mon Nov 23 14:19:47 CET 2009. -------- --- dhcpcd/dhcpcd.changes 2009-10-30 14:40:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2009-11-21 18:20:40.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 21 18:02:30 CET 2009 - varkoly(a)suse.de + +- bnc#551350 - dhcpcd -T eth0 - always returns error code 1 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc#551350.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.vaI7YO/_old 2009-11-23 14:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.vaI7YO/_new 2009-11-23 14:18:37.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 47 +Release: 48 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -36,6 +36,7 @@ Patch7: dhcpcd-%{version}-lastlease.diff Patch8: dhcpcd-%{version}-unaligned.diff Patch9: dhcpcd-%{version}-fiximplicit.diff +Patch10: bnc#551350.diff License: GPL v2 or later Group: Productivity/Networking/Boot/Clients Provides: dhcp_client @@ -67,6 +68,7 @@ %patch7 -p1 %patch8 %patch9 -p1 +%patch10 -p1 cp %{S:1} . cp %{S:3} . ++++++ bnc#551350.diff ++++++ diff -ru dhcpcd-3.2.3-patched//dhcpcd.c dhcpcd-3.2.3/dhcpcd.c --- dhcpcd-3.2.3-patched//dhcpcd.c 2009-11-21 16:44:25.000000000 +0100 +++ dhcpcd-3.2.3/dhcpcd.c 2009-11-21 17:48:04.000000000 +0100 @@ -654,7 +654,9 @@ #endif logger (LOG_INFO, "exiting"); - + if ( options->test && ! errno ) { + exit (0); + } exit (retval); /* NOTREACHED */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libcompizconfig for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package libcompizconfig for openSUSE:Factory checked in at Mon Nov 23 14:18:22 CET 2009. -------- --- libcompizconfig/libcompizconfig.changes 2009-08-18 12:26:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcompizconfig/libcompizconfig.changes 2009-11-13 11:36:38.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 13 10:03:52 CET 2009 - dimstar(a)opensuse.org + +- Update to version 0.8.4: + + Ignore extensions and string restrictions at startup + + Fix circular dependencies + + Use XDG_CACHE_HOME for protobuf cache +- Drop libcompizconfig-linkX11.patch - upstream included. +- Disable libcompizconfig-NOMAD.diff. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libcompizconfig-0.7.8.tar.bz2 libcompizconfig-linkX11.patch New: ---- libcompizconfig-0.8.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcompizconfig.spec ++++++ --- /var/tmp/diff_new_pack.DDM4nq/_old 2009-11-23 13:57:19.000000000 +0100 +++ /var/tmp/diff_new_pack.DDM4nq/_new 2009-11-23 13:57:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libcompizconfig (Version 0.7.8) +# spec file for package libcompizconfig (Version 0.8.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,40 +18,56 @@ Name: libcompizconfig -BuildRequires: autoconf automake compiz-devel compiz-gnome gcc-c++ glib2-devel intltool libtool libxslt-devel perl-XML-Parser pkg-config -BuildRequires: startup-notification-devel -Url: http://opencompositing.org +Version: 0.8.4 +Release: 1 License: GPL v2 or later +Summary: CompizConfig plugin(ccp) required for compizconfig-settings-manager(ccsm) +Url: http://opencompositing.org Group: System/X11/Utilities +Source: %name-%version.tar.bz2 +Source1: libcompizconfig-rpmlintrc +# PATCH-NEEDS-REBASE: libcompizconfig-NOMAD.diff dreveman(a)novell.com (Was: PATCH-FEATURE-UPSTREAM) +Patch0: libcompizconfig-NOMAD.diff +# PATCH-FIX-UPSTREAM libcompizconfig-config-dir.patch bnc#438081 rodrigo(a)novell.com +Patch2: libcompizconfig-config-dir.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: compiz-devel +BuildRequires: compiz-gnome +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: libxslt-devel +BuildRequires: perl-XML-Parser +BuildRequires: pkg-config +BuildRequires: startup-notification-devel PreReq: %fillup_prereq Requires: compiz -Version: 0.7.8 -Release: 7 Provides: ccs-lib = %{version} Obsoletes: ccs-lib <= %{version} -Summary: CompizConfig plugin(ccp) required for compizconfig-settings-manager(ccsm) BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 -Source: %name-%version.tar.bz2 -Source1: libcompizconfig-rpmlintrc -# PATCH-FEATURE-UPSTREAM libcompizconfig-NOMAD.diff dreveman(a)novell.com -Patch: libcompizconfig-NOMAD.diff -# PATCH-FIX-UPSTREAM libcompizconfig-config-dir.patch bnc#438081 rodrigo(a)novell.com -Patch2: libcompizconfig-config-dir.patch -# PATCH-FIX-UPSTREAM libcompizconfig-linkX11.patch bnc#525691 dominique-obs(a)leuenberger.net -- Properly link against libX11 for missing symbols. -Patch3: libcompizconfig-linkX11.patch %description CompizConfig plugin(ccp) required for compizconfig-settings-manager(ccsm). - %package devel License: GPL v2 or later Summary: Development files for libcompizconfig Group: Development/Libraries/C and C++ -Requires: autoconf automake compiz-devel compiz-gnome glib2-devel intltool libtool libxslt-devel perl-XML-Parser pkg-config %name = %version -AutoReqProv: on +Requires: %name = %version +Requires: autoconf +Requires: automake +Requires: compiz-devel +Requires: compiz-gnome +Requires: glib2-devel +Requires: intltool +Requires: libtool +Requires: libxslt-devel +Requires: perl-XML-Parser +Requires: pkg-config %description devel CompizConfig plugin(ccp) required for @@ -61,9 +77,9 @@ %prep %setup -q -n libcompizconfig-%{version} -%patch -p1 +# NEEDS REBASE +#%patch0 -p1 %patch2 -p1 -%patch3 %build # @@ -74,7 +90,7 @@ %install %makeinstall -find %buildroot $ -name \*.la $ -print0 | xargs -0 rm -fv +find %{buildroot} $ -name \*.la $ -print0 | xargs -0 rm -fv %clean %__rm -rf %{buildroot} @@ -87,11 +103,10 @@ %defattr(-, root, root) %{_libdir}/compiz* %{_libdir}/libcompizconfig*.so.* -%{_datadir}/compizconfig %dir %{_datadir}/compiz %{_datadir}/compiz/ccp.xml -%dir /etc/compizconfig -/etc/compizconfig/config +%dir %{_sysconfdir}/compizconfig +%{_sysconfdir}/compizconfig/config %files devel %defattr(-, root, root) ++++++ libcompizconfig-0.7.8.tar.bz2 -> libcompizconfig-0.8.4.tar.bz2 ++++++ ++++ 35607 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 python-sip for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at Mon Nov 23 13:57:07 CET 2009. -------- --- python-sip/python-sip.changes 2009-10-24 12:29:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-sip/python-sip.changes 2009-11-20 12:16:52.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Nov 20 12:15:54 CET 2009 - dmueller(a)suse.de + +- update to 4.9.2: + * A bug fix release. + +------------------------------------------------------------------- +Fri Nov 20 12:11:56 CET 2009 - dmueller(a)suse.de + +- add split-provides + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sip-4.9.1.tar.bz2 New: ---- sip-4.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.ugtlGD/_old 2009-11-23 13:55:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ugtlGD/_new 2009-11-23 13:55:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-sip (Version 4.9.1) +# spec file for package python-sip (Version 4.9.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPL v2 or later Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings -Version: 4.9.1 +Version: 4.9.2 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro @@ -51,6 +51,7 @@ License: GPL v2 or later Group: Development/Libraries/Python Summary: SIP tool to create python bindings +Provides: python-sip:/usr/bin/sip Requires: %name = %version %description devel ++++++ sip-4.9.1.tar.bz2 -> sip-4.9.2.tar.bz2 ++++++ ++++ 4672 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 gdb for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package gdb for openSUSE:Factory checked in at Mon Nov 23 13:19:01 CET 2009. -------- --- gdb/gdb.changes 2009-10-12 10:23:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdb/gdb.changes 2009-10-26 17:27:52.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Oct 26 17:27:34 CET 2009 - rguenther(a)suse.de + +- Merge from gdb-7.0-3.fc12.src.rpm. + +------------------------------------------------------------------- +Thu Oct 22 17:03:30 CEST 2009 - rguenther(a)suse.de + +- Merge from gdb-7.0-2.fc12.src.rpm. [fate#304116] + [bnc#488132] [bnc#498749] + +------------------------------------------------------------------- +Mon Oct 19 12:48:43 CEST 2009 - rguenther(a)suse.de + +- Recommend python-base. + +------------------------------------------------------------------- @@ -141 +157 @@ -Tue Feb 3 18:11:57 CET 2009 - schwab(a)suse.de +Tue Feb 3 16:18:13 CET 2009 - schwab(a)suse.de @@ -143 +159 @@ -- Update to head to trunk. +- Fix merge error. @@ -146 +162 @@ -Thu Jan 22 17:12:42 CET 2009 - schwab(a)suse.de +Thu Jan 22 17:17:14 CET 2009 - schwab(a)suse.de @@ -148 +164 @@ -- Update Cell combined debugger patch. +- Add updates for Cell combined debugger. @@ -151 +167 @@ -Fri Jan 16 16:02:56 CET 2009 - schwab(a)suse.de +Tue Jan 20 15:45:56 CET 2009 - schwab(a)suse.de @@ -153 +169,2 @@ -- Update to head of trunk. +- Do not call get_frame_arch for NULL frame pointers. +- Remove deprecated_safe_get_selected_frame call from read_var_value. calling whatdependson for head-i586 Old: ---- gdb-6.3-sepcrc-20050402.patch gdb-6.3-test-sepcrc-20050402.patch gdb-6.8.91.20090930.tar.bz2 New: ---- gdb-7.0.tar.bz2 gdb-bz528668-symfile-cleanup.patch gdb-bz528668-symfile-multi.patch gdb-bz528668-symfile-sepcrc.patch gdb-core-open-vdso-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdb.spec ++++++ --- /var/tmp/diff_new_pack.8FGPN7/_old 2009-11-23 13:13:28.000000000 +0100 +++ /var/tmp/diff_new_pack.8FGPN7/_new 2009-11-23 13:13:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gdb (Version 6.8.91.20090930) +# spec file for package gdb (Version 7.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.8.91.20090930 +Version: 7.0 Release: 1 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. @@ -99,9 +99,6 @@ Patch145: gdb-6.3-threaded-watchpoints2-20050225.patch # Fix printing of inherited members Patch148: gdb-6.3-inheritance-20050324.patch -# Print a warning when the separate debug info's CRC doesn't match. -Patch150: gdb-6.3-test-sepcrc-20050402.patch -Patch151: gdb-6.3-sepcrc-20050402.patch # Do not issue warning message about first page of storage for ia64 gcore Patch153: gdb-6.3-ia64-gcore-page0-20050421.patch # Security errata for untrusted .gdbinit @@ -265,6 +262,12 @@ Patch376: libstdc++-v3-python-common-prefix.patch # New test for step-resume breakpoint placed in multiple threads at once. Patch381: gdb-simultaneous-step-resume-breakpoint-test.patch +# Fix GNU/Linux core open: Can't read pathname for load map: Input/output error. +Patch382: gdb-core-open-vdso-warning.patch +# Support multiple directories for `set debug-file-directory' (BZ 528668). +Patch383: gdb-bz528668-symfile-sepcrc.patch +Patch384: gdb-bz528668-symfile-cleanup.patch +Patch385: gdb-bz528668-symfile-multi.patch # Fix readline 5.1 warnings Patch1000: readline-5.1-random.patch Patch1002: gdb-6.6-buildid-locate-rpm-suse.patch @@ -280,6 +283,9 @@ #Requires: rpm-libs BuildRequires: rpm-devel %if 0%{!?_without_python:1} +%if 0%{suse_version} > 1000 +Recommends: python-base +%endif BuildRequires: python-devel # Temporarily before it gets moved to libstdc++.rpm BuildRequires: libstdc++ @@ -342,6 +348,9 @@ %if 0%{!?_with_upstream:1} #patch232 -p1 %patch349 -p1 +%patch383 -p1 +%patch384 -p1 +%patch385 -p1 %patch1 -p1 %patch3 -p1 %patch104 -p1 @@ -361,8 +370,6 @@ %patch142 -p1 %patch145 -p1 %patch148 -p1 -%patch150 -p1 -%patch151 -p1 %patch153 -p1 %patch157 -p1 %patch158 -p1 @@ -444,6 +451,7 @@ %patch375 -p1 %patch376 -p1 %patch381 -p1 +%patch382 -p1 %patch124 -p1 %patch1000 %patch1002 -p1 ++++++ gdb-6.3-pie-20050110.patch ++++++ --- /var/tmp/diff_new_pack.8FGPN7/_old 2009-11-23 13:13:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8FGPN7/_new 2009-11-23 13:13:29.000000000 +0100 @@ -705,7 +705,7 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); if (errcode != 0) @@ -1101,63 +1336,76 @@ svr4_current_sos (void) - safe_strerror (errcode)); + } else { - struct build_id *build_id; ++++++ gdb-6.6-buildid-locate.patch ++++++ --- /var/tmp/diff_new_pack.8FGPN7/_old 2009-11-23 13:13:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8FGPN7/_new 2009-11-23 13:13:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: gdb-6.8.91.20090925/gdb/corelow.c +Index: gdb-7.0/gdb/corelow.c =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/corelow.c 2009-07-31 17:25:21.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/corelow.c 2009-09-25 09:39:09.000000000 +0200 +--- gdb-7.0.orig/gdb/corelow.c 2009-07-31 17:25:21.000000000 +0200 ++++ gdb-7.0/gdb/corelow.c 2009-10-23 00:17:29.000000000 +0200 @@ -45,6 +45,10 @@ #include "exceptions.h" #include "solib.h" @@ -91,11 +91,11 @@ + NULL, NULL, NULL, + &setlist, &showlist); } -Index: gdb-6.8.91.20090925/gdb/doc/gdb.texinfo +Index: gdb-7.0/gdb/doc/gdb.texinfo =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/doc/gdb.texinfo 2009-09-25 09:29:58.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/doc/gdb.texinfo 2009-09-25 09:29:58.000000000 +0200 -@@ -13895,6 +13895,27 @@ information files. +--- gdb-7.0.orig/gdb/doc/gdb.texinfo 2009-10-23 00:12:39.000000000 +0200 ++++ gdb-7.0/gdb/doc/gdb.texinfo 2009-10-23 00:17:29.000000000 +0200 +@@ -13896,6 +13896,27 @@ information files. @end table @@ -123,10 +123,10 @@ @cindex @code{.gnu_debuglink} sections @cindex debug link sections A debug link is a special section of the executable file named -Index: gdb-6.8.91.20090925/gdb/solib-svr4.c +Index: gdb-7.0/gdb/solib-svr4.c =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/solib-svr4.c 2009-09-25 09:29:57.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/solib-svr4.c 2009-09-25 09:43:14.000000000 +0200 +--- gdb-7.0.orig/gdb/solib-svr4.c 2009-10-23 00:12:38.000000000 +0200 ++++ gdb-7.0/gdb/solib-svr4.c 2009-10-23 00:17:29.000000000 +0200 @@ -1101,9 +1101,49 @@ svr4_current_sos (void) safe_strerror (errcode)); else @@ -180,10 +180,10 @@ } xfree (buffer); -Index: gdb-6.8.91.20090925/gdb/symfile.c +Index: gdb-7.0/gdb/symfile.c =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/symfile.c 2009-09-25 09:29:57.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/symfile.c 2009-09-25 09:29:58.000000000 +0200 +--- gdb-7.0.orig/gdb/symfile.c 2009-10-23 00:12:38.000000000 +0200 ++++ gdb-7.0/gdb/symfile.c 2009-10-23 00:43:28.000000000 +0200 @@ -56,6 +56,7 @@ #include "elf-bfd.h" #include "solib.h" @@ -618,7 +618,7 @@ if (found == NULL) warning (_("File \"%s\" has no build-id, file skipped"), filename); -@@ -1234,8 +1626,9 @@ build_id_verify (const char *filename, s +@@ -1234,14 +1626,16 @@ build_id_verify (const char *filename, s return retval; } @@ -628,48 +628,77 @@ +build_id_to_filename (struct build_id *build_id, char **link_return, + int add_debug_suffix) { - char *link, *s, *retval = NULL; - gdb_byte *data = build_id->data; -@@ -1243,7 +1636,9 @@ build_id_to_debug_filename (struct build + char *link, *debugdir, *retval = NULL; ++ char *link_all = NULL; /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ - link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 -- + 2 * size + (sizeof ".debug" - 1) + 1); -+ + 2 * size -+ + (add_debug_suffix ? sizeof ".debug" - 1 : 0) -+ + 1); - s = link + sprintf (link, "%s/.build-id/", debug_file_directory); - if (size > 0) - { -@@ -1254,12 +1649,14 @@ build_id_to_debug_filename (struct build - *s++ = '/'; - while (size-- > 0) - s += sprintf (s, "%02x", (unsigned) *data++); -- strcpy (s, ".debug"); -+ if (add_debug_suffix) -+ strcpy (s, ".debug"); -+ else -+ *s = 0; +- link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 +- + 2 * build_id->size + (sizeof ".debug" - 1) + 1); ++ link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 ++ + 2 * build_id->size + (sizeof ".debug" - 1) + 1); + + /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will + cause "/.build-id/..." lookups. */ +@@ -1272,7 +1666,10 @@ build_id_to_debug_filename (struct build + *s++ = '/'; + while (size-- > 0) + s += sprintf (s, "%02x", (unsigned) *data++); +- strcpy (s, ".debug"); ++ if (add_debug_suffix) ++ strcpy (s, ".debug"); ++ else ++ *s = 0; + + /* lrealpath() is expensive even for the usually non-existent files. */ + if (access (link, F_OK) == 0) +@@ -1285,15 +1682,185 @@ build_id_to_debug_filename (struct build + } - /* lrealpath() is expensive even for the usually non-existent files. */ - if (access (link, F_OK) == 0) - retval = lrealpath (link); -- xfree (link); + if (retval != NULL) +- break; ++ { ++ /* LINK_ALL is not used below in this non-NULL RETVAL case. */ ++ break; ++ } ++ ++ if (link_all == NULL) ++ link_all = xstrdup (link); ++ else ++ { ++ size_t len_orig = strlen (link_all); ++ ++ link_all = xrealloc (link_all, len_orig + 1 + strlen (link) + 1); ++ ++ /* Use whitespace instead of DIRNAME_SEPARATOR to be compatible with ++ its possible use as an argument for installation command. */ ++ link_all[len_orig] = ' '; ++ ++ strcpy (&link_all[len_orig + 1], link); ++ } - if (retval != NULL && !build_id_verify (retval, build_id)) - { -@@ -1267,9 +1664,150 @@ build_id_to_debug_filename (struct build - retval = NULL; + debugdir = debugdir_end; } + while (*debugdir != 0); + if (link_return != NULL) -+ *link_return = link; -+ else -+ xfree (link); ++ { ++ if (retval != NULL) ++ { ++ *link_return = link; ++ link = NULL; ++ } ++ else ++ { ++ *link_return = link_all; ++ link_all = NULL; ++ } ++ } ++ xfree (link); ++ xfree (link_all); ++ ++ return retval; ++} + - return retval; - } - +/* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages + Try to install the hash file ... + avoidance. */ @@ -692,9 +721,9 @@ + + retval = obstack_alloc (&missing_filepair_obstack, size); + memset (retval, 0, size); -+ return retval; -+} -+ + return retval; + } + +static hashval_t +missing_filepair_hash_func (const struct missing_filepair *elem) +{ @@ -809,20 +838,7 @@ static char * get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out) { -@@ -1352,32 +1890,36 @@ static char * - find_separate_debug_file (struct objfile *objfile) - { - asection *sect; -- char *basename; -- char *dir; -- char *debugfile; -+ char *basename = NULL; -+ char *dir = NULL; -+ char *debugfile = NULL; - char *name_copy; -- char *canon_name; -+ char *canon_name = NULL; - bfd_size_type debuglink_size; +@@ -1384,13 +1951,14 @@ find_separate_debug_file (struct objfile unsigned long crc32; int i; struct build_id *build_id; @@ -839,123 +855,34 @@ xfree (build_id); /* Prevent looping on a stripped .debug file. */ if (build_id_name != NULL && strcmp (build_id_name, objfile->name) == 0) - { -- warning (_("\"%s\": separate debug info file has no debug info"), -+ warning (_("\"%s\": The separate debug info file has no debug info"), - build_id_name); +@@ -1400,7 +1968,10 @@ find_separate_debug_file (struct objfile xfree (build_id_name); } else if (build_id_name != NULL) - return build_id_name; -+ { ++ { + xfree (build_id_filename); + return build_id_name; + } } basename = get_debug_link_info (objfile, &crc32); -@@ -1385,7 +1927,7 @@ find_separate_debug_file (struct objfile - if (basename == NULL) - /* There's no separate debug info, hence there's no way we could - load it => no warning. */ -- return NULL; -+ goto cleanup_return_debugfile; - - dir = xstrdup (objfile->name); - -@@ -1407,24 +1949,19 @@ find_separate_debug_file (struct objfile - if (canon_name && strlen (canon_name) > i) - i = strlen (canon_name); - -- debugfile = alloca (strlen (debug_file_directory) + 1 -- + i -- + strlen (DEBUG_SUBDIRECTORY) -- + strlen ("/") -- + strlen (basename) -- + 1); -+ debugfile = xmalloc (strlen (debug_file_directory) + 1 -+ + i -+ + strlen (DEBUG_SUBDIRECTORY) -+ + strlen ("/") -+ + strlen (basename) -+ + 1); - - /* First try in the same directory as the original file. */ - strcpy (debugfile, dir); - strcat (debugfile, basename); - - if (separate_debug_file_exists (debugfile, crc32, objfile->name)) -- { -- xfree (basename); -- xfree (dir); -- xfree (canon_name); -- return xstrdup (debugfile); -- } -+ goto cleanup_return_debugfile; - - /* Then try in the subdirectory named DEBUG_SUBDIRECTORY. */ - strcpy (debugfile, dir); -@@ -1433,12 +1970,7 @@ find_separate_debug_file (struct objfile - strcat (debugfile, basename); - - if (separate_debug_file_exists (debugfile, crc32, objfile->name)) -- { -- xfree (basename); -- xfree (dir); -- xfree (canon_name); -- return xstrdup (debugfile); -- } -+ goto cleanup_return_debugfile; - - /* Then try in the global debugfile directory. */ - strcpy (debugfile, debug_file_directory); -@@ -1447,12 +1979,7 @@ find_separate_debug_file (struct objfile - strcat (debugfile, basename); - - if (separate_debug_file_exists (debugfile, crc32, objfile->name)) -- { -- xfree (basename); -- xfree (dir); -- xfree (canon_name); -- return xstrdup (debugfile); -- } -+ goto cleanup_return_debugfile; - - /* If the file is in the sysroot, try using its base path in the - global debugfile directory. */ -@@ -1466,20 +1993,18 @@ find_separate_debug_file (struct objfile - strcat (debugfile, basename); - - if (separate_debug_file_exists (debugfile, crc32, objfile->name)) -- { -- xfree (canon_name); -- xfree (basename); -- xfree (dir); -- return xstrdup (debugfile); -- } -+ goto cleanup_return_debugfile; - } +@@ -1501,8 +2072,10 @@ find_separate_debug_file (struct objfile -- if (canon_name) -- xfree (canon_name); -+ debugfile = NULL; + xfree (debugfile); + debugfile = NULL; + debug_print_missing (objfile->name, build_id_filename); -+cleanup_return_debugfile: + cleanup_return_debugfile: + xfree (build_id_filename); -+ xfree (canon_name); + xfree (canon_name); xfree (basename); xfree (dir); -- return NULL; -+ return debugfile; - } - - -@@ -4229,4 +4754,16 @@ the global debug-file directory prepende +@@ -4256,4 +4829,16 @@ each global debug-file-directory compone NULL, show_debug_file_directory, &setlist, &showlist); -+ ++ + add_setshow_zinteger_cmd ("build-id-verbose", no_class, &build_id_verbose, + _("\ + Set debugging level of the build-id locator."), _("\ @@ -965,13 +892,13 @@ + NULL, + show_build_id_verbose, + &setlist, &showlist); -+ ++ + observer_attach_executable_changed (debug_print_executable_changed); } -Index: gdb-6.8.91.20090925/gdb/symfile.h +Index: gdb-7.0/gdb/symfile.h =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/symfile.h 2009-09-25 09:29:57.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/symfile.h 2009-09-25 09:29:58.000000000 +0200 +--- gdb-7.0.orig/gdb/symfile.h 2009-10-23 00:12:38.000000000 +0200 ++++ gdb-7.0/gdb/symfile.h 2009-10-23 00:17:29.000000000 +0200 @@ -381,6 +381,13 @@ extern int symfile_map_offsets_to_segmen struct symfile_segment_data *get_symfile_segment_data (bfd *abfd); void free_symfile_segment_data (struct symfile_segment_data *data); @@ -986,10 +913,10 @@ /* From dwarf2read.c */ extern int dwarf2_has_info (struct objfile *); -Index: gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp +Index: gdb-7.0/gdb/testsuite/lib/gdb.exp =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/gdb.exp 2009-09-25 09:29:57.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/testsuite/lib/gdb.exp 2009-09-25 09:29:58.000000000 +0200 +--- gdb-7.0.orig/gdb/testsuite/lib/gdb.exp 2009-10-23 00:12:38.000000000 +0200 ++++ gdb-7.0/gdb/testsuite/lib/gdb.exp 2009-10-23 00:17:29.000000000 +0200 @@ -1248,6 +1248,16 @@ proc default_gdb_start { } { warning "Couldn't set the width to 0." } @@ -1007,10 +934,10 @@ return 0; } -Index: gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp +Index: gdb-7.0/gdb/testsuite/lib/mi-support.exp =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/testsuite/lib/mi-support.exp 2009-09-15 20:51:26.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/testsuite/lib/mi-support.exp 2009-09-25 09:29:58.000000000 +0200 +--- gdb-7.0.orig/gdb/testsuite/lib/mi-support.exp 2009-09-15 20:51:26.000000000 +0200 ++++ gdb-7.0/gdb/testsuite/lib/mi-support.exp 2009-10-23 00:17:29.000000000 +0200 @@ -221,6 +221,16 @@ proc default_mi_gdb_start { args } { } } @@ -1028,10 +955,10 @@ detect_async -Index: gdb-6.8.91.20090925/gdb/objfiles.h +Index: gdb-7.0/gdb/objfiles.h =================================================================== ---- gdb-6.8.91.20090925.orig/gdb/objfiles.h 2009-09-25 09:29:57.000000000 +0200 -+++ gdb-6.8.91.20090925/gdb/objfiles.h 2009-09-25 09:38:27.000000000 +0200 +--- gdb-7.0.orig/gdb/objfiles.h 2009-10-23 00:12:38.000000000 +0200 ++++ gdb-7.0/gdb/objfiles.h 2009-10-23 00:17:29.000000000 +0200 @@ -428,6 +428,10 @@ struct objfile #define OBJF_MAIN (1 << 7) ++++++ gdb-6.8.91.20090930.tar.bz2 -> gdb-7.0.tar.bz2 ++++++ gdb/gdb-6.8.91.20090930.tar.bz2 /mounts/work_src_done/STABLE/gdb/gdb-7.0.tar.bz2 differ: byte 11, line 1 ++++++ gdb-archer.patch ++++++ ++++ 621 lines (skipped) ++++ between gdb/gdb-archer.patch ++++ and /mounts/work_src_done/STABLE/gdb/gdb-archer.patch ++++++ gdb-bz528668-symfile-cleanup.patch ++++++ http://sourceware.org/ml/gdb-patches/2009-10/msg00509.html Subject: [patch 2/3] find_separate_debug_file cleanup Hi, current code was: * difficult to maintain as a new variable required xfree on many places * was causing memory corruptions due to silently misapplied 3rd party patches as the close code fragments unfortunately match patch context Thanks, Jan gdb/ 2009-10-21 Jan Kratochvil <jan.kratochvil(a)redhat.com> * symfile.c (find_separate_debug_file): Initialize dir, debugfile and canon_name to NULL. Change alloca to xmalloc, newly call xfree for it. New label cleanup_return_debugfile, jump to it from the failure paths. --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1333,11 +1333,10 @@ static char * find_separate_debug_file (struct objfile *objfile) { asection *sect; - char *basename; - char *dir; - char *debugfile; - char *name_copy; - char *canon_name; + char *basename, *name_copy; + char *dir = NULL; + char *debugfile = NULL; + char *canon_name = NULL; bfd_size_type debuglink_size; unsigned long crc32; int i; @@ -1366,7 +1365,7 @@ find_separate_debug_file (struct objfile *objfile) if (basename == NULL) /* There's no separate debug info, hence there's no way we could load it => no warning. */ - return NULL; + goto cleanup_return_debugfile; dir = xstrdup (objfile->name); @@ -1388,24 +1387,19 @@ find_separate_debug_file (struct objfile *objfile) if (canon_name && strlen (canon_name) > i) i = strlen (canon_name); - debugfile = alloca (strlen (debug_file_directory) + 1 - + i - + strlen (DEBUG_SUBDIRECTORY) - + strlen ("/") - + strlen (basename) - + 1); + debugfile = xmalloc (strlen (debug_file_directory) + 1 + + i + + strlen (DEBUG_SUBDIRECTORY) + + strlen ("/") + + strlen (basename) + + 1); /* First try in the same directory as the original file. */ strcpy (debugfile, dir); strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { - xfree (basename); - xfree (dir); - xfree (canon_name); - return xstrdup (debugfile); - } + goto cleanup_return_debugfile; /* Then try in the subdirectory named DEBUG_SUBDIRECTORY. */ strcpy (debugfile, dir); @@ -1414,12 +1408,7 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { - xfree (basename); - xfree (dir); - xfree (canon_name); - return xstrdup (debugfile); - } + goto cleanup_return_debugfile; /* Then try in the global debugfile directory. */ strcpy (debugfile, debug_file_directory); @@ -1428,12 +1417,7 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { - xfree (basename); - xfree (dir); - xfree (canon_name); - return xstrdup (debugfile); - } + goto cleanup_return_debugfile; /* If the file is in the sysroot, try using its base path in the global debugfile directory. */ @@ -1447,20 +1431,17 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - { - xfree (canon_name); - xfree (basename); - xfree (dir); - return xstrdup (debugfile); - } + goto cleanup_return_debugfile; } - if (canon_name) - xfree (canon_name); + xfree (debugfile); + debugfile = NULL; +cleanup_return_debugfile: + xfree (canon_name); xfree (basename); xfree (dir); - return NULL; + return debugfile; } ++++++ gdb-bz528668-symfile-multi.patch ++++++ http://sourceware.org/ml/gdb-patches/2009-10/msg00508.html Subject: [patch 3/3] debug-file-directory with multiple components Hi, for various reasons `debug-file-directory' would be sometimes useful to have multiple components such as `solib-search-path' has. I found it useful myself during various separate debuginfo tests/scripts. It was requested for the ABRT bugreporting project at the preceding mail of: https://fedorahosted.org/pipermail/crash-catcher/2009-October/000054.html It should be a backward compatible extension as DIRNAME_SEPARATOR should never be a valid part of a single DEBUG_FILE_DIRECTORY component. Thanks, Jan gdb/doc/ 2009-10-22 Jan Kratochvil <jan.kratochvil(a)redhat.com> * gdb.texinfo (set debug-file-directory, show debug-file-directory) (Auto-loading): Use plural and note one can use multiple components now. gdb/ 2009-10-22 Jan Kratochvil <jan.kratochvil(a)redhat.com> * symfile.c (build_id_to_debug_filename): New variable debugdir. Move variables size, s and data into a new inner block. Change xmalloc for alloca, use direct BUILDID->SIZE there now. Loop for the DEBUG_FILE_DIRECTORY components. (find_separate_debug_file): New variable debugdir and debugdir_end. Loop for the DEBUG_FILE_DIRECTORY components. (_initialize_symfile): For "debug-file-directory" use plural and note one can use multiple components now. gdb/testsuite/ 2009-10-22 Jan Kratochvil <jan.kratochvil(a)redhat.com> * gdb.base/sepdebug.exp: New test_different_dir call for multiple-dirs. --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -14066,13 +14066,14 @@ name @value{GDBN} is currently using. @table @code @kindex set debug-file-directory -@item set debug-file-directory @var{directory} -Set the directory which @value{GDBN} searches for separate debugging -information files to @var{directory}. +@item set debug-file-directory @var{directories} +Set the directories which @value{GDBN} searches for separate debugging +information files to @var{directory}. Multiple directory components can be set +concatenating them by a directory separator. @kindex show debug-file-directory @item show debug-file-directory -Show the directory @value{GDBN} searches for separate debugging +Show the directories @value{GDBN} searches for separate debugging information files. @end table @@ -19336,8 +19337,8 @@ readable, @value{GDBN} will evaluate it as a Python script. If this file does not exist, and if the parameter @code{debug-file-directory} is set (@pxref{Separate Debug Files}), -then @value{GDBN} will use the file named -@file{@var{debug-file-directory}/@var{real-name}}, where +then @value{GDBN} will use for its each separated directory component +@code{component} the file named @file{@code{component}/@var{real-name}}, where @var{real-name} is the object file's real name, as described above. Finally, if this file does not exist, then @value{GDBN} will look for --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1218,35 +1218,59 @@ build_id_verify (const char *filename, struct build_id *check) static char * build_id_to_debug_filename (struct build_id *build_id) { - char *link, *s, *retval = NULL; - gdb_byte *data = build_id->data; - size_t size = build_id->size; + char *link, *debugdir, *retval = NULL; /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */ - link = xmalloc (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 - + 2 * size + (sizeof ".debug" - 1) + 1); - s = link + sprintf (link, "%s/.build-id/", debug_file_directory); - if (size > 0) - { - size--; - s += sprintf (s, "%02x", (unsigned) *data++); - } - if (size > 0) - *s++ = '/'; - while (size-- > 0) - s += sprintf (s, "%02x", (unsigned) *data++); - strcpy (s, ".debug"); - - /* lrealpath() is expensive even for the usually non-existent files. */ - if (access (link, F_OK) == 0) - retval = lrealpath (link); - xfree (link); - - if (retval != NULL && !build_id_verify (retval, build_id)) + link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 + + 2 * build_id->size + (sizeof ".debug" - 1) + 1); + + /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will + cause "/.build-id/..." lookups. */ + + debugdir = debug_file_directory; + do { - xfree (retval); - retval = NULL; + char *s, *debugdir_end; + gdb_byte *data = build_id->data; + size_t size = build_id->size; + + while (*debugdir == DIRNAME_SEPARATOR) + debugdir++; + + debugdir_end = strchr (debugdir, DIRNAME_SEPARATOR); + if (debugdir_end == NULL) + debugdir_end = &debugdir[strlen (debugdir)]; + + memcpy (link, debugdir, debugdir_end - debugdir); + s = &link[debugdir_end - debugdir]; + s += sprintf (s, "/.build-id/"); + if (size > 0) + { + size--; + s += sprintf (s, "%02x", (unsigned) *data++); + } + if (size > 0) + *s++ = '/'; + while (size-- > 0) + s += sprintf (s, "%02x", (unsigned) *data++); + strcpy (s, ".debug"); + + /* lrealpath() is expensive even for the usually non-existent files. */ + if (access (link, F_OK) == 0) + retval = lrealpath (link); + + if (retval != NULL && !build_id_verify (retval, build_id)) + { + xfree (retval); + retval = NULL; + } + + if (retval != NULL) + break; + + debugdir = debugdir_end; } + while (*debugdir != 0); return retval; } @@ -1333,7 +1357,7 @@ static char * find_separate_debug_file (struct objfile *objfile) { asection *sect; - char *basename, *name_copy; + char *basename, *name_copy, *debugdir; char *dir = NULL; char *debugfile = NULL; char *canon_name = NULL; @@ -1410,29 +1434,51 @@ find_separate_debug_file (struct objfile *objfile) if (separate_debug_file_exists (debugfile, crc32, objfile->name)) goto cleanup_return_debugfile; - /* Then try in the global debugfile directory. */ - strcpy (debugfile, debug_file_directory); - strcat (debugfile, "/"); - strcat (debugfile, dir); - strcat (debugfile, basename); - - if (separate_debug_file_exists (debugfile, crc32, objfile->name)) - goto cleanup_return_debugfile; + /* Then try in the global debugfile directories. + + Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will + cause "/..." lookups. */ - /* If the file is in the sysroot, try using its base path in the - global debugfile directory. */ - if (canon_name - && strncmp (canon_name, gdb_sysroot, strlen (gdb_sysroot)) == 0 - && IS_DIR_SEPARATOR (canon_name[strlen (gdb_sysroot)])) + debugdir = debug_file_directory; + do { - strcpy (debugfile, debug_file_directory); - strcat (debugfile, canon_name + strlen (gdb_sysroot)); + char *debugdir_end; + + while (*debugdir == DIRNAME_SEPARATOR) + debugdir++; + + debugdir_end = strchr (debugdir, DIRNAME_SEPARATOR); + if (debugdir_end == NULL) + debugdir_end = &debugdir[strlen (debugdir)]; + + memcpy (debugfile, debugdir, debugdir_end - debugdir); + debugfile[debugdir_end - debugdir] = 0; strcat (debugfile, "/"); + strcat (debugfile, dir); strcat (debugfile, basename); if (separate_debug_file_exists (debugfile, crc32, objfile->name)) goto cleanup_return_debugfile; + + /* If the file is in the sysroot, try using its base path in the + global debugfile directory. */ + if (canon_name + && strncmp (canon_name, gdb_sysroot, strlen (gdb_sysroot)) == 0 + && IS_DIR_SEPARATOR (canon_name[strlen (gdb_sysroot)])) + { + memcpy (debugfile, debugdir, debugdir_end - debugdir); + debugfile[debugdir_end - debugdir] = 0; + strcat (debugfile, canon_name + strlen (gdb_sysroot)); + strcat (debugfile, "/"); + strcat (debugfile, basename); + + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) + goto cleanup_return_debugfile; + } + + debugdir = debugdir_end; } + while (*debugdir != 0); xfree (debugfile); debugfile = NULL; @@ -4173,12 +4219,12 @@ Usage: set extension-language .foo bar"), add_setshow_optional_filename_cmd ("debug-file-directory", class_support, &debug_file_directory, _("\ -Set the directory where separate debug symbols are searched for."), _("\ -Show the directory where separate debug symbols are searched for."), _("\ +Set the directories where separate debug symbols are searched for."), _("\ +Show the directories where separate debug symbols are searched for."), _("\ Separate debug symbols are first searched for in the same\n\ directory as the binary, then in the `" DEBUG_SUBDIRECTORY "' subdirectory,\n\ and lastly at the path of the directory of the binary with\n\ -the global debug-file directory prepended."), +each global debug-file-directory component prepended."), NULL, show_debug_file_directory, &setlist, &showlist); --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -995,6 +995,12 @@ if ![string compare $build_id_debug_filename ""] then { test_different_dir build-id "${objdir}/${subdir}" $xfail + # Test also multiple directories can be specified. Without the build-id + # reference GDB would find the separate debug info just at the same + # location as the executable file. + + test_different_dir multiple-dirs "/doesnotexist:${objdir}/${subdir}" $xfail + # Spare debug files may confuse testsuite runs in the future. remote_exec build "rm -f ${objdir}/${subdir}/${build_id_debug_filename}" } ++++++ gdb-bz528668-symfile-sepcrc.patch ++++++ http://sourceware.org/ml/gdb-patches/2009-10/msg00507.html Subject: [patch 1/3] print the .debug file name having CRC mismatch Hi, this patch is left as is from Andrew Cagney. Thanks, Jan gdb/ 2005-04-02 Andrew Cagney <cagney(a)gnu.org> * symfile.c (separate_debug_file_exists): When the CRCs mismatch print a warning. (find_separate_debug_file): Pass in the objfile's name. gdb/testsuite/ 2009-10-21 Jan Kratochvil <jan.kratochvil(a)redhat.com> * gdb.base/sepdebug.exp (CRC mismatch is reported): New test. * gdb.base/sepdebug2.c: New file. --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1283,7 +1283,8 @@ get_debug_link_info (struct objfile *objfile, unsigned long *crc32_out) } static int -separate_debug_file_exists (const char *name, unsigned long crc) +separate_debug_file_exists (const char *name, unsigned long crc, + const char *parent_name) { unsigned long file_crc = 0; bfd *abfd; @@ -1303,7 +1304,15 @@ separate_debug_file_exists (const char *name, unsigned long crc) bfd_close (abfd); - return crc == file_crc; + if (crc != file_crc) + { + warning (_("the debug information found in \"%s\"" + " does not match \"%s\" (CRC mismatch).\n"), + name, parent_name); + return 0; + } + + return 1; } char *debug_file_directory = NULL; @@ -1355,6 +1364,8 @@ find_separate_debug_file (struct objfile *objfile) basename = get_debug_link_info (objfile, &crc32); if (basename == NULL) + /* There's no separate debug info, hence there's no way we could + load it => no warning. */ return NULL; dir = xstrdup (objfile->name); @@ -1388,7 +1399,7 @@ find_separate_debug_file (struct objfile *objfile) strcpy (debugfile, dir); strcat (debugfile, basename); - if (separate_debug_file_exists (debugfile, crc32)) + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) { xfree (basename); xfree (dir); @@ -1402,7 +1413,7 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, "/"); strcat (debugfile, basename); - if (separate_debug_file_exists (debugfile, crc32)) + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) { xfree (basename); xfree (dir); @@ -1416,7 +1427,7 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, dir); strcat (debugfile, basename); - if (separate_debug_file_exists (debugfile, crc32)) + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) { xfree (basename); xfree (dir); @@ -1435,7 +1446,7 @@ find_separate_debug_file (struct objfile *objfile) strcat (debugfile, "/"); strcat (debugfile, basename); - if (separate_debug_file_exists (debugfile, crc32)) + if (separate_debug_file_exists (debugfile, crc32, objfile->name)) { xfree (canon_name); xfree (basename); --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -952,6 +952,23 @@ set debugfile "${objdir}/${subdir}/${testfile}.debug" test_different_dir debuglink "${objdir}/${subdir}" 0 +# Test CRC mismatch is reported. + +if {[build_executable sepdebug.exp sepdebug2 sepdebug2.c debug] != -1 + && ![gdb_gnu_strip_debug ${objdir}/${subdir}/sepdebug2]} { + + remote_exec build "cp ${debugfile} ${objdir}/${subdir}/.debug/sepdebug2.debug" + + gdb_exit + gdb_start + gdb_reinitialize_dir $srcdir/$subdir + + set escapedobjdirsubdir [string_to_regexp ${objdir}/${subdir}] + + gdb_test "file ${objdir}/${subdir}/sepdebug2" "warning: the debug information found in \"${escapedobjdirsubdir}/\\.debug/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \$CRC mismatch\$\\..*\$no debugging symbols found\$.*" "CRC mismatch is reported" +} + + # NT_GNU_BUILD_ID / .note.gnu.build-id test: set build_id_debug_filename [build_id_debug_filename_get $binfile] --- /dev/null +++ b/gdb/testsuite/gdb.base/sepdebug2.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2009 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +int +main (void) +{ + return 0; +} ++++++ gdb-core-open-vdso-warning.patch ++++++ http://sourceware.org/ml/gdb-patches/2009-10/msg00142.html Subject: [patch] Fix GNU/Linux core open: Can't read pathname for load map: Input/output error. Hi, GDB currently always prints on loading a core file: warning: Can't read pathname for load map: Input/output error. The patch is not nice but it was WONTFIXed on the glibc side in: http://sourceware.org/ml/libc-alpha/2009-10/msg00001.html The same message in GDB PR 8882 and glibc PR 387 was for ld-linux.so.2 l_name but that one is now ignored thanks to IGNORE_FIRST_LINK_MAP_ENTRY. This fix is intended for Linux system vDSO l_name which is a second entry in the DSO list. Regression tested on {x86_86,x86_64-m32,i686}-fedora11-linux-gnu. Thanks, Jan gdb/ 2009-10-06 Jan Kratochvil <jan.kratochvil(a)redhat.com> Do not print false warning on reading core file with vDSO on GNU/Linux. * solib-svr4.c (svr4_current_sos): Suppress the warning if MASTER_SO_LIST is still NULL. * solib.c (update_solib_list): New variable saved_so_list_head. Conditionally restart the function. [ Context backport. ] --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1097,8 +1097,18 @@ svr4_current_sos (void) target_read_string (LM_NAME (new), &buffer, SO_NAME_MAX_PATH_SIZE - 1, &errcode); if (errcode != 0) - warning (_("Can't read pathname for load map: %s."), - safe_strerror (errcode)); + { + /* During the first ever DSO list reading some strings may be + unreadable as residing in the ld.so readonly memory not being + present in a dumped core file. Delay the error check after + the first pass of DSO list scanning when ld.so should be + already mapped in and all the DSO list l_name memory gets + readable. */ + + if (master_so_list () != NULL) + warning (_("Can't read pathname for load map: %s."), + safe_strerror (errcode)); + } else { struct build_id *build_id; --- a/gdb/solib.c +++ b/gdb/solib.c @@ -538,6 +538,7 @@ update_solib_list (int from_tty, struct target_ops *target) struct target_so_ops *ops = solib_ops (target_gdbarch); struct so_list *inferior = ops->current_sos(); struct so_list *gdb, **gdb_link; + struct so_list *saved_so_list_head = so_list_head; /* We can reach here due to changing solib-search-path or the sysroot, before having any inferior. */ @@ -668,6 +669,12 @@ update_solib_list (int from_tty, struct target_ops *target) observer_notify_solib_loaded (i); } } + + /* If this was the very first DSO list scan and we possibly read in ld.so + recheck all the formerly unreadable DSO names strings. */ + + if (saved_so_list_head == NULL && so_list_head != NULL) + update_solib_list (from_tty, target); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-packager for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Mon Nov 23 13:12:38 CET 2009. -------- --- yast2-packager/yast2-packager.changes 2009-10-19 16:34:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2009-11-20 15:07:07.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 20 14:38:37 CET 2009 - lslezak(a)suse.cz + +- sw_single - don't restart when started from command line (using + "yast2 -i" option) and PKGMGR_ACTION_AT_EXIT="restart" + (bnc#547609) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.18.13.tar.bz2 New: ---- yast2-packager-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.3dIsyG/_old 2009-11-23 13:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.3dIsyG/_new 2009-11-23 13:11:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.18.13) +# spec file for package yast2-packager (Version 2.19.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-packager -Version: 2.18.13 +Version: 2.19.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.18.13.tar.bz2 +Source0: yast2-packager-2.19.0.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -79,7 +79,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.18.13 +%setup -n yast2-packager-2.19.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.18.13.tar.bz2 -> yast2-packager-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.13/configure new/yast2-packager-2.19.0/configure --- old/yast2-packager-2.18.13/configure 2009-10-19 16:33:03.000000000 +0200 +++ new/yast2-packager-2.19.0/configure 2009-11-20 15:02:56.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-packager 2.18.13. +# Generated by GNU Autoconf 2.63 for yast2-packager 2.19.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.18.13' -PACKAGE_STRING='yast2-packager 2.18.13' +PACKAGE_VERSION='2.19.0' +PACKAGE_STRING='yast2-packager 2.19.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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 yast2-packager 2.18.13 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.19.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.18.13:";; + short | recursive ) echo "Configuration of yast2-packager 2.19.0:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.18.13 +yast2-packager configure 2.19.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.18.13, which was +It was created by yast2-packager $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2419,7 +2419,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.18.13' + VERSION='2.19.0' cat >>confdefs.h <<_ACEOF @@ -2541,7 +2541,7 @@ -VERSION="2.18.13" +VERSION="2.19.0" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3483,7 +3483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.18.13, which was +This file was extended by yast2-packager $as_me 2.19.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3533,7 +3533,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-packager config.status 2.18.13 +yast2-packager config.status 2.19.0 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/yast2-packager-2.18.13/configure.in new/yast2-packager-2.19.0/configure.in --- old/yast2-packager-2.18.13/configure.in 2009-10-19 16:32:59.000000000 +0200 +++ new/yast2-packager-2.19.0/configure.in 2009-11-20 15:02:51.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.18.13, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.19.0, http://bugs.opensuse.org/, yast2-packager) 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.13" +VERSION="2.19.0" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.13/src/clients/sw_single.ycp new/yast2-packager-2.19.0/src/clients/sw_single.ycp --- old/yast2-packager-2.18.13/src/clients/sw_single.ycp 2009-09-21 16:47:47.000000000 +0200 +++ new/yast2-packager-2.19.0/src/clients/sw_single.ycp 2009-11-20 15:02:46.000000000 +0100 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 58430 2009-08-25 09:32:01Z kmachalkova $ + * $Id: sw_single.ycp 59670 2009-11-20 14:02:45Z lslezak $ * * Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol, * "repo_mgmt" : boolean ] @@ -617,12 +617,12 @@ if (PKGMGR_ACTION_AT_EXIT == "summary" || size(commit_result[1]:[]) > 0) { - if (PackagesUI::ShowInstallationSummary() == `back) + if (PackagesUI::ShowInstallationSummary() == `back && size(packagelist) == 0) { force_restart = true; } } - else if (PKGMGR_ACTION_AT_EXIT == "restart") + else if (PKGMGR_ACTION_AT_EXIT == "restart" && size(packagelist) == 0) { force_restart = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.13/VERSION new/yast2-packager-2.19.0/VERSION --- old/yast2-packager-2.18.13/VERSION 2009-10-19 16:32:25.000000000 +0200 +++ new/yast2-packager-2.19.0/VERSION 2009-11-20 14:38:21.000000000 +0100 @@ -1 +1 @@ -2.18.13 +2.19.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 kdebase4-workspace for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Mon Nov 23 12:17:26 CET 2009. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-11-04 10:55:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-11-23 12:14:55.717251000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 20 20:44:14 UTC 2009 - beineri(a)opensuse.org + +- make patches apply without fuzz + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:06.000000000 +0100 @@ -30,7 +30,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.3.3 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:06.000000000 +0100 @@ -38,7 +38,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.3.3 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -60,10 +60,7 @@ Patch69: kdm-all-users-nopass.diff Patch70: kdm-generic-same-pam.diff Patch71: kdm-kdmconf.diff -#Subject: Dialog notifying about running low on disk space -#From: Lubos Lunak -#Feature: bnc#199054 -#Patch-upstream: no +# https://svn.kde.org/home/kde/trunk/playground/base/freespacenotifier Patch74: lowdiskspace.patch Patch77: systemsettings-desktop.diff Patch82: rotate-wacom-pointers.diff ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:06.000000000 +0100 @@ -33,7 +33,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.3.3 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ 4_3_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:06.000000000 +0100 @@ -1,6 +1,8 @@ package: kdebase-workspace-4.3.1.tar.bz2 kdemod: kdebase/workspace ---- BRANCH_STATUS +Index: BRANCH_STATUS +=================================================================== +--- /dev/null +++ BRANCH_STATUS @@ -0,0 +1,2 @@ +current HEAD: 1027708 ++++++ kde4-migrate.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:06.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- startkde.cmake.orig +++ startkde.cmake -@@ -76,6 +76,11 @@ fi +@@ -72,6 +72,11 @@ fi kdehome=$HOME/@KDE_DEFAULT_HOME@ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` ++++++ kdm-all-users-nopass.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:08.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- kdm/backend/client.c.orig +++ kdm/backend/client.c -@@ -523,6 +523,9 @@ isNoPassAllowed( struct passwd *pw ) +@@ -525,6 +525,9 @@ isNoPassAllowed( struct passwd *pw ) if (cursource != PWSRC_MANUAL) return True; ++++++ kdm-audit-log.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:08.000000000 +0100 @@ -91,7 +91,7 @@ static int doPAMAuth( const char *psrv, struct pam_data *pdata ) { -@@ -420,6 +478,8 @@ doPAMAuth( const char *psrv, struct pam_ +@@ -422,6 +480,8 @@ doPAMAuth( const char *psrv, struct pam_ gSendStr( curuser ); } if (pretc != PAM_SUCCESS) { @@ -100,7 +100,7 @@ switch (pretc) { case PAM_USER_UNKNOWN: case PAM_AUTH_ERR: -@@ -766,6 +826,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -768,6 +828,8 @@ verify( GConvFunc gconv, int rootok ) if (!p->pw_uid) { if (!rootok && !td->allowRootLogin) V_RET_FAIL( "Root logins are not allowed" ); @@ -109,7 +109,7 @@ wipeStr( curpass ); curpass = 0; return True; /* don't deny root to log in */ -@@ -806,6 +868,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -808,6 +870,8 @@ verify( GConvFunc gconv, int rootok ) } if (pretc == PAM_SUCCESS) break; @@ -118,7 +118,7 @@ /* effectively there is only PAM_AUTHTOK_ERR */ gSendInt( V_FAIL ); } -@@ -893,6 +957,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -895,6 +959,8 @@ verify( GConvFunc gconv, int rootok ) displayStr( V_MSG_ERR, "Your account has expired;" " please contact your system administrator" ); @@ -127,7 +127,7 @@ gSendInt( V_FAIL ); LC_RET0; } else if (tim > (expir - warntime) && !quietlog) { -@@ -919,6 +985,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -921,6 +987,8 @@ verify( GConvFunc gconv, int rootok ) displayStr( V_MSG_ERR, "Your account has expired;" " please contact your system administrator" ); @@ -136,7 +136,7 @@ gSendInt( V_FAIL ); LC_RET0; } -@@ -970,6 +1038,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -972,6 +1040,8 @@ verify( GConvFunc gconv, int rootok ) } displayStr( V_MSG_ERR, "Logins are not allowed at the moment.\nTry again later" ); @@ -145,7 +145,7 @@ gSendInt( V_FAIL ); LC_RET0; } -@@ -979,6 +1049,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -981,6 +1051,8 @@ verify( GConvFunc gconv, int rootok ) if (!auth_timeok( lc, time( NULL ) )) { displayStr( V_MSG_ERR, "You are not allowed to login at the moment" ); @@ -154,7 +154,7 @@ gSendInt( V_FAIL ); LC_RET0; } -@@ -990,6 +1062,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -992,6 +1064,8 @@ verify( GConvFunc gconv, int rootok ) debug( "shell not in /etc/shells\n" ); endusershell(); V_RET_FAIL( "Your login shell is not listed in /etc/shells" ); @@ -163,7 +163,7 @@ } if (!strcmp( s, p->pw_shell )) { endusershell(); -@@ -1517,6 +1591,9 @@ startClient( volatile int *pid ) +@@ -1519,6 +1593,9 @@ startClient( volatile int *pid ) # define D_LOGIN_SETGROUP 0 #endif /* USE_PAM */ @@ -177,7 +177,7 @@ =================================================================== --- kdm/ConfigureChecks.cmake.orig +++ kdm/ConfigureChecks.cmake -@@ -221,4 +221,6 @@ if (NOT LIBEXEC_INSTALL_DIR STREQUAL "${ +@@ -231,4 +231,6 @@ if (NOT LIBEXEC_INSTALL_DIR STREQUAL "${ endif (NOT inip) endif (NOT LIBEXEC_INSTALL_DIR STREQUAL "${BIN_INSTALL_DIR}") ++++++ kdm-generic-same-pam.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:08.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- kdm/backend/client.c.orig +++ kdm/backend/client.c -@@ -601,7 +601,8 @@ verify( GConvFunc gconv, int rootok ) +@@ -603,7 +603,8 @@ verify( GConvFunc gconv, int rootok ) #ifdef USE_PAM pnopass = False; @@ -12,7 +12,7 @@ if (!gconv( GCONV_USER, 0 )) return False; if (isNoPassAllowed( curuser )) { -@@ -614,11 +615,11 @@ verify( GConvFunc gconv, int rootok ) +@@ -616,11 +617,11 @@ verify( GConvFunc gconv, int rootok ) psrv = PAMService; } else psrv = PAMService; ++++++ kdm-relaxed-auth.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:08.000000000 +0100 @@ -1,16 +1,14 @@ -Index: kdm/backend/auth.c -=================================================================== ---- kdm/backend/auth.c.orig +--- kdm/backend/auth.c +++ kdm/backend/auth.c -@@ -534,6 +534,7 @@ defineLocal( FILE *file, Xauth *auth, in +@@ -536,6 +536,7 @@ uname( &name ); writeAddr( FamilyLocal, strlen( name.nodename ), (CARD8 *)name.nodename, file, auth, ok ); + setenv("XAUTHLOCALHOSTNAME", name.nodename, 1); #endif - #if !defined(NEED_UTSNAME) || defined(__hpux) -@@ -1230,6 +1231,9 @@ setUserAuthorization( struct display *d + /* +@@ -1215,6 +1216,9 @@ userEnviron = setEnv( userEnviron, "XAUTHORITY", envname ); systemEnviron = setEnv( systemEnviron, "XAUTHORITY", envname ); } ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:08.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:08.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- kdm/kfrontend/CMakeLists.txt.orig +++ kdm/kfrontend/CMakeLists.txt -@@ -115,3 +115,5 @@ build_confci() +@@ -116,3 +116,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS install(CODE " exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ") ++++++ kwin-suse.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -1,15 +1,5 @@ ---- kwin/clients/ozone/oxygenclient.h.sav 2008-11-02 10:48:52.000000000 +0100 -+++ kwin/clients/ozone/oxygenclient.h 2009-06-03 19:58:38.000000000 +0200 -@@ -62,6 +62,7 @@ private: - QColor titlebarTextColor(const QPalette &palette); - bool colorCacheInvalid_; - QColor cachedTitlebarTextColor_; -+ QImage logo; - - protected: - friend class OxygenButton; ---- kwin/clients/ozone/oxygenclient.cpp.sav 2009-05-30 18:35:20.000000000 +0200 -+++ kwin/clients/ozone/oxygenclient.cpp 2009-06-03 20:44:38.000000000 +0200 +--- kwin/clients/ozone/oxygenclient.cpp ++++ kwin/clients/ozone/oxygenclient.cpp @@ -59,6 +59,9 @@ #include "oxygenbutton.h" #include "oxygen.h" @@ -20,7 +10,7 @@ namespace Ozone { namespace Oxygen -@@ -89,6 +92,7 @@ OxygenClient::OxygenClient(KDecorationBr +@@ -95,6 +98,7 @@ , helper_(*globalHelper) { qAddPostRoutine(oxkwincleanupBefore); @@ -28,7 +18,7 @@ } OxygenClient::~OxygenClient() -@@ -303,7 +307,7 @@ void OxygenClient::paintEvent(QPaintEven +@@ -331,7 +335,7 @@ const int titleWidth = frame.width() - titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - @@ -37,7 +27,7 @@ QPalette pal2( palette ); if( !OxygenFactory::blendTitlebarColors()) { -@@ -319,6 +323,18 @@ void OxygenClient::paintEvent(QPaintEven +@@ -374,6 +378,18 @@ painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight, // -1 is to go into top resizearea OxygenFactory::titleAlignment() | Qt::AlignVCenter, caption()); @@ -56,12 +46,22 @@ painter.setRenderHint(QPainter::Antialiasing); // Draw dividing line -@@ -344,7 +360,7 @@ void OxygenClient::paintEvent(QPaintEven +@@ -398,7 +414,7 @@ } if (align & Qt::AlignLeft) { - int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + 4; + int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + 4 + logo.width() + logooffset; int right = titleLeft + titleWidth; - drawScratch(&painter, palette, left, right, titleTop+6); - } + if (left < right) + drawStripes(&painter, palette, left, right, titleTop+6); +--- kwin/clients/ozone/oxygenclient.h ++++ kwin/clients/ozone/oxygenclient.h +@@ -70,6 +70,7 @@ + bool isMaximized() const; + bool colorCacheInvalid_; + QColor cachedTitlebarTextColor_; ++ QImage logo; + + TileSet *shadowTiles(const QColor& color, const QColor& glow, qreal size, bool active); + ++++++ plasma-branding-defaults.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -135,7 +135,7 @@ + else + iconname = "start-here-kde"; - QStringList viewtypes = cg.readEntry("views", QStringList()); + const QStringList viewtypes = cg.readEntry("views", QStringList()); if(viewtypes.isEmpty()) { // backward-compatibility to <KDE4.3 --- plasma/applets/kickoff/ui/brandingbutton.cpp +++ plasma/applets/kickoff/ui/brandingbutton.cpp ++++++ plasma-plaindesktop.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -19,8 +19,8 @@ -install(FILES plasma_desktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules) +install(TARGETS plasma_containment_plaindesktop DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES plasma-containment-plaindesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ---- plasma/containments/plaindesktop/desktop.cpp 2009-05-14 22:29:52.000000000 +0200 -+++ plasma/containments/plaindesktop/desktop.cpp 2009-05-15 14:07:28.000000000 +0200 +--- plasma/containments/plaindesktop/desktop.cpp 2009/11/20 20:40:57 1.1 ++++ plasma/containments/plaindesktop/desktop.cpp 2009/11/20 20:41:10 @@ -59,7 +59,7 @@ using namespace Plasma; @@ -28,8 +28,8 @@ - : Containment(parent, args), + : Containment(parent, args, false), m_addPanelsMenu(0), - m_lockDesktopAction(0), - m_appletBrowserAction(0), + m_addPanelAction(0), + m_runCommandAction(0), --- plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:15:33.000000000 +0200 +++ plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:07:28.000000000 +0200 @@ -1,17 +1,17 @@ @@ -57,10 +57,10 @@ Index: plasma/containments/CMakeLists.txt =================================================================== ---- plasma/containments/CMakeLists.txt (revision 968327) -+++ plasma/containments/CMakeLists.txt (working copy) -@@ -2,3 +2,4 @@ +--- plasma/containments/CMakeLists.txt 2009/11/20 20:40:06 1.1 ++++ plasma/containments/CMakeLists.txt 2009/11/20 20:41:10 +@@ -1,3 +1,4 @@ + add_subdirectory(desktop) add_subdirectory(panel) - add_subdirectory(mid-panel) add_subdirectory(screensaver) +add_subdirectory(plaindesktop) ++++++ rotate-wacom-pointers.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -1,96 +1,103 @@ -Index: kcontrol/randr/legacyrandrscreen.h +Index: kcontrol/randr/randrscreen.cpp =================================================================== ---- kcontrol/randr/legacyrandrscreen.h.orig -+++ kcontrol/randr/legacyrandrscreen.h -@@ -29,6 +29,7 @@ - #include "randr.h" - - class KTimerDialog; -+class KProcess; - - class LegacyRandRScreen : public QObject - { -@@ -131,6 +132,9 @@ public: - void load(KConfig& config); - void save(KConfig& config) const; - -+private slots: -+ void gotAvailablePointers(KProcess*, char *buffer, int len); -+ - private: - XRRScreenConfiguration* m_config; - -@@ -152,6 +156,8 @@ private: - int m_proposedSize; - int m_proposedRefreshRate; +--- kcontrol/randr/randrscreen.cpp.orig ++++ kcontrol/randr/randrscreen.cpp +@@ -490,6 +490,8 @@ bool RandRScreen::applyProposed(bool con + if (succeed && confirm) + succeed = RandR::confirm(r); -+ QStringList m_wacomPointers; ++ RandR::rotateWacom( m_unifiedRotation ); + - KTimerDialog* m_shownDialog; + // if we succeeded applying and the user confirmed the changes, + // just return from here + if (succeed) +Index: kcontrol/randr/randr.h +=================================================================== +--- kcontrol/randr/randr.h.orig ++++ kcontrol/randr/randr.h +@@ -101,6 +101,7 @@ public: + static bool confirm(const QRect &rect = QRect()); + static SizeList sortSizes(const SizeList &sizes); ++ static void rotateWacom( int rotation ); }; + + #endif Index: kcontrol/randr/legacyrandrscreen.cpp =================================================================== --- kcontrol/randr/legacyrandrscreen.cpp.orig +++ kcontrol/randr/legacyrandrscreen.cpp -@@ -31,6 +31,8 @@ - #include <kiconloader.h> - #include <QtGui/QLabel> - #include <QDesktopWidget> -+#include <kprocess.h> -+#include <kstandarddirs.h> - - #include <QX11Info> - #include "legacyrandrscreen.h" -@@ -104,12 +106,51 @@ bool LegacyRandRScreen::applyProposed() +@@ -104,6 +104,7 @@ bool LegacyRandRScreen::applyProposed() m_currentSize = m_proposedSize; m_currentRotation = m_proposedRotation; m_currentRefreshRate = m_proposedRefreshRate; -+ -+ // search wacom utility and set orientation for available wacom pointers -+ QString xsetwacom = KStandardDirs::findExe("xsetwacom"); -+ if (!xsetwacom.isEmpty()) { -+ m_wacomPointers.clear(); -+ KProcess *proc = new KProcess; -+ connect(proc, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(gotAvailablePointers(KProcess *, char *, int))); -+ *proc << "xsetwacom" << "list"; -+ proc->start(); -+ for ( QStringList::Iterator it = m_wacomPointers.begin(); it != m_wacomPointers.end(); ++it ) { -+ KProcess *set = new KProcess; -+ *set << "xsetwacom" << "set" << (*it) << "Rotate"; -+ switch (m_currentRotation) { ++ RandR::rotateWacom( m_currentRotation ); + return true; + } + +Index: kcontrol/randr/randrcrtc.cpp +=================================================================== +--- kcontrol/randr/randrcrtc.cpp.orig ++++ kcontrol/randr/randrcrtc.cpp +@@ -317,6 +317,7 @@ bool RandRCrtc::applyProposed() + m_currentRect = m_proposedRect; + m_currentRate = mode.refreshRate(); + emit crtcChanged(m_id, RandR::ChangeMode); ++ RandR::rotateWacom( m_currentRotation ); + ret = true; + } + else +Index: kcontrol/randr/randr.cpp +=================================================================== +--- kcontrol/randr/randr.cpp.orig ++++ kcontrol/randr/randr.cpp +@@ -19,6 +19,8 @@ + + #include "randr.h" + #include <KIconLoader> ++#include <kstandarddirs.h> ++#include <qprocess.h> + + bool RandR::has_1_2 = false; + Time RandR::timestamp = 0; +@@ -176,5 +178,40 @@ SizeList RandR::sortSizes(const SizeList + return sorted; + } + ++void RandR::rotateWacom( int rotation ) ++{ ++ // search wacom utility and set orientation for available wacom pointers ++ QString xsetwacom = KStandardDirs::findExe("xsetwacom"); ++ if (!xsetwacom.isEmpty()) { ++ QProcess proc; ++ proc.start( "xsetwacom", QStringList() << "list" ); ++ if (!proc.waitForStarted() || !proc.waitForFinished()) { ++ kError("Could not ask xsetwacom for available pointers."); ++ return; ++ } else { ++ while( !proc.atEnd()) { ++ QString line = QString::fromLocal8Bit( proc.readLine()); ++ QString pointer = line.split( ' ' ).first(); ++ QStringList args; ++ args << "set" << pointer << "Rotate"; ++ switch (rotation) { + case RR_Rotate_90: -+ *set << "CW"; ++ args << "CW"; + break; + case RR_Rotate_180: -+ *set << "HALF"; ++ args << "HALF"; + break; + case RR_Rotate_270: -+ *set << "CCW"; ++ args << "CCW"; + break; + default: -+ *set << "NONE"; ++ args << "NONE"; + } -+ set->start(); ++ if( QProcess::execute( "xsetwacom", args ) != 0 ) ++ kError("Could not set orientation for wacom pointers."); + } + } -+ - return true; - } ++ } ++} - return false; - } -+void LegacyRandRScreen::gotAvailablePointers(KProcess*, char *buffer, int len) -+{ -+ QString myBuf = QString::fromLatin1(buffer, len); -+ QStringList lines = myBuf.split('\n'); -+ for ( QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { -+ QStringList split = (*it).split(' '); -+ m_wacomPointers+=split.first(); -+ } -+} -+ - bool LegacyRandRScreen::applyProposedAndConfirm() - { - if (proposedChanged()) { ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- startkde.cmake.orig +++ startkde.cmake -@@ -80,6 +80,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD +@@ -76,6 +76,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD mkdir -m 700 -p $kdehome mkdir -m 700 -p $kdehome/share mkdir -m 700 -p $kdehome/share/config @@ -12,7 +12,7 @@ cat >$kdehome/share/config/startupconfigkeys <<EOF kcminputrc Mouse cursorTheme 'Oxygen_Black' kcminputrc Mouse cursorSize '' -@@ -93,6 +96,7 @@ kcmrandrrc [Screen3] +@@ -89,6 +92,7 @@ kcmrandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF @@ -20,7 +20,7 @@ kstartupconfig4 returncode=$? if test $returncode -ne 0; then -@@ -214,7 +218,7 @@ fi +@@ -210,7 +214,7 @@ fi libpath=`kde4-config --path lib | tr : '\n'` ++++++ suspend-lock.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -19,7 +19,7 @@ #include <solid/control/powermanager.h> #include <kwindowsystem.h> #include <netwm.h> -@@ -651,9 +652,16 @@ void KSMShutdownDlg::slotSuspend(QAction +@@ -648,9 +649,16 @@ void KSMShutdownDlg::slotSuspend(QAction { m_bootOption.clear(); Solid::Control::PowerManager::SuspendMethod spdMethod = action->data().value<Solid::Control::PowerManager::SuspendMethod>(); ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.7AOzxZ/_old 2009-11-23 12:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7AOzxZ/_new 2009-11-23 12:15:09.000000000 +0100 @@ -11,7 +11,7 @@ GenericName[ar]=إعدادات النظام GenericName[be@latin]=Systemnyja nałady GenericName[bg]=Системни настройки -@@ -78,7 +78,7 @@ GenericName[x-test]=xxSystem Settingsxx +@@ -80,7 +80,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 @@ -20,7 +20,7 @@ Name[ar]=إعدادات النظام Name[be]=Сістэмныя настаўленні Name[be@latin]=Systemnyja nałady -@@ -156,4 +156,4 @@ Name[zh_CN]=系统设置 +@@ -160,4 +160,4 @@ Name[zh_CN]=系统设置 Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 emacs for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Mon Nov 23 12:04:02 CET 2009. -------- --- emacs/emacs.changes 2009-08-14 13:23:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2009-11-19 11:22:01.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 19 11:18:54 CET 2009 - werner(a)suse.de + +- Remove binaries from main package as theyx are provided by the + x11 sub package (bnc#555682) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.7BPhCb/_old 2009-11-23 12:03:26.000000000 +0100 +++ /var/tmp/diff_new_pack.7BPhCb/_new 2009-11-23 12:03:26.000000000 +0100 @@ -24,7 +24,7 @@ License: GPL v2 or later Group: Productivity/Editors/Emacs Version: 23.1 -Release: 2 +Release: 3 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -556,10 +556,6 @@ /etc/skel/.gnu-emacs %{_bindir}/b2m %{_bindir}/ebrowse -%{_bindir}/emacs -%{_bindir}/emacs-gtk -%{_bindir}/emacs-nox -%{_bindir}/emacs-x11 %{_bindir}/emacsclient %{_bindir}/grep-changelog %{_bindir}/rcs-checkin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dnsmasq for openSUSE:Factory
by root＠Hilbert.suse.de 23 Nov '09

23 Nov '09

Hello community, here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at Mon Nov 23 12:03:09 CET 2009. -------- --- dnsmasq/dnsmasq.changes 2009-11-03 20:17:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/dnsmasq/dnsmasq.changes 2009-11-20 16:21:32.000000000 +0100 @@ -1,0 +2,50 @@ +Fri Nov 20 16:07:32 CET 2009 - ug(a)suse.de + +* Add support for internationalised DNS. + +* Add two more environment variables for lease-change scripts: + First, DNSMASQ_SUPPLIED_HOSTNAME; this is set to the hostname + supplied by a client, even if the actual hostname used is + over-ridden by dhcp-host or dhcp-ignore-names directives. + Also DNSMASQ_RELAY_ADDRESS which gives the address of + a DHCP relay, if used. + +* Fix regression which broke echo of relay-agent + options. Thanks to Michael Rack for spotting this. + +* Don't treat option 67 as being interchangeable with + dhcp-boot parameters if it's specified as + dhcp-option-force. + +* Make the code to call scripts on lease-change compile-time + optional. It can be switched off by editing src/config.h + or building with "make COPTS=-DNO_SCRIPT". + +* Make the TFTP server cope with filenames from Windows/DOS + which use '\' as pathname separator. Thanks to Ralf for + the patch. + +* Warn if an IP address is duplicated in /etc/ethers. + +* Teach --conf-dir to take an option list of file suffices + which will be ignored when scanning the directory. Useful + for backup files etc. Thanks to Helmut Hullen for the + suggestion. + +* Add new DHCP option named tftpserver-address + +* Don't do any PXE processing, even for clients with the + correct vendorclass, unless at least one pxe-prompt or + pxe-service option is given. + +* Limit the blocksize used for TFTP transfers to a value + which avoids packet fragmentation, based on the MTU of the + local interface. Many netboot ROMs can't cope with + fragmented packets. + +* Honour dhcp-ignore configuration for PXE and proxy-PXE + requests. + +* 2.51 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dnsmasq-2.50.tar.bz2 New: ---- dnsmasq-2.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ --- /var/tmp/diff_new_pack.zQlWu1/_old 2009-11-23 11:53:23.000000000 +0100 +++ /var/tmp/diff_new_pack.zQlWu1/_new 2009-11-23 11:53:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dnsmasq (Version 2.50) +# spec file for package dnsmasq (Version 2.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.50 -Release: 2 +Version: 2.51 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers Provides: dns_daemon @@ -34,7 +34,7 @@ Patch2: chuser.diff Patch3: manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel pkg-config +BuildRequires: dbus-1-devel libidn libidn-devel pkg-config %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP @@ -63,7 +63,7 @@ %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} AWK=gawk +%{__make} %{?jobs:-j%jobs} AWK=gawk all-i18n %pre if ! /usr/bin/getent passwd dnsmasq >/dev/null; then ++++++ dnsmasq-2.50.tar.bz2 -> dnsmasq-2.51.tar.bz2 ++++++ ++++ 13221 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