July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit perl-CGI-Application for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package perl-CGI-Application for openSUSE:Factory checked in at Fri Jul 31 22:45:15 CEST 2009. -------- --- perl-CGI-Application/perl-CGI-Application.changes 2008-11-04 11:55:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-CGI-Application/perl-CGI-Application.changes 2009-07-30 18:04:41.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Jul 30 17:01:25 CEST 2009 - cwh(a)suse.de + +- 4.31 Wed Jul 29, 2009 + + [FEATURES] + - html_tmpl_class() now allows setting an an alternate HTML::Template class + at a run time. This makes it easy to set the class to be + 'HTML::Template::Dumper' for debugging. You can then see and precisely + test the Perl data structure that would be sent your template, taking + into account the template tokens that are actually set there. (Mark Stosberg) + + [DOCUMENTATION] + - More typo fixes (Lyle) + +- 4.21 Sat Jan 3, 2009 + + [FEATURES] + - This now works: + $webapp->query($new_query_object); + Setting a new query object can be useful in combination with + CGI::Application::Server. (Jaldhar Vyas) + + [DOCUMENTATION] + - More typo fixes (Lyle) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- CGI-Application-4.20.tar.bz2 New: ---- CGI-Application-4.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CGI-Application.spec ++++++ --- /var/tmp/diff_new_pack.f1GC5o/_old 2009-07-31 22:44:00.000000000 +0200 +++ /var/tmp/diff_new_pack.f1GC5o/_new 2009-07-31 22:44:00.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-CGI-Application (Version 4.20) +# spec file for package perl-CGI-Application (Version 4.31) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ Name: perl-CGI-Application -Version: 4.20 +Version: 4.31 Release: 1 Provides: CGI-Application Requires: perl = %{perl_version} AutoReqProv: on Group: Development/Libraries/Perl -License: Artistic License +License: Artistic License .. Url: http://search.cpan.org/~jerlbaum/CGI-Application Summary: Framework for building reusable web-applications Source: CGI-Application-%{version}.tar.bz2 ++++++ CGI-Application-4.20.tar.bz2 -> CGI-Application-4.31.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/Changes new/CGI-Application-4.31/Changes --- old/CGI-Application-4.20/Changes 2008-11-02 01:41:27.000000000 +0100 +++ new/CGI-Application-4.31/Changes 2009-07-30 03:41:00.000000000 +0200 @@ -1,5 +1,28 @@ Revision history for CGI::Application. +4.31 Wed Jul 29, 2009 + + [FEATURES] + - html_tmpl_class() now allows setting an an alternate HTML::Template class + at a run time. This makes it easy to set the class to be + 'HTML::Template::Dumper' for debugging. You can then see and precisely + test the Perl data structure that would be sent your template, taking + into account the template tokens that are actually set there. (Mark Stosberg) + + [DOCUMENTATION] + - More typo fixes (Lyle) + +4.21 Sat Jan 3, 2009 + + [FEATURES] + - This now works: + $webapp->query($new_query_object); + Setting a new query object can be useful in combination with + CGI::Application::Server. (Jaldhar Vyas) + + [DOCUMENTATION] + - More typo fixes (Lyle) + 4.20 Sat Nov 1, 2008 [DOCUMENTATION] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/MANIFEST new/CGI-Application-4.31/MANIFEST --- old/CGI-Application-4.20/MANIFEST 2008-11-02 01:40:57.000000000 +0100 +++ new/CGI-Application-4.31/MANIFEST 2009-07-30 03:41:00.000000000 +0200 @@ -27,6 +27,7 @@ t/mode_param_path_info.t t/mode_param_overwritten.t t/load_tmpl_hook.t +t/query.t t/lib/TestApp.pm t/lib/TestApp2.pm t/lib/TestApp3.pm @@ -39,5 +40,7 @@ t/lib/TestApp10.pm t/lib/TestApp11.pm t/lib/TestApp12.pm +t/lib/TestApp13.pm +t/lib/TestApp14.pm t/lib/TestCGI.pm t/lib/templates/test.tmpl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/META.yml new/CGI-Application-4.31/META.yml --- old/CGI-Application-4.20/META.yml 2008-08-10 17:34:30.000000000 +0200 +++ new/CGI-Application-4.31/META.yml 2009-07-30 03:41:00.000000000 +0200 @@ -1,10 +1,10 @@ ---- #YAML:1.0 +--- name: CGI-Application -version: 4.11 +version: 4.31 author: - - Jesse Erlbaum <jesse(a)erlbaum.net> - - Mark Stosberg <mark(a)summersault.com> - - with the help of many others! + - 'Jesse Erlbaum <jesse(a)erlbaum.net>' + - 'Mark Stosberg <mark(a)summersault.com>' + - "with the help of many others!" abstract: Framework for building reusable web-applications license: perl requires: @@ -13,10 +13,17 @@ Class::ISA: 0 HTML::Template: 0 Test::More: 0.47 +generated_by: Module::Build version 0.32 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.2.html + version: 1.2 +no_index: + file: provides: CGI::Application: file: lib/CGI/Application.pm - version: 4.11 + version: 4.31 CGI::Application::Mailform: file: lib/CGI/Application/Mailform.pm -generated_by: Module::Build version 0.2611 +resources: + license: ~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/Makefile.PL new/CGI-Application-4.31/Makefile.PL --- old/CGI-Application-4.20/Makefile.PL 2008-08-10 17:34:30.000000000 +0200 +++ new/CGI-Application-4.31/Makefile.PL 2009-07-30 03:41:00.000000000 +0200 @@ -1,17 +1,17 @@ -# Note: this file was auto-generated by Module::Build::Compat version 0.03 +# Note: this file was auto-generated by Module::Build::Compat version 0.32 use ExtUtils::MakeMaker; WriteMakefile ( + 'INSTALLDIRS' => 'site', 'NAME' => 'CGI::Application', + 'EXE_FILES' => [], 'VERSION_FROM' => 'lib/CGI/Application.pm', 'PREREQ_PM' => { - 'CGI' => '0', - 'Carp' => '0', - 'Class::ISA' => '0', - 'HTML::Template' => '0', - 'Test::More' => '0.47' - }, - 'INSTALLDIRS' => 'site', - 'PL_FILES' => {} + 'Test::More' => '0.47', + 'HTML::Template' => 0, + 'Class::ISA' => 0, + 'CGI' => 0, + 'Carp' => 0 + } ) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/lib/CGI/Application.pm new/CGI-Application-4.31/lib/CGI/Application.pm --- old/CGI-Application-4.20/lib/CGI/Application.pm 2008-11-02 01:38:26.000000000 +0100 +++ new/CGI-Application-4.31/lib/CGI/Application.pm 2009-07-30 03:41:00.000000000 +0200 @@ -3,7 +3,7 @@ use strict; use Class::ISA; -$CGI::Application::VERSION = '4.20'; +$CGI::Application::VERSION = '4.31'; my %INSTALLED_CALLBACKS = ( # hook name package sub @@ -21,6 +21,7 @@ sub new { my $class = shift; + my @args = @_; if (ref($class)) { @@ -464,18 +465,14 @@ my $self = shift; my ($query) = @_; - # We're only allowed to set a new query object if one does not yet exist! - unless (exists($self->{__QUERY_OBJ})) { - my $new_query_obj; - - # If data is provided, set it! Otherwise, create a new one. - if (defined($query)) { - $new_query_obj = $query; - } else { - $new_query_obj = $self->cgiapp_get_query(); + # If data is provided, set it! Otherwise, create a new one. + if (defined($query)) { + $self->{__QUERY_OBJ} = $query; + } else { + # We're only allowed to create a new query object if one does not yet exist! + unless (exists($self->{__QUERY_OBJ})) { + $self->{__QUERY_OBJ} = $self->cgiapp_get_query(); } - - $self->{__QUERY_OBJ} = $new_query_obj; } return $self->{__QUERY_OBJ}; @@ -1037,7 +1034,7 @@ all the arguments which were sent to the new() method. An example of the benefits provided by utilizing this hook is -creating a custom "application super-class" from which which all +creating a custom "application super-class" from which all your web applications would inherit, instead of CGI::Application. Consider the following: @@ -1165,13 +1162,13 @@ Override this method to retrieve the query object if you wish to use a different query interface instead of CGI.pm. -CGI.pm is only loaded to provided query object is only loaded if it used on a given request. +CGI.pm is only loaded if it is used on a given request. If you can use an alternative to CGI.pm, it needs to have some compatibility with the CGI.pm API. For normal use, just having a compatible C<param> method should be sufficient. -If use the C<path_info> option to the mode_param() method, then we will call +If you use the C<path_info> option to the mode_param() method, then we will call the C<path_info()> method on the query object. If you use the C<Dump> method in CGI::Application, we will call the C<Dump> and @@ -1225,7 +1222,7 @@ Note that if you want to pass extra arguments but use the default template name, you still need to provide a name of C<undef>: - my $tmpl_obj = $webapp->load_tmpl(undef', + my $tmpl_obj = $webapp->load_tmpl(undef, die_on_bad_params => 0, cache => 1 ); @@ -1246,9 +1243,12 @@ B<specifying the template class with html_tmpl_class()> -You may specify an API-compatible alternative to HTML::Template by overriding -C<html_tmpl_class()>. This method should return the class name of your template -system. The default simply returns "HTML::Template". The alternate class should +You may specify an API-compatible alternative to L<HTML::Template> by setting +a new C<html_tmpl_class()>: + + $self->html_tmpl_class('HTML::Template::Dumper'); + +The default is "HTML::Template". The alternate class should provide at least the following parts of the HTML::Template API: $t = $class->new( scalarref => ... ); # If you use scalarref templates @@ -1256,9 +1256,23 @@ $t = $class->new( filename => ... ); $t->param(...); -Example implementation: +Here's an example case allowing you to precisely test what's sent to your +templates: - sub html_tmpl_class { 'HTML::Template::Pro' } + $ENV{CGI_APP_RETURN_ONLY} = 1; + my $webapp = WebApp->new; + $webapp->html_tmpl_class('HTML::Template::Dumper'); + my $out_str = $webapp->run; + my $tmpl_href = eval "$out_str"; + + # Now Precisely test what would be set to the template + is ($tmpl_href->{pet_name}, 'Daisy', "Daisy is sent template"); + +This is a powerful technique because HTML::Template::Dumper loads and considers +the template file that would actually be used. If the 'pet_name' token was missing +in the template, the above test would fail. So, you are testing both your code +and your templates in a much more precise way than using simple regular +expressions to see if the string "Daisy" appeared somewhere on the page. B<The load_tmpl() callback> @@ -1345,6 +1359,12 @@ method supports passing in your existing query object on construction using the QUERY attribute. +There are a few rare situations where you want your own query object to be +used after your Application Module has already been constructed. In that case +you can pass it to c<query()> like this: + + $webapp->query($new_query_object); + my $q = $webapp->query(); # now uses $new_query_object =head3 run_modes() @@ -1638,7 +1658,19 @@ =cut -sub html_tmpl_class { 'HTML::Template' } +sub html_tmpl_class { + my $self = shift; + my $tmpl_class = shift; + + # First use? Create new __ERROR_MODE + $self->{__HTML_TMPL_CLASS} = 'HTML::Template' unless (exists($self->{__HTML_TMPL_CLASS})); + + if (defined $tmpl_class) { + $self->{__HTML_TMPL_CLASS} = $tmpl_class; + } + + return $self->{__HTML_TMPL_CLASS}; +} sub load_tmpl { my $self = shift; @@ -1938,7 +1970,7 @@ =item * -L<CGI::Application::Plugin::DBH> - Provides easy management of one or more database handles and candelay making the database connection until the moment it is actually used. +L<CGI::Application::Plugin::DBH> - Provides easy management of one or more database handles and can delay making the database connection until the moment it is actually used. =item * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/t/lib/TestApp13.pm new/CGI-Application-4.31/t/lib/TestApp13.pm --- old/CGI-Application-4.20/t/lib/TestApp13.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/CGI-Application-4.31/t/lib/TestApp13.pm 2009-07-30 03:41:00.000000000 +0200 @@ -0,0 +1,53 @@ +package TestApp13; +use strict; +use CGI::Application; +@TestApp13::ISA = qw(CGI::Application); + +# Prevent output to STDOUT +$ENV{CGI_APP_RETURN_ONLY} = 1; + +sub setup { + my $self = shift; + $self->run_modes( [ qw( mode1 mode2 ) ] ); + $self->start_mode( 'mode1' ); + $self->error_mode( 'error' ); +} + + +sub mode1 { + my $self = shift; + my $file; + open ( $file, "t/lib/templates/test.tmpl" ) + || die "Cannot open testing template"; + my $template = $self->load_tmpl( $file, 'die_on_bad_params' => 0 ); + $template->param( 'ping' => "HELLO!" ); + my $output = $template->output; + close ( $file ); + $output; +} + +sub mode2 { + my $self = shift; + my $template_string = <<_EOF_; +<html> +<head> +<title>Simple Test</title> +</head> +<body> +What's this:  +</body> +</html> +_EOF_ + + my $template = $self->load_tmpl( \$template_string, 'die_on_bad_params' => 0 ); + $template->param( 'ping' => 'HELLO!' ); + $template->output; +} + +sub error { + my $self = shift; + return "ERROR"; +} + +1; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/t/lib/TestApp14.pm new/CGI-Application-4.31/t/lib/TestApp14.pm --- old/CGI-Application-4.20/t/lib/TestApp14.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/CGI-Application-4.31/t/lib/TestApp14.pm 2009-07-30 03:41:00.000000000 +0200 @@ -0,0 +1,21 @@ +package TestApp14; +use base 'CGI::Application'; +use warnings; +use strict; + +sub setup { + my $self = shift; + $self->run_modes([qw/ start /]); + $self->tmpl_path('t/lib/templates'); +} + +sub start { + my $self = shift; + + my $t = $self->load_tmpl('test.tmpl'); + $t->param(ping => $self->query->param('message')); + + return $t->output(); +} + +1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CGI-Application-4.20/t/query.t new/CGI-Application-4.31/t/query.t --- old/CGI-Application-4.20/t/query.t 1970-01-01 01:00:00.000000000 +0100 +++ new/CGI-Application-4.31/t/query.t 2009-07-30 03:41:00.000000000 +0200 @@ -0,0 +1,27 @@ +# test the query() method + +use Test::More 'no_plan'; +use CGI; + +# Include the test hierarchy +use lib 't/lib'; + +use TestApp14; + +# Prevent output to STDOUT +$ENV{CGI_APP_RETURN_ONLY} = 1; + +# Test query() +{ + my $cgi = CGI->new('message=hello'); + my $ta_obj = TestApp14->new(QUERY => $cgi); + my $output = $ta_obj->run(); + + like($output, qr/---->hello<----/); + + my $cgi2 = CGI->new('message=goodbye'); + $ta_obj->query($cgi2); + $output = $ta_obj->run(); + + like($output, qr/---->goodbye<----/); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Apache2-AuthCookieDBI for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package perl-Apache2-AuthCookieDBI for openSUSE:Factory checked in at Fri Jul 31 22:43:47 CEST 2009. -------- --- perl-Apache2-AuthCookieDBI/perl-Apache2-AuthCookieDBI.changes 2006-10-25 13:23:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Apache2-AuthCookieDBI/perl-Apache2-AuthCookieDBI.changes 2009-07-30 16:54:48.000000000 +0200 @@ -1,0 +2,27 @@ +Thu Jul 30 16:13:43 CEST 2009 - cwh(a)suse.de + +- 2.05 - Thu May 14 18:37:07 PDT 2009 + - Fixed bug in _get_cipher_type() where it was not memoizing the + Crypt::CBC objects. + - Fixed https://rt.cpan.org/Ticket/Display.html?id=45207 + Hash keys for configuration values were wrong in several places. + - Improved test coverage a little. + +- 2.04 - Fri Nov 28 15:41:33 PST 2008 + Incorporated bug fix for authen_ses_key() provided by + Carl Gustafsson. authen_ses_key() was not properly handling + any extra_session_info - the fix is to get $hashed_string with + my $hashed_string = pop @rest; + + Also releasing the work done between April 26, 2005 and February 4, 2007, + plus bug fix for authen_ses_key + - Added basic framework for unit tests. + - Factored out some of the DBI code into new methods: + - _dbi_connect() + - _get_crypted_password() + + - Changes to satisfy Perl::Critic, e.g. + - Removed function prototypes (they are ignored for methods.) + - Cleaned up regular expressions: use /x, etc. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Apache2-AuthCookieDBI-2.03.tar.gz New: ---- Apache2-AuthCookieDBI-2.05.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Apache2-AuthCookieDBI.spec ++++++ --- /var/tmp/diff_new_pack.R2mHCZ/_old 2009-07-31 22:41:45.000000000 +0200 +++ /var/tmp/diff_new_pack.R2mHCZ/_new 2009-07-31 22:41:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Apache2-AuthCookieDBI (Version 2.03) +# spec file for package perl-Apache2-AuthCookieDBI (Version 2.05) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,12 @@ Url: http://search.cpan.org/~matisse/Apache2-AuthCookieDBI/ License: LGPL v2.1 or later Group: Productivity/Networking/Web/Servers -Requires: perl(Apache2::AuthCookie) >= 3.08 perl-Apache-DBI perl-Date-Calc -Obsoletes: perl-Apache-AuthCookieDBI +Requires: perl-base >= 5.10.0 perl(Apache2::AuthCookie) >= 3.08 perl-Apache-DBI perl-Date-Calc AutoReqProv: on -Summary: An AuthCookie module backed by a DBI database. -Version: 2.03 -Release: 114 -Source: Apache2-AuthCookieDBI-%{version}.tar.gz +Summary: An AuthCookie module backed by a DBI database +Version: 2.05 +Release: 1 +Source: Apache2-AuthCookieDBI-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,8 +55,8 @@ # --------------------------------------------------------------------------- %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install_vendor +#mv $RPM_BUILD_ROOT%{_docdir}/%{name}/eg $RPM_BUILD_ROOT%{_docdir}/%{name}/examples %perl_process_packlist %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Jul 31 22:41:28 CEST 2009. -------- --- libqt4/libQtWebKit-devel.changes 2009-06-24 17:42:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libQtWebKit-devel.changes 2009-07-28 18:47:23.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 28 18:31:05 CEST 2009 - dmueller(a)novell.com + +- disable use of x shared pixmaps, not supported by newer + drivers anymore and very slow anyway +- Fix QMenu not respecting minimum width, this affects + the Plasma taskabar +- Fix X11 timestamp issues which cause clipboard synchronisation + bugs + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 New: ---- 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch 0019-Make-QMenu-respect-the-minimum-width-set.patch 9e5fa633913ef952ca4ef5312fe396bcfc885321.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.wofjow/_old 2009-07-31 22:40:35.000000000 +0200 +++ /var/tmp/diff_new_pack.wofjow/_new 2009-07-31 22:40:35.000000000 +0200 @@ -38,7 +38,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.5.2 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.2 @@ -72,6 +72,9 @@ Patch106: build-install-qdoc3.diff Patch108: 0280-deserialization-custom-dbus-properties.diff Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff +Patch112: 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch +Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch +Patch114: 9e5fa633913ef952ca4ef5312fe396bcfc885321.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -128,6 +131,9 @@ %patch106 %patch108 %patch111 +%patch112 -p1 +%patch113 -p1 +%patch114 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END libqt4-devel-doc-data.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.wofjow/_old 2009-07-31 22:40:35.000000000 +0200 +++ /var/tmp/diff_new_pack.wofjow/_new 2009-07-31 22:40:35.000000000 +0200 @@ -50,7 +50,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN Version: 4.5.2 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.5.2 @@ -84,6 +84,9 @@ Patch106: build-install-qdoc3.diff Patch108: 0280-deserialization-custom-dbus-properties.diff Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff +Patch112: 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch +Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch +Patch114: 9e5fa633913ef952ca4ef5312fe396bcfc885321.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support @@ -140,6 +143,9 @@ %patch106 %patch108 %patch111 +%patch112 -p1 +%patch113 -p1 +%patch114 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END ++++++ 0012-This-patch-makes-the-raster-graphics-system-use-shar.patch ++++++ >From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001 From: Thiago Macieira <thiago.macieira(a)nokia.com> Date: Thu, 25 Jun 2009 13:50:29 +0200 Subject: [PATCH 12/19] This patch makes the raster graphics system use shared images instead of shared pixmaps. Shared memory pixmaps are deprecated since they are slower than shared images with modern graphics hardware. They are also not supported by EXA drivers and can be disabled in the latest version of the NVidia driver. qt-bugs@ issue : none Qt Software task ID : none bugs.kde.org number : none --- src/gui/image/qnativeimage.cpp | 10 ---------- src/gui/image/qnativeimage_p.h | 1 - src/gui/painting/qwindowsurface_raster.cpp | 13 ++++++++++--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 3745708..3c21fce 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* { if (!X11->use_mitshm) { xshmimg = 0; - xshmpm = 0; image = QImage(width, height, format); return; } @@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* shmctl(xshminfo.shmid, IPC_RMID, 0); return; } - xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data, - &xshminfo, width, height, dd); - if (!xshmpm) { - qWarning() << "QNativeImage: Unable to create shared Pixmap."; - } } @@ -204,10 +198,6 @@ QNativeImage::~QNativeImage() if (!xshmimg) return; - if (xshmpm) { - XFreePixmap(X11->display, xshmpm); - xshmpm = 0; - } XShmDetach(X11->display, &xshminfo); xshmimg->data = 0; XDestroyImage(xshmimg); diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h index 07d5dfe..ba01854 100644 --- a/src/gui/image/qnativeimage_p.h +++ b/src/gui/image/qnativeimage_p.h @@ -90,7 +90,6 @@ public: #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM) XImage *xshmimg; - Pixmap xshmpm; XShmSegmentInfo xshminfo; #elif defined(Q_WS_MAC) diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp index d6fb03b..09963d9 100644 --- a/src/gui/painting/qwindowsurface_raster.cpp +++ b/src/gui/painting/qwindowsurface_raster.cpp @@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi QRect br = rgn.boundingRect().translated(offset); #ifndef QT_NO_MITSHM - if (d_ptr->image->xshmpm) { - XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc, - br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y()); + if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) { + const QImage &src = d->image->image; + br = br.intersected(src.rect()); + // Hack to make sure we satisify the PutImage() constraints in the X server, + // since the doShmPutImage() route currently forces a migration to system ram. + wbr.setX(wbr.x() - br.x()); + br.setX(0); + br.setWidth(src.width()); + XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg, + br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False); XSync(X11->display, False); } else #endif -- 1.6.3.3 ++++++ 0019-Make-QMenu-respect-the-minimum-width-set.patch ++++++ >From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001 From: Aaron Seigo <aseigo(a)kde.org> Date: Mon, 27 Jul 2009 21:46:22 -0600 Subject: [PATCH 19/19] Make QMenu respect the minimum width set If one sets a minimum width on a QMenu and that size is larger than the smallest size needed by the large menu item, it ignores the minimum width and just uses the largest menu item size. This results in ugly painting artifacts. This currently affects (at least) the tasks widget in Plasma in KDE4. --- src/gui/widgets/qmenu.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 9fbbb04..5d62ea6 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc if (!sz.isEmpty()) { - max_column_width = qMax(max_column_width, sz.width()); + max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width())); //wrapping if (!scroll && y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) { -- 1.6.3.3 ++++++ 9e5fa633913ef952ca4ef5312fe396bcfc885321.patch ++++++ >From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko <denis.dzyubenko(a)nokia.com> Date: Wed, 22 Jul 2009 17:12:17 +0200 Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only." In some cases we might get an invalid timestamp that is far away in the future, so remembering it will break all consequent X calls that require a timestamp because it just contains junk (for example clipboard will stop working). This happens with XIM+SCIM pair - whenever we start input method and type something to the widget, we get a XKeyPress event with a commited string, however the 'serial' and 'time' members of the XEvent structure are not initialized (according to valgrind) and contain junk. This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. Reviewed-By: Brad --- src/gui/kernel/qapplication_x11.cpp | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 163ceb6..abedfd6 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event) #ifdef ALIEN_DEBUG //qDebug() << "QApplication::x11ProcessEvent:" << event->type; #endif - Time time = 0, userTime = 0; switch (event->type) { case ButtonPress: pressed_window = event->xbutton.window; - userTime = event->xbutton.time; + X11->userTime = event->xbutton.time; // fallthrough intended case ButtonRelease: - time = event->xbutton.time; + X11->time = event->xbutton.time; break; case MotionNotify: - time = event->xmotion.time; + X11->time = event->xmotion.time; break; case XKeyPress: - userTime = event->xkey.time; + X11->userTime = event->xkey.time; // fallthrough intended case XKeyRelease: - time = event->xkey.time; + X11->time = event->xkey.time; break; case PropertyNotify: - time = event->xproperty.time; + X11->time = event->xproperty.time; break; case EnterNotify: case LeaveNotify: - time = event->xcrossing.time; + X11->time = event->xcrossing.time; break; case SelectionClear: - time = event->xselectionclear.time; + X11->time = event->xselectionclear.time; break; default: -#ifndef QT_NO_XFIXES - if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { - XFixesSelectionNotifyEvent *req = - reinterpret_cast<XFixesSelectionNotifyEvent *>(event); - time = req->selection_timestamp; - } -#endif break; } - if (time > X11->time) - X11->time = time; - if (userTime > X11->userTime) - X11->userTime = userTime; +#ifndef QT_NO_XFIXES + if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { + XFixesSelectionNotifyEvent *req = + reinterpret_cast<XFixesSelectionNotifyEvent *>(event); + X11->time = req->selection_timestamp; + } +#endif QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window); -- 1.6.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vala for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package vala for openSUSE:Factory checked in at Fri Jul 31 22:39:37 CEST 2009. -------- --- GNOME/vala/vala.changes 2008-10-14 17:43:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/vala/vala.changes 2009-07-31 22:26:38.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jul 27 23:09:45 CEST 2009 - dominique-obs(a)leuenberger.net + +- Update to version 0.7.4: + + Way too many changes since 0.3.3. See NEWS for details. +- Refactored retry-fix.patch. Patch rejected upstream, as the .c + files are generated ones. +- Remove INSTALL from %%doc to fix a rpmlint warning. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vala-0.3.3.tar.bz2 New: ---- vala-0.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vala.spec ++++++ --- /var/tmp/diff_new_pack.h3tfWY/_old 2009-07-31 22:39:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h3tfWY/_new 2009-07-31 22:39:09.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vala (Version 0.3.3) +# spec file for package vala (Version 0.7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,14 @@ Name: vala -Version: 0.3.3 -Release: 5 +Version: 0.7.4 +Release: 1 Summary: Vala is a new programming language for GNOME Group: Development/Languages/Other License: LGPL v2.1 or later Url: http://live.gnome.org/Vala Source0: http://www.paldo.org/vala/vala-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM return-fix bgo#589942 dominique-obs(a)leuenberger.net -- Fix no-return-in-nonvoid function errors Patch0: return-fix.patch Patch1: vala-0.3.3-implicit-fortify-decl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +69,7 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 %build @@ -92,7 +93,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README +%doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/valac %{_bindir}/vala-gen-introspect %{_bindir}/vapicheck ++++++ return-fix.patch ++++++ --- /var/tmp/diff_new_pack.h3tfWY/_old 2009-07-31 22:39:09.000000000 +0200 +++ /var/tmp/diff_new_pack.h3tfWY/_new 2009-07-31 22:39:09.000000000 +0200 @@ -1,77 +1,102 @@ -diff -Naur vala-0.3.3/vala/valagenieparser.c vala-0.3.3-mp/vala/valagenieparser.c ---- vala-0.3.3/vala/valagenieparser.c 2008-06-03 22:22:26.000000000 +0200 -+++ vala-0.3.3-mp/vala/valagenieparser.c 2008-09-12 07:33:04.025057000 +0200 -@@ -464,6 +464,7 @@ - g_propagate_error (error, inner_error); +diff -Nurpa vala-0.7.4/codegen/valaccodecompiler.c vala-0.7.4.patched//codegen/valaccodecompiler.c +--- vala-0.7.4/codegen/valaccodecompiler.c 2009-06-14 18:53:16.000000000 +0200 ++++ vala-0.7.4.patched//codegen/valaccodecompiler.c 2009-07-27 23:53:41.000000000 +0200 +@@ -138,6 +138,7 @@ static gboolean vala_ccode_compiler_pack return FALSE; } + pc = (g_free (pc), NULL); + return FALSE; } -@@ -486,6 +487,7 @@ - g_propagate_error (error, inner_error); - return FALSE; +diff -Nurpa vala-0.7.4/vala/valagenieparser.c vala-0.7.4.patched//vala/valagenieparser.c +--- vala-0.7.4/vala/valagenieparser.c 2009-06-14 18:52:43.000000000 +0200 ++++ vala-0.7.4.patched//vala/valagenieparser.c 2009-07-27 23:52:08.000000000 +0200 +@@ -2230,6 +2230,7 @@ static inline gboolean vala_genie_parser + return FALSE; + } } + return FALSE; } -@@ -673,6 +675,7 @@ - g_propagate_error (error, inner_error); - return NULL; +@@ -2261,6 +2262,7 @@ static inline gboolean vala_genie_parser + return FALSE; + } } -+ return NULL; ++ return FALSE; } -@@ -1880,6 +1883,7 @@ +@@ -2663,6 +2665,7 @@ static ValaExpression* vala_genie_parser + } } } - (member == NULL ? NULL : (member = (g_object_unref (member), NULL))); + return NULL; } -@@ -5019,6 +5023,7 @@ - return NULL; +@@ -10950,6 +10953,7 @@ static ValaSymbol* vala_genie_parser_par + } } - (attrs == NULL ? NULL : (attrs = (g_object_unref (attrs), NULL))); + (attrs == NULL) ? NULL : (attrs = (gee_collection_object_unref (attrs), NULL)); + return NULL; } -diff -Naur vala-0.3.3/vala/valaparser.c vala-0.3.3-mp/vala/valaparser.c ---- vala-0.3.3/vala/valaparser.c 2008-06-03 22:22:28.000000000 +0200 -+++ vala-0.3.3-mp/vala/valaparser.c 2008-09-12 07:44:47.890487000 +0200 -@@ -419,6 +419,7 @@ - g_propagate_error (error, inner_error); - return FALSE; +diff -Nurpa vala-0.7.4/vala/valaparser.c vala-0.7.4.patched//vala/valaparser.c +--- vala-0.7.4/vala/valaparser.c 2009-06-25 14:46:31.000000000 +0200 ++++ vala-0.7.4.patched//vala/valaparser.c 2009-07-27 23:56:17.000000000 +0200 +@@ -2174,6 +2174,7 @@ static inline gboolean vala_parser_expec + return FALSE; + } } + return FALSE; } -@@ -618,6 +619,7 @@ - g_propagate_error (error, inner_error); - return NULL; +@@ -2565,6 +2566,7 @@ static ValaExpression* vala_parser_parse + } + } } + return NULL; } -@@ -1594,6 +1596,7 @@ +@@ -4317,6 +4319,7 @@ static ValaExpression* vala_parser_parse } } - (member == NULL ? NULL : (member = (g_object_unref (member), NULL))); -+ return NULL; + (member == NULL) ? NULL : (member = (vala_code_node_unref (member), NULL)); ++ return NULL; + } + + +@@ -9725,6 +9728,7 @@ static ValaSymbol* vala_parser_parse_dec + } + } + (attrs == NULL) ? NULL : (attrs = (gee_collection_object_unref (attrs), NULL)); ++ return NULL; + } + + +diff -Nurpa vala-0.7.4/vapigen/valavapicheck.c vala-0.7.4.patched//vapigen/valavapicheck.c +--- vala-0.7.4/vapigen/valavapicheck.c 2009-06-14 18:52:25.000000000 +0200 ++++ vala-0.7.4.patched//vapigen/valavapicheck.c 2009-07-27 23:54:57.000000000 +0200 +@@ -432,6 +432,7 @@ static gint vala_vapi_check_check_metada + g_clear_error (&_inner_error_); + return 0; + } ++ return 0; } -@@ -4549,6 +4552,7 @@ +diff -Nurpa vala-0.7.4/vapigen/valavapigen.c vala-0.7.4.patched//vapigen/valavapigen.c +--- vala-0.7.4/vapigen/valavapigen.c 2009-06-25 22:10:01.000000000 +0200 ++++ vala-0.7.4.patched//vapigen/valavapigen.c 2009-07-27 23:54:16.000000000 +0200 +@@ -224,6 +224,7 @@ static char** vala_vapi_gen_get_packages + g_clear_error (&_inner_error_); return NULL; } - (attrs == NULL ? NULL : (attrs = (g_object_unref (attrs), NULL))); + return NULL; } ++++++ vala-0.3.3.tar.bz2 -> vala-0.7.4.tar.bz2 ++++++ ++++ 567045 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 kerry for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package kerry for openSUSE:Factory checked in at Fri Jul 31 22:38:26 CEST 2009. -------- --- KDE/kerry/kerry.changes 2009-07-11 17:01:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2009-07-31 22:26:17.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 31 22:13:38 CEST 2009 - beineri(a)opensuse.org + +- update to latest SVN version (r1005337) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-build.diff kerry-0.2.90.tar.bz2 New: ---- kerry.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kerry.spec ++++++ --- /var/tmp/diff_new_pack.CN9ZXm/_old 2009-07-31 22:38:16.000000000 +0200 +++ /var/tmp/diff_new_pack.CN9ZXm/_new 2009-07-31 22:38:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kerry (Version 0.2.90) +# spec file for package kerry (Version 0.2.90.svn1005337) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,18 +24,16 @@ Group: System/GUI/KDE Summary: Desktop search tool BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 0.2.90 +Version: 0.2.90.svn1005337 Release: 1 -Source: kerry-%{version}.tar.bz2 +Source: kerry.tar.bz2 Source1: po.tar.bz2 Patch: po.diff -Patch1: fix-build.diff Requires: beagle >= 0.3.0 Requires: libbeagle1 >= 0.3.0 Provides: kde4-kerry = 0.2.90 Obsoletes: kde4-kerry <= 0.2.90 %kde4_runtime_requires -%kde4_pimlibs_requires %description A desktop search tool integrated with Beagle and KDE. @@ -49,7 +47,6 @@ %prep %setup -n kerry -b 1 %patch -%patch1 %build %cmake_kde4 -d build ++++++ kerry-0.2.90.tar.bz2 -> kerry.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beagled.desktop new/kerry/src/beagled.desktop --- old/kerry/src/beagled.desktop 2008-11-24 13:51:48.000000000 +0100 +++ new/kerry/src/beagled.desktop 2009-07-31 22:13:12.000000000 +0200 @@ -1,19 +1,25 @@ [Desktop Entry] Type=Application -Encoding=UTF-8 Exec=sleep 5 && beagled --bg Name=Beagle Daemon Name[cs]=Démon Beagle +Name[de]=Beagle-Dienst Name[el]=Δαίμονας Beagle +Name[en_GB]=Beagle Dæmon Name[es]=Demonio Beagle Name[et]=Beagle'i deemon Name[fr]=Démon Beagle Name[ga]=Deamhan Beagle Name[gl]=Daemon Beagle Name[hi]=बीगल डेमन +Name[hne]=बीगल डेमन +Name[it]=Demone Beagle Name[km]=ដេមិន Beagle Name[ko]=Beagle 데몬 +Name[ml]=ബീഗിള്‍ ഡെമണ്‍ +Name[nb]=Beagle-nisse Name[nl]=Beagle-daemon +Name[nn]=Beagle-teneste Name[pt]=Servidor do Beagle Name[pt_BR]=Servidor do Beagle Name[ro]=Demon Beagle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beaglesearch.cpp new/kerry/src/beaglesearch.cpp --- old/kerry/src/beaglesearch.cpp 2008-09-29 13:51:08.000000000 +0200 +++ new/kerry/src/beaglesearch.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -22,7 +22,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <klocale.h> -#include <qapplication.h> +#include <QApplication> //Added by qt3to4: #include <QCustomEvent> #include <kurl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beaglesearch.h new/kerry/src/beaglesearch.h --- old/kerry/src/beaglesearch.h 2008-09-29 17:45:05.000000000 +0200 +++ new/kerry/src/beaglesearch.h 2009-07-31 22:13:12.000000000 +0200 @@ -21,11 +21,11 @@ #ifndef BEAGLESEARCH_H #define BEAGLESEARCH_H -#include <qobject.h> -#include <qthread.h> -#include <qstringlist.h> -#include <qregexp.h> -#include <qmutex.h> +#include <QObject> +#include <QThread> +#include <QStringList> +#include <QRegExp> +#include <QMutex> #include <QLinkedList> #include <Q3PtrList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/hitwidget.cpp new/kerry/src/hitwidget.cpp --- old/kerry/src/hitwidget.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/hitwidget.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -23,14 +23,14 @@ #include <kpushbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <qtoolbutton.h> +#include <QToolButton> #include <kfileitem.h> //Added by qt3to4: #include <QEvent> #include <klocale.h> #include <kurllabel.h> #include <kglobalsettings.h> -#include <qlayout.h> +#include <QLayout> //#include <konq_filetip.h> #include <q3scrollview.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/hitwidget.h new/kerry/src/hitwidget.h --- old/kerry/src/hitwidget.h 2008-10-03 09:04:16.000000000 +0200 +++ new/kerry/src/hitwidget.h 2009-07-31 22:13:12.000000000 +0200 @@ -21,7 +21,7 @@ #define HITWIDGET_H #include <ui_hitwidget_layout.h> -#include <qdatetime.h> +#include <QDateTime> //Added by qt3to4: #include <QEvent> #include "kwidgetlistbox.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/CMakeLists.txt new/kerry/src/kcm/CMakeLists.txt --- old/kerry/src/kcm/CMakeLists.txt 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/CMakeLists.txt 2009-07-31 22:13:11.000000000 +0200 @@ -14,7 +14,7 @@ kde4_add_plugin(kcm_kerry ${kcm_kerry_PART_SRCS} ) -target_link_libraries(kcm_kerry ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${BEAGLE_LDFLAGS}) +target_link_libraries(kcm_kerry ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${BEAGLE_LDFLAGS}) install(TARGETS kcm_kerry DESTINATION ${PLUGIN_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/backends.cpp new/kerry/src/kcm/backends.cpp --- old/kerry/src/kcm/backends.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/backends.cpp 2009-07-31 22:13:11.000000000 +0200 @@ -21,11 +21,11 @@ #include "backends.h" -#include <qdir.h> +#include <QDir> #include <qdom.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> +#include <QFile> +#include <QLabel> +#include <QLayout> //Added by qt3to4: #include <Q3VBoxLayout> #include <kdialog.h> @@ -106,7 +106,7 @@ { QString myBuf = QString::fromLatin1(buffer, len); if (myBuf.startsWith("User:")) { - QStringList list = QStringList::split('\n',myBuf); + QStringList list = myBuf.split('\n'); for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) if ((*it).startsWith(" - ")) { Q3CheckListItem *item = new Q3CheckListItem(listview,(*it).mid(3),Q3CheckListItem::CheckBox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/indexing.cpp new/kerry/src/kcm/indexing.cpp --- old/kerry/src/kcm/indexing.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/indexing.cpp 2009-07-31 22:13:11.000000000 +0200 @@ -24,13 +24,13 @@ #include <qdom.h> #include <q3groupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> +#include <QLabel> +#include <QLayout> +#include <QRadioButton> //Added by qt3to4: -#include <Q3HBoxLayout> +#include <QHBoxLayout> #include <Q3GridLayout> -#include <Q3VBoxLayout> +#include <QVBoxLayout> #include <QTextStream> #include <kconfig.h> #include <kdialog.h> @@ -46,13 +46,13 @@ KCMBeagleIndexing::KCMBeagleIndexing(const KComponentData &inst, QWidget *parent) : KCModule(inst, parent) { - Q3VBoxLayout* top_layout = new Q3VBoxLayout( this, KDialog::spacingHint() ); + QVBoxLayout* top_layout = new QVBoxLayout( this, KDialog::spacingHint() ); // General Q3GroupBox* gb_general = new Q3GroupBox(0, Qt::Vertical, i18n("General"), this); top_layout->addWidget(gb_general); gb_general->setFlat(true); - Q3VBoxLayout* gb_general_layout = new Q3VBoxLayout( gb_general->layout(), KDialog::spacingHint() ); + QVBoxLayout* gb_general_layout = new QVBoxLayout( gb_general->layout(), KDialog::spacingHint() ); startBeagle = new QCheckBox(i18n("Start Beagle indexing service automatically"), gb_general); gb_general_layout->addWidget( startBeagle); @@ -64,9 +64,9 @@ Q3GroupBox* gb_index = new Q3GroupBox(0, Qt::Vertical, i18n("Index"), this); top_layout->addWidget(gb_index); gb_index->setFlat(true); - Q3VBoxLayout* gb_index_layout = new Q3VBoxLayout( gb_index->layout(), KDialog::spacingHint() ); + QVBoxLayout* gb_index_layout = new QVBoxLayout( gb_index->layout(), KDialog::spacingHint() ); - Q3HBoxLayout* qh_index = new Q3HBoxLayout(gb_index_layout); + QHBoxLayout* qh_index = new QHBoxLayout(gb_index_layout); indexHome = new QCheckBox(i18n("Index my home folder"), gb_index); qh_index->addWidget( indexHome ); qh_index->addStretch(1); @@ -101,7 +101,7 @@ Q3GroupBox* gb_privacy = new Q3GroupBox(0, Qt::Vertical, i18n("Privacy"), this); top_layout->addWidget(gb_privacy); gb_privacy->setFlat(true); - Q3VBoxLayout* gb_privacy_layout = new Q3VBoxLayout( gb_privacy->layout(), KDialog::spacingHint() ); + QVBoxLayout* gb_privacy_layout = new QVBoxLayout( gb_privacy->layout(), KDialog::spacingHint() ); QLabel* label_privacy = new QLabel(i18n( "Specify any resource, such as folder or pattern, you wish to exclude from indexing." ), gb_privacy); gb_privacy_layout->addWidget(label_privacy); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/indexing.h new/kerry/src/kcm/indexing.h --- old/kerry/src/kcm/indexing.h 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/indexing.h 2009-07-31 22:13:11.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef __INDEXING_H__ #define __INDEXING_H__ -#include <qcheckbox.h> +#include <QCheckBox> #include <k3listview.h> #include <kpushbutton.h> #include <kcmodule.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/kerry.cpp new/kerry/src/kcm/kerry.cpp --- old/kerry/src/kcm/kerry.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/kerry.cpp 2009-07-31 22:13:11.000000000 +0200 @@ -19,10 +19,9 @@ ******************************************************************/ -#include <qlayout.h> -#include <qtabwidget.h> -//Added by qt3to4: -#include <Q3VBoxLayout> +#include <QLayout> +#include <QTabWidget> +#include <QVBoxLayout> //#include <dcopclient.h> #include <kapplication.h> #include <kdebug.h> @@ -46,7 +45,7 @@ { setButtons(KCModule::Default | KCModule::Apply); - Q3VBoxLayout *layout = new Q3VBoxLayout(this); + QVBoxLayout *layout = new QVBoxLayout(this); m_tab = new QTabWidget(this); layout->addWidget(m_tab); m_search = new KCMKerrySearch(KCMKerryFactory::componentData(), this); @@ -108,7 +107,7 @@ QString KCMKerry::quickHelp() const { - QWidget *w = m_tab->currentPage(); + QWidget *w = m_tab->currentWidget(); if (w->inherits("KCModule")) { KCModule *m = static_cast<KCModule *>(w); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/search.cpp new/kerry/src/kcm/search.cpp --- old/kerry/src/kcm/search.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/search.cpp 2009-07-31 22:13:11.000000000 +0200 @@ -22,23 +22,22 @@ #include "search.h" #include <kconfig.h> -//Added by qt3to4: -#include <Q3HBoxLayout> -#include <Q3VBoxLayout> +#include <QHBoxLayout> +#include <QVBoxLayout> #include <QLabel> KCMKerrySearch::KCMKerrySearch(const KComponentData &inst, QWidget *parent) : KCModule(inst, parent) { - Q3VBoxLayout* top_layout = new Q3VBoxLayout( this, KDialog::spacingHint() ); + QVBoxLayout* top_layout = new QVBoxLayout( this, KDialog::spacingHint() ); // General Q3GroupBox* gb_general = new Q3GroupBox(0, Qt::Vertical, i18n("General"), this); gb_general->setFlat(true); top_layout->addWidget(gb_general); - Q3VBoxLayout* gb_general_layout = new Q3VBoxLayout( gb_general->layout(), KDialog::spacingHint() ); + QVBoxLayout* gb_general_layout = new QVBoxLayout( gb_general->layout(), KDialog::spacingHint() ); - Q3HBoxLayout* qh_layout = new Q3HBoxLayout(gb_general_layout); + QHBoxLayout* qh_layout = new QHBoxLayout(gb_general_layout); QLabel* label_order = new QLabel(i18n("Default result sort order:"), gb_general); qh_layout->addWidget(label_order); combo_order = new QComboBox(gb_general); @@ -50,7 +49,7 @@ label_order->setBuddy(combo_order); qh_layout->addWidget(combo_order); - Q3HBoxLayout* qh_number = new Q3HBoxLayout(gb_general_layout); + QHBoxLayout* qh_number = new QHBoxLayout(gb_general_layout); QLabel* label_number = new QLabel(i18n( "Maximum number of results displayed:" ), gb_general); qh_number->addWidget(label_number); maxResultsDisplayed = new QSpinBox( 1, 100, 1, gb_general ); @@ -66,7 +65,7 @@ // Global Shortcuts Q3GroupBox* gb_keys = new Q3GroupBox(0, Qt::Vertical, i18n("Global Shortcuts"), this); - Q3VBoxLayout* gb_keys_layout = new Q3VBoxLayout( gb_keys->layout(), KDialog::spacingHint() ); + QVBoxLayout* gb_keys_layout = new QVBoxLayout( gb_keys->layout(), KDialog::spacingHint() ); top_layout->addWidget(gb_keys); gb_keys->setFlat(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/search.h new/kerry/src/kcm/search.h --- old/kerry/src/kcm/search.h 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/search.h 2009-07-31 22:13:11.000000000 +0200 @@ -22,14 +22,14 @@ #ifndef __SEARCH_H__ #define __SEARCH_H__ -#include <qcheckbox.h> +#include <QCheckBox> #include <q3groupbox.h> -#include <qlabel.h> -#include <qlayout.h> +#include <QLabel> +#include <QLayout> #include <qspinbox.h> #include <q3whatsthis.h> #include <kcmodule.h> -#include <qcombobox.h> +#include <QComboBox> #include <kglobalaccel.h> #include <kshortcutsdialog.h> #include <klocale.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/select_privacy_resource.ui new/kerry/src/kcm/select_privacy_resource.ui --- old/kerry/src/kcm/select_privacy_resource.ui 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/select_privacy_resource.ui 2009-07-31 22:13:11.000000000 +0200 @@ -64,8 +64,7 @@ </layout> </widget> <layoutdefault spacing="6" margin="11" /> - <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> - <customwidgets> + <customwidgets> <customwidget> <class>Q3ButtonGroup</class> <extends>Q3GroupBox</extends> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/status.cpp new/kerry/src/kcm/status.cpp --- old/kerry/src/kcm/status.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/status.cpp 2009-07-31 22:13:11.000000000 +0200 @@ -22,17 +22,17 @@ #include "status.h" -#include <qdatetime.h> -#include <q3hbox.h> -#include <qlayout.h> -#include <qtimer.h> -//Added by qt3to4: -#include <Q3VBoxLayout> +#include <QDateTime> + +#include <QLayout> +#include <QTimer> +#include <QVBoxLayout> #include <QLabel> #include <kdialog.h> #include <klocale.h> #include <kpassivepopup.h> #include <k3process.h> +#include <kvbox.h> extern "C" { #include <glib.h> @@ -42,9 +42,9 @@ KCMBeagleStatus::KCMBeagleStatus(const KComponentData &inst, QWidget *parent) : KCModule(inst, parent) { - Q3VBoxLayout* general_layout = new Q3VBoxLayout( this, KDialog::spacingHint() ); + QVBoxLayout* general_layout = new QVBoxLayout( this, KDialog::spacingHint() ); - Q3HBox *control_box = new Q3HBox (this); + KHBox *control_box = new KHBox (this); control_box->setSpacing (3); general_layout->addWidget(control_box); @@ -67,7 +67,7 @@ index_info_box = new Q3TextEdit (status_box); index_info_box->setReadOnly (true); - Q3HBox *footer_box = new Q3HBox (this); + KHBox *footer_box = new KHBox (this); general_layout->addWidget(footer_box); // Add some spacing to left diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/status.h new/kerry/src/kcm/status.h --- old/kerry/src/kcm/status.h 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kcm/status.h 2009-07-31 22:13:11.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef __STATUS_H__ #define __STATUS_H__ -#include <qlabel.h> +#include <QLabel> #include <q3groupbox.h> #include <q3textedit.h> #include <kcmodule.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerry.autostart.desktop new/kerry/src/kerry.autostart.desktop --- old/kerry/src/kerry.autostart.desktop 2008-11-24 13:51:48.000000000 +0100 +++ new/kerry/src/kerry.autostart.desktop 2009-07-31 22:13:12.000000000 +0200 @@ -1,11 +1,15 @@ [Desktop Entry] -Encoding=UTF-8 Name=Kerry Beagle +Name[de]=Kerry/Beagle Name[hi]=केरी बीगल +Name[hne]=केरी बीगल +Name[ml]=കെറി ബീഗിള്‍ +Name[nn]=Kerry Beagle-søk Name[x-test]=xxKerry Beaglexx GenericName=Desktop Search GenericName[be]=Пошук для працоўнага стала GenericName[cs]=Hledání na ploše +GenericName[de]=Desktop-Suche GenericName[el]=Αναζήτηση επιφάνειας εργασίας GenericName[es]=Búsqueda de escritorio GenericName[et]=Töölauaotsing @@ -13,10 +17,15 @@ GenericName[ga]=Cuardach Deisce GenericName[gl]=Procuras de escritorio GenericName[hi]=डेस्कटॉप खोज +GenericName[hne]=डेस्कटाप खोज +GenericName[it]=Ricerca del desktop GenericName[km]=ការស្វែងរកផ្ទៃតុ GenericName[ko]=데스크톱 검색 -GenericName[nds]=Schrievdischsöök +GenericName[ml]=പണിയിടത്തില്‍ തെരയല്‍ +GenericName[nb]=Skrivebordssøk +GenericName[nds]=Schriefdischsöök GenericName[nl]=Desktop-zoekactie +GenericName[nn]=Skrivebordssøk GenericName[pt]=Pesquisa no Ambiente de Trabalho GenericName[pt_BR]=Pesquisa no ambiente de trabalho GenericName[ro]=Căutare de birou @@ -29,7 +38,7 @@ Exec=kerry Icon=kerry Type=Application -Categories=Qt;KDE;Application;Core;Utility;Filesystem; +Categories=Qt;KDE;Core;Utility;Filesystem; Terminal=false X-DCOP-ServiceType=Unique X-KDE-StartupNotify=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerry.desktop new/kerry/src/kerry.desktop --- old/kerry/src/kerry.desktop 2008-11-24 13:51:48.000000000 +0100 +++ new/kerry/src/kerry.desktop 2009-07-31 22:13:12.000000000 +0200 @@ -1,11 +1,15 @@ [Desktop Entry] -Encoding=UTF-8 Name=Kerry Beagle +Name[de]=Kerry/Beagle Name[hi]=केरी बीगल +Name[hne]=केरी बीगल +Name[ml]=കെറി ബീഗിള്‍ +Name[nn]=Kerry Beagle-søk Name[x-test]=xxKerry Beaglexx GenericName=Desktop Search GenericName[be]=Пошук для працоўнага стала GenericName[cs]=Hledání na ploše +GenericName[de]=Desktop-Suche GenericName[el]=Αναζήτηση επιφάνειας εργασίας GenericName[es]=Búsqueda de escritorio GenericName[et]=Töölauaotsing @@ -13,10 +17,15 @@ GenericName[ga]=Cuardach Deisce GenericName[gl]=Procuras de escritorio GenericName[hi]=डेस्कटॉप खोज +GenericName[hne]=डेस्कटाप खोज +GenericName[it]=Ricerca del desktop GenericName[km]=ការស្វែងរកផ្ទៃតុ GenericName[ko]=데스크톱 검색 -GenericName[nds]=Schrievdischsöök +GenericName[ml]=പണിയിടത്തില്‍ തെരയല്‍ +GenericName[nb]=Skrivebordssøk +GenericName[nds]=Schriefdischsöök GenericName[nl]=Desktop-zoekactie +GenericName[nn]=Skrivebordssøk GenericName[pt]=Pesquisa no Ambiente de Trabalho GenericName[pt_BR]=Pesquisa no ambiente de trabalho GenericName[ro]=Căutare de birou @@ -29,7 +38,7 @@ Exec=kerry --show-searchdialog Icon=kerry Type=Application -Categories=Qt;KDE;Application;Core;Utility;Filesystem; +Categories=Qt;KDE;Core;Utility;Filesystem; Terminal=false X-DCOP-ServiceType=Unique X-KDE-StartupNotify=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerryapp.cpp new/kerry/src/kerryapp.cpp --- old/kerry/src/kerryapp.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/kerryapp.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * ***************************************************************************/ -#include <qstring.h> -#include <qstringlist.h> -#include <qdir.h> -#include <qclipboard.h> +#include <QString> +#include <QStringList> +#include <QDir> +#include <QClipboard> #include <kfiledialog.h> #include <kcmdlineargs.h> #include <fcntl.h> @@ -30,9 +30,9 @@ #include <khelpmenu.h> #include <kprocess.h> -#include <qtooltip.h> +#include <QToolTip> #include <qdom.h> -#include <qtimer.h> +#include <QTimer> #include "searchdlg.h" #include "kerryapp.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerrylabel.cpp new/kerry/src/kerrylabel.cpp --- old/kerry/src/kerrylabel.cpp 2008-09-30 16:41:19.000000000 +0200 +++ new/kerry/src/kerrylabel.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -89,6 +89,7 @@ void KerryLabel::popupMenu( const QPoint &_global ) { + Q_UNUSED(_global); /* KFileItem item( ((HitWidget*)parent())->uri(),((HitWidget*)parent())->mimetype(),KFileItem::Unknown); KFileItemList _items; _items.append( item ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/main.cpp new/kerry/src/main.cpp --- old/kerry/src/main.cpp 2008-09-30 16:41:19.000000000 +0200 +++ new/kerry/src/main.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -18,16 +18,16 @@ ***************************************************************************/ #include <kerryapp.h> -#include <qobject.h> -#include <qdir.h> +#include <QObject> +#include <QDir> #include <qdom.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <klocale.h> #include <kconfig.h> -#include <qfileinfo.h> -#include <qstringlist.h> +#include <QFileInfo> +#include <QStringList> #include <kconfig.h> #include <kstandarddirs.h> #include <kdeversion.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/query.cpp new/kerry/src/query.cpp --- old/kerry/src/query.cpp 2008-09-29 13:51:08.000000000 +0200 +++ new/kerry/src/query.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -110,7 +110,7 @@ bool next_alternative = false; - for ( QStringList::ConstIterator it = alt->excludes.begin(); it != alt->excludes.end(); ++it ) { + for ( QStringList::ConstIterator it = alt->excludes.constBegin(); it != alt->excludes.constEnd(); ++it ) { if ( lower_term.find(*it)!=-1 ) { next_alternative = true; continue; @@ -119,7 +119,7 @@ if (next_alternative) continue; - for ( QStringList::ConstIterator it = alt->includes.begin(); it != alt->includes.end(); ++it ) { + for ( QStringList::ConstIterator it = alt->includes.constBegin(); it != alt->includes.constEnd(); ++it ) { if ( lower_term.find(*it)==-1 ) { next_alternative = true; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/query.h new/kerry/src/query.h --- old/kerry/src/query.h 2008-09-29 13:51:08.000000000 +0200 +++ new/kerry/src/query.h 2009-07-31 22:13:12.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef QUERY_H #define QUERY_H -#include <qstringlist.h> +#include <QStringList> #include <q3ptrlist.h> class Alternative diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/searchdlg.cpp new/kerry/src/searchdlg.cpp --- old/kerry/src/searchdlg.cpp 2008-11-24 14:52:14.000000000 +0100 +++ new/kerry/src/searchdlg.cpp 2009-07-31 22:13:12.000000000 +0200 @@ -23,17 +23,17 @@ #include "kwidgetlistbox.h" #include "kerrylabel.h" -#include <qclipboard.h> -#include <qlayout.h> -#include <qtextcodec.h> -//Added by qt3to4: -#include <QMovie> -#include <QPixmap> -#include <QShowEvent> -#include <QKeyEvent> -#include <QEvent> -#include <QCustomEvent> -#include <Q3CString> +#include <QtGui/QClipboard> +#include <QtGui/QLayout> +#include <QtCore/QTextCodec> +#include <QtGui/QMovie> +#include <QtGui/QPixmap> +#include <QtGui/QShowEvent> +#include <QtGui/QKeyEvent> +#include <QtCore/QEvent> +#include <QtCore/QCustomEvent> +#include <QtCore/QByteArray> + #include <kdebug.h> #include <kfiledialog.h> #include <kpushbutton.h> @@ -47,23 +47,23 @@ #include <kurllabel.h> #include <krun.h> #include <q3table.h> -#include <qdir.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <QDir> +#include <QLabel> +#include <QComboBox> #include <kio/job.h> #include <kprotocolinfo.h> #include <ktrader.h> #include <kprocess.h> -#include <qregexp.h> +#include <QRegExp> #include <kaction.h> #include <kmenu.h> -#include <qcheckbox.h> +#include <QCheckBox> #include <kdesktopfile.h> -#include <qtoolbutton.h> +#include <QToolButton> #include <kcombobox.h> #include <kservicegroup.h> #include <kbookmarkmanager.h> -#include <qcursor.h> +#include <QCursor> #include <kwindowsystem.h> #include <kwindowsystem.h> @@ -87,11 +87,9 @@ editSearch->setMaxCount(MAX_HISTORY_ITEMS); editSearch->setDuplicatesEnabled(false); -#if KDE_IS_VERSION( 3, 5, 4 ) KLineEdit *lineedit = new KLineEdit(editSearch); lineedit->setClickMessage(i18n( "Applications, Contacts, Conversations, Files and more..." ) ); editSearch->setLineEdit(lineedit); -#endif connect(editSearch->lineEdit(), SIGNAL(returnPressed()), SLOT(search())); connect(editSearch, SIGNAL(activated(const QString &)), SLOT(search(const QString &))); @@ -1500,6 +1498,7 @@ void SearchDlg::slotOpenKNotes(const QString &noteid) { + Q_UNUSED(noteid); /* if (ensureServiceRunning("knotes")) { QByteArray data; QDataStream arg(data, QIODevice::WriteOnly); @@ -1614,7 +1613,7 @@ text += i18n("- A broader search scope might produce more results.")+"<br>"; text += i18n("- You should check the spelling of your search words."); if (beagleJustStarted) { - text += "<br>"+i18n("- The Beagle daemon was just started. Please be patient until it finished its indexing."); + text += "<br>"+i18n("- The Beagle daemon was just started. Please be patient until it has finished its indexing."); beagleJustStarted = false; } item->setDescriptionText(text+"</qt>"); @@ -1647,12 +1646,12 @@ pPreviewMimeTypes->clear(); // Load the list of plugins to determine which mimetypes are supported - KService::List plugins = KServiceTypeTrader::self()->query("ThumbCreator"); + const KService::List plugins = KServiceTypeTrader::self()->query("ThumbCreator"); KService::List::ConstIterator it; - for ( it = plugins.begin(); it != plugins.end(); ++it ) { - QStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); - for (QStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) + for ( it = plugins.constBegin(); it != plugins.constEnd(); ++it ) { + const QStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); + for (QStringList::ConstIterator mt = mimeTypes.constBegin(); mt != mimeTypes.constEnd(); ++mt) pPreviewMimeTypes->append(*mt); } } @@ -1802,8 +1801,8 @@ if (list.isEmpty()) return; - KServiceGroup::List::ConstIterator it = list.begin(); - for(; it != list.end(); ++it) { + KServiceGroup::List::ConstIterator it = list.constBegin(); + for(; it != list.constEnd(); ++it) { KSycocaEntry::Ptr e = (*it); if(e) { @@ -1881,8 +1880,8 @@ if (!m_addressBook) m_addressBook = KABC::StdAddressBook::self( false ); - KABC::AddressBook::ConstIterator it = m_addressBook->begin(); - while (it!=m_addressBook->end()) { + KABC::AddressBook::ConstIterator it = m_addressBook->constBegin(); + while (it!=m_addressBook->constEnd()) { if (!current_query.matches((*it).assembledName()+' '+(*it).fullEmail())) { it++; continue; @@ -2027,9 +2026,10 @@ bool SearchDlg::ensureServiceRunning(const QString & name) { + Q_UNUSED(name); /* QStringList URLs; QByteArray data, replyData; - Q3CString replyType; + QByteArray replyType; QDataStream arg(data, QIODevice::WriteOnly); arg << name << URLs; @@ -2046,7 +2046,7 @@ return false; } int result; - Q3CString dcopName; + QByteArray dcopName; QString error; // reply >> result >> dcopName >> error; if (result != 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 scribus for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at Fri Jul 31 21:25:03 CEST 2009. -------- --- KDE/scribus/scribus.changes 2009-07-30 23:33:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/scribus/scribus.changes 2009-07-31 10:25:54.000000000 +0200 @@ -2,4 +2 @@ -Tue Apr 28 16:18 CET 2009 - mrdocs(a)opensuse.org -- drop fdupes it breaks the help browser -- update to 1.3.3.13 -- make %jobs can break builds just use make +Fri Jul 31 10:25:33 CEST 2009 - coolo(a)novell.com @@ -7,5 +4 @@ -------------------------------------------------------------------- -Tue Apr 28 16:18 CET 2009 - mrdocs(a)opensuse.org -- drop fdupes it breaks the help browser -- update to 1.3.3.13 -- make %jobs can break builds just use make +- fix build @@ -14,0 +8 @@ + calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.eJAiJB/_old 2009-07-31 21:21:55.000000000 +0200 +++ /var/tmp/diff_new_pack.eJAiJB/_new 2009-07-31 21:21:55.000000000 +0200 @@ -34,7 +34,7 @@ Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words Version: 1.3.3.13 -Release: 1 +Release: 2 %define tar_version %version Source: %{name}-%{tar_version}.tar.bz2 Source1: vnd.%name.desktop @@ -90,7 +90,7 @@ export CFLAGS="$CXXFLAGS -fno-strict-aliasing" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ -DCMAKE_SKIP_RPATH=TRUE -DDOCDIR=%{_docdir} -DLIB_INSTALL_DIR=%{_libdir} \ - -DLIB_SUFFIX=$(echo %_lib | cut -b4-) -DWANT_CAIRO=1 .. \ + -DLIB_SUFFIX=$(echo %_lib | cut -b4-) -DWANT_CAIRO=1 .. make VERBOSE=1 %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 skanlite for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package skanlite for openSUSE:Factory checked in at Fri Jul 31 21:24:53 CEST 2009. -------- --- KDE/skanlite/skanlite.changes 2009-06-03 09:07:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/skanlite/skanlite.changes 2009-07-31 20:08:41.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 31 20:01:22 CEST 2009 - beineri(a)opensuse.org + +- update to 0.3-kde4.3.0: updated translations + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- skanlite-0.3-kde4.2.4.tar.bz2 New: ---- skanlite-0.3-kde4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skanlite.spec ++++++ --- /var/tmp/diff_new_pack.OWJswn/_old 2009-07-31 21:14:57.000000000 +0200 +++ /var/tmp/diff_new_pack.OWJswn/_new 2009-07-31 21:14:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skanlite (Version 0.3.kde4.2.4) +# spec file for package skanlite (Version 0.3.kde4.3.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,9 +23,10 @@ License: LGPL v2.1 or later Group: Hardware/Scanner Summary: Scanner Front-End -Version: 0.3.kde4.2.4 +Version: 0.3.kde4.3.0 Release: 1 -Source0: skanlite-0.3-kde4.2.4.tar.bz2 +%define rversion 0.3-kde4.3.0 +Source0: skanlite-%{rversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kdegraphics3-scan = 3.5.1 Obsoletes: kdegraphics3-scan <= 3.5.1 @@ -41,7 +42,7 @@ Kare Sars <kare.sars(a)iki.fi> %prep -%setup -q -n skanlite-0.3-kde4.2.4 +%setup -q -n skanlite-%{rversion} %build %cmake_kde4 -d build ++++++ skanlite-0.3-kde4.2.4.tar.bz2 -> skanlite-0.3-kde4.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/doc-translations/de_skanlite/skanlite/index.docbook new/skanlite-0.3-kde4.3.0/doc-translations/de_skanlite/skanlite/index.docbook --- old/skanlite-0.3-kde4.2.4/doc-translations/de_skanlite/skanlite/index.docbook 2009-05-30 02:31:34.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/doc-translations/de_skanlite/skanlite/index.docbook 2009-07-30 14:47:53.000000000 +0200 @@ -259,14 +259,18 @@ >Um das Bild besser auszuwählen kann der Anwender in das Bild hinein und aus der aktuellen Auswahl hinaus zoomen. Er kann den Zoom auch so einstellen, dass die komplette Vorschau in das Fenster passt. </para> <screenshot> <screeninfo ->Der Knopf "Passend zoomen"</screeninfo> +>Der Knopf <quote +>Passend zoomen</quote +></screeninfo> <mediaobject> <imageobject> <imagedata fileref="zoom-to-fit.png" format="PNG"/> </imageobject> <textobject> <phrase ->Der Knopf "Passend zoomen"</phrase> +>Der Knopf <quote +>Passend zoomen</quote +></phrase> </textobject> </mediaobject> </screenshot> @@ -452,7 +456,9 @@ >Hilfe</guibutton > startet die KDE-Hilfe mit dem &skanlite;-Handbuch. Der Knopf <guibutton >Über</guibutton -> startet den KDE "Über"-Dialog für &skanlite;. Der Knopf <guibutton +> startet den KDE <quote +>Über</quote +>-Dialog für &skanlite;. Der Knopf <guibutton >Einstellungen</guibutton > zeigt den Dialog für die Einstellungen und <guibutton >Schließen</guibutton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/CMakeLists.txt new/skanlite-0.3-kde4.3.0/po/CMakeLists.txt --- old/skanlite-0.3-kde4.2.4/po/CMakeLists.txt 2009-05-30 02:48:43.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/po/CMakeLists.txt 2009-07-30 14:50:25.000000000 +0200 @@ -9,6 +9,7 @@ add_subdirectory( fr ) add_subdirectory( ga ) add_subdirectory( gl ) +add_subdirectory( is ) add_subdirectory( it ) add_subdirectory( ja ) add_subdirectory( km ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/is/CMakeLists.txt new/skanlite-0.3-kde4.3.0/po/is/CMakeLists.txt --- old/skanlite-0.3-kde4.2.4/po/is/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/skanlite-0.3-kde4.3.0/po/is/CMakeLists.txt 2009-07-30 14:49:34.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( is ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/is/skanlite.po new/skanlite-0.3-kde4.3.0/po/is/skanlite.po --- old/skanlite-0.3-kde4.2.4/po/is/skanlite.po 1970-01-01 01:00:00.000000000 +0100 +++ new/skanlite-0.3-kde4.3.0/po/is/skanlite.po 2009-07-30 14:49:34.000000000 +0200 @@ -0,0 +1,214 @@ +# translation of skanlite.po to +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: skanlite\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2009-04-30 11:49+0200\n" +"PO-Revision-Date: 2009-07-23 23:25+0000\n" +"Last-Translator: \n" +"Language-Team: <is(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: main.cpp:32 +msgid "Skanlite" +msgstr "" + +#: main.cpp:33 +msgid "This is a scanning application for KDE based on libksane." +msgstr "" + +#: main.cpp:35 +msgid "(C) 2008 Kåre Särs" +msgstr "" + +#: main.cpp:37 +msgid "Kåre Särs" +msgstr "" + +#: main.cpp:38 +#, fuzzy +msgid "developer" +msgstr "forritari" + +#: main.cpp:41 +msgid "Arseniy Lartsev" +msgstr "" + +#: main.cpp:42 +msgid "contributor" +msgstr "" + +#: main.cpp:45 +#, fuzzy +msgid "Gilles Caulier" +msgstr "Gilles Caulier" + +#: main.cpp:46 main.cpp:54 +msgid "Importing libksane to extragear" +msgstr "" + +#: main.cpp:49 +#, fuzzy +msgid "Anne-Marie Mahfouf" +msgstr "Anne-Marie Mahfouf" + +#: main.cpp:50 +msgid "Writing the user manual" +msgstr "" + +#: main.cpp:53 +#, fuzzy +msgid "Laurent Montel" +msgstr "Laurent Montel" + +#: main.cpp:57 +msgid "Chusslove Illich" +msgstr "" + +#: main.cpp:58 main.cpp:62 +msgid "Help with translations" +msgstr "" + +#: main.cpp:61 +#, fuzzy +msgid "Albert Astals Cid" +msgstr "Albert Astals Cid" + +#: main.cpp:70 +msgid "Sane scanner device name." +msgstr "" + +#. i18n: file: settings.ui:5 +#. i18n: ectx: property (windowTitle), widget (QWidget, SkanliteSettings) +#: rc.cpp:3 rc.cpp:45 skanlite.cpp:52 +#, fuzzy +msgid "Settings" +msgstr "Stillingar" + +#. i18n: file: settings.ui:11 +#. i18n: ectx: property (text), widget (QCheckBox, showB4Save) +#: rc.cpp:6 rc.cpp:48 +msgid "Preview the image before saving." +msgstr "" + +#. i18n: file: settings.ui:18 +#. i18n: ectx: property (text), widget (QLabel, label_6) +#: rc.cpp:9 rc.cpp:51 +msgid "Save mode:" +msgstr "" + +#. i18n: file: settings.ui:26 +#. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) +#: rc.cpp:12 rc.cpp:54 +msgid "Open the save dialog for every image" +msgstr "" + +#. i18n: file: settings.ui:31 +#. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) +#: rc.cpp:15 rc.cpp:57 +msgid "Open the save dialog for the first image only" +msgstr "" + +#. i18n: file: settings.ui:36 +#. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) +#: rc.cpp:18 rc.cpp:60 +msgid "Save without asking for a filename" +msgstr "" + +#. i18n: file: settings.ui:44 +#. i18n: ectx: property (text), widget (QLabel, label) +#: rc.cpp:21 rc.cpp:63 +msgid "Save Location:" +msgstr "" + +#. i18n: file: settings.ui:77 +#. i18n: ectx: property (text), widget (QPushButton, getDirButton) +#: rc.cpp:24 rc.cpp:66 +#, fuzzy +msgid "..." +msgstr "..." + +#. i18n: file: settings.ui:86 +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: rc.cpp:27 rc.cpp:69 +msgid "Name & Format:" +msgstr "" + +#. i18n: file: settings.ui:95 +#. i18n: ectx: property (text), widget (QLineEdit, imgPrefix) +#: rc.cpp:30 rc.cpp:72 +#, fuzzy +msgid "Image" +msgstr "Mynd" + +#. i18n: file: settings.ui:102 +#. i18n: ectx: property (text), widget (QLabel, label_3) +#: rc.cpp:33 rc.cpp:75 +msgid "###." +msgstr "" + +#. i18n: file: settings.ui:121 +#. i18n: ectx: property (text), widget (QCheckBox, setQuality) +#: rc.cpp:36 rc.cpp:78 +msgid "Specify quality:" +msgstr "" + +#. i18n: file: settings.ui:174 +#. i18n: ectx: property (suffix), widget (QSpinBox, imgQuality) +#: rc.cpp:40 rc.cpp:82 +#, fuzzy, no-c-format +msgid "%" +msgstr "%" + +#: rc.cpp:41 +#, fuzzy +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Sveinn í Felli" + +#: rc.cpp:42 +#, fuzzy +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "sveinki(a)nett.is" + +#: skanlite.cpp:54 +#, fuzzy +msgid "About" +msgstr "Um" + +#: skanlite.cpp:82 +msgid "Skanlite Settings" +msgstr "" + +#: skanlite.cpp:103 +#, fuzzy +msgid "Opening the selected scanner failed." +msgstr "Mistókst að tengjast völdum skanna." + +#: skanlite.cpp:202 +#, fuzzy +msgid "Save" +msgstr "Vista" + +#: skanlite.cpp:289 +#, kde-format +msgid "Do you want to overwrite \"%1\"?" +msgstr "" + +#: skanlite.cpp:291 +#, fuzzy +msgid "Overwrite" +msgstr "Skrifa yfir" + +#: skanlite.cpp:329 skanlite.cpp:375 +msgid "Failed to save image" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/it/skanlite.po new/skanlite-0.3-kde4.3.0/po/it/skanlite.po --- old/skanlite-0.3-kde4.2.4/po/it/skanlite.po 2009-05-30 02:43:20.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/po/it/skanlite.po 2009-07-30 14:49:35.000000000 +0200 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Valter Mura <valtermura(a)gmail.com>, 2008, 2009. +# Federico Zenith <federico.zenith(a)member.fsf.org>, 2009. msgid "" msgstr "" "Project-Id-Version: skanlite\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-04-30 11:49+0200\n" -"PO-Revision-Date: 2009-03-24 21:55+0100\n" -"Last-Translator: Valter Mura <valtermura(a)gmail.com>\n" -"Language-Team: Italian <kde-i18n-it(a)lists.kde.org>\n" +"PO-Revision-Date: 2009-06-19 21:53+0200\n" +"Last-Translator: Federico Zenith <federico.zenith(a)member.fsf.org>\n" +"Language-Team: Italian <kde-i18n-it(a)kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,7 +28,7 @@ #: main.cpp:35 msgid "(C) 2008 Kåre Särs" -msgstr "(C) 2008 Kåre Särs" +msgstr "© 2008 Kåre Särs" #: main.cpp:37 msgid "Kåre Särs" @@ -43,7 +44,7 @@ #: main.cpp:42 msgid "contributor" -msgstr "collaboratore" +msgstr "Collaboratore" #: main.cpp:45 msgid "Gilles Caulier" @@ -51,7 +52,7 @@ #: main.cpp:46 main.cpp:54 msgid "Importing libksane to extragear" -msgstr "Importare libksane in extragear" +msgstr "Importazione di libksane in extragear" #: main.cpp:49 msgid "Anne-Marie Mahfouf" @@ -59,7 +60,7 @@ #: main.cpp:50 msgid "Writing the user manual" -msgstr "Scrivere il manuale utente" +msgstr "Scrittura del manuale utente" #: main.cpp:53 msgid "Laurent Montel" @@ -71,7 +72,7 @@ #: main.cpp:58 main.cpp:62 msgid "Help with translations" -msgstr "Aiutare con le traduzioni" +msgstr "Aiuto con le traduzioni" #: main.cpp:61 msgid "Albert Astals Cid" @@ -97,7 +98,7 @@ #. i18n: ectx: property (text), widget (QLabel, label_6) #: rc.cpp:9 rc.cpp:51 msgid "Save mode:" -msgstr "Modo salvataggio:" +msgstr "Come salvare:" #. i18n: file: settings.ui:26 #. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) @@ -121,7 +122,7 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: rc.cpp:21 rc.cpp:63 msgid "Save Location:" -msgstr "Salva posizione:" +msgstr "Dove salvare:" #. i18n: file: settings.ui:77 #. i18n: ectx: property (text), widget (QPushButton, getDirButton) @@ -151,7 +152,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, setQuality) #: rc.cpp:36 rc.cpp:78 msgid "Specify quality:" -msgstr "Specifica qualità:" +msgstr "Specifica la qualità:" #. i18n: file: settings.ui:174 #. i18n: ectx: property (suffix), widget (QSpinBox, imgQuality) @@ -172,7 +173,7 @@ #: skanlite.cpp:54 msgid "About" -msgstr "Informazioni su" +msgstr "Informazioni" #: skanlite.cpp:82 msgid "Skanlite Settings" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/pa/skanlite.po new/skanlite-0.3-kde4.3.0/po/pa/skanlite.po --- old/skanlite-0.3-kde4.2.4/po/pa/skanlite.po 2009-05-30 02:45:53.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/po/pa/skanlite.po 2009-07-30 14:49:58.000000000 +0200 @@ -2,18 +2,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Amanpreet Singh Alam <aalam(a)users.sf.net>, 2009. +# A S Alam <aalam(a)users.sf.net>, 2009. msgid "" msgstr "" "Project-Id-Version: skanlite\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-04-30 11:49+0200\n" -"PO-Revision-Date: 2009-01-04 16:54+0530\n" -"Last-Translator: Amanpreet Singh Alam <aalam(a)users.sf.net>\n" -"Language-Team: Punjabi/Panjabi <punjab-l10n(a)list.sf.net>\n" +"PO-Revision-Date: 2009-07-07 07:14+0530\n" +"Last-Translator: A S Alam <aalam(a)users.sf.net>\n" +"Language-Team: Punjabi/Panjabi <punjabi-users(a)lists.sf.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: main.cpp:32 @@ -38,11 +39,11 @@ #: main.cpp:41 msgid "Arseniy Lartsev" -msgstr "" +msgstr "Arseniy Lartsev" #: main.cpp:42 msgid "contributor" -msgstr "" +msgstr "ਯੋਗਦਾਨੀ" #: main.cpp:45 msgid "Gilles Caulier" @@ -107,10 +108,8 @@ #. i18n: file: settings.ui:31 #. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) #: rc.cpp:15 rc.cpp:57 -#, fuzzy -#| msgid "Open the save dialog for every image" msgid "Open the save dialog for the first image only" -msgstr "ਹਰੇਕ ਚਿੱਤਰ ਲਈ ਸੰਭਾਲੋ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" +msgstr "ਕੇਵਲ ਪਹਿਲੇ ਚਿੱਤਰ ਲਈ ਹੀ ਸੰਭਾਲੋ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" #. i18n: file: settings.ui:36 #. i18n: ectx: property (text), item, widget (QComboBox, saveModeCB) @@ -180,10 +179,8 @@ msgstr "ਸਕੈਨਲਾਈਟ ਸੈਟਿੰਗ" #: skanlite.cpp:103 -#, fuzzy -#| msgid "Opening the selected scanner failed!" msgid "Opening the selected scanner failed." -msgstr "ਚੁਣਿਆ ਸਕੈਨਰ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਫੇਲ੍ਹ!" +msgstr "ਚੁਣਿਆ ਸਕੈਨਰ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਫੇਲ੍ਹ ਹੈ।" #: skanlite.cpp:202 msgid "Save" @@ -200,7 +197,7 @@ #: skanlite.cpp:329 skanlite.cpp:375 msgid "Failed to save image" -msgstr "" +msgstr "ਚਿੱਤਰ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ" #~ msgid "Saving Failed!" #~ msgstr "ਸੰਭਾਲਣਾ ਫੇਲ੍ਹ!" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/po/zh_TW/skanlite.po new/skanlite-0.3-kde4.3.0/po/zh_TW/skanlite.po --- old/skanlite-0.3-kde4.2.4/po/zh_TW/skanlite.po 2009-05-30 02:48:43.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/po/zh_TW/skanlite.po 2009-07-30 14:50:25.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: skanlite\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2009-04-30 11:49+0200\n" -"PO-Revision-Date: 2009-03-20 10:17+0800\n" +"PO-Revision-Date: 2009-07-07 14:17+0800\n" "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv " "dot tw>\n" "Language-Team: Chinese Traditional <zh-l10n(a)linux.org.tw>\n" @@ -180,10 +180,8 @@ msgstr "Skanlite 設定" #: skanlite.cpp:103 -#, fuzzy -#| msgid "Opening the selected scanner failed!" msgid "Opening the selected scanner failed." -msgstr "開啟選取的掃描器時失敗！" +msgstr "開啟選取的掃描器失敗。" #: skanlite.cpp:202 msgid "Save" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skanlite-0.3-kde4.2.4/skanlite.desktop new/skanlite-0.3-kde4.3.0/skanlite.desktop --- old/skanlite-0.3-kde4.2.4/skanlite.desktop 2009-05-30 02:28:47.000000000 +0200 +++ new/skanlite-0.3-kde4.3.0/skanlite.desktop 2009-07-30 14:47:32.000000000 +0200 @@ -5,10 +5,12 @@ X-DocPath=skanlite/index.html Terminal=false Name=Skanlite +Name[bg]=Сканиране Name[ml]=സ്കാന്‍ലൈറ്റ് Name[pa]=ਸਕਿਨਲਾਈਟ Name[x-test]=xxSkanlitexx GenericName=Image Scanning Application +GenericName[bg]=Програма за сканиране на изображения GenericName[cs]=Aplikace pro skenování obrázků GenericName[da]=Program til scanning af billeder GenericName[de]=Anwendung zum Einlesen von Bildern @@ -39,6 +41,7 @@ GenericName[zh_CN]=图像扫描程序 GenericName[zh_TW]=影像掃描程式 Comment=Scan and save images +Comment[bg]=Сканиране и записване на изображения Comment[cs]=Senovat a uložit obrázky Comment[da]=Scan og gem billeder Comment[de]=Bilder einlesen und abspeichern ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kvm for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Fri Jul 31 21:14:42 CEST 2009. -------- --- kvm/kvm.changes 2009-07-22 10:13:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/kvm/kvm.changes 2009-07-31 20:21:06.000000000 +0200 @@ -1,0 +2,46 @@ +Thu Jul 30 14:51:29 UTC 2009 - brogers(a)novell.com + +- update to kvm-88, removed patches for mac compatability + - (kvm-88) kvm-87 wasn't so hot due to networking not working withi + rtl8139 and e1000. So kvm-88 fixes that and brings a bunch of new features + (resizable sdl windows, multiboot, x2apic, and more). Enjoy. + + - (kvm-87) Many fixes, performance improvements, a preview of irqfd, but + all of these pale in comparison to + + qemu-system-x86_64 -m 1024 -cdrom http://example.com/livecd.iso + + yes, no need for tedious downloading anymore. + + - (kvm-86) There are many qcow2 and live migration fixes in this release; + also noteworthy is the beginning of NUMA support. The interrupt injection + code has seen some significant rework. + + - (kvm-85) selected changes listed: + - merge qemu-svn + - microsoft serial mouse emulation + - cpuid fixes + - multiple simulataneous vnc client support + - allow additions of acpi tables from command line + - vnc sasl authentication + - fix one qcow2 corruptor + - fix qcow2 > 2TB images + - use preadv/pwritev when available for zero-copy block devices + - fix extboot with cache=off (Nolan Leake) + - fix 4GB+ guest RAM with large pages (Marcelo Tosatti) + - fix handling of large pages in assigned devices (Joerg Roedel) + - set accessed bit on segment selectos on AMD (Andre Przywara) + - fixes cross-vendor migrations + - fix large page memory leak (Joerg Roedel) + - support device deassignment (Weidong Han) + - msi-x support (Sheng Yang) + - fix missing flush on invlpg emulation (Andrea Arcangeli) + - fix vmx feature testing (Sheng Yang) + - fix PDPTE reserved bit testing (Eddie Dong) + - fix handling of a fault during NMI unblocked due to IRET (Gleb Natapov) + - fix task switch back link pointer (Gleb Natapov) + - fix near call emulation (Gleb Natapov) + - fix extboot failure after reset (Ryan Harper) + - fix PIT mode 0 handling (Marcelo Tosatti) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- convert-commits-to-patch.sh kvm-84.tar.bz2 kvm-bios.patch kvm-ioapic.patch kvm-kernel-cpuid4.patch kvm-kernel-msr.patch kvm-maccpuid.patch kvm-preXX-altgr-and-dead-keys-with-VNC.patch kvm-qemu-applesmc.patch kvm-qemu-ide-ich6.patch kvm-qemu-local-include2.patch kvm-qemu-lpc.patch kvm-qemu-macmodel.patch kvm-qemu-multiboot.patch kvm-qemu-rtl8139-link.patch New: ---- kvm-88.tar.bz2 kvm-preXX-fix-build-for-ESD-audio.patch kvm-preXX-fix-serious-regression.patch kvm-preXX-fix-virtio-hd.patch kvm-preXX-tracepoint-for-latest-kernel.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.H1P7M7/_old 2009-07-31 21:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.H1P7M7/_new 2009-07-31 21:13:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kvm (Version 84) +# spec file for package kvm (Version 88) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -49,20 +49,9 @@ Group: System/Kernel Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ -Version: 84 -Release: 6 +Version: 88 +Release: 1 Source0: %name-%version.tar.bz2 -### To update to new version, recompress the kvm-??.tar.gz using: -# rpmbuild -bp kvm.spec --define="_sourcedir `pwd`" -#%( -if [ -f %name-%version.tar.gz ]; then - gunzip %name-%version.tar.gz - tar --delete %name-%version/patches \ - --file=%{name}-%{version}.tar - bzip2 %name-%version.tar -fi -) -### ExclusiveArch: %ix86 x86_64 ia64 s390 Source1: 60-kvm.rules Source2: NETKVM-20081229.iso @@ -71,31 +60,16 @@ Patch01: qemu-datadir.diff Patch02: kvm-qemu-default-memsize.patch Patch03: kvm-qemu-no-fallback-if-open-kvm-fails.patch -%define work_around_bad_symlink 0 -%if %work_around_bad_symlink -Patch04: kvm-qemu-local-include2.patch -%endif -# Mac OS X patches -Patch10: kvm-qemu-lpc.patch -Patch11: kvm-qemu-applesmc.patch -Patch12: kvm-qemu-ide-ich6.patch -Patch13: kvm-qemu-macmodel.patch -Patch14: kvm-qemu-rtl8139-link.patch -Patch15: kvm-qemu-multiboot.patch -Patch16: kvm-kernel-cpuid4.patch -Patch17: kvm-kernel-msr.patch -Patch18: kvm-maccpuid.patch -Patch19: kvm-ioapic.patch -Patch20: kvm-bios.patch # Post-release upstream patches Patch100: kvm-preXX-init-on-demand.patch -Patch101: kvm-preXX-altgr-and-dead-keys-with-VNC.patch +Patch101: kvm-preXX-fix-build-for-ESD-audio.patch +Patch102: kvm-preXX-fix-serious-regression.patch +Patch103: kvm-preXX-fix-virtio-hd.patch +Patch104: kvm-preXX-tracepoint-for-latest-kernel.patch # for IA64 Source500: ia64-fix-pagesize.pl Patch500: IA64-kvm-suse.patch # For upstream patches: -Source100: convert-commits-to-patch.sh -#Patch111: kvm-commits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/sbin/groupadd %define use_kmp 1 @@ -104,7 +78,6 @@ Requires: kvm-kmp %suse_kernel_module_package debug kdump um xen xenpae %endif -# Can't use --with-patched-kernel with kvm-36 on i386, so for now also on 10.3: BuildRequires: kernel-syms %description @@ -176,49 +149,27 @@ %prep # build the BIOS on x86 platforms %ifarch %ix86 x86_64 -%define bios_targets bios vgabios extboot %define vanilla 0 # build no BIOS on others %else %define vanilla 1 %endif %setup -q -%patch01 -p1 -b .use-qemu-kvm-as-datadir +%patch01 -p1 %patch02 -p1 %patch03 -p1 -%if %work_around_bad_symlink -%patch04 -p1 -%endif -# Mac OS X guest -%if !%{vanilla} -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -cp -a bios bios-mac -%patch20 -p1 -b .bios-mac -%endif # Post-release patches %patch100 -p1 %patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 # IA64 support %ifarch ia64 %patch500 -p1 -#%_sourcedir/ia64-fix-pagesize.pl # needs testing... %endif -# Currently not used, keep it for later use: -# Apply selected upstream patches from the kvm-commits list: -#sh %_sourcedir/convert-commits-to-patch.sh %PATCH111 | patch -p0 %build -# Temporary workaround until qemu's configure is fixed: -sed -i 's/-lcurses/-lncurses/' qemu/configure ./configure --prefix=%{_prefix} \ --audio-card-list="ac97 adlib cs4231a gus" \ %if %suse_version >= 1100 @@ -226,45 +177,34 @@ %else --audio-drv-list="alsa sdl oss" \ %endif - --qemu-cflags="%{optflags}" -# Aborts if curses support is not enabled: -grep "^CONFIG_CURSES=yes" qemu/config-host.mak + --extra-cflags="%{optflags}" # Patch kvm/user Makefile to accept inital CFLAGS: -sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile -echo "CFLAGS=%optflags" >> user/config.mak +sed -i 's/CFLAGS =/CFLAGS +=/' kvm/user/Makefile +echo "CFLAGS=%optflags" >> kvm/user/config.mak # Patch the module version, so we know which kmp was installed: for i in `find . -name "*.c"`; do sed -i "s|kvm-%{version}|kvm-%{version}-%{release}|" "$i" done -# Main build: -%if !%{vanilla} -make libkvm user qemu %{?bios_targets} %{?jobs:-j%jobs} -make -C bios-mac -%else -make libkvm user qemu %{?jobs:-j%jobs} -%endif -# kernel modules +# kernel modules: %if %use_kmp -mkdir suse-kernel +mkdir kvm/suse-kernel for flavor in %flavors_to_build; do - rm -rf suse-kernel/$flavor - cp -r kernel suse-kernel/$flavor - cd suse-kernel/$flavor + rm -rf kvm/suse-kernel/$flavor + cp -r kvm/kernel kvm/suse-kernel/$flavor + cd kvm/suse-kernel/$flavor kernel_source_dir=/usr/src/$(line < /usr/src/linux-obj/%_target_cpu/$flavor/Makefile | cut -f4 -d/) -%if %work_around_bad_symlink - mkdir include2 - if [ ! -d /usr/src/linux-obj/%_target_cpu/$flavor/include2/asm/ ]; then - ln -s $kernel_source_dir/arch/x86/include/asm include2/asm - else - ln -s $kernel_source_dir/include/asm-x86 include2/asm - fi -%endif - sed "s|KERNELDIR=.*|KERNELDIR=/usr/src/linux-obj/%_target_cpu/$flavor| -s|KERNELSOURCEDIR=.*|KERNELSOURCEDIR=$kernel_source_dir|" ../../config.mak >../config.mak + sed -i "s|KERNELDIR=.*|KERNELDIR=/usr/src/linux-obj/%_target_cpu/$flavor| +s|KERNELSOURCEDIR=.*|KERNELSOURCEDIR=$kernel_source_dir|" config.mak make %{?jobs:-j%jobs} - cd ../.. + cd ../../.. done %endif +# userspace: +make KVM_KMOD="no" %{?jobs:-j%jobs} +%if !%{vanilla} +make -C kvm/bios +make -C kvm/vgabios +%endif %install # kernel modules @@ -273,17 +213,16 @@ export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ - M=$PWD/suse-kernel/$flavor + M=$PWD/kvm/suse-kernel/$flavor done %endif -make DESTDIR=%{buildroot} WANT_MODULE="" install -mv qemu/qemu-doc.html qemu/qemu-kvm.html -%if !%{vanilla} -install -m 644 bios-mac/BIOS-bochs-latest %{buildroot}/%{_datadir}/qemu-kvm/bios-mac.bin -%endif -install -m 755 kvm_stat %{buildroot}/%_bindir/kvm_stat +make DESTDIR=%{buildroot} KVM_KMOD="no" install +mv qemu-doc.html qemu-kvm.html +mkdir -p %{buildroot}%{_docdir}/kvm +install -m 644 qemu-kvm.html %{buildroot}%{_docdir}/kvm/qemu-kvm.html +install -m 755 kvm/kvm_stat %{buildroot}%_bindir/kvm_stat cd %{buildroot} -rm -r .{%_bindir/qemu-img,%_bindir/qemu-nbd,%_datadir/{doc,qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,bamboo.dtb,video.x,openbios-ppc}}} +rm -r .{%_bindir/qemu-io,%_bindir/qemu-img,%_bindir/qemu-nbd,%_datadir/{doc/qemu,qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,video.x,bamboo.dtb,petalogix-s3adsp1800.dtb}}} %ifarch ia64 s390 rm -f .%_datadir/qemu-kvm/bios.bin %endif @@ -323,7 +262,7 @@ %files %defattr(-,root,root) -%doc qemu/qemu-kvm.html +%doc qemu-kvm.html %attr(755,root,kvm) %{_bindir}/qemu-kvm %attr(755,root,kvm) %{_bindir}/kvm_stat %{_datadir}/qemu-kvm ++++++ kvm-84.tar.bz2 -> kvm-88.tar.bz2 ++++++ ++++ 1169623 lines of diff (skipped) ++++++ kvm-preXX-fix-build-for-ESD-audio.patch ++++++ commit c6a5a71a3a1886afad5eeb214eb6e8785f4e0319 Author: Anthony Liguori <aliguori(a)us.ibm.com> Date: Wed Jul 1 10:07:16 2009 -0500 Fix build for ESD audio Signed-off-by: Anthony Liguori <aliguori(a)us.ibm.com> Index: kvm-88/Makefile =================================================================== --- kvm-88.orig/Makefile +++ kvm-88/Makefile @@ -139,18 +139,18 @@ obj-y += migration-exec.o endif ifdef CONFIG_COREAUDIO -AUDIO_PT = yes +AUDIO_PT = y endif ifdef CONFIG_FMOD audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) endif ifdef CONFIG_ESD -AUDIO_PT = yes -AUDIO_PT_INT = yes +AUDIO_PT = y +AUDIO_PT_INT = y endif ifdef CONFIG_PA -AUDIO_PT = yes -AUDIO_PT_INT = yes +AUDIO_PT = y +AUDIO_PT_INT = y endif ifdef AUDIO_PT LDFLAGS += -pthread ++++++ kvm-preXX-fix-serious-regression.patch ++++++ Index: kvm-88/qemu-kvm.c =================================================================== --- kvm-88.orig/qemu-kvm.c +++ kvm-88/qemu-kvm.c @@ -1016,8 +1016,6 @@ int pre_kvm_run(kvm_context_t kvm, CPUSt { kvm_arch_pre_kvm_run(kvm->opaque, env); - if (env->exit_request) - return 1; pthread_mutex_unlock(&qemu_mutex); return 0; } ++++++ kvm-preXX-fix-virtio-hd.patch ++++++ Index: kvm-88/hw/virtio-blk.c =================================================================== --- kvm-88.orig/hw/virtio-blk.c +++ kvm-88/hw/virtio-blk.c @@ -25,7 +25,6 @@ typedef struct VirtIOBlock BlockDriverState *bs; VirtQueue *vq; void *rq; - char serial_str[BLOCK_SERIAL_STRLEN + 1]; } VirtIOBlock; static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) @@ -33,47 +32,6 @@ static VirtIOBlock *to_virtio_blk(VirtIO return (VirtIOBlock *)vdev; } -/* store identify data in little endian format - */ -static inline void put_le16(uint16_t *p, unsigned int v) -{ - *p = cpu_to_le16(v); -} - -/* copy to *dst from *src, nul pad dst tail as needed to len bytes - */ -static inline void padstr(char *dst, const char *src, int len) -{ - while (len--) - *dst++ = *src ? *src++ : '\0'; -} - -/* setup simulated identify data as appropriate for virtio block device - * - * ref: AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS) - */ -static inline void virtio_identify_template(struct virtio_blk_config *bc) -{ - uint16_t *p = &bc->identify[0]; - uint64_t lba_sectors = bc->capacity; - - memset(p, 0, sizeof(bc->identify)); - put_le16(p + 0, 0x0); /* ATA device */ - padstr((char *)(p + 23), QEMU_VERSION, 8); /* firmware revision */ - padstr((char *)(p + 27), "QEMU VIRT_BLK", 40); /* model# */ - put_le16(p + 47, 0x80ff); /* max xfer 255 sectors */ - put_le16(p + 49, 0x0b00); /* support IORDY/LBA/DMA */ - put_le16(p + 59, 0x1ff); /* cur xfer 255 sectors */ - put_le16(p + 80, 0x1f0); /* support ATA8/7/6/5/4 */ - put_le16(p + 81, 0x16); - put_le16(p + 82, 0x400); - put_le16(p + 83, 0x400); - put_le16(p + 100, lba_sectors); - put_le16(p + 101, lba_sectors >> 16); - put_le16(p + 102, lba_sectors >> 32); - put_le16(p + 103, lba_sectors >> 48); -} - typedef struct VirtIOBlockReq { VirtIOBlock *dev; @@ -327,8 +285,6 @@ static void virtio_blk_reset(VirtIODevic qemu_aio_flush(); } -/* coalesce internal state, copy to pci i/o region 0 - */ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) { VirtIOBlock *s = to_virtio_blk(vdev); @@ -345,15 +301,11 @@ static void virtio_blk_update_config(Vir blkcfg.heads = heads; blkcfg.sectors = secs; blkcfg.size_max = 0; - virtio_identify_template(&blkcfg); - memcpy(&blkcfg.identify[VIRTIO_BLK_ID_SN], s->serial_str, - VIRTIO_BLK_ID_SN_BYTES); memcpy(config, &blkcfg, sizeof(blkcfg)); } static uint32_t virtio_blk_get_features(VirtIODevice *vdev) { - VirtIOBlock *s = to_virtio_blk(vdev); uint32_t features = 0; features |= (1 << VIRTIO_BLK_F_SEG_MAX); @@ -361,8 +313,6 @@ static uint32_t virtio_blk_get_features( #ifdef __linux__ features |= (1 << VIRTIO_BLK_F_SCSI); #endif - if (strcmp(s->serial_str, "0")) - features |= 1 << VIRTIO_BLK_F_IDENTIFY; return features; } @@ -406,7 +356,6 @@ VirtIODevice *virtio_blk_init(DeviceStat int cylinders, heads, secs; static int virtio_blk_id; BlockDriverState *bs; - char *ps; s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, sizeof(struct virtio_blk_config), @@ -418,10 +367,6 @@ VirtIODevice *virtio_blk_init(DeviceStat s->vdev.reset = virtio_blk_reset; s->bs = bs; s->rq = NULL; - if (strlen(ps = (char *)drive_get_serial(bs))) - strncpy(s->serial_str, ps, sizeof(s->serial_str)); - else - snprintf(s->serial_str, sizeof(s->serial_str), "0"); bs->private = dev; bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); bdrv_set_geometry_hint(s->bs, cylinders, heads, secs); Index: kvm-88/hw/virtio-blk.h =================================================================== --- kvm-88.orig/hw/virtio-blk.h +++ kvm-88/hw/virtio-blk.h @@ -30,11 +30,6 @@ #define VIRTIO_BLK_F_RO 5 /* Disk is read-only */ #define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available*/ #define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */ -#define VIRTIO_BLK_F_IDENTIFY 8 /* ATA IDENTIFY supported */ - -#define VIRTIO_BLK_ID_LEN 256 /* length of identify u16 array */ -#define VIRTIO_BLK_ID_SN 10 /* start of char * serial# */ -#define VIRTIO_BLK_ID_SN_BYTES 20 /* length in bytes of serial# */ struct virtio_blk_config { @@ -44,8 +39,6 @@ struct virtio_blk_config uint16_t cylinders; uint8_t heads; uint8_t sectors; - uint32_t _blk_size; /* structure pad, currently unused */ - uint16_t identify[VIRTIO_BLK_ID_LEN]; } __attribute__((packed)); /* These two define direction. */ Index: kvm-88/sysemu.h =================================================================== --- kvm-88.orig/sysemu.h +++ kvm-88/sysemu.h @@ -157,8 +157,6 @@ typedef enum { BLOCK_ERR_STOP_ANY } BlockInterfaceErrorAction; -#define BLOCK_SERIAL_STRLEN 20 - typedef struct DriveInfo { BlockDriverState *bdrv; const char *devaddr; @@ -168,7 +166,7 @@ typedef struct DriveInfo { int used; int drive_opt_idx; BlockInterfaceErrorAction onerror; - char serial[BLOCK_SERIAL_STRLEN + 1]; + char serial[21]; } DriveInfo; #define MAX_IDE_DEVS 2 ++++++ kvm-preXX-init-on-demand.patch ++++++ --- /var/tmp/diff_new_pack.H1P7M7/_old 2009-07-31 21:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.H1P7M7/_new 2009-07-31 21:13:51.000000000 +0200 @@ -41,11 +41,11 @@ virt/kvm/kvm_main.c | 75 ++++++++++++++++++++++++++++++++++++------- 9 files changed, 90 insertions(+), 27 deletions(-) -Index: kvm-83/kernel/ia64/kvm-ia64.c +Index: kvm-88/kvm/kernel/ia64/kvm-ia64.c =================================================================== ---- kvm-83.orig/kernel/ia64/kvm-ia64.c -+++ kvm-83/kernel/ia64/kvm-ia64.c -@@ -151,7 +151,7 @@ long ia64_pal_vp_create(u64 *vpd, u64 *h +--- kvm-88.orig/kvm/kernel/ia64/kvm-ia64.c ++++ kvm-88/kvm/kernel/ia64/kvm-ia64.c +@@ -164,7 +164,7 @@ long ia64_pal_vp_create(u64 *vpd, u64 *h static DEFINE_SPINLOCK(vp_lock); @@ -54,7 +54,7 @@ { long status; long tmp_base; -@@ -165,7 +165,7 @@ void kvm_arch_hardware_enable(void *garb +@@ -177,7 +177,7 @@ void kvm_arch_hardware_enable(void *garb slot = ia64_itr_entry(0x3, KVM_VMM_BASE, pte, KVM_VMM_SHIFT); local_irq_restore(saved_psr); if (slot < 0) @@ -63,7 +63,7 @@ spin_lock(&vp_lock); status = ia64_pal_vp_init_env(kvm_vsa_base ? -@@ -173,7 +173,7 @@ void kvm_arch_hardware_enable(void *garb +@@ -185,7 +185,7 @@ void kvm_arch_hardware_enable(void *garb __pa(kvm_vm_buffer), KVM_VM_BUFFER_BASE, &tmp_base); if (status != 0) { printk(KERN_WARNING"kvm: Failed to Enable VT Support!!!!\n"); @@ -72,7 +72,7 @@ } if (!kvm_vsa_base) { -@@ -182,6 +182,8 @@ void kvm_arch_hardware_enable(void *garb +@@ -194,6 +194,8 @@ void kvm_arch_hardware_enable(void *garb } spin_unlock(&vp_lock); ia64_ptr_entry(0x3, slot); @@ -81,11 +81,11 @@ } void kvm_arch_hardware_disable(void *garbage) -Index: kvm-83/kernel/x86/svm.c +Index: kvm-88/kvm/kernel/x86/svm.c =================================================================== ---- kvm-83.orig/kernel/x86/svm.c -+++ kvm-83/kernel/x86/svm.c -@@ -303,7 +303,7 @@ static void svm_hardware_disable(void *g +--- kvm-88.orig/kvm/kernel/x86/svm.c ++++ kvm-88/kvm/kernel/x86/svm.c +@@ -327,7 +327,7 @@ static void svm_hardware_disable(void *g cpu_svm_disable(); } @@ -94,7 +94,7 @@ { struct svm_cpu_data *svm_data; -@@ -312,16 +312,20 @@ static void svm_hardware_enable(void *ga +@@ -336,16 +336,20 @@ static void svm_hardware_enable(void *ga struct kvm_desc_struct *gdt; int me = raw_smp_processor_id(); @@ -117,7 +117,7 @@ } svm_data->asid_generation = 1; -@@ -332,11 +336,12 @@ static void svm_hardware_enable(void *ga +@@ -356,11 +360,12 @@ static void svm_hardware_enable(void *ga gdt = (struct kvm_desc_struct *)gdt_descr.address; svm_data->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS); @@ -131,11 +131,11 @@ } static void svm_cpu_uninit(int cpu) -Index: kvm-83/kernel/x86/vmx.c +Index: kvm-88/kvm/kernel/x86/vmx.c =================================================================== ---- kvm-83.orig/kernel/x86/vmx.c -+++ kvm-83/kernel/x86/vmx.c -@@ -1099,12 +1099,15 @@ static __init int vmx_disabled_by_bios(v +--- kvm-88.orig/kvm/kernel/x86/vmx.c ++++ kvm-88/kvm/kernel/x86/vmx.c +@@ -1170,12 +1170,15 @@ static __init int vmx_disabled_by_bios(v /* locked but not enabled */ } @@ -152,7 +152,7 @@ INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); rdmsrl(MSR_IA32_FEATURE_CONTROL, old); if ((old & (FEATURE_CONTROL_LOCKED | -@@ -1119,6 +1122,8 @@ static void hardware_enable(void *garbag +@@ -1190,6 +1193,8 @@ static void hardware_enable(void *garbag asm volatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr) : "memory", "cc"); @@ -161,11 +161,11 @@ } static void vmclear_local_vcpus(void) -Index: kvm-83/kernel/x86/x86.c +Index: kvm-88/kvm/kernel/x86/x86.c =================================================================== ---- kvm-83.orig/kernel/x86/x86.c -+++ kvm-83/kernel/x86/x86.c -@@ -4158,9 +4158,9 @@ int kvm_arch_vcpu_reset(struct kvm_vcpu +--- kvm-88.orig/kvm/kernel/x86/x86.c ++++ kvm-88/kvm/kernel/x86/x86.c +@@ -4659,9 +4659,9 @@ int kvm_arch_vcpu_reset(struct kvm_vcpu return kvm_x86_ops->vcpu_reset(vcpu); } @@ -177,10 +177,10 @@ } void kvm_arch_hardware_disable(void *garbage) -Index: kvm-83/kernel/include/asm-x86/kvm_host.h +Index: kvm-88/kvm/kernel/include/asm-x86/kvm_host.h =================================================================== ---- kvm-83.orig/kernel/include/asm-x86/kvm_host.h -+++ kvm-83/kernel/include/asm-x86/kvm_host.h +--- kvm-88.orig/kvm/kernel/include/asm-x86/kvm_host.h ++++ kvm-88/kvm/kernel/include/asm-x86/kvm_host.h @@ -504,7 +504,7 @@ struct descriptor_table { struct kvm_x86_ops { int (*cpu_has_kvm_support)(void); /* __init */ @@ -190,11 +190,11 @@ void (*hardware_disable)(void *dummy); void (*check_processor_compatibility)(void *rtn); int (*hardware_setup)(void); /* __init */ -Index: kvm-83/kernel/include/linux/kvm_host.h +Index: kvm-88/kvm/kernel/include/linux/kvm_host.h =================================================================== ---- kvm-83.orig/kernel/include/linux/kvm_host.h -+++ kvm-83/kernel/include/linux/kvm_host.h -@@ -316,7 +316,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu +--- kvm-88.orig/kvm/kernel/include/linux/kvm_host.h ++++ kvm-88/kvm/kernel/include/linux/kvm_host.h +@@ -360,7 +360,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu); int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu); @@ -203,11 +203,11 @@ void kvm_arch_hardware_disable(void *garbage); int kvm_arch_hardware_setup(void); void kvm_arch_hardware_unsetup(void); -Index: kvm-83/kernel/x86/kvm_main.c +Index: kvm-88/kvm/kernel/x86/kvm_main.c =================================================================== ---- kvm-83.orig/kernel/x86/kvm_main.c -+++ kvm-83/kernel/x86/kvm_main.c -@@ -112,6 +112,8 @@ DEFINE_SPINLOCK(kvm_lock); +--- kvm-88.orig/kvm/kernel/x86/kvm_main.c ++++ kvm-88/kvm/kernel/x86/kvm_main.c +@@ -116,6 +116,8 @@ DEFINE_SPINLOCK(kvm_lock); LIST_HEAD(vm_list); static cpumask_var_t cpus_hardware_enabled; @@ -216,7 +216,7 @@ struct kmem_cache *kvm_vcpu_cache; EXPORT_SYMBOL_GPL(kvm_vcpu_cache); -@@ -122,6 +124,8 @@ struct dentry *kvm_debugfs_dir; +@@ -126,6 +128,8 @@ struct dentry *kvm_debugfs_dir; static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); @@ -225,7 +225,7 @@ static bool kvm_rebooting; -@@ -873,13 +877,19 @@ static const struct mmu_notifier_ops kvm +@@ -978,13 +982,19 @@ static const struct mmu_notifier_ops kvm static struct kvm *kvm_create_vm(void) { @@ -244,9 +244,9 @@ + goto out_err; + } #ifdef CONFIG_HAVE_KVM_IRQCHIP + INIT_LIST_HEAD(&kvm->irq_routing); INIT_HLIST_HEAD(&kvm->mask_notifier_list); - #endif -@@ -887,8 +897,8 @@ static struct kvm *kvm_create_vm(void) +@@ -993,8 +1003,8 @@ static struct kvm *kvm_create_vm(void) #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET page = alloc_page(GFP_KERNEL | __GFP_ZERO); if (!page) { @@ -257,7 +257,7 @@ } kvm->coalesced_mmio_ring = (struct kvm_coalesced_mmio_ring *)page_address(page); -@@ -896,15 +906,13 @@ static struct kvm *kvm_create_vm(void) +@@ -1002,15 +1012,13 @@ static struct kvm *kvm_create_vm(void) #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) { @@ -276,7 +276,7 @@ } } #endif -@@ -923,8 +931,12 @@ mmget(&kvm->mm->mm_count); +@@ -1032,8 +1040,12 @@ mmget(&kvm->mm->mm_count); #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET kvm_coalesced_mmio_init(kvm); #endif @@ -290,15 +290,15 @@ } /* -@@ -974,6 +986,7 @@ static void kvm_destroy_vm(struct kvm *k - mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); +@@ -1092,6 +1104,7 @@ static void kvm_destroy_vm(struct kvm *k + kvm_arch_flush_shadow(kvm); #endif kvm_arch_destroy_vm(kvm); + hardware_disable_all(); mmdrop(mm); } -@@ -2112,14 +2125,40 @@ static struct miscdevice kvm_dev = { +@@ -2459,14 +2472,40 @@ static struct miscdevice kvm_dev = { &kvm_chardev_ops, }; @@ -341,7 +341,7 @@ } static void hardware_disable(void *junk) -@@ -2132,6 +2171,18 @@ static void hardware_disable(void *junk) +@@ -2479,6 +2518,18 @@ static void hardware_disable(void *junk) kvm_arch_hardware_disable(NULL); } @@ -360,7 +360,7 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, void *v) { -@@ -2382,7 +2433,6 @@ int kvm_init(void *opaque, unsigned int +@@ -2743,7 +2794,6 @@ int kvm_init(void *opaque, unsigned int goto out_free_1; } @@ -368,7 +368,7 @@ r = register_cpu_notifier(&kvm_cpu_notifier); if (r) goto out_free_2; -@@ -2440,7 +2490,6 @@ out_free_3: +@@ -2799,7 +2849,6 @@ out_free_3: unregister_reboot_notifier(&kvm_reboot_notifier); unregister_cpu_notifier(&kvm_cpu_notifier); out_free_2: @@ -376,11 +376,11 @@ out_free_1: kvm_arch_hardware_unsetup(); out_free_0a: -Index: kvm-83/kernel/ia64/kvm_main.c +Index: kvm-88/kvm/kernel/ia64/kvm_main.c =================================================================== ---- kvm-83.orig/kernel/ia64/kvm_main.c -+++ kvm-83/kernel/ia64/kvm_main.c -@@ -112,6 +112,8 @@ DEFINE_SPINLOCK(kvm_lock); +--- kvm-88.orig/kvm/kernel/ia64/kvm_main.c ++++ kvm-88/kvm/kernel/ia64/kvm_main.c +@@ -116,6 +116,8 @@ DEFINE_SPINLOCK(kvm_lock); LIST_HEAD(vm_list); static cpumask_var_t cpus_hardware_enabled; @@ -389,7 +389,7 @@ struct kmem_cache *kvm_vcpu_cache; EXPORT_SYMBOL_GPL(kvm_vcpu_cache); -@@ -122,6 +124,8 @@ struct dentry *kvm_debugfs_dir; +@@ -126,6 +128,8 @@ struct dentry *kvm_debugfs_dir; static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); @@ -398,7 +398,7 @@ static bool kvm_rebooting; -@@ -873,13 +877,19 @@ static const struct mmu_notifier_ops kvm +@@ -978,13 +982,19 @@ static const struct mmu_notifier_ops kvm static struct kvm *kvm_create_vm(void) { @@ -417,9 +417,9 @@ + goto out_err; + } #ifdef CONFIG_HAVE_KVM_IRQCHIP + INIT_LIST_HEAD(&kvm->irq_routing); INIT_HLIST_HEAD(&kvm->mask_notifier_list); - #endif -@@ -887,8 +897,8 @@ static struct kvm *kvm_create_vm(void) +@@ -993,8 +1003,8 @@ static struct kvm *kvm_create_vm(void) #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET page = alloc_page(GFP_KERNEL | __GFP_ZERO); if (!page) { @@ -430,7 +430,7 @@ } kvm->coalesced_mmio_ring = (struct kvm_coalesced_mmio_ring *)page_address(page); -@@ -896,15 +906,13 @@ static struct kvm *kvm_create_vm(void) +@@ -1002,15 +1012,13 @@ static struct kvm *kvm_create_vm(void) #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) { @@ -449,7 +449,7 @@ } } #endif -@@ -923,8 +931,12 @@ static struct kvm *kvm_create_vm(void) +@@ -1032,8 +1040,12 @@ mmget(&kvm->mm->mm_count); #ifdef KVM_COALESCED_MMIO_PAGE_OFFSET kvm_coalesced_mmio_init(kvm); #endif @@ -463,15 +463,15 @@ } /* -@@ -974,6 +986,7 @@ static void kvm_destroy_vm(struct kvm *k - mmu_notifier_unregister(&kvm->mmu_notifier, kvm->mm); +@@ -1092,6 +1104,7 @@ static void kvm_destroy_vm(struct kvm *k + kvm_arch_flush_shadow(kvm); #endif kvm_arch_destroy_vm(kvm); + hardware_disable_all(); mmdrop(mm); } -@@ -2112,14 +2125,40 @@ static struct miscdevice kvm_dev = { +@@ -2459,14 +2472,40 @@ static struct miscdevice kvm_dev = { &kvm_chardev_ops, }; @@ -514,7 +514,7 @@ } static void hardware_disable(void *junk) -@@ -2132,6 +2171,18 @@ static void hardware_disable(void *junk) +@@ -2479,6 +2518,18 @@ static void hardware_disable(void *junk) kvm_arch_hardware_disable(NULL); } @@ -533,7 +533,7 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, void *v) { -@@ -2379,7 +2430,6 @@ int kvm_init(void *opaque, unsigned int +@@ -2743,7 +2794,6 @@ int kvm_init(void *opaque, unsigned int goto out_free_1; } @@ -541,7 +541,7 @@ r = register_cpu_notifier(&kvm_cpu_notifier); if (r) goto out_free_2; -@@ -2430,7 +2480,6 @@ out_free_3: +@@ -2799,7 +2849,6 @@ out_free_3: unregister_reboot_notifier(&kvm_reboot_notifier); unregister_cpu_notifier(&kvm_cpu_notifier); out_free_2: ++++++ kvm-preXX-tracepoint-for-latest-kernel.patch ++++++ commit 181d9e8ef2bc42530ae227069f63014a287e5a4a Author: Marcelo Tosatti <mtosatti(a)redhat.com> Date: Sat Jul 18 19:57:27 2009 -0300 Fix event-trace compat with 2.6.30 Fix undefined tracepoint symbols on 2.6.30 (this kernel version lacks event trace). Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> Index: kvm-88/kvm/kernel/external-module-compat-comm.h =================================================================== --- kvm-88.orig/kvm/kernel/external-module-compat-comm.h +++ kvm-88/kvm/kernel/external-module-compat-comm.h @@ -845,7 +845,7 @@ static inline struct file *eventfd_fget( #include <linux/tracepoint.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) struct tracepoint; ++++++ kvm-qemu-default-memsize.patch ++++++ --- /var/tmp/diff_new_pack.H1P7M7/_old 2009-07-31 21:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.H1P7M7/_new 2009-07-31 21:13:51.000000000 +0200 @@ -1,8 +1,8 @@ -Index: a/qemu/vl.c +Index: kvm-88/vl.c =================================================================== ---- a/qemu/vl.c -+++ b/qemu/vl.c -@@ -165,7 +165,7 @@ +--- kvm-88.orig/vl.c ++++ kvm-88/vl.c +@@ -181,7 +181,7 @@ int main(int argc, char **argv) # define LOG_IOPORT(...) do { } while (0) #endif ++++++ kvm-qemu-no-fallback-if-open-kvm-fails.patch ++++++ --- /var/tmp/diff_new_pack.H1P7M7/_old 2009-07-31 21:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.H1P7M7/_new 2009-07-31 21:13:51.000000000 +0200 @@ -1,8 +1,8 @@ -Index: a/qemu/vl.c +Index: kvm-88/vl.c =================================================================== ---- a/qemu/vl.c -+++ b/qemu/vl.c -@@ -5658,7 +5658,8 @@ int main(int argc, char **argv, char **e +--- kvm-88.orig/vl.c ++++ kvm-88/vl.c +@@ -5951,7 +5951,8 @@ int main(int argc, char **argv, char **e #ifdef USE_KVM if (kvm_enabled()) { if (kvm_qemu_init() < 0) { ++++++ qemu-datadir.diff ++++++ --- /var/tmp/diff_new_pack.H1P7M7/_old 2009-07-31 21:13:51.000000000 +0200 +++ /var/tmp/diff_new_pack.H1P7M7/_new 2009-07-31 21:13:51.000000000 +0200 @@ -1,8 +1,8 @@ -Index: kvm-75/qemu/configure +Index: kvm-88/configure =================================================================== ---- kvm-75.orig/qemu/configure -+++ kvm-75/qemu/configure -@@ -952,7 +952,7 @@ else +--- kvm-88.orig/configure ++++ kvm-88/configure +@@ -1508,7 +1508,7 @@ else prefix="/usr/local" fi mansuffix="/share/man" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libwebkit for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at Fri Jul 31 21:13:54 CEST 2009. -------- --- libwebkit/libwebkit.changes 2009-06-11 02:09:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/libwebkit/libwebkit.changes 2009-07-31 20:56:07.000000000 +0200 @@ -1,0 +2,56 @@ +Fri Jul 31 20:51:43 CEST 2009 - vuntz(a)novell.com + +- Move back doc files to the devel package. + +------------------------------------------------------------------- +Wed Jul 29 05:49:49 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.1.12: + + Fix WebKitSoupAuthDialog to only save passwords in + gnome-keyring (if enabled) when authentication succeeds. + + Implement a proper size_request method for WebKitWebView. The + widget will request the size of the whole page as its size + requisition. + + Many a11y improvements. + + The usual amount of other misc fixes. + + WEBKIT_DEBUG variable now accepts channel names in any case + again. + +------------------------------------------------------------------- +Mon Jul 20 00:43:24 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.1.11: + + WebKit has got a new feature - a XSS auditor, that should + improve security; this feature is still experimental, and + disabled by default, but applications can enable it using the + setting. + + The hackish content sniffing code that was beig used to avoid + pages requesting downloads instead of displaying content has + been replaced by usage of a new Soup feature, which implements + proper content sniffing. + + More accessibility work, including fixes for problems which + were critical for a possible GNOME 2.28 release. + + Pasting rich text from other browsers should now work as + expected. + + The usual amount of misc fixes. + +------------------------------------------------------------------- +Tue Jun 16 01:13:30 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.1.10: + + WebKitNetworkRequest has now GObject properties for its URI and + the SoupMessage that backs it up. + + Fix AtkText methods get_selection and get_n_selections to not + use the global selection but only the selection that belongs to + the object being used. + + Fix a crasher when emitting the a11y signal 'text-caret-moved' + in some situations with debug builds. + +------------------------------------------------------------------- +Mon Jun 15 09:45:33 CEST 2009 - vuntz(a)novell.com + +- Move doc files to the library package instead of devel package, + and also install the NEWS file for the GTK+-specific part of + WebKit. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webkit-1.1.9.tar.bz2 New: ---- webkit-1.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.YxysVo/_old 2009-07-31 21:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.YxysVo/_new 2009-07-31 21:13:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libwebkit (Version 1.1.9) +# spec file for package libwebkit (Version 1.1.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,11 +33,11 @@ BuildRequires: libsoup-devel BuildRequires: libxslt-devel BuildRequires: sqlite3-devel -License: LGPL v2.0 only; LGPL v2.0 or later +License: LGPL v2.0 only ; LGPL v2.0 or later Group: Development/Libraries/C and C++ Summary: Library for rendering web content, GTK+ Port BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.1.9 +Version: 1.1.12 Release: 1 Source: webkit-%{version}.tar.bz2 %define debug_package_requires libwebkit-1_0-2 = %{version}-%{release} @@ -64,7 +64,7 @@ %package -n libwebkit-1_0-2 Group: Development/Libraries/C and C++ -License: LGPL v2.0 only; LGPL v2.0 or later +License: LGPL v2.0 only ; LGPL v2.0 or later Provides: libwebkit = %{version} Provides: libWebKitGtk0 = %{version} Obsoletes: libWebKitGtk0 <= %{version} @@ -93,7 +93,7 @@ Staikos Computing Services Inc. <info(a)staikos.net> %package -n libwebkit-devel -License: LGPL v2.0 only; LGPL v2.0 or later +License: LGPL v2.0 only ; LGPL v2.0 or later Group: Development/Libraries/C and C++ Summary: Library for rendering web content, GTK+ Port Requires: libwebkit-1_0-2 = %{version} @@ -123,7 +123,7 @@ Staikos Computing Services Inc. <info(a)staikos.net> %package -n webkit-jsc -License: LGPL v2.0 only; LGPL v2.0 or later +License: LGPL v2.0 only ; LGPL v2.0 or later Group: Development/Libraries/C and C++ Summary: Library for rendering web content, GTK+ Port Requires: libwebkit-1_0-2 = %{version} @@ -181,7 +181,7 @@ %files -n libwebkit-devel %defattr(-,root,root) -%doc JavaScriptCore/COPYING.LIB WebCore/LICENSE-APPLE WebCore/LICENSE-LGPL-2 WebCore/LICENSE-LGPL-2.1 +%doc JavaScriptCore/COPYING.LIB WebCore/LICENSE-APPLE WebCore/LICENSE-LGPL-2 WebCore/LICENSE-LGPL-2.1 WebKit/gtk/NEWS %{_libdir}/libwebkit-1.0.so %{_libdir}/pkgconfig/webkit-1.0.pc %{_includedir}/webkit-1.0 ++++++ webkit-1.1.9.tar.bz2 -> webkit-1.1.12.tar.bz2 ++++++ ++++ 250062 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-server for openSUSE:Factory
by root＠Hilbert.suse.de 31 Jul '09

31 Jul '09

Hello community, here is the log from the commit of package yast2-ldap-server for openSUSE:Factory checked in at Fri Jul 31 21:08:46 CEST 2009. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2009-07-13 15:46:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2009-07-31 10:52:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 31 09:48:56 CEST 2009 - rhafer(a)novell.com + +- Version 2.18.1 + * Fixes for AutoYaST integration, error out on invalid profiles + (bnc#522216) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-server-2.18.0.tar.bz2 New: ---- yast2-ldap-server-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.suUC4b/_old 2009-07-31 21:02:47.000000000 +0200 +++ /var/tmp/diff_new_pack.suUC4b/_new 2009-07-31 21:02:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.18.0) +# spec file for package yast2-ldap-server (Version 2.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-ldap-server -Version: 2.18.0 +Version: 2.18.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.18.0.tar.bz2 +Source0: yast2-ldap-server-2.18.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -35,7 +35,7 @@ Center and during installation. %prep -%setup -n yast2-ldap-server-2.18.0 +%setup -n yast2-ldap-server-2.18.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-server-2.18.0.tar.bz2 -> yast2-ldap-server-2.18.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/VERSION new/yast2-ldap-server-2.18.1/VERSION --- old/yast2-ldap-server-2.18.0/VERSION 2009-07-13 15:03:19.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/VERSION 2009-07-31 09:51:59.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/autodocs-ycp.ami new/yast2-ldap-server-2.18.1/autodocs-ycp.ami --- old/yast2-ldap-server-2.18.0/autodocs-ycp.ami 2009-07-13 14:59:01.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/autodocs-ycp.ami 2009-07-31 09:52:32.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57556 2009-06-15 13:33:12Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/configure new/yast2-ldap-server-2.18.1/configure --- old/yast2-ldap-server-2.18.0/configure 2009-07-13 14:59:10.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/configure 2009-07-31 09:52:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.17.20. +# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-server' PACKAGE_TARNAME='yast2-ldap-server' -PACKAGE_VERSION='2.17.20' -PACKAGE_STRING='yast2-ldap-server 2.17.20' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-ldap-server 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1532,7 +1532,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-ldap-server 2.17.20 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-server 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1604,7 +1604,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-server 2.17.20:";; + short | recursive ) echo "Configuration of yast2-ldap-server 2.18.1:";; esac cat <<\_ACEOF @@ -1716,7 +1716,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-server configure 2.17.20 +yast2-ldap-server configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1730,7 +1730,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-ldap-server $as_me 2.17.20, which was +It was created by yast2-ldap-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2710,7 +2710,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-server' - VERSION='2.17.20' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2832,7 +2832,7 @@ -VERSION="2.17.20" +VERSION="2.18.1" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" @@ -17566,7 +17566,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap-server $as_me 2.17.20, which was +This file was extended by yast2-ldap-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17629,7 +17629,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ldap-server config.status 2.17.20 +yast2-ldap-server config.status 2.18.1 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-ldap-server-2.18.0/configure.in new/yast2-ldap-server-2.18.1/configure.in --- old/yast2-ldap-server-2.18.0/configure.in 2009-07-13 14:59:01.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/configure.in 2009-07-31 09:52:32.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ldap-server dnl -dnl -- This file is generated by y2autoconf 2.18.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-server, 2.17.20, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.18.1, http://bugs.opensuse.org/, yast2-ldap-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.20" +VERSION="2.18.1" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/doc/autodocs/Makefile.in new/yast2-ldap-server-2.18.1/doc/autodocs/Makefile.in --- old/yast2-ldap-server-2.18.0/doc/autodocs/Makefile.in 2009-07-13 14:59:11.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/doc/autodocs/Makefile.in 2009-07-31 09:52:43.000000000 +0200 @@ -18,7 +18,7 @@ # Makefile.am for YCP module .../doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57556 2009-06-15 13:33:12Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -27,6 +27,10 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -210,7 +214,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -467,14 +471,15 @@ AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/src/LdapServer.pm new/yast2-ldap-server-2.18.1/src/LdapServer.pm --- old/yast2-ldap-server-2.18.0/src/LdapServer.pm 2008-12-05 11:39:09.000000000 +0100 +++ new/yast2-ldap-server-2.18.1/src/LdapServer.pm 2009-07-30 09:44:23.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: LdapServer settings, input and output functions # Authors: Ralf Haferkamp <rhafer(a)suse.de>, Andreas Bauer <abauer(a)suse.de> # -# $Id: LdapServer.pm 53911 2008-12-05 10:39:09Z rhafer $ +# $Id: LdapServer.pm 58211 2009-07-30 07:44:43Z rhafer $ # # Representation of the configuration of ldap-server. # Input and output routines. @@ -535,6 +535,10 @@ my $ret = 1; if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig ) { + if ( ! $self->ReadServiceEnabled() ) + { + return 1; + } $overwriteConfig = 0; my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), @@ -595,6 +599,15 @@ y2milestone("using tempfile: ".$tmpfile ); my $ldif = SCR->Read('.ldapserver.configAsLdif' ); y2debug($ldif); + if ( ! $ldif ) + { + my $err = SCR->Error(".ldapserver"); + y2error("Creating LDIF for initial configuration failed"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + # cleanup + SCR->Execute('.target.bash', "rm -f $tmpfile" ); + return 0; + } $rc = SCR->Write('.target.string', $tmpfile, $ldif ); if ( $rc ) { @@ -856,21 +869,41 @@ my $hash = shift; y2milestone("LdapServer::Import() : ". Data::Dumper->Dump([$hash])); - if ( ! keys( %$hash ) ) + if ( (! keys( %$hash )) || (! defined $hash->{'daemon'}) || + (! defined $hash->{'globals'}) || (! defined $hash->{'databases'}) ) { $usingDefaults = 1; $overwriteConfig = 0; $self->WriteServiceEnabled( 0 ); + y2milestone("Wrong/empty ldap-server profile"); + return 0; + } + + if ( defined $hash->{'daemon'}->{'serviceEnabled'} ) + { + $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); + } + else + { + $self->WriteServiceEnabled(0); + } + + if ( ! $self->ReadServiceEnabled() ) + { return 1; } + $usingDefaults = 0; $overwriteConfig = 1; - $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); - if ( ! $self->ReadServiceEnabled() ) + + if ( defined $hash->{'daemon'}->{'slp'} ) { - return 1; + $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); + } + else + { + $self->WriteSLPEnabled( 0 ); } - $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); foreach my $listner (@{$hash->{'daemon'}->{'listners'} } ) { @@ -1108,7 +1141,7 @@ sub AutoPackages { # TODO FIXME: your code here... my %ret = ( - "install" => (), + "install" => ( "openldap2", "openldap2-client" ), "remove" => (), ); return \%ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.18.1/src/agent/SlapdConfigAgent.cc --- old/yast2-ldap-server-2.18.0/src/agent/SlapdConfigAgent.cc 2009-07-13 14:41:05.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/src/agent/SlapdConfigAgent.cc 2009-07-29 17:13:43.000000000 +0200 @@ -1583,6 +1583,10 @@ { y2milestone("ConfigToLdif"); std::ostringstream ldif; + if ( ! globals || ! schemaBase ) + { + throw std::runtime_error("Configuration not initialized. Can't create LDIF dump." ); + } ldif << globals->toLdif() << std::endl; ldif << schemaBase->toLdif() << std::endl; OlcSchemaList::const_iterator j; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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