November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Fri Nov 5 14:47:42 CET 2010. -------- --- yast2-packager/yast2-packager.changes 2010-10-25 09:28:41.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2010-11-03 14:50:31.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Nov 3 13:44:55 UTC 2010 - lslezak(a)suse.cz + +- don't reset package selection in dirinstall mode when target + directory is changed (bnc#568511, bnc#568512) +- 2.20.9 + +------------------------------------------------------------------- +Tue Nov 2 13:00:15 UTC 2010 - lslezak(a)suse.cz + +- correctly display download progress in DownloadInAdvance + libzypp mode (bnc#616708) +- 2.20.8 + +------------------------------------------------------------------- +Mon Nov 1 16:30:27 UTC 2010 - lslezak(a)suse.cz + +- sw_single: clear the startup progress dialog so it's not + displayed in slow systems at the end (bnc#637201) + +------------------------------------------------------------------- +Wed Oct 27 14:36:59 CEST 2010 - mzugec(a)suse.cz + +- improved UI layout (bnc#619653) +- 2.20.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.20.6.tar.bz2 New: ---- yast2-packager-2.20.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.X5gbB4/_old 2010-11-05 14:46:46.000000000 +0100 +++ /var/tmp/diff_new_pack.X5gbB4/_new 2010-11-05 14:46:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.20.6) +# spec file for package yast2-packager (Version 2.20.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.20.6 +Version: 2.20.9 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.20.6.tar.bz2 +Source0: yast2-packager-2.20.9.tar.bz2 Prefix: /usr @@ -37,14 +37,14 @@ # Installation summary in PackagesUI:: BuildRequires: yast2 >= 2.18.1 -# "keeppackages" repo property -BuildRequires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +BuildRequires: yast2-pkg-bindings >= 2.20.3 # Newly added RPM Requires: yast2-country-data >= 2.16.3 -# "keeppackages" repo property -Requires: yast2-pkg-bindings >= 2.17.27 +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 # Installation summary in PackagesUI:: Requires: yast2 >= 2.18.1 @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.20.6 +%setup -n yast2-packager-2.20.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.20.6.tar.bz2 -> yast2-packager-2.20.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/VERSION new/yast2-packager-2.20.9/VERSION --- old/yast2-packager-2.20.6/VERSION 2010-10-25 09:17:48.000000000 +0200 +++ new/yast2-packager-2.20.9/VERSION 2010-11-03 14:47:47.000000000 +0100 @@ -1 +1 @@ -2.20.6 +2.20.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/agents/Makefile.am new/yast2-packager-2.20.9/agents/Makefile.am --- old/yast2-packager-2.20.6/agents/Makefile.am 2008-09-09 17:58:21.000000000 +0200 +++ new/yast2-packager-2.20.9/agents/Makefile.am 2010-11-02 13:48:52.000000000 +0100 @@ -6,6 +6,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/agents/Makefile.in new/yast2-packager-2.20.9/agents/Makefile.in --- old/yast2-packager-2.20.6/agents/Makefile.in 2010-10-25 09:24:44.000000000 +0200 +++ new/yast2-packager-2.20.9/agents/Makefile.in 2010-11-03 14:48:35.000000000 +0100 @@ -197,6 +197,7 @@ ag_zypp_repos scrconf_DATA = \ + etc_zypp_conf.scr \ zypp_repos.scr EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/agents/etc_zypp_conf.scr new/yast2-packager-2.20.9/agents/etc_zypp_conf.scr --- old/yast2-packager-2.20.6/agents/etc_zypp_conf.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.20.9/agents/etc_zypp_conf.scr 2010-11-02 13:51:24.000000000 +0100 @@ -0,0 +1,65 @@ +/** + * File: + * etc_zypp_conf.scr + * Summary: + * SCR Agent for reading/writing /etc/zypp/zypp.conf file + * using the ini-agent + * Access: + * read/write + * Authors: + * Ladislav Slezak <lslezak(a)suse.cz> + * Example: + * + * Read list of available files + * SCR::Dir(.etc.zypp_conf) + * + * Read list of sections in a file + * SCR::Dir(.etc.policykit.section."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege") + * (["Privilege"]) + * + * Read list of options in a section + * SCR::Dir(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege") + * (["RequiredPrivileges", "SufficientPrivileges", "Allow", "Deny", "CanObtain", "CanGrant", "ObtainRequireRoot"]) + * + * Read an option + * SCR::Read(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges") + * ("desktop-console") + * + * + * Write an option + * SCR::Write(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges", "") + * (true) + * + * + * Flush the changes + * SCR::Write(.etc.zypp_conf, nil) + * + * + * Fore more information see the INI-agent documentation + * + * $Id$ + */ + +.etc.zypp_conf + +`ag_ini( + `IniAgent( "/etc/zypp/zypp.conf" , $[ + "options" : [ "no_nested_sections", "line_can_continue", "comments_last" ], + "comments": [ + "^[ \t]*$", // empty line + "^[ \t]*#.*$", // comment char + ], + "sections" : [ + $[ + "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], + ] + ], + "params" : [ + $[ + "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*$" , "%s=%s"], + ] + ] + ] + ) +) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/configure new/yast2-packager-2.20.9/configure --- old/yast2-packager-2.20.6/configure 2010-10-25 09:24:44.000000000 +0200 +++ new/yast2-packager-2.20.9/configure 2010-11-03 14:48:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.6. +# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.20.6' -PACKAGE_STRING='yast2-packager 2.20.6' +PACKAGE_VERSION='2.20.9' +PACKAGE_STRING='yast2-packager 2.20.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1221,7 +1221,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.20.6 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.20.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1292,7 +1292,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.20.6:";; + short | recursive ) echo "Configuration of yast2-packager 2.20.9:";; esac cat <<\_ACEOF @@ -1372,7 +1372,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.20.6 +yast2-packager configure 2.20.9 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1389,7 +1389,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.20.6, which was +It was created by yast2-packager $as_me 2.20.9, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2319,7 +2319,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.20.6' + VERSION='2.20.9' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ -VERSION="2.20.6" +VERSION="2.20.9" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3359,7 +3359,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.20.6, which was +This file was extended by yast2-packager $as_me 2.20.9, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3412,7 +3412,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.20.6 +yast2-packager config.status 2.20.9 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/configure.in new/yast2-packager-2.20.9/configure.in --- old/yast2-packager-2.20.6/configure.in 2010-10-25 09:24:39.000000000 +0200 +++ new/yast2-packager-2.20.9/configure.in 2010-11-03 14:48:30.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.20.6, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.20.9, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.6" +VERSION="2.20.9" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/src/clients/sw_single.ycp new/yast2-packager-2.20.9/src/clients/sw_single.ycp --- old/yast2-packager-2.20.6/src/clients/sw_single.ycp 2010-10-12 16:23:58.000000000 +0200 +++ new/yast2-packager-2.20.9/src/clients/sw_single.ycp 2010-11-02 11:48:40.000000000 +0100 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 62608 2010-10-12 14:23:57Z lslezak $ + * $Id: sw_single.ycp 62709 2010-11-01 16:34:10Z lslezak $ * * Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol, * "repo_mgmt" : boolean ] @@ -456,7 +456,8 @@ // check the arguments and try the mount/search for local description symbol result = CheckWhichPackages (arg_list); - Progress::Finish(); + // clear the progress dialog so it's not displayed by accident at the end (bnc#637201) + Wizard::SetContents ("", `Empty(), "", false, false); Pkg::SetTextLocale (UI::GetLanguage (true)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/src/modules/PackageSlideShow.ycp new/yast2-packager-2.20.9/src/modules/PackageSlideShow.ycp --- old/yast2-packager-2.20.6/src/modules/PackageSlideShow.ycp 2010-09-10 14:22:55.000000000 +0200 +++ new/yast2-packager-2.20.9/src/modules/PackageSlideShow.ycp 2010-11-02 15:28:39.000000000 +0100 @@ -16,6 +16,7 @@ import "SlideShow"; import "String"; import "Mode"; + import "URL"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -28,6 +29,9 @@ global string media_type = _("Medium %1"); global integer total_size_installed = 0; global integer total_size_to_install = 0; + global integer total_count_to_download = 0; + global integer total_count_downloaded = 0; + global integer downloading_pct = 0; global integer min_time_per_cd = 10; // const - minimum time displayed per CD if there is something to install global integer max_time_per_cd = 7200; // const - seconds to cut off predicted time (it's bogus anyway) global integer size_column = 1; // const - column number for remaining size per CD @@ -47,6 +51,8 @@ string provide_name = ""; // currently downlaoded package name string provide_size = ""; // currently downlaoded package size + boolean download_in_advance_mode = false; + // package summary // package counters @@ -65,7 +71,6 @@ integer current_provide_size = 0; integer current_install_size = 0; - string current_pkg_name = ""; boolean updating = false; void ResetPackageSummary() @@ -80,7 +85,6 @@ // temporary values current_provide_size = 0; current_install_size = 0; - current_pkg_name = ""; updating = false; } @@ -405,6 +409,50 @@ y2milestone( "SubtractPackageSize( %1 ) -> %2", pkg_size, remaining_sizes_per_cd_per_src); } + integer packages_to_download(list<list<integer> >src_mapping) + { + y2milestone("Packages to download input: %1", src_mapping); + + integer ret = 0; + + integer i = 0; + foreach(list<integer> media_mapping, src_mapping, + { + if (size(media_mapping) > 0) + { + // check if the repository is remote + string repo_url = Pkg::SourceGeneralData(i)["url"]:""; + string repo_schema = tolower(URL::Parse(repo_url)["scheme"]:""); + + if (contains(["http", "https", "ftp", "sftp"], repo_schema)) + { + integer total = 0; + foreach(integer count, media_mapping, + { + total = total + count; + } + ); + + y2milestone("Downloading %1 packages from remote repository %2", total, i); + ret = ret + total; + } + } + + i = i + 1; + } + ); + + y2milestone("Total number of packages to download: %1", ret); + + return ret; + } + + integer packages_to_install(list<list<integer> >src_mapping) + { + integer ret = ListSum(flatten(src_mapping)); + y2milestone("Total number of packages to install: %1", ret); + return ret; + } /** * Initialize internal pacakge data, such as remaining package sizes and @@ -454,6 +502,11 @@ remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); + total_count_to_download = packages_to_download(total_pkg_count_per_cd_per_src); + total_count_downloaded = 0; + integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); + downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); + download_in_advance_mode= (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") == "DownloadInAdvance"; init_pkg_data_complete = true; // reset the history log @@ -783,6 +836,27 @@ } } + // update the overall progress value (download + installation) + void UpdateTotalProgressValue() + { + integer total_progress = 0; + + if (total_count_to_download == 0) + { + // no package to download, just use the install size + total_progress = (TotalInstalledSize() * 100 / total_size_to_install); + } + else + { + // compute the total progress (use both download and installation size) + total_progress = (total_count_downloaded * downloading_pct / total_count_to_download) + + (TotalInstalledSize() * (100 - downloading_pct) / total_size_to_install); + } + + y2internal("Total package installation progress: %1%%", total_progress); + SlideShow::StageProgress( total_progress, nil ); + } + /** * Update progress widgets **/ @@ -796,7 +870,8 @@ total_size_to_install_kB = 1; } - SlideShow::StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / total_size_to_install_kB, nil /*, SlideShow::GetProgressLabel()*/ ); + // update the overall progress value (download + installation) + UpdateTotalProgressValue(); UpdateCurrentCdProgress(silent_check); @@ -943,6 +1018,21 @@ if (error == 0) { total_downloaded = total_downloaded + current_provide_size; + + total_count_downloaded = total_count_downloaded + 1; + y2milestone("Downloaded %1/%2 packages (%3%%)", total_count_downloaded, total_count_to_download, total_count_downloaded * 100 / total_count_to_download); + + // move the progress also for downloaded files + UpdateTotalProgressValue(); + + if (download_in_advance_mode) + { + // display download progress in DownloadInAdvance mode + // translations: progress message (part1) + SlideShow::SetGlobalProgressLabel( _("Downloading Packages...") + + // progress message (part2) + sformat(_(" (Downloaded %1 of %2 packages)"), total_count_downloaded, total_count_to_download)); + } } } @@ -1006,7 +1096,7 @@ if (Mode::normal()) { - updated_packages_list = add(updated_packages_list, current_pkg_name); + updated_packages_list = add(updated_packages_list, pkg_name); } } else @@ -1015,7 +1105,7 @@ if (Mode::normal()) { - installed_packages_list = add(installed_packages_list, current_pkg_name); + installed_packages_list = add(installed_packages_list, pkg_name); } } @@ -1028,7 +1118,7 @@ if (Mode::normal()) { - removed_packages_list = add(removed_packages_list, current_pkg_name); + removed_packages_list = add(removed_packages_list, pkg_name); } } } @@ -1044,6 +1134,7 @@ * @param deleting Flag: deleting (true) or installing (false) package? **/ global void SlideDisplayStart( string pkg_name, + string pkg_location, string pkg_summary, integer pkg_size, boolean deleting ) @@ -1051,10 +1142,8 @@ if ( ! SanityCheck( false ) ) return; // remove path - pkg_name = StripPath(pkg_name); - - // remove release and .rpm suffix - // pkg_name = StripReleaseNo( pkg_name ); // bug #154872 + string pkg_filename = StripPath(pkg_location); + y2internal("pkg_name: %1", pkg_name); if ( deleting ) { @@ -1083,15 +1172,14 @@ // Heading for the progress bar for the current package // while it is deleted. "%1" is the package name. msg = sformat( _("Deleting %1"), pkg_name ); - current_pkg_name = pkg_name; } else { - updating = Pkg::PkgInstalled(current_pkg_name); + updating = Pkg::PkgInstalled(pkg_name); // package installation - summary text // %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) - msg = sformat( _("Installing %1 (installed size %2)"), pkg_name, String::FormatSize( pkg_size ) ); + msg = sformat( _("Installing %1 (installed size %2)"), pkg_filename, String::FormatSize( pkg_size ) ); current_install_size = pkg_size; } @@ -1178,7 +1266,6 @@ global void SlideProvideStart (string pkg_name, integer sz, boolean remote) { current_provide_size = remote ? sz : 0; - current_pkg_name = pkg_name; if (remote) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/src/modules/Packages.ycp new/yast2-packager-2.20.9/src/modules/Packages.ycp --- old/yast2-packager-2.20.6/src/modules/Packages.ycp 2010-10-25 09:24:13.000000000 +0200 +++ new/yast2-packager-2.20.9/src/modules/Packages.ycp 2010-11-03 14:48:09.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 60363 2010-01-14 13:57:12Z lslezak $ + * $Id: Packages.ycp 62731 2010-11-03 13:48:08Z lslezak $ */ { @@ -1804,6 +1804,14 @@ y2milestone("the cached proposal is empty or reset is required"); } + if (Installation::dirinstall_installing_into_dir && !force_reset && init_called) + { + return Summary ( + [ `product, `pattern, `selection, `size, `desktop ], + false + ); + } + UI::OpenDialog(`opt(`decorated ), // popup label `Label (_("Evaluating package selection..."))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.20.9/src/modules/SlideShowCallbacks.ycp --- old/yast2-packager-2.20.6/src/modules/SlideShowCallbacks.ycp 2010-10-25 09:15:09.000000000 +0200 +++ new/yast2-packager-2.20.9/src/modules/SlideShowCallbacks.ycp 2010-11-02 15:49:08.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: provides the Callbacks for SlideShow * - * $Id: SlideShowCallbacks.ycp 62676 2010-10-23 07:23:05Z lslezak $ + * $Id: SlideShowCallbacks.ycp 62717 2010-11-02 14:49:08Z lslezak $ * */ @@ -284,9 +284,9 @@ * Note: The packager doesn't call this directly - the corresponding wrapper callbacks do * and pass the "deleting" flag as appropriate. **/ - global void DisplayStartInstall(string pkg_name, string pkg_description, integer pkg_size, boolean deleting ) + global void DisplayStartInstall(string pkg_name, string pkg_location, string pkg_description, integer pkg_size, boolean deleting ) { - PackageSlideShow::SlideDisplayStart( pkg_name, pkg_description, pkg_size, deleting ); + PackageSlideShow::SlideDisplayStart( pkg_name, pkg_location, pkg_description, pkg_size, deleting ); HandleInput(); // warn user about exhausted diskspace during installation (not if deleting packages) @@ -368,13 +368,13 @@ /** * at start of package install */ - global void StartPackage( string name, string summary, integer install_size, boolean is_delete ) + global void StartPackage( string name, string location, string summary, integer install_size, boolean is_delete ) { PackageCallbacks::_package_name = name; PackageCallbacks::_package_size = install_size; PackageCallbacks::_deleting_package = is_delete; - DisplayStartInstall( name, + DisplayStartInstall( name, location, summary, install_size, is_delete); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.6/src/modules/SourceDialogs.ycp new/yast2-packager-2.20.9/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.20.6/src/modules/SourceDialogs.ycp 2010-10-12 11:50:45.000000000 +0200 +++ new/yast2-packager-2.20.9/src/modules/SourceDialogs.ycp 2010-11-01 17:29:47.000000000 +0100 @@ -1418,12 +1418,12 @@ `InputField (`id (`server), `opt (`hstretch), _("Server &Name"), server), (type == `http || type == `https) ? `HBox(`HSpacing(1), `HSquash(`InputField (`id (`port), _("&Port"), port))) - : `Empty() - ), + : `Empty(), type == `samba // text entry ? `InputField (`id (`share), `opt (`hstretch), _("&Share")) - : `Empty (), + : `Empty () + ), type == `samba ? `VBox ( `InputField (`id (`dir), `opt (`hstretch), @@ -1449,9 +1449,11 @@ : `Empty (), // text entry `VSpacing(0.4), - `InputField(`id (`username), `opt(`hstretch), _("&User Name"), username), - // password entry - `Password (`id (`password), `opt(`hstretch), _("&Password"), password) + `HBox( + `InputField(`id (`username), `opt(`hstretch), _("&User Name"), username), + // password entry + `Password (`id (`password), `opt(`hstretch), _("&Password"), password) + ) )), `HSpacing (0.5) ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Fri Nov 5 14:46:28 CET 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-09-30 23:43:53.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-10-28 22:13:24.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 28 22:13:19 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.3 + * see http://kde.org/announcements/changelogs/changelog4_5_2to4_5_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.5.2.tar.bz2 New: ---- kdepimlibs-4.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.QcM166/_old 2010-11-05 14:46:05.000000000 +0100 +++ /var/tmp/diff_new_pack.QcM166/_new 2010-11-05 14:46:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.5.2) +# spec file for package kdepimlibs4 (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 Source0: kdepimlibs-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdepimlibs-4.5.2.tar.bz2 -> kdepimlibs-4.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/CMakeLists.txt new/kdepimlibs-4.5.3/CMakeLists.txt --- old/kdepimlibs-4.5.2/CMakeLists.txt 2010-09-30 23:19:17.000000000 +0200 +++ new/kdepimlibs-4.5.3/CMakeLists.txt 2010-10-28 19:35:23.000000000 +0200 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 5) -set(KDEPIMLIBS_VERSION_PATCH 2) +set(KDEPIMLIBS_VERSION_PATCH 3) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/collectionstatisticsdelegate.cpp new/kdepimlibs-4.5.3/akonadi/collectionstatisticsdelegate.cpp --- old/kdepimlibs-4.5.2/akonadi/collectionstatisticsdelegate.cpp 2010-08-04 21:13:03.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/collectionstatisticsdelegate.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -74,7 +74,8 @@ if ( index.model()->hasChildren( index ) ) { - for ( int row = 0; row < index.model()->rowCount( index ); row++ ) + const int rowCount = index.model()->rowCount( index ); + for ( int row = 0; row < rowCount; row++ ) { static const int column = 0; count += getCountRecursive<countType>( index.model()->index( row, column, index ) ); @@ -287,7 +288,7 @@ sumText = QString::number( expanded ? unreadCount : unreadRecursiveCount ); } else { - qint64 totalCount = statistics.unreadCount(); + qint64 totalCount = statistics.count(); qint64 totalRecursiveCount = d->getCountRecursive<TotalCount>( index.sibling( index.row(), 0 ) ); if (index.column() == 2 && ( ( !expanded && totalRecursiveCount > 0 ) || ( expanded && totalCount > 0 ) ) ) { sumText = QString::number( expanded ? totalCount : totalRecursiveCount ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/contactsfilterproxymodel.cpp new/kdepimlibs-4.5.3/akonadi/contact/contactsfilterproxymodel.cpp --- old/kdepimlibs-4.5.2/akonadi/contact/contactsfilterproxymodel.cpp 2010-05-27 19:22:13.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/contactsfilterproxymodel.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -155,6 +155,13 @@ return true; } + const QStringList categories = contact.categories(); + count = categories.count(); + for ( int i = 0; i < count; ++i ) { + if ( categories.at( i ).contains( filterString, Qt::CaseInsensitive ) ) + return true; + } + if ( contact.mailer().contains( filterString, Qt::CaseInsensitive ) ) return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/kaddressbookimprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/kaddressbookimprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2010-07-28 23:04:09.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -28,6 +28,7 @@ Name[sr@latin]=Brzoglasnički protokol K‑adresra Name[sv]=Addressbokens direktmeddelandeprotokoll Name[th]=โพรโทคอลข้อความด่วนทันใจของสมุดที่อยู่-K +Name[tr]=KAddressbook Anlık Mesajlaşma Protokolü Name[uk]=Протокол миттєвого обміну повідомленнями KAddressbook Name[wa]=Protocole di messaedjreye sol moumint di KAddressbook Name[x-test]=xxKAddressbook Instant Messaging Protocolxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/aimprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/aimprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/aimprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/aimprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -30,6 +30,7 @@ Comment[sr@latin]=Protokol AIM Comment[sv]=AIM-protokoll Comment[th]=โพรโทคอล AIM +Comment[tr]=AIM Protokolü Comment[uk]=Протокол AIM Comment[wa]=Protocole AIM Comment[x-test]=xxAIM Protocolxx @@ -62,6 +63,7 @@ Name[sr@latin]=AIM Name[sv]=AIM Name[th]=AIM +Name[tr]=AIM Name[uk]=AIM Name[wa]=AIM Name[x-test]=xxAIMxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/gaduprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/gaduprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/gaduprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/gaduprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -30,6 +30,7 @@ Comment[sr@latin]=Protokol Gadu‑Gadu Comment[sv]=Gadu-Gadu protokoll Comment[th]=โพรโทคอล Gadu-Gadu +Comment[tr]=Gadu-Gadu Protokolü Comment[uk]=Протокол Gadu-Gadu Comment[wa]=Protocole Gadu-gadu Comment[x-test]=xxGadu-Gadu Protocolxx @@ -62,6 +63,7 @@ Name[sr@latin]=Gadu‑Gadu Name[sv]=Gadu-Gadu Name[th]=Gadu-Gadu +Name[tr]=Gadu-Gadu Name[uk]=Gadu-Gadu Name[wa]=Gadu-Gadu Name[x-test]=xxGadu-Gaduxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -29,6 +29,7 @@ Comment[sr@latin]=Novellov GroupWise Messenger Comment[sv]=Novell GroupWise-meddelandeklient Comment[th]=ข้อความด่วนทันใจ GroupWise ของโนเวลล์ +Comment[tr]=Novell GroupWise Messenger Comment[uk]=Програма обміну повідомленнями Novell GroupWise Comment[wa]=Messaedjî Novell GroupWise Comment[x-test]=xxNovell GroupWise Messengerxx @@ -60,6 +61,7 @@ Name[sr@latin]=GroupWise Name[sv]=GroupWise Name[th]=GroupWise +Name[tr]=GroupWise Name[uk]=GroupWise Name[wa]=GroupWise Name[x-test]=xxGroupWisexx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/icqprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/icqprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/icqprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/icqprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -30,6 +30,7 @@ Comment[sr@latin]=Protokol ICQ Comment[sv]=ICQ-protokoll Comment[th]=โพรโทคอล ICQ +Comment[tr]=ICQ Protokolü Comment[uk]=Протокол ICQ Comment[wa]=Protocole ICQ Comment[x-test]=xxICQ Protocolxx @@ -62,6 +63,7 @@ Name[sr@latin]=ICQ Name[sv]=ICQ Name[th]=ICQ +Name[tr]=ICQ Name[uk]=ICQ Name[wa]=ICQ Name[x-test]=xxICQxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -28,6 +28,7 @@ Comment[sr@ijekavianlatin]=Ćaskanje putem Interneta Comment[sr@latin]=Ćaskanje putem Interneta Comment[sv]=Internet Relay Chat +Comment[tr]=Internet Relay Chat Comment[uk]=Internet Relay Chat Comment[wa]=Internet Relay Chat Comment[x-test]=xxInternet Relay Chatxx @@ -60,6 +61,7 @@ Name[sr@latin]=IRC Name[sv]=IRC Name[th]=IRC +Name[tr]=IRC Name[uk]=IRC Name[wa]=IRC Name[x-test]=xxIRCxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/jabberprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/jabberprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/jabberprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/jabberprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -30,6 +30,7 @@ Comment[sr@latin]=Protokol Jabber Comment[sv]=Jabber-protokoll Comment[th]=โพรโทคอล Jabber +Comment[tr]=Jabber Protokolü Comment[uk]=Протокол Jabber Comment[wa]=Protocole Jabber Comment[x-test]=xxJabber Protocolxx @@ -62,6 +63,7 @@ Name[sr@latin]=Jabber Name[sv]=Jabber Name[th]=Jabber +Name[tr]=Jabber Name[uk]=Jabber Name[wa]=Jabber Name[x-test]=xxJabberxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -29,6 +29,7 @@ Comment[sr@latin]=Protokol Meanwhile Comment[sv]=Meanwhile-protokoll Comment[th]=โพรโทคอล Meanwhile +Comment[tr]=Aynı Zamanlı Protokol Comment[uk]=Протокол Meanwhile Comment[wa]=Protocole Meanwhile Comment[x-test]=xxMeanwhile Protocolxx @@ -60,6 +61,7 @@ Name[sr@latin]=Meanwhile Name[sv]=Meanwhile Name[th]=Meanwhile +Name[tr]=Aynı Zamanlı Name[uk]=Meanwhile Name[wa]=Meanwhile Name[x-test]=xxMeanwhilexx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/msnprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/msnprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -28,6 +28,7 @@ Comment[sr@ijekavianlatin]=MSN Messenger Comment[sr@latin]=MSN Messenger Comment[sv]=MSN Messenger +Comment[tr]=MSN Messenger Comment[uk]=MSN Messenger Comment[wa]=MSN Messenger Comment[x-test]=xxMSN Messengerxx @@ -58,6 +59,7 @@ Name[sr@ijekavianlatin]=MSN Messenger Name[sr@latin]=MSN Messenger Name[sv]=MSN Messenger +Name[tr]=MSN Messenger Name[uk]=MSN Messenger Name[wa]=MSN Messenger Name[x-test]=xxMSN Messengerxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/skypeprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/skypeprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/skypeprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/skypeprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -28,6 +28,7 @@ Comment[sr@ijekavianlatin]=Skype, internet telefonija Comment[sr@latin]=Skype, internet telefonija Comment[sv]=Skype Internettelefoni +Comment[tr]=Skype İnternet Telefonu Comment[uk]=Інтернет-телефонія Skype Comment[wa]=Telefoneye sol Daegntoele Skype Comment[x-test]=xxSkype Internet Telephonyxx @@ -59,6 +60,7 @@ Name[sr@latin]=Skype Name[sv]=Skype Name[th]=Skype +Name[tr]=Skype Name[uk]=Skype Name[wa]=Skype Name[x-test]=xxSkypexx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/smsprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/smsprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/smsprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/smsprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -29,6 +29,7 @@ Comment[sr@latin]=Protokol SMS Comment[sv]=SMS-protokoll Comment[th]=โพรโทคอล SMS +Comment[tr]=SMS Protokolü Comment[uk]=Протокол SMS Comment[wa]=Protocole SMS Comment[x-test]=xxSMS Protocolxx @@ -60,6 +61,7 @@ Name[sr@latin]=SMS Name[sv]=SMS Name[th]=SMS +Name[tr]=SMS Name[uk]=SMS Name[wa]=SMS Name[x-test]=xxSMSxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/yahooprotocol.desktop new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/yahooprotocol.desktop --- old/kdepimlibs-4.5.2/akonadi/contact/editor/im/protocols/yahooprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/contact/editor/im/protocols/yahooprotocol.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -29,6 +29,7 @@ Comment[sr@latin]=Protokol Yahooa Comment[sv]=Yahoo-protokoll Comment[th]=โพรโทคอล Yahoo +Comment[tr]=Yahoo Protokolü Comment[uk]=Протокол Yahoo Comment[wa]=Protocole Yahoo Comment[x-test]=xxYahoo Protocolxx @@ -60,6 +61,7 @@ Name[sr@latin]=Yahoo Name[sv]=Yahoo Name[th]=Yahoo +Name[tr]=Yahoo Name[uk]=Yahoo Name[wa]=Yahoo Name[x-test]=xxYahooxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/item_p.h new/kdepimlibs-4.5.3/akonadi/item_p.h --- old/kdepimlibs-4.5.2/akonadi/item_p.h 2010-03-03 19:23:55.000000000 +0100 +++ new/kdepimlibs-4.5.3/akonadi/item_p.h 2010-10-28 19:35:23.000000000 +0200 @@ -94,9 +94,9 @@ QString mMimeType; Item::Flags mAddedFlags; Item::Flags mDeletedFlags; - bool mFlagsOverwritten; - bool mSizeChanged; - bool mClearPayload; + bool mFlagsOverwritten : 1; + bool mSizeChanged : 1; + bool mClearPayload : 1; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/itemfetchjob.cpp new/kdepimlibs-4.5.3/akonadi/itemfetchjob.cpp --- old/kdepimlibs-4.5.2/akonadi/itemfetchjob.cpp 2010-06-24 18:26:25.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/itemfetchjob.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -40,11 +40,17 @@ { public: ItemFetchJobPrivate( ItemFetchJob *parent ) - : JobPrivate( parent ) + : JobPrivate( parent ), + mValuePool( 0 ) { mCollection = Collection::root(); } + ~ItemFetchJobPrivate() + { + delete mValuePool; + } + void init() { Q_Q( ItemFetchJob ); @@ -78,6 +84,7 @@ ItemFetchScope mFetchScope; Item::List mPendingItems; // items pending for emitting itemsReceived() QTimer* mEmitTimer; + ProtocolHelperValuePool *mValuePool; }; void ItemFetchJobPrivate::startFetchJob() @@ -116,6 +123,7 @@ d->init(); d->mCollection = collection; + d->mValuePool = new ProtocolHelperValuePool; // only worth it for lots of results } ItemFetchJob::ItemFetchJob( const Item & item, QObject * parent) @@ -171,7 +179,7 @@ ImapParser::parseParenthesizedList( data, fetchResponse, begin + 6 ); Item item; - ProtocolHelper::parseItemFetchResult( fetchResponse, item ); + ProtocolHelper::parseItemFetchResult( fetchResponse, item, d->mValuePool ); if ( !item.isValid() ) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/protocolhelper.cpp new/kdepimlibs-4.5.3/akonadi/protocolhelper.cpp --- old/kdepimlibs-4.5.2/akonadi/protocolhelper.cpp 2010-06-24 18:26:25.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/protocolhelper.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -79,26 +79,49 @@ return rv; } +void ProtocolHelper::parseAncestorsCached( const QByteArray &data, Entity *entity, Collection::Id parentCollection, + ProtocolHelperValuePool *pool, int start ) +{ + if ( !pool || parentCollection == -1 ) { + // if no pool or parent collection id is provided we can't cache anything, so continue as usual + parseAncestors( data, entity, start ); + return; + } + + if ( pool->ancestorCollections.contains( parentCollection ) ) { + // ancestor chain is cached already, so use the cached value + entity->setParentCollection( pool->ancestorCollections.value( parentCollection ) ); + } else { + // not cached yet, parse the chain + parseAncestors( data, entity, start ); + pool->ancestorCollections.insert( parentCollection, entity->parentCollection() ); + } +} + void ProtocolHelper::parseAncestors( const QByteArray &data, Entity *entity, int start ) { Q_UNUSED( start ); - QList<QByteArray> ancestors; + static const Collection::Id rootCollectionId = Collection::root().id(); + QVarLengthArray<QByteArray, 16> ancestors; + QVarLengthArray<QByteArray, 16> parentIds; + ImapParser::parseParenthesizedList( data, ancestors ); Entity* current = entity; - foreach ( const QByteArray &uidRidPair, ancestors ) { - QList<QByteArray> parentIds; - ImapParser::parseParenthesizedList( uidRidPair, parentIds ); + for ( int i = 0; i < ancestors.count(); ++i ) { + parentIds.clear(); + ImapParser::parseParenthesizedList( ancestors[ i ], parentIds ); if ( parentIds.size() != 2 ) break; - const Collection::Id uid = parentIds.at( 0 ).toLongLong(); - const QString rid = QString::fromUtf8( parentIds.at( 1 ) ); - if ( uid == Collection::root().id() ) { + + const Collection::Id uid = parentIds[ 0 ].toLongLong(); + if ( uid == rootCollectionId ) { current->setParentCollection( Collection::root() ); break; } + current->parentCollection().setId( uid ); - current->parentCollection().setRemoteId( rid ); + current->parentCollection().setRemoteId( QString::fromUtf8( parentIds[ 1 ] ) ); current = &current->parentCollection(); } } @@ -270,7 +293,7 @@ return command; } -void ProtocolHelper::parseItemFetchResult( const QList<QByteArray> &lineTokens, Item &item ) +void ProtocolHelper::parseItemFetchResult( const QList<QByteArray> &lineTokens, Item &item, ProtocolHelperValuePool *valuePool ) { // create a new item object Item::Id uid = -1; @@ -298,7 +321,10 @@ } else if ( key == "COLLECTIONID" ) { cid = value.toInt(); } else if ( key == "MIMETYPE" ) { - mimeType = QString::fromLatin1( value ); + if ( valuePool ) + mimeType = valuePool->mimeTypePool.sharedValue( QString::fromLatin1( value ) ); + else + mimeType = QString::fromLatin1( value ); } } @@ -327,8 +353,16 @@ if ( key == "FLAGS" ) { QList<QByteArray> flags; ImapParser::parseParenthesizedList( lineTokens[i + 1], flags ); - foreach ( const QByteArray &flag, flags ) { - item.setFlag( flag ); + if ( !flags.isEmpty() ) { + Item::Flags convertedFlags; + convertedFlags.reserve( flags.size() ); + foreach ( const QByteArray &flag, flags ) { + if ( valuePool ) + convertedFlags.insert( valuePool->flagPool.sharedValue( flag ) ); + else + convertedFlags.insert( flag ); + } + item.setFlags( convertedFlags ); } } else if ( key == "SIZE" ) { const quint64 size = lineTokens[i + 1].toLongLong(); @@ -338,7 +372,7 @@ ImapParser::parseDateTime( lineTokens[i + 1], datetime ); item.setModificationTime( datetime ); } else if ( key == "ANCESTORS" ) { - ProtocolHelper::parseAncestors( lineTokens[i + 1], &item ); + ProtocolHelper::parseAncestorsCached( lineTokens[i + 1], &item, cid, valuePool ); } else { int version = 0; QByteArray plainKey( key ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/protocolhelper_p.h new/kdepimlibs-4.5.3/akonadi/protocolhelper_p.h --- old/kdepimlibs-4.5.2/akonadi/protocolhelper_p.h 2010-07-07 19:08:53.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/protocolhelper_p.h 2010-10-28 19:35:23.000000000 +0200 @@ -25,6 +25,7 @@ #include <akonadi/collectionutils_p.h> #include <akonadi/item.h> #include <akonadi/itemfetchscope.h> +#include <akonadi/sharedvaluepool_p.h> #include <akonadi/private/imapparser_p.h> #include <akonadi/private/protocol_p.h> @@ -34,6 +35,16 @@ namespace Akonadi { +struct ProtocolHelperValuePool +{ + typedef Internal::SharedValuePool<QByteArray, QVector> FlagPool; + typedef Internal::SharedValuePool<QString, QVector> MimeTypePool; + + FlagPool flagPool; + MimeTypePool mimeTypePool; + QHash<Collection::Id, Collection> ancestorCollections; +}; + /** @internal Helper methods for converting between libakonadi objects and their protocol @@ -72,6 +83,14 @@ static void parseAncestors( const QByteArray &data, Entity *entity, int start = 0 ); /** + Convert a ancestor chain from its protocol representation into an Entity object. + + This method allows to pass a @p valuePool which acts as cache, so ancestor paths for the + same @p parentCollection don't have to be parsed twice. + */ + static void parseAncestorsCached( const QByteArray &data, Entity *entity, Collection::Id parentCollection, ProtocolHelperValuePool *valuePool = 0, int start = 0 ); + + /** Parse a collection description. @param data The input data. @param collection The parsed collection. @@ -195,7 +214,7 @@ /** Parses a single line from an item fetch job result into an Item object. */ - static void parseItemFetchResult( const QList<QByteArray> &lineTokens, Item &item ); + static void parseItemFetchResult( const QList<QByteArray> &lineTokens, Item &item, ProtocolHelperValuePool *valuePool = 0 ); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/sharedvaluepool_p.h new/kdepimlibs-4.5.3/akonadi/sharedvaluepool_p.h --- old/kdepimlibs-4.5.2/akonadi/sharedvaluepool_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.5.3/akonadi/sharedvaluepool_p.h 2010-10-28 19:35:23.000000000 +0200 @@ -0,0 +1,78 @@ +/* + Copyright (c) 2010 Volker Krause <vkrause(a)kde.org> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef AKONADI_SHAREDVALUEPOOL_P_H +#define AKONADI_SHAREDVALUEPOOL_P_H + +#include <boost/utility/enable_if.hpp> +#include <algorithm> + +namespace Akonadi { +namespace Internal { + +/*template <typename T> class container_traits +{ + private: + typedef char sizeOne; + typedef struct { char a[2]; } sizeTwo; + template <typename C> static sizeOne testForKeyType( typename C::key_type const* ); + template <typename C> static sizeTwo testForKeyType( ... ); + public: + enum { isAssociative = sizeof( container_traits<T>::testForKeyType<T>( 0 ) ) == 1 }; +};*/ + +/** + * Pool of implicitly shared values, use for optimizing memory use + * when having a large amount of copies from a small set of different values. + */ +template <typename T, template <typename> class Container> +class SharedValuePool +{ + public: + /** Returns the shared value equal to @p value .*/ + /*template <typename C> + typename boost::enable_if_c<container_traits<Container<C> >::isAssociative, C>::type sharedValue( const C &value, const int* = 0 ) + { + typename Container<T>::const_iterator it = m_pool.constFind( value ); + if ( it != m_pool.constEnd() ) + return *it; + m_pool.insert( value ); + return value; + } + + template <typename C> + typename boost::disable_if_c<container_traits<Container<C> >::isAssociative, C>::type sharedValue( const C &value )*/ + T sharedValue( const T &value ) + { + // for small pool sizes this is actually faster than using lower_bound and a sorted vector + typename Container<T>::const_iterator it = std::find( m_pool.constBegin(), m_pool.constEnd(), value ); + if ( it != m_pool.constEnd() ) + return *it; + m_pool.push_back( value ); + return value; + } + + private: + Container<T> m_pool; +}; + +} +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/tests/CMakeLists.txt new/kdepimlibs-4.5.3/akonadi/tests/CMakeLists.txt --- old/kdepimlibs-4.5.2/akonadi/tests/CMakeLists.txt 2010-05-05 16:51:13.000000000 +0200 +++ new/kdepimlibs-4.5.3/akonadi/tests/CMakeLists.txt 2010-10-28 19:35:23.000000000 +0200 @@ -137,6 +137,7 @@ add_akonadi_test(collectionutilstest.cpp) add_akonadi_test(entitydisplayattributetest.cpp) add_akonadi_test(proxymodelstest.cpp) +add_akonadi_test(sharedvaluepooltest.cpp) # qtestlib tests that need non-exported stuff from akonadi-kde kde4_add_unit_test(resourceschedulertest TESTNAME akonadi-resourceschedulertest resourceschedulertest.cpp ../resourcescheduler.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/akonadi/tests/sharedvaluepooltest.cpp new/kdepimlibs-4.5.3/akonadi/tests/sharedvaluepooltest.cpp --- old/kdepimlibs-4.5.2/akonadi/tests/sharedvaluepooltest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.5.3/akonadi/tests/sharedvaluepooltest.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -0,0 +1,89 @@ +/* + Copyright (c) 2010 Volker Krause <vkrause(a)kde.org> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "../sharedvaluepool_p.h" +#include <qtest_kde.h> + +#include <QVector> +#include <QSet> +#include <set> +#include <vector> + +using namespace Akonadi; + +class SharedValuePoolTest : public QObject +{ + Q_OBJECT + private slots: + void testQVector_data() + { + QTest::addColumn<int>( "size" ); + QTest::newRow( "10" ) << 10; + QTest::newRow( "100" ) << 100; + } + + void testQVector() + { + QFETCH( int, size ); + QVector<QByteArray> data; + Internal::SharedValuePool<QByteArray, QVector> pool; + + for ( int i = 0; i < size; ++i ) { + QByteArray b( 10, (char)i ); + data.push_back( b ); + QCOMPARE( pool.sharedValue( b ), b ); + QCOMPARE( pool.sharedValue( b ), b ); + } + + QBENCHMARK { + foreach ( const QByteArray &b, data ) + pool.sharedValue( b ); + } + } + + /*void testQSet_data() + { + QTest::addColumn<int>( "size" ); + QTest::newRow( "10" ) << 10; + QTest::newRow( "100" ) << 100; + } + + void testQSet() + { + QFETCH( int, size ); + QVector<QByteArray> data; + Internal::SharedValuePool<QByteArray, QSet> pool; + + for ( int i = 0; i < size; ++i ) { + QByteArray b( 10, (char)i ); + data.push_back( b ); + QCOMPARE( pool.sharedValue( b ), b ); + QCOMPARE( pool.sharedValue( b ), b ); + } + + QBENCHMARK { + foreach ( const QByteArray &b, data ) + pool.sharedValue( b ); + } + }*/ +}; + +QTEST_KDEMAIN( SharedValuePoolTest, NoGUI ) + +#include "sharedvaluepooltest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.5.3/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-4.5.2/kabc/plugins/dir/dir.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kabc/plugins/dir/dir.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -53,7 +53,7 @@ Comment[es]=Provee acceso a los contactos, cada uno almacenado en un archivo diferente, dentro de un directorio determinado. Soporta archivos VCard estándar y otros formatos dependiendo de la disponibilidad de los complementos. Comment[et]=Võimaldab kasutada eraldi failidesse salvestatud kontakte määratud kataloogis. Toetab standardseid VCard-faile ja teisi vorminguid sõltuvalt pluginate olemasolust. Comment[fi]=Tarjoaa pääsyn annetun kansion yksittäisiin tiedostoihin tallennettuihin yhteystietoihin. Tukee vakiomuotoista vCard-tiedostoa sekä muita tiedostomuotoja liitännäisistä riippuen. -Comment[fr]=Fourni l'accès aux contacts stockés chacun dans un fichier dans le dossier indiqué. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles +Comment[fr]=Fournit l'accès aux contacts stockés chacun dans un fichier dans le dossier indiqué. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, gach ceann stóráilte i gcomhad aonair, i bhfillteán sonraithe. Tacaítear le comhaid v-Chárta agus le formáidí eile, ag brath ar na breiseáin atá ar fáil. Comment[gl]=Dá acceso aos contactos, cada un gardado nun ficheiro nun cartafol dado. Admite ficheiros vCard estándar e outros formatos, en función da dispoñibilidade de extensións. Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kabc/plugins/file/file.desktop new/kdepimlibs-4.5.3/kabc/plugins/file/file.desktop --- old/kdepimlibs-4.5.2/kabc/plugins/file/file.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kabc/plugins/file/file.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -59,7 +59,7 @@ Comment[es]=Provee acceso a los contactos almacenados en un único archivo local. Soporta archivos VCard estándar y otros formatos dependiendo de la disponibilidad de los componentes. Comment[et]=Võimaldab kasutada kohalikku faili salvestatud kontakte. Toetab standardseid VCard-faile ja teisi vorminguid sõltuvalt pluginate olemasolust. Comment[fi]=Tarjoaa pääsyn yksittäiseen paikalliseen tiedostoon tallennettuihin yhteystietoihin. Tukee vakiomuotoisia vCard-tiedostoja sekä muita tiedostomuotoja liitännäisistä riippuen. -Comment[fr]=Fourni l'accès aux contacts stockés dans un seul fichier local. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles. +Comment[fr]=Fournit l'accès aux contacts stockés dans un seul fichier local. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles. Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, stóráilte i gcomhad aonair. Tacaítear le comhaid v-Chárta agus formáidí eile, ag brath ar na breiseáin atá ar fáil. Comment[gl]=Dá acceso a contactos gardados nun único ficheiro local. Admite ficheiros vCard estándar e outros formatos en función das extensións dispoñíbeis. Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kabc/plugins/ldapkio/ldapkio.desktop new/kdepimlibs-4.5.3/kabc/plugins/ldapkio/ldapkio.desktop --- old/kdepimlibs-4.5.2/kabc/plugins/ldapkio/ldapkio.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kabc/plugins/ldapkio/ldapkio.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -59,7 +59,7 @@ Comment[es]=Provee acceso a los contactos almacenados en un servidor de directorios LDAP Comment[et]=Võimaldab kasutada LDAP kataloogiserverisse salvestatud kontakte Comment[fi]=Tarjoaa pääsyn LDAP-hakemistopalvelimelle tallennettuihin yhteystietoihin -Comment[fr]=Fourni l'accès aux contacts stockés dans un annuaire LDAP +Comment[fr]=Fournit l'accès aux contacts stockés dans un annuaire LDAP Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha atá stóráilte in eolaire LDAP Comment[gl]=Dá acceso a contactos gardados nun servidor de directorio LDAP Comment[hu]=LDAP címtárkiszolgálókon tárolt névjegyek elérését biztosítja. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kabc/plugins/net/net.desktop new/kdepimlibs-4.5.3/kabc/plugins/net/net.desktop --- old/kdepimlibs-4.5.2/kabc/plugins/net/net.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kabc/plugins/net/net.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -59,7 +59,7 @@ Comment[es]=Provee acceso a los contactos en un archivo remoto utilizando la infraestructura de red KIO de KDE. Soporta archivos VCard estándar y otros formatos dependiendo en la disponibilidad de los complementos. Comment[et]=Võimaldab kasutada võrgufaile KDE võrguraamistiku KIO abil. Toetab standardseid VCard-faile ja teisi vorminguid sõltuvalt pluginate olemasolust. Comment[fi]=Tarjoaa pääsyn etätiedostoissa oleviin yhteystietoihin KDE:n verkkokehyksen KIOn välityksellä. Tukee vakiomuotoisia vCard-tiedostoja sekä muita tiedostomuotoja liitännäisistä riippuen. -Comment[fr]=Fourni l'accès aux contacts stockés dans des fichiers distants en utilisant le mécanisme réseau KIO de KDE. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles. +Comment[fr]=Fournit l'accès aux contacts stockés dans des fichiers distants en utilisant le mécanisme réseau KIO de KDE. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles. Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha i gcianchomhaid tríd an gcreatlach líonra KIO atá cuid de KDE. Tacaítear le comhaid v-Chárta agus formáidí eile, ag brath ar na breiseáin atá ar fáil. Comment[gl]=Dá acceso a contactos gardados en ficheiros remotos mediante a infraestrutura de rede KIO, de KDE. Admite ficheiros vCard estándar e outros formatos en función das extensións dispoñíbeis. Comment[hu]=Távoli fájlokban található névjegyek elérését biztosítja a KDE KIO keretrendszeren keresztül. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kcal/local.desktop new/kdepimlibs-4.5.3/kcal/local.desktop --- old/kdepimlibs-4.5.2/kcal/local.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kcal/local.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -57,7 +57,7 @@ Comment[es]=Provee acceso a un calendario almacenado en un único archivo local Comment[et]=Võimaldab kasutada kohalikku faili salvestatud kalendrit Comment[fi]=Tarjoaa pääsyn yksittäiseen paikalliseen tiedostoon tallennettuun kalenteriin -Comment[fr]=Fourni l'accès à un agenda stocké dans un fichier local +Comment[fr]=Fournit l'accès à un agenda stocké dans un fichier local Comment[ga]=Soláthraíonn sé seo rochtain ar fhéilire stóráilte i gcomhad logánta amháin Comment[gl]=Dá acceso a un calendario gardado nun único ficheiro local Comment[hu]=Helyi fájlban tárolt naptár elérését biztosítja. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kcal/localdir.desktop new/kdepimlibs-4.5.3/kcal/localdir.desktop --- old/kdepimlibs-4.5.2/kcal/localdir.desktop 2010-07-28 23:04:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kcal/localdir.desktop 2010-10-28 19:35:23.000000000 +0200 @@ -57,7 +57,7 @@ Comment[es]=Provee acceso a elementos de un calendario, cada uno almacenado en un archivo diferente, dentro de un directorio determinado Comment[et]=Võimaldab kasutada eraldi failidesse salvestatud kalendrielemente määratud kataloogis Comment[fi]=Tarjoaa pääsyn annetun kansion erillisiin tiedostoihin tallennettuihin kalenteritietueisiin -Comment[fr]=Fourni l'accès à des entrées d'agenda, chaque élément étant représenté par un fichier dans le dossier indiqué +Comment[fr]=Fournit l'accès à des entrées d'agenda, chaque élément étant représenté par un fichier dans le dossier indiqué Comment[ga]=Soláthraíonn sé seo rochtain ar mhíreanna féilire, gach ceann stóráilte i gcomhad aonair, i gcomhadlann sonraithe Comment[gl]=Dá acceso aos obxectos do calendario, cada un gardado nun ficheiro nun cartafol dado Comment[hu]=Helyi mappában tárolt naptérbejegyzések elérését biztosítja. Minden bejegyzés külön fájlban található. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kcal/scheduler.cpp new/kdepimlibs-4.5.3/kcal/scheduler.cpp --- old/kdepimlibs-4.5.2/kcal/scheduler.cpp 2010-05-16 22:05:07.000000000 +0200 +++ new/kdepimlibs-4.5.3/kcal/scheduler.cpp 2010-10-28 19:35:23.000000000 +0200 @@ -256,8 +256,8 @@ if ( !visitor.assign( calInc, newInc ) ) { kError() << "assigning different incidence types"; } else { - calInc->setUid( oldUid ); calInc->setSchedulingID( newInc->uid() ); + calInc->setUid( oldUid ); res = true; } } @@ -345,8 +345,8 @@ kError() << "assigning different incidence types"; res = false; } else { - i->setUid( oldUid ); i->setSchedulingID( inc->uid() ); + i->setUid( oldUid ); } deleteTransaction( incidence ); return res; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_content.h new/kdepimlibs-4.5.3/kmime/kmime_content.h --- old/kdepimlibs-4.5.2/kmime/kmime_content.h 2010-05-16 22:05:06.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_content.h 2010-10-28 19:35:22.000000000 +0200 @@ -770,8 +770,7 @@ template <typename T> T *Content::header( bool create ) { - T dummy; - Headers::Base *h = headerByType( dummy.type() ); + Headers::Base *h = headerByType( T::staticType() ); if( h ) { // Make sure the header is actually of the right type. Q_ASSERT( dynamic_cast<T*>( h ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_headers.cpp new/kdepimlibs-4.5.3/kmime/kmime_headers.cpp --- old/kdepimlibs-4.5.2/kmime/kmime_headers.cpp 2010-06-24 18:26:24.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_headers.cpp 2010-10-28 19:35:22.000000000 +0200 @@ -124,12 +124,14 @@ \ const char *subclass::type() const \ { \ - return #name; \ -} + return staticType(); \ +} \ +const char *subclass::staticType() { return #name; } #define kmime_mk_trivial_ctor_with_name_and_dptr( subclass, baseclass, name ) \ kmime_mk_trivial_ctor_with_dptr( subclass, baseclass ) \ -const char *subclass::type() const { return #name; } +const char *subclass::type() const { return staticType(); } \ +const char *subclass::staticType() { return #name; } #define kmime_mk_dptr_ctor( subclass, baseclass ) \ subclass::subclass( subclass##Private *d, KMime::Content *parent ) : baseclass( d, parent ) {} @@ -1715,7 +1717,13 @@ QByteArray ContentType::mimeType() const { - return d_func()->mimeType + '/' + d_func()->mimeSubType; + Q_D(const ContentType); + QByteArray mt; + mt.reserve( d->mimeType.size() + d->mimeSubType.size() + 1 ); + mt.append( d->mimeType ); + mt.append( '/' ); + mt.append( d->mimeSubType ); + return mt; } QByteArray ContentType::mediaType() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_headers.h new/kdepimlibs-4.5.3/kmime/kmime_headers.h --- old/kdepimlibs-4.5.2/kmime/kmime_headers.h 2010-05-16 22:05:06.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_headers.h 2010-10-28 19:35:22.000000000 +0200 @@ -109,7 +109,8 @@ #define kmime_mk_trivial_ctor_with_name( subclass ) \ kmime_mk_trivial_ctor( subclass ) \ - const char *type() const; + const char *type() const; \ + static const char *staticType(); //@endcond // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_message.cpp new/kdepimlibs-4.5.3/kmime/kmime_message.cpp --- old/kdepimlibs-4.5.2/kmime/kmime_message.cpp 2010-07-12 23:08:14.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_message.cpp 2010-10-28 19:35:22.000000000 +0200 @@ -103,8 +103,9 @@ KMime::Content *c = this; while ( c ) { // not a multipart message - if ( !c->contentType()->isMultipart() ) { - if ( c->contentType()->mimeType() == type || type.isEmpty() ) { + const KMime::Headers::ContentType * const contentType = c->contentType(); + if ( !contentType->isMultipart() ) { + if ( contentType->mimeType() == type || type.isEmpty() ) { return c; } return 0; @@ -116,7 +117,7 @@ } // multipart/alternative - if ( c->contentType()->subType() == "alternative" ) { + if ( contentType->subType() == "alternative" ) { if ( type.isEmpty() ) { return c->contents().first(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_parsers.cpp new/kdepimlibs-4.5.3/kmime/kmime_parsers.cpp --- old/kdepimlibs-4.5.2/kmime/kmime_parsers.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_parsers.cpp 2010-10-28 19:35:22.000000000 +0200 @@ -22,7 +22,6 @@ */ #include "kmime_parsers.h" -#include <QtCore/QRegExp> #include <QtCore/QByteArray> using namespace KMime::Parser; @@ -164,7 +163,7 @@ //============================================================================== UUEncoded::UUEncoded( const QByteArray &src, const QByteArray &subject ) : - NonMimeParser( src ), s_ubject( subject ) + NonMimeParser( src ), s_ubject( subject ), m_beginRegExp( "begin [0-9][0-9][0-9]" ), m_numberRegExp( "[0-9]+/[0-9]+" ) {} bool UUEncoded::parse() @@ -178,7 +177,7 @@ QByteArray tmp, fileName; if ( ( beginPos = QString( s_rc ). - indexOf( QRegExp( "begin [0-9][0-9][0-9]" ), currentPos ) ) > -1 && + indexOf( m_beginRegExp, currentPos ) ) > -1 && ( beginPos == 0 || s_rc.at( beginPos - 1 ) == '\n') ) { containsBegin = true; uuStart = s_rc.indexOf( '\n', beginPos ); @@ -223,9 +222,8 @@ if ( ( !containsBegin || !containsEnd ) && !s_ubject.isNull() ) { // message may be split up => parse subject - QRegExp rx("[0-9]+/[0-9]+"); - pos = rx.indexIn( QString( s_ubject ), 0 ); - len = rx.matchedLength(); + pos = m_numberRegExp.indexIn( QString( s_ubject ), 0 ); + len = m_numberRegExp.matchedLength(); if ( pos != -1 ) { tmp = s_ubject.mid( pos, len ); pos = tmp.indexOf( '/' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.2/kmime/kmime_parsers.h new/kdepimlibs-4.5.3/kmime/kmime_parsers.h --- old/kdepimlibs-4.5.2/kmime/kmime_parsers.h 2009-08-20 04:41:48.000000000 +0200 +++ new/kdepimlibs-4.5.3/kmime/kmime_parsers.h 2010-10-28 19:35:22.000000000 +0200 @@ -23,8 +23,9 @@ #ifndef __KMIME_PARSERS__ #define __KMIME_PARSERS__ -#include<QByteArray> -#include<QList> +#include<QtCore/QByteArray> +#include<QtCore/QList> +#include<QtCore/QRegExp> namespace KMime { @@ -103,6 +104,10 @@ protected: QByteArray s_ubject; + + private: + QRegExp m_beginRegExp; + QRegExp m_numberRegExp; }; /** Helper-class: tries to extract the data from a possibly ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Fri Nov 5 14:45:47 CET 2010. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2010-08-15 09:34:12.000000000 +0200 +++ akonadi-runtime/akonadi-runtime.changes 2010-10-25 09:26:17.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 25 07:23:47 UTC 2010 - wstephenson(a)novell.com + +- update to 1.4.1: + * Server startup performance fix + * IMAP Parser fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.4.0.tar.bz2 New: ---- akonadi-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.Squg2Y/_old 2010-11-05 14:44:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Squg2Y/_new 2010-11-05 14:44:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.4.0) +# spec file for package akonadi-runtime (Version 1.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -Version: 1.4.0 -Release: 2 +Version: 1.4.1 +Release: 1 %define rversion %version License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,7 +105,7 @@ %prep %setup -q -n akonadi-%version -%patch0 +#%patch0 %build %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc ++++++ 1_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.Squg2Y/_old 2010-11-05 14:44:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Squg2Y/_new 2010-11-05 14:44:48.000000000 +0100 @@ -1,100 +1 @@ -package: kdelibs-4.4.3.tar.bz2 -kdemod: kdelibs ---- BRANCH_STATUS -+++ BRANCH_STATUS -@@ -0,0 +1,2 @@ -+current HEAD: 1163872 -+svn di between //tags/akonadi/1.4.0 and //branches/akonadi/1.4 -Index: server/src/storage/dbconfigmysql.h -=================================================================== ---- server/src/storage/dbconfigmysql.h (revision 1157505) -+++ server/src/storage/dbconfigmysql.h (revision 1163873) -@@ -78,7 +78,7 @@ - QString mServerPath; - QString mCleanServerShutdownCommand; - QString mMysqlInstallDbPath; -- QString mMysqlUpgradeDBPath; -+ QString mMysqlCheckPath; - bool mInternalServer; - QProcess *mDatabaseProcess; - }; -Index: server/src/storage/dbconfigmysql.cpp -=================================================================== ---- server/src/storage/dbconfigmysql.cpp (revision 1157505) -+++ server/src/storage/dbconfigmysql.cpp (revision 1163873) -@@ -86,8 +86,8 @@ - mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_install_db" ), mysqldSearchPath ); - akDebug() << "Found mysql_install_db: " << mMysqlInstallDbPath; - -- mMysqlUpgradeDBPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_upgrade" ), mysqldSearchPath ); -- akDebug() << "Found mysql_upgrade: " << mMysqlUpgradeDBPath; -+ mMysqlCheckPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysqlcheck" ), mysqldSearchPath ); -+ akDebug() << "Found mysqlcheck: " << mMysqlCheckPath; - - mInternalServer = settings.value( QLatin1String( "QMYSQL/StartServer" ), defaultInternalServer ).toBool(); - if ( mInternalServer ) { -@@ -239,7 +239,7 @@ - if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { - const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - QProcess::execute( mMysqlInstallDbPath, arguments ); -- } -+ } - - // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate - if ( confUpdate ) { -@@ -267,11 +267,6 @@ - akFatal() << "process error:" << mDatabaseProcess->errorString(); - } - -- if ( !mMysqlUpgradeDBPath.isEmpty() ) { -- const QStringList arguments = QStringList() << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); -- QProcess::execute( mMysqlUpgradeDBPath, arguments ); -- } -- - const QLatin1String initCon( "initConnection" ); - { - QSqlDatabase db = QSqlDatabase::addDatabase( QLatin1String( "QMYSQL" ), initCon ); -@@ -298,6 +293,15 @@ - } - - if ( opened ) { -+ -+ if ( !mMysqlCheckPath.isEmpty() ) { -+ const QStringList arguments = QStringList() << QLatin1String( "--check-upgrade" ) -+ << QLatin1String( "--all-databases" ) -+ << QLatin1String( "--auto-repair" ) -+ << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); -+ QProcess::execute( mMysqlCheckPath, arguments ); -+ } -+ - { - QSqlQuery query( db ); - if ( !query.exec( QString::fromLatin1( "USE %1" ).arg( mDatabaseName ) ) ) { -Index: server/src/storage/queryhelper.cpp -=================================================================== ---- server/src/storage/queryhelper.cpp (revision 1157505) -+++ server/src/storage/queryhelper.cpp (revision 1163873) -@@ -32,13 +32,18 @@ - if ( i.size() == 1 ) { - cond.addValueCondition( column, Query::Equals, i.begin() ); - } else { -- Query::Condition subCond( Query::And ); -- subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); -- subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); -- cond.addCondition( subCond ); -+ if ( i.begin() != 1 ) { // 1 is our standard lower bound, so we don't have to check for it explicitly -+ Query::Condition subCond( Query::And ); -+ subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); -+ subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); -+ cond.addCondition( subCond ); -+ } else { -+ cond.addValueCondition( column, Query::LessOrEqual, i.end() ); -+ } - } - } else if ( i.hasDefinedBegin() ) { -- cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); -+ if ( i.begin() != 1 ) // 1 is our standard lower bound, so we don't have to check for it explicitly -+ cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); - } else if ( i.hasDefinedEnd() ) { - cond.addValueCondition( column, Query::LessOrEqual, i.end() ); - } + ++++++ akonadi-1.4.0.tar.bz2 -> akonadi-1.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/CMakeLists.txt new/akonadi-1.4.1/CMakeLists.txt --- old/akonadi-1.4.0/CMakeLists.txt 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/CMakeLists.txt 2010-10-22 17:12:44.000000000 +0200 @@ -37,7 +37,7 @@ set(AKONADI_VERSION_MAJOR "1") set(AKONADI_VERSION_MINOR "4") -set(AKONADI_VERSION_PATCH "0") +set(AKONADI_VERSION_PATCH "1") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") # If Subversion is installed, and a '.svn' directory is found, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/ChangeLog new/akonadi-1.4.1/ChangeLog --- old/akonadi-1.4.0/ChangeLog 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/ChangeLog 2010-10-22 17:12:44.000000000 +0200 @@ -1,3 +1,82 @@ +2010-10-18 08:44 +0000 [r1187073] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/src/imapstreamparser.cpp: Backport + bugfix (r1186987) + +2010-10-11 07:48 +0000 [r1184650] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/CMakeLists.txt, + branches/akonadi/1.4/server/src/storage/dbconfigmysql.cpp, + branches/akonadi/1.4/server/src/utils.h, + branches/akonadi/1.4/server/src/akonadi.cpp, + branches/akonadi/1.4/server/src/storage/dbconfig.cpp, + branches/akonadi/1.4/server/src/utils.cpp (added), + branches/akonadi/1.4/server/src/storage/dbconfigpostgresql.cpp, + branches/akonadi/1.4/server/src/storage/dbconfig.h: Allow to use + the place holder '$USER' inside the custom socket directory + +2010-10-08 14:10 +0000 [r1183854] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/libs/imapparser.cpp: Backport performance + improvments from commit r1182169 + +2010-10-08 12:28 +0000 [r1183789] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/src/storage/dbconfigmysql.cpp, + branches/akonadi/1.4/server/src/storage/dbconfig.cpp, + branches/akonadi/1.4/server/src/storage/dbconfigpostgresql.cpp, + branches/akonadi/1.4/server/src/storage/dbconfig.h: Fixed the + handling of custom Connection/SocketDirectory entry in + akonadiserverrc. The databases (MySQL and PostgreSQL) respect + this setting now as well and the directory is created + automatically if non-existing. + +2010-09-26 14:11 +0000 [r1179920] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/libs/tests/CMakeLists.txt, + branches/akonadi/1.4/libs/tests/imapparserbenchmark.cpp (added), + branches/akonadi/1.4/libs/imapparser.cpp: Backport imapparser + performance improvements (r1179519, r1179534) + +2010-08-19 07:43 +0000 [r1165384] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.4/server/src/storage/akonadidb.xml, + branches/akonadi/1.4: Merged revisions 1165376 via svnmerge from + svn+ssh://vkrause@svn.kde.org/home/kde/trunk/kdesupport/akonadi + ........ r1165376 | vkrause | 2010-08-19 09:31:45 +0200 (Thu, 19 + Aug 2010) | 4 lines Add index on part name, speeds up server + startup on big databases considerably (due to + unhideAllPimitems()). Actually found by David during Akademy, but + somehow didn't get committed yet. ........ + +2010-08-05 09:02 +0000 [r1159382] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/src/storage/dbconfigmysql.cpp, + branches/akonadi/1.4/server/src/storage/dbconfigmysql.h: Do not + use 'mysql_upgrade', it will call 'mysql_fix_privilege_tables' + internally which prevents us from further logins. Only call + 'mysqlcheck' instead, which does the checks we want to have. + +2010-08-03 15:24 +0000 [r1158741] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/src/storage/dbconfigmysql.cpp: Move + the mysql_upgrade call to a place where we have made sure that + mysqld is up and running and accepts connections. This will avoid + mysql_upgrade to fail with the FATAL ERROR message. BUG: 241977 + +2010-08-02 08:59 +0000 [r1158192] Tobias Koenig tokoe(a)kde.org + + * branches/akonadi/1.4/server/src/storage/queryhelper.cpp: Do not + add '>= 1' condition to query, because this will always be true + for item id sets. Avoiding a range check does improve the + performance of the query. + +2010-07-31 09:50 +0000 [r1157502] Volker Krause vkrause(a)kde.org + + * branches/akonadi/1.4/ChangeLog, branches/akonadi/1.4/NEWS, + branches/akonadi/1.4/CMakeLists.txt: prepare Akonadi 1.4.0 + release + 2010-07-31 09:45 +0000 [r1157499-1157500] Volker Krause vkrause(a)kde.org * branches/akonadi/1.4/server/src/storage/notificationcollector.h, @@ -706,12 +785,12 @@ modify job, but that requires intrusive server changes and this makes the search in kmail work. Ok'd by Volker. -2010-04-09 13:52 +0000 [r1112925] Nicolas Lécureuil nlecureuil(a)mandriva.com +2010-04-09 13:52 +0000 [r1112925] Nicolas Lécureuil neoclust.kde(a)free.fr * trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.cpp: Forward port commit 1112923 CCBUG:185395 -2010-04-07 12:42 +0000 [r1112128] Nicolas Lécureuil nlecureuil(a)mandriva.com +2010-04-07 12:42 +0000 [r1112128] Nicolas Lécureuil neoclust.kde(a)free.fr * trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.cpp: Use mysqk_upgrade after the creation of the socket @@ -730,7 +809,7 @@ from restarting). Instead, we now get the postmaster pid and force it to quit. -2010-04-06 08:56 +0000 [r1111611] Nicolas Lécureuil nlecureuil(a)mandriva.com +2010-04-06 08:56 +0000 [r1111611] Nicolas Lécureuil neoclust.kde(a)free.fr * trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.h, trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.cpp: @@ -1769,18 +1848,18 @@ 1044743, 1044749 and fix only what needs fixing. (and don't break 4.3 compilation against akonadi trunk) -2009-11-04 15:13 +0000 [r1044749] Helio Chissini de Castro helio(a)kde.org +2009-11-04 15:13 +0000 [r1044749] Helio Castro helio(a)kde.org * trunk/kdesupport/akonadi/CMakeLists.txt: All kdepimlibs expect that we have akonadi headers installed in <includedir>/akonadi. This now fix the issue -2009-11-04 15:02 +0000 [r1044743] Helio Chissini de Castro helio(a)kde.org +2009-11-04 15:02 +0000 [r1044743] Helio Castro helio(a)kde.org * trunk/kdesupport/akonadi/CMakeLists.txt: - Revert this part since was pointed as not necessary by krop. -2009-11-04 14:57 +0000 [r1044736] Helio Chissini de Castro helio(a)kde.org +2009-11-04 14:57 +0000 [r1044736] Helio Castro helio(a)kde.org * trunk/kdesupport/akonadi/CMakeLists.txt, trunk/kdesupport/akonadi/libs/CMakeLists.txt: - Make install @@ -3580,7 +3659,7 @@ the KDE Support API docs main pages, but not into the kdelibs API docs main pages? -2009-03-08 16:22 +0000 [r936905] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2009-03-08 16:22 +0000 [r936905] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/tests/unittest/CMakeLists.txt: the private/public hack does not work on windows -> disabled @@ -4151,7 +4230,7 @@ Restart agents when their executable changed, much easier to test changes this way :) -2008-12-30 17:49 +0000 [r903502] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-12-30 17:49 +0000 [r903502] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/src/tests/CMakeLists.txt, trunk/kdesupport/akonadi/CMakeLists.txt, @@ -4718,12 +4797,12 @@ trunk/kdesupport/akonadi/server/src/handler/copy.cpp: Add serverside timestamp support for items. -2008-07-20 08:55 +0000 [r835215] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-07-20 08:55 +0000 [r835215] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/libs/xdgbasedirs.cpp: better fix for windows -2008-07-19 13:19 +0000 [r834689] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-07-19 13:19 +0000 [r834689] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/libs/xdgbasedirs.cpp, trunk/kdesupport/akonadi/server/src/akonadi.cpp: make msvc and @@ -4885,7 +4964,7 @@ * trunk/kdesupport/akonadi/server/control/agentmanager.cpp: dynamic_cast provides a runtime check, static_cast doesn't -2008-05-05 17:48 +0000 [r804324-804326] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-05-05 17:48 +0000 [r804324-804326] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/interfaces/org.kde.Akonadi.Agent.Control.xml (removed): two seconds to late... @@ -5077,7 +5156,7 @@ * trunk/kdesupport/akonadi/cmake/modules/FindAutomoc4.cmake (added): -add FindAutomoc4.cmake, forgot that last night Alex -2008-04-26 08:06 +0000 [r801261] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-04-26 08:06 +0000 [r801261] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/control/kcrash.cpp: mingw doesn't have _exit(), only _Exit() or better - it has _exit() but not @@ -5150,12 +5229,12 @@ trunk/kdesupport/akonadi/INSTALL (added): Add INSTALL and README file -2008-04-25 15:12 +0000 [r801052] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-04-25 15:12 +0000 [r801052] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/CMakeLists.txt: no need to link against kdewin32 lib here -2008-04-25 14:25 +0000 [r801042] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-04-25 14:25 +0000 [r801042] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/control/kcrash.cpp: _exit() -> exit() because _exit() is not available when compiling on @@ -5167,7 +5246,7 @@ flags for -Wno-long-long and more warnings - add the cmake directory after that flags are set -2008-04-25 05:09 +0000 [r800884] Christian Ehrlicher Ch.Ehrlicher(a)gmx.de +2008-04-25 05:09 +0000 [r800884] Christian Ehrlicher ch.ehrlicher(a)gmx.de * trunk/kdesupport/akonadi/server/CMakeLists.txt, trunk/kdesupport/akonadi/libs/CMakeLists.txt: win32 compile++ @@ -5188,7 +5267,7 @@ * trunk/kdesupport/akonadi/CMakeLists.txt: Check that Qt has DBus -2008-04-24 10:23 +0000 [r800462] Nicolas Lécureuil nlecureuil(a)mandriva.com +2008-04-24 10:23 +0000 [r800462] Nicolas Lécureuil neoclust.kde(a)free.fr * trunk/kdesupport/akonadi/CMakeLists.txt: Require Qt 4.4 minimum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/NEWS new/akonadi-1.4.1/NEWS --- old/akonadi-1.4.0/NEWS 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/NEWS 2010-10-22 17:12:44.000000000 +0200 @@ -1,3 +1,15 @@ +1.4.1 22-October-2010 +--------------------------------------------- +- Improve range query performance. +- Fix MySQL database upgrade happening too early. +- Fix MySQL database upgrade setting wrong priviledges. +- Fix non-index access slowing down server startup. +- ASAP parser performance optimizations +- Respect SocketDirectory setting also for database sockets. +- Allow $USER placeholder in SocketDirectory setting. +- Fix ASAP parser failing on non-zero serialization format versions. + + 1.4.0 31-July-2010 --------------------------------------------- - Add change notification for collection subscription state changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/libs/imapparser.cpp new/akonadi-1.4.1/libs/imapparser.cpp --- old/akonadi-1.4.0/libs/imapparser.cpp 2010-07-31 18:12:24.000000000 +0200 +++ new/akonadi-1.4.1/libs/imapparser.cpp 2010-10-22 17:12:42.000000000 +0200 @@ -77,13 +77,14 @@ int sublistbegin = start; bool insideQuote = false; for ( int i = begin + 1; i < data.length(); ++i ) { - if ( data[i] == '(' && !insideQuote ) { + const char currentChar = data[i]; + if ( currentChar == '(' && !insideQuote ) { ++count; if ( count == 1 ) sublistbegin = i; continue; } - if ( data[i] == ')' && !insideQuote ) { + if ( currentChar == ')' && !insideQuote ) { if ( count <= 0 ) return i + 1; if ( count == 1 ) @@ -91,7 +92,7 @@ --count; continue; } - if ( data[i] == ' ' || data[i] == '\n' || data[i] == '\r' ) + if ( currentChar == ' ' || currentChar == '\n' || currentChar == '\r' ) continue; if ( count == 0 ) { QByteArray ba; @@ -99,9 +100,9 @@ i = consumed - 1; // compensate for the for loop increment result.append( ba ); } else if ( count > 0 ) { - if ( data[i] == '"' ) { + if ( currentChar == '"' ) { insideQuote = !insideQuote; - } else if ( data[i] == '\\' && insideQuote ) { + } else if ( currentChar == '\\' && insideQuote ) { ++i; continue; } @@ -200,12 +201,13 @@ else { bool reachedInputEnd = true; for ( int i = begin; i < data.length(); ++i ) { - if ( data[i] == ' ' || data[i] == '(' || data[i] == ')' || data[i] == '\n' || data[i] == '\r' ) { + const char ch = data.at( i ); + if ( ch == ' ' || ch == '(' || ch == ')' || ch == '\n' || ch == '\r' ) { end = i; reachedInputEnd = false; break; } - if (data[i] == '\\') + if ( ch == '\\' ) foundSlash = true; } if ( reachedInputEnd ) @@ -242,19 +244,20 @@ int count = 0; bool insideQuote = false; for ( int i = start; i < data.length(); ++i ) { - if ( data[i] == '"' ) { + const char ch = data[i]; + if ( ch == '"' ) { insideQuote = !insideQuote; continue; } - if ( data[i] == '\\' && insideQuote ) { + if ( ch == '\\' && insideQuote ) { ++i; continue; } - if ( data[i] == '(' && !insideQuote ) { + if ( ch == '(' && !insideQuote ) { ++count; continue; } - if ( data[i] == ')' && !insideQuote ) { + if ( ch == ')' && !insideQuote ) { --count; continue; } @@ -264,14 +267,28 @@ QByteArray ImapParser::join(const QList< QByteArray > & list, const QByteArray & separator) { + // shortcuts for the easy cases if ( list.isEmpty() ) return QByteArray(); + if ( list.size() == 1 ) + return list.first(); - QByteArray result = list.first(); - QList<QByteArray>::ConstIterator it = list.constBegin(); + // avoid expensive realloc's by determining the size beforehand + QList<QByteArray>::const_iterator it = list.constBegin(); + const QList<QByteArray>::const_iterator endIt = list.constEnd(); + int resultSize = (list.size() - 1) * separator.size(); + for ( ; it != endIt; ++it ) + resultSize += (*it).size(); + + QByteArray result; + result.reserve( resultSize ); + it = list.constBegin(); + result += (*it); ++it; - for ( ; it != list.constEnd(); ++it ) - result += separator + (*it); + for ( ; it != endIt; ++it ) { + result += separator; + result += (*it); + } return result; } @@ -310,24 +327,43 @@ QByteArray ImapParser::quote(const QByteArray & data) { - QByteArray result( "\"" ); - result.reserve( data.length() + 2 ); - for ( int i = 0; i < data.length(); ++i ) { + if ( data.isEmpty() ) + return QByteArray( "\"\"" ); + + const int inputLength = data.length(); + int stuffToQuote = 0; + for ( int i = 0; i < inputLength; ++i ) { const char ch = data.at( i ); - if ( ch == '\n' ) { - result += "\\n"; - continue; - } + if ( ch == '"' || ch == '\\' || ch == '\n' || ch == '\r' ) + ++stuffToQuote; + } - if ( ch == '\r' ) { - result += "\\r"; - continue; + QByteArray result; + result.reserve( inputLength + stuffToQuote + 2 ); + result += '"'; + + // shortcut for the case that we don't need to quote anything at all + if ( stuffToQuote == 0 ) { + result += data; + } else { + for ( int i = 0; i < inputLength; ++i ) { + const char ch = data.at( i ); + if ( ch == '\n' ) { + result += "\\n"; + continue; + } + + if ( ch == '\r' ) { + result += "\\r"; + continue; + } + + if ( ch == '"' || ch == '\\' ) + result += '\\'; + result += ch; } - - if ( ch == '"' || ch == '\\' ) - result += '\\'; - result += ch; } + result += '"'; return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/libs/tests/CMakeLists.txt new/akonadi-1.4.1/libs/tests/CMakeLists.txt --- old/akonadi-1.4.0/libs/tests/CMakeLists.txt 2010-07-31 18:12:24.000000000 +0200 +++ new/akonadi-1.4.1/libs/tests/CMakeLists.txt 2010-10-22 17:12:42.000000000 +0200 @@ -10,3 +10,4 @@ endmacro(add_unit_test) add_unit_test( notificationmessagetest.cpp ) +add_unit_test( imapparserbenchmark.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/libs/tests/imapparserbenchmark.cpp new/akonadi-1.4.1/libs/tests/imapparserbenchmark.cpp --- old/akonadi-1.4.0/libs/tests/imapparserbenchmark.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-1.4.1/libs/tests/imapparserbenchmark.cpp 2010-10-22 17:12:42.000000000 +0200 @@ -0,0 +1,73 @@ +/* + Copyright (c) 2010 Volker Krause <vkrause(a)kde.org> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include <QtTest/QTest> +#include "../imapparser_p.h" + +using namespace Akonadi; + +Q_DECLARE_METATYPE( QList<QByteArray> ) + +class ImapParserBenchmark : public QObject +{ + Q_OBJECT + private slots: + void quote_data() + { + QTest::addColumn<QByteArray>( "input" ); + QTest::newRow( "empty" ) << QByteArray(); + QTest::newRow( "10-idle" ) << QByteArray( "ababababab" ); + QTest::newRow( "10-quote" ) << QByteArray( "\"abababab\"" ); + QTest::newRow( "50-idle" ) << QByteArray( "ababababababababababababababababababababababababab" ); + QTest::newRow( "50-quote" ) << QByteArray( "\"abababab\ncabababab\ncabababab\ncabababab\ncabababab\"" ); + } + + void quote() + { + QFETCH( QByteArray, input ); + QBENCHMARK { + ImapParser::quote( input ); + } + } + + void join_data() + { + QTest::addColumn<QList<QByteArray> >( "list" ); + QTest::newRow( "empty" ) << QList<QByteArray>(); + QTest::newRow( "single" ) << (QList<QByteArray>() << "ababab"); + QTest::newRow( "two" ) << (QList<QByteArray>() << "ababab" << "ababab"); + QTest::newRow( "five" ) << (QList<QByteArray>() << "ababab" << "ababab" << "ababab" << "ababab" << "ababab"); + QList<QByteArray> list; + for ( int i = 0; i < 50; ++i ) + list << "ababab"; + QTest::newRow( "a lot" ) << list; + } + + void join() + { + QFETCH( QList<QByteArray>, list ); + QBENCHMARK { + ImapParser::join( list, " " ); + } + } +}; + +#include "imapparserbenchmark.moc" + +QTEST_MAIN( ImapParserBenchmark ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/CMakeLists.txt new/akonadi-1.4.1/server/CMakeLists.txt --- old/akonadi-1.4.0/server/CMakeLists.txt 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/CMakeLists.txt 2010-10-22 17:12:44.000000000 +0200 @@ -125,6 +125,7 @@ src/storage/transaction.cpp src/storage/parthelper.cpp src/tracer.cpp + src/utils.cpp src/dbustracer.cpp src/filetracer.cpp src/notificationmanager.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/akonadi.cpp new/akonadi-1.4.1/server/src/akonadi.cpp --- old/akonadi-1.4.0/server/src/akonadi.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/akonadi.cpp 2010-10-22 17:12:44.000000000 +0200 @@ -29,6 +29,7 @@ #include "notificationmanager.h" #include "resourcemanager.h" #include "tracer.h" +#include "utils.h" #include "debuginterface.h" #include "storage/itemretrievalthread.h" #include "preprocessormanager.h" @@ -84,13 +85,7 @@ connectionSettings.setValue( QLatin1String( "Data/Method" ), QLatin1String( "NamedPipe" ) ); connectionSettings.setValue( QLatin1String( "Data/NamedPipe" ), namedPipe ); #else - const QString defaultSocketDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ); - QString socketDir = settings.value( QLatin1String( "Connection/SocketDirectory" ), defaultSocketDir ).toString(); - if ( socketDir[0] != QLatin1Char( '/' ) ) { - QDir::home().mkdir( socketDir ); - socketDir = QDir::homePath() + QLatin1Char( '/' ) + socketDir; - } - + const QString socketDir = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ) ); const QString socketFile = socketDir + QLatin1String( "/akonadiserver.socket" ); unlink( socketFile.toUtf8().constData() ); if ( !listen( socketFile ) ) @@ -205,8 +200,7 @@ #ifndef Q_OS_WIN QSettings connectionSettings( connectionSettingsFile, QSettings::IniFormat ); - const QString defaultSocketDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ); - const QString socketDir = settings.value( QLatin1String( "Connection/SocketDirectory" ), defaultSocketDir ).toString(); + const QString socketDir = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ) ); if ( !QDir::home().remove( socketDir + QLatin1String( "/akonadiserver.socket" ) ) ) akError() << "Failed to remove Unix socket"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/imapstreamparser.cpp new/akonadi-1.4.1/server/src/imapstreamparser.cpp --- old/akonadi-1.4.0/server/src/imapstreamparser.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/imapstreamparser.cpp 2010-10-22 17:12:44.000000000 +0200 @@ -572,7 +572,9 @@ m_position = i; throw ImapParserException("Unable to read more data"); } - if ( m_data[i] == ' ' || m_data[i] == '(' || m_data[i] == ')' || m_data[i] == '[' || m_data[i] == ']' || m_data[i] == '\n' || m_data[i] == '\r' || m_data[i] == '"') { + // unlike in the copy in KIMAP we do not want to consider [] brackets as separators, breaks payload version parsing + // if that ever gets fixed we can re-add them here, see svn revision 937879 + if ( m_data[i] == ' ' || m_data[i] == '(' || m_data[i] == ')' || m_data[i] == '\n' || m_data[i] == '\r' || m_data[i] == '"') { end = i; reachedInputEnd = false; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/akonadidb.xml new/akonadi-1.4.1/server/src/storage/akonadidb.xml --- old/akonadi-1.4.0/server/src/storage/akonadidb.xml 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/akonadidb.xml 2010-10-22 17:12:43.000000000 +0200 @@ -153,6 +153,7 @@ <column name="version" type="int" default="0"/> <column name="external" type="bool" default="false" /> <index name="pimItemIdNameIndex" columns="pimItemId,name" unique="true"/> + <index name="pimItemNameIndex" columns="name"/> </table> <table name="CollectionAttribute"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/dbconfig.cpp new/akonadi-1.4.1/server/src/storage/dbconfig.cpp --- old/akonadi-1.4.0/server/src/storage/dbconfig.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/dbconfig.cpp 2010-10-22 17:12:43.000000000 +0200 @@ -27,6 +27,8 @@ #include <akdebug.h> #include <libs/xdgbasedirs_p.h> +#include <QtCore/QDir> + using namespace Akonadi; //TODO: make me Q_GLOBAL_STATIC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/dbconfigmysql.cpp new/akonadi-1.4.1/server/src/storage/dbconfigmysql.cpp --- old/akonadi-1.4.0/server/src/storage/dbconfigmysql.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/dbconfigmysql.cpp 2010-10-22 17:12:43.000000000 +0200 @@ -21,6 +21,7 @@ #include "../../libs/xdgbasedirs_p.h" #include "akdebug.h" +#include "utils.h" #include <QtCore/QDateTime> #include <QtCore/QDir> @@ -55,6 +56,8 @@ QString defaultServerPath; QString defaultCleanShutdownCommand; + const QString socketDirectory = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ) ); + defaultDbName = QLatin1String( "akonadi" ); const bool defaultInternalServer = true; #ifdef MYSQLD_EXECUTABLE @@ -77,7 +80,7 @@ #ifndef Q_OS_WIN defaultCleanShutdownCommand = QString::fromLatin1( "%1 shutdown --socket=%2/mysql.socket" ) .arg( mysqladminPath ) - .arg( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ) ); + .arg( socketDirectory ); #else defaultCleanShutdownCommand = QString::fromLatin1( "%1 shutdown --shared-memory" ).arg( mysqladminPath ); #endif @@ -86,14 +89,13 @@ mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_install_db" ), mysqldSearchPath ); akDebug() << "Found mysql_install_db: " << mMysqlInstallDbPath; - mMysqlUpgradeDBPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_upgrade" ), mysqldSearchPath ); - akDebug() << "Found mysql_upgrade: " << mMysqlUpgradeDBPath; + mMysqlCheckPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysqlcheck" ), mysqldSearchPath ); + akDebug() << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value( QLatin1String( "QMYSQL/StartServer" ), defaultInternalServer ).toBool(); if ( mInternalServer ) { - const QString miscDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ); #if !(defined Q_WS_WIN) - defaultOptions = QString::fromLatin1( "UNIX_SOCKET=%1/mysql.socket" ).arg( miscDir ); + defaultOptions = QString::fromLatin1( "UNIX_SOCKET=%1/mysql.socket" ).arg( socketDirectory ); #endif } @@ -163,7 +165,7 @@ const QString akDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/" ) ); const QString dataDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_data" ) ); - const QString miscDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ); + const QString socketDirectory = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ) ); // generate config file const QString globalConfig = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); @@ -212,12 +214,12 @@ if ( akDir.isEmpty() ) akFatal() << "Akonadi server was not able to create database log directory"; - if ( miscDir.isEmpty() ) + if ( socketDirectory.isEmpty() ) akFatal() << "Akonadi server was not able to create database misc directory"; // the socket path must not exceed 103 characters, so check for max dir length right away - if ( miscDir.length() >= 90 ) - akFatal() << "MySQL cannot deal with a socket path this long. Path was: " << miscDir; + if ( socketDirectory.length() >= 90 ) + akFatal() << "MySQL cannot deal with a socket path this long. Path was: " << socketDirectory; // move mysql error log file out of the way const QFileInfo errorLog( dataDir + QDir::separator() + QString::fromLatin1( "mysql.err" ) ); @@ -239,7 +241,7 @@ if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); QProcess::execute( mMysqlInstallDbPath, arguments ); - } + } // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate if ( confUpdate ) { @@ -252,7 +254,7 @@ arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir ); #ifndef Q_WS_WIN arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); + arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory ); #else arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); arguments << QString::fromLatin1( "--shared-memory" ); @@ -267,11 +269,6 @@ akFatal() << "process error:" << mDatabaseProcess->errorString(); } - if ( !mMysqlUpgradeDBPath.isEmpty() ) { - const QStringList arguments = QStringList() << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); - QProcess::execute( mMysqlUpgradeDBPath, arguments ); - } - const QLatin1String initCon( "initConnection" ); { QSqlDatabase db = QSqlDatabase::addDatabase( QLatin1String( "QMYSQL" ), initCon ); @@ -298,6 +295,15 @@ } if ( opened ) { + + if ( !mMysqlCheckPath.isEmpty() ) { + const QStringList arguments = QStringList() << QLatin1String( "--check-upgrade" ) + << QLatin1String( "--all-databases" ) + << QLatin1String( "--auto-repair" ) + << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory ); + QProcess::execute( mMysqlCheckPath, arguments ); + } + { QSqlQuery query( db ); if ( !query.exec( QString::fromLatin1( "USE %1" ).arg( mDatabaseName ) ) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/dbconfigmysql.h new/akonadi-1.4.1/server/src/storage/dbconfigmysql.h --- old/akonadi-1.4.0/server/src/storage/dbconfigmysql.h 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/dbconfigmysql.h 2010-10-22 17:12:43.000000000 +0200 @@ -78,7 +78,7 @@ QString mServerPath; QString mCleanServerShutdownCommand; QString mMysqlInstallDbPath; - QString mMysqlUpgradeDBPath; + QString mMysqlCheckPath; bool mInternalServer; QProcess *mDatabaseProcess; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/dbconfigpostgresql.cpp new/akonadi-1.4.1/server/src/storage/dbconfigpostgresql.cpp --- old/akonadi-1.4.0/server/src/storage/dbconfigpostgresql.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/dbconfigpostgresql.cpp 2010-10-22 17:12:43.000000000 +0200 @@ -21,6 +21,7 @@ #include "../../libs/xdgbasedirs_p.h" #include "akdebug.h" +#include "utils.h" #include <QtCore/QDir> #include <QtCore/QProcess> @@ -71,7 +72,7 @@ defaultServerPath = XdgBaseDirs::findExecutableFile( QLatin1String( "pg_ctl" ), postgresSearchPath ); defaultInitDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "initdb" ), postgresSearchPath ); - defaultHostName = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ); + defaultHostName = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ) ); defaultCleanShutdownCommand = QString::fromLatin1( "%1 stop -D%2" ) .arg( defaultServerPath ) .arg( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_data" ) ) ); @@ -130,7 +131,7 @@ void DbConfigPostgresql::startInternalServer() { const QString dataDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_data" ) ); - const QString socketDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ); + const QString socketDir = Utils::preferredSocketDirectory( XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi/db_misc" ) ) ); if ( !QFile::exists( QString::fromLatin1( "%1/PG_VERSION" ).arg( dataDir ) ) ) { // postgres data directory not initialized yet, so call initdb on it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/storage/queryhelper.cpp new/akonadi-1.4.1/server/src/storage/queryhelper.cpp --- old/akonadi-1.4.0/server/src/storage/queryhelper.cpp 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/storage/queryhelper.cpp 2010-10-22 17:12:43.000000000 +0200 @@ -32,13 +32,18 @@ if ( i.size() == 1 ) { cond.addValueCondition( column, Query::Equals, i.begin() ); } else { - Query::Condition subCond( Query::And ); - subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); - subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); - cond.addCondition( subCond ); + if ( i.begin() != 1 ) { // 1 is our standard lower bound, so we don't have to check for it explicitly + Query::Condition subCond( Query::And ); + subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); + subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); + cond.addCondition( subCond ); + } else { + cond.addValueCondition( column, Query::LessOrEqual, i.end() ); + } } } else if ( i.hasDefinedBegin() ) { - cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); + if ( i.begin() != 1 ) // 1 is our standard lower bound, so we don't have to check for it explicitly + cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); } else if ( i.hasDefinedEnd() ) { cond.addValueCondition( column, Query::LessOrEqual, i.end() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/utils.cpp new/akonadi-1.4.1/server/src/utils.cpp --- old/akonadi-1.4.0/server/src/utils.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-1.4.1/server/src/utils.cpp 2010-10-22 17:12:44.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2010 Tobias Koenig <tokoe(a)kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "utils.h" + +#include "libs/xdgbasedirs_p.h" + +#include <QtCore/QDir> +#include <QtCore/QFileInfo> +#include <QtCore/QSettings> + +using namespace Akonadi; + +QString Utils::preferredSocketDirectory( const QString &defaultDirectory ) +{ + const QString serverConfigFile = XdgBaseDirs::akonadiServerConfigFile( XdgBaseDirs::ReadWrite ); + const QSettings serverSettings( serverConfigFile, QSettings::IniFormat ); + + QString socketDir = serverSettings.value( QLatin1String( "Connection/SocketDirectory" ), defaultDirectory ).toString(); + + const QString userName = QString::fromLocal8Bit( qgetenv( "USER" ) ); + if ( socketDir.contains( QLatin1String( "$USER" ) ) && !userName.isEmpty() ) + socketDir.replace( QLatin1String( "$USER" ), userName ); + + if ( socketDir[0] != QLatin1Char( '/' ) ) { + QDir::home().mkdir( socketDir ); + socketDir = QDir::homePath() + QLatin1Char( '/' ) + socketDir; + } + + QFileInfo dirInfo( socketDir ); + if ( !dirInfo.exists() ) + QDir::home().mkpath( dirInfo.absoluteFilePath() ); + + return socketDir; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.0/server/src/utils.h new/akonadi-1.4.1/server/src/utils.h --- old/akonadi-1.4.0/server/src/utils.h 2010-07-31 18:12:25.000000000 +0200 +++ new/akonadi-1.4.1/server/src/utils.h 2010-10-22 17:12:44.000000000 +0200 @@ -57,6 +57,12 @@ } } +/** + * Returns the socket @p directory that is passed to this method or the one + * the user has overwritten via the config file. + */ +QString preferredSocketDirectory( const QString &directory ); + } #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 man-pages for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at Fri Nov 5 14:44:32 CET 2010. -------- --- man-pages/man-pages.changes 2010-10-21 08:59:59.000000000 +0200 +++ man-pages/man-pages.changes 2010-11-04 09:04:38.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 4 09:04:13 CET 2010 - pgajdos(a)suse.cz + +- updated ot 3.30 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- man-pages-3.29.tar.bz2 needed_space_in_mb New: ---- man-pages-3.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.7sxBtm/_old 2010-11-05 14:43:38.000000000 +0100 +++ /var/tmp/diff_new_pack.7sxBtm/_new 2010-11-05 14:43:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package man-pages (Version 3.29) +# spec file for package man-pages (Version 3.30) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ License: BSD3c(or similar) ; GPLv2+ ; Other uncritical OpenSource License Group: Documentation/Man AutoReqProv: on -Version: 3.29 +Version: 3.30 Release: 1 Summary: Linux Manual Pages BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ man-pages-3.29.tar.bz2 -> man-pages-3.30.tar.bz2 ++++++ ++++ 17626 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 gnome-sharp2 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package gnome-sharp2 for openSUSE:Factory checked in at Fri Nov 5 14:43:20 CET 2010. -------- --- GNOME/gnome-sharp2/gnome-sharp2.changes 2010-09-30 19:37:25.000000000 +0200 +++ gnome-sharp2/gnome-sharp2.changes 2010-10-29 20:25:42.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 29 18:23:46 UTC 2010 - ajorgensen(a)novell.com + +- Spec cleanup +- Update to 2.24.2 + * Remove Mono.GetOptions dep + * Fix bgo#483251 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-sharp-2.16.1.tar.bz2 gnome-sharp-2.20.1.tar.bz2 gnome-sharp-2.24.1.tar.bz2 gnome-sharp-find_gtkhtml_ver.patch New: ---- gnome-sharp-2.24.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.fXUANa/_old 2010-11-05 14:42:49.000000000 +0100 +++ /var/tmp/diff_new_pack.fXUANa/_new 2010-11-05 14:42:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-sharp2 (Version 2.16.1) +# spec file for package gnome-sharp2 (Version 2.24.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,81 +17,29 @@ # norootforbuild +%define _name gnome-sharp Name: gnome-sharp2 -%define _name gnome-sharp -Url: http://gtk-sharp.sf.net +Version: 2.24.2 +Release: 1 +Url: http://www.mono-project.com/GtkSharp License: LGPLv2.1 Group: System/GUI/GNOME Summary: Mono bindings for Gnome -Patch2: gnome-sharp-find_gtkhtml_ver.patch BuildRequires: glade-sharp2 gtk-sharp2 gtk-sharp2-gapi -%define minimum_glib_sharp_version 2.10.3 -%define two_sixteen_version 2.16.1 -%define two_twenty_version 2.20.1 -%define two_twentyfour_version 2.24.1 -##### suse #### -%if 0%{?suse_version} -# Not needed with rpm .config dep search -#%define gtkhtml_requires gtkhtml2 -# Only builds on 10.2 and 10.3 -%if %suse_version <= 1020 -%define _version %two_sixteen_version -%endif -%if %suse_version >= 1030 -%define _version %two_twenty_version -%endif -%if %suse_version >= 1110 -%define _version %two_twentyfour_version -%endif -%define new_suse_buildrequires librsvg-devel mono-devel vte-devel gnome-panel-devel monodoc-core update-desktop-files -BuildRequires: %{new_suse_buildrequires} gtkhtml2-devel -%endif -################# -#### fedora #### -%if 0%{?fedora_version} -%define env_options export MONO_SHARED_DIR=/tmp -%if %fedora_version <= 7 -%define _version %two_sixteen_version -%endif -%if %fedora_version >= 8 -%define _version %two_twenty_version -%endif -%if %fedora_version >= 10 -%define _version %two_twentyfour_version -%endif -# All fedora distros (5 and 6) have the same names, requirements -BuildRequires: gnome-panel-devel gtkhtml3-devel libgnomeprintui22-devel librsvg2-devel mono-devel monodoc-core vte-devel -# Not needed with rpm .config dep search -#%define gtkhtml_requires gtkhtml2 -%endif -# RHEL -%if 0%{?rhel_version} -%define env_options export MONO_SHARED_DIR=/tmp -BuildRequires: gnome-panel-devel gtkhtml3-devel libgnomeprintui22-devel librsvg2-devel mono-devel monodoc-core vte-devel -%if %rhel_version >= 500 -%define _version %two_sixteen_version -%endif -%endif -################# -############## -### Options that relate to a version of gnome#, not necessarily a distro -# Define true for 2.20 -# (Must do this inside of shell... rpm can't handle this expression) -%define two_twenty_split %(if test x%_version = x%two_twenty_version || test x%_version = x%two_twentyfour_version; then echo "1" ; else echo "0" ; fi) -### -############## -# Need to put this stuff down here after Version: gets defined -Version: %_version -Release: 9 -Source: %{_name}-%{version}.tar.bz2 +BuildRequires: librsvg-devel +BuildRequires: mono-devel +BuildRequires: vte-devel +BuildRequires: gnome-panel-devel +BuildRequires: monodoc-core +BuildRequires: update-desktop-files +BuildRequires: gtkhtml2-devel +Source: http://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.24/%{_name}-%{version}.ta… BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains Mono bindings for Gnome. - - %package -n gnome-sharp2-complete License: LGPLv2.1 Group: System/GUI/GNOME @@ -100,12 +48,6 @@ Requires: gconf-sharp2 = %{version}-%{release} Requires: gnome-sharp2 = %{version}-%{release} Requires: gnome-vfs-sharp2 = %{version}-%{release} -Requires: glib-sharp2 >= %minimum_glib_sharp_version -%if %two_twenty_split == 0 -Requires: gtkhtml-sharp2 = %{version}-%{release} -Requires: rsvg-sharp2 = %{version}-%{release} -Requires: vte-sharp2 = %{version}-%{release} -%endif %description -n gnome-sharp2-complete Gtk# is a library that allows you to build fully native graphical GNOME @@ -114,181 +56,81 @@ Atk, Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. (Virtual package which depends on all gtk-sharp2 subpackages) - - %package -n gnome-vfs-sharp2 License: LGPLv2.1 Summary: Mono bindings for gnomevfs Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: gnome-vfs2 -Requires: glib-sharp2 >= %minimum_glib_sharp_version %description -n gnome-vfs-sharp2 This package contains Mono bindings gnomevfs. - - %package -n art-sharp2 License: LGPLv2.1 Summary: Mono bindings for libart Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: libart_lgpl -Requires: glib-sharp2 >= %minimum_glib_sharp_version %description -n art-sharp2 This package contains Mono bindings for libart. - - %package -n gconf-sharp2 License: LGPLv2.1 Summary: Mono bindings for gconf Group: System/GUI/GNOME -Requires: glib-sharp2 >= %minimum_glib_sharp_version %description -n gconf-sharp2 This package contains Mono bindings for gconf and gconf peditors. - - %prep %setup -q -n %{_name}-%{version} -if [ %version = %two_sixteen_version ] ; then -%patch2 -p1 -fi %build -%{?env_options} -autoreconf -f -i -# FIXME: windowmanager.c:*: warning: dereferencing type-punned pointer will break strict-aliasing rules export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ - --libexecdir=%{_prefix}/lib\ - --enable-debug +%configure --libexecdir=%{_prefix}/lib --enable-debug make %install -%{?env_options} -make install DESTDIR=%buildroot -rm $RPM_BUILD_ROOT%{_libdir}/*.*a +make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_libdir}/*.*a %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -n gnome-sharp2-complete %defattr(-, root, root) -## This is the 'base' package so we put the common dirs of all in this package -# Otherwise, this package doesn't get created! -%dir %{_prefix}/lib/mono/gtk-sharp-2.0 %dir %{_prefix}/lib/gtk-sharp-2.0 +%dir %{_prefix}/lib/mono/gtk-sharp-2.0 %files -n gnome-sharp2 %defattr(-,root,root) +%{_datadir}/gapi-2.0/gnome-api.xml %{_libdir}/libgnomesharpglue-2.so %{_libdir}/pkgconfig/gnome-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gnome-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-sharp.dll -%{_prefix}/share/gapi-2.0/gnome-api.xml %files -n gnome-vfs-sharp2 %defattr(-,root,root) +%{_datadir}/gapi-2.0/gnome-vfs-api.xml %{_libdir}/pkgconfig/gnome-vfs-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gnome-vfs-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-vfs-sharp.dll -%{_prefix}/share/gapi-2.0/gnome-vfs-api.xml %files -n art-sharp2 %defattr(-,root,root) +%{_datadir}/gapi-2.0/art-api.xml %{_libdir}/pkgconfig/art-sharp-2.0.pc %{_prefix}/lib/mono/gac/*art-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*art-sharp.dll -%{_prefix}/share/gapi-2.0/art-api.xml %files -n gconf-sharp2 %defattr(-, root, root) %{_bindir}/gconfsharp2-schemagen %{_libdir}/pkgconfig/gconf-sharp-2.0.pc +%{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc %{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe %{_prefix}/lib/mono/gac/*gconf-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp.dll -# Other distros place these in gnome-sharp2?? -%{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc %{_prefix}/lib/mono/gac/*gconf-sharp-peditors %{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp-peditors.dll -########################################################## -# packages that don't exist in 2.20 -%if %two_twenty_split == 0 - -%package -n rsvg-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for rsvg -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: librsvg -Requires: glib-sharp2 >= %minimum_glib_sharp_version - -%description -n rsvg-sharp2 -This package contains Mono bindings for librsvg. - - - -%package -n gtkhtml-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for gtkhtml -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: %gtkhtml_requires -Requires: glib-sharp2 >= %minimum_glib_sharp_version - -%description -n gtkhtml-sharp2 -This package contains Mono bindings for gtkhtml. - - - -%package -n vte-sharp2 -License: LGPLv2.1 -Group: System/GUI/GNOME -Summary: Mono bindings for vte -# Not needed with rpm .config dep search -#Requires: vte -Requires: glib-sharp2 >= %minimum_glib_sharp_version - -%description -n vte-sharp2 -This package contains Mono bindings for vte. - - - -%files -n vte-sharp2 -%defattr(-, root, root) -%{_libdir}/libvtesharpglue-2.so -%{_libdir}/pkgconfig/vte-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*vte-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*vte-sharp.dll -%{_prefix}/share/gapi-2.0/vte-api.xml - -%files -n rsvg-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/rsvg-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*rsvg-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*rsvg-sharp.dll -%{_prefix}/share/gapi-2.0/rsvg-api.xml - -%files -n gtkhtml-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/gtkhtml-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*gtkhtml-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gtkhtml-sharp.dll -%{_prefix}/share/gapi-2.0/gtkhtml-api.xml -%endif -# -########################################################## -%if 0%{?fedora_version} || 0%{?rhel_version} -# Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) -%define _use_internal_dependency_generator 0 -%endif -%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' +%{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp.dll %changelog ++++++ gnome-sharp-2.16.1.tar.bz2 -> gnome-sharp-2.24.2.tar.bz2 ++++++ ++++ 75612 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-pkg-bindings for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Fri Nov 5 14:42:31 CET 2010. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-10-25 09:38:02.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2010-11-02 15:47:27.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 2 14:30:38 UTC 2010 - lslezak(a)suse.cz + +- updated StartPackage callback - added the package name to the + arguments (file location is not enough, it's too dificult to get + just the name from it in YCP) +- 2.20.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.20.2.tar.bz2 New: ---- yast2-pkg-bindings-2.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.dniwm9/_old 2010-11-05 14:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.dniwm9/_new 2010-11-05 14:40:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.20.2) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.20.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.20.2 +Version: 2.20.3 Release: 1 License: GPL Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.20.2.tar.bz2 +Source0: yast2-pkg-bindings-2.20.3.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) @@ -42,7 +42,7 @@ from the pkg-bindings sources. %prep -%setup -n yast2-pkg-bindings-2.20.2 +%setup -n yast2-pkg-bindings-2.20.3 # build only documentation, ignore all other directories echo "doc" > SUBDIRS ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.dniwm9/_old 2010-11-05 14:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.dniwm9/_new 2010-11-05 14:40:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.20.2) +# spec file for package yast2-pkg-bindings (Version 2.20.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-pkg-bindings -Version: 2.20.2 +Version: 2.20.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.20.2.tar.bz2 +Source0: yast2-pkg-bindings-2.20.3.tar.bz2 Prefix: /usr @@ -42,7 +42,7 @@ library in YaST2. %prep -%setup -n yast2-pkg-bindings-2.20.2 +%setup -n yast2-pkg-bindings-2.20.3 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS ++++++ yast2-pkg-bindings-2.20.2.tar.bz2 -> yast2-pkg-bindings-2.20.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.20.2/VERSION new/yast2-pkg-bindings-2.20.3/VERSION --- old/yast2-pkg-bindings-2.20.2/VERSION 2010-10-25 09:15:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.3/VERSION 2010-11-02 15:30:14.000000000 +0100 @@ -1 +1 @@ -2.20.2 +2.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.20.2/configure new/yast2-pkg-bindings-2.20.3/configure --- old/yast2-pkg-bindings-2.20.2/configure 2010-10-25 09:34:17.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.3/configure 2010-11-02 15:42:23.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for yast2-pkg-bindings 2.20.2. +# Generated by GNU Autoconf 2.67 for yast2-pkg-bindings 2.20.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.20.2' -PACKAGE_STRING='yast2-pkg-bindings 2.20.2' +PACKAGE_VERSION='2.20.3' +PACKAGE_STRING='yast2-pkg-bindings 2.20.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1491,7 +1491,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-pkg-bindings 2.20.2 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.20.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1563,7 +1563,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.20.2:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.20.3:";; esac cat <<\_ACEOF @@ -1679,7 +1679,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.20.2 +yast2-pkg-bindings configure 2.20.3 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2078,7 +2078,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-pkg-bindings $as_me 2.20.2, which was +It was created by yast2-pkg-bindings $as_me 2.20.3, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3008,7 +3008,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.20.2' + VERSION='2.20.3' cat >>confdefs.h <<_ACEOF @@ -3130,7 +3130,7 @@ -VERSION="2.20.2" +VERSION="2.20.3" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -15953,7 +15953,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.20.2, which was +This file was extended by yast2-pkg-bindings $as_me 2.20.3, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16019,7 +16019,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-pkg-bindings config.status 2.20.2 +yast2-pkg-bindings config.status 2.20.3 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.20.2/configure.in new/yast2-pkg-bindings-2.20.3/configure.in --- old/yast2-pkg-bindings-2.20.2/configure.in 2010-10-25 09:34:03.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.3/configure.in 2010-11-02 15:42:11.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.20.2, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.20.3, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.20.2" +VERSION="2.20.3" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.20.2/src/Callbacks.cc new/yast2-pkg-bindings-2.20.3/src/Callbacks.cc --- old/yast2-pkg-bindings-2.20.2/src/Callbacks.cc 2009-09-21 15:14:39.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.3/src/Callbacks.cc 2010-11-02 15:19:18.000000000 +0100 @@ -244,6 +244,7 @@ CB callback( ycpcb( YCPCallbacks::CB_StartPackage ) ); if (callback._set) { + callback.addStr(res->name()); callback.addStr(res->location().filename()); callback.addStr(res->summary()); callback.addInt(res->installSize()); @@ -352,6 +353,7 @@ if (callback._set) { callback.addStr(resolvable->name()); callback.addStr(std::string()); + callback.addStr(std::string()); callback.addInt(-1); callback.addBool(true); // is_delete = true callback.evaluate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-2.20.2/src/PkgFunctions.h new/yast2-pkg-bindings-2.20.3/src/PkgFunctions.h --- old/yast2-pkg-bindings-2.20.2/src/PkgFunctions.h 2009-07-10 13:30:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.20.3/src/PkgFunctions.h 2010-11-02 15:41:55.000000000 +0100 @@ -19,7 +19,7 @@ */ /* - File: $Id: PkgFunctions.h 58008 2009-07-10 11:30:50Z lslezak $ + File: $Id: PkgFunctions.h 62715 2010-11-02 14:41:55Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Handles Pkg::function (list_of_arguments) calls Namespace: Pkg @@ -267,7 +267,7 @@ // FIXME: create ErrorProvide /* TYPEINFO: void(string(integer,string,string)) */ YCPValue CallbackDoneProvide (const YCPValue& /*nil*/ args); - /* TYPEINFO: void(void(string,string,integer,boolean)) */ + /* TYPEINFO: void(void(string,string,string,integer,boolean)) */ YCPValue CallbackStartPackage (const YCPValue& /*nil*/ args); /* TYPEINFO: void(boolean(integer)) */ YCPValue CallbackProgressPackage (const YCPValue& /*nil*/ args); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gtk-sharp2 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package gtk-sharp2 for openSUSE:Factory checked in at Fri Nov 5 14:40:36 CET 2010. -------- --- GNOME/gtk-sharp2/gtk-sharp2.changes 2010-05-15 19:16:30.000000000 +0200 +++ gtk-sharp2/gtk-sharp2.changes 2010-11-03 16:26:27.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 3 15:26:02 UTC 2010 - ajorgensen(a)novell.com + +- Cleanup spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-sharp-revert_unportable_relocatable.patch gtk-sharp-2.10.4.tar.bz2 gtk-sharp-2.8.5.tar.bz2 gtk-sharp-find_gtkhtml_ver.patch gtk-sharp-fix_vte_so_version.patch gtk-sharp-makefile.patch gtk-sharp-optflags.patch gtk-sharp-revert_unportable_relocatable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.RZMypJ/_old 2010-11-05 14:40:10.000000000 +0100 +++ /var/tmp/diff_new_pack.RZMypJ/_new 2010-11-05 14:40:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gtk-sharp2 (Version 2.10.4) +# spec file for package gtk-sharp2 (Version 2.12.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,10 +17,10 @@ # norootforbuild +%define _name gtk-sharp Name: gtk-sharp2 -%define _name gtk-sharp -Url: http://gtk-sharp.sf.net +Url: http://www.mono-project.com/GtkSharp License: GPLv2 Group: System/GUI/GNOME Summary: .Net Language Bindings for GTK+ @@ -31,96 +31,21 @@ %ifarch %ix86 ppc Obsoletes: gtk-sharp2-32bit %endif -# -Patch0: gtk-sharp-optflags.patch -Patch1: gtk-sharp-revert_unportable_relocatable.patch -Patch2: gtk-sharp-makefile.patch -Patch3: gtk-sharp-find_gtkhtml_ver.patch -Patch4: gtk-sharp-fix_vte_so_version.patch -Patch5: gnome-sharp-revert_unportable_relocatable.patch -%define old_version 2.4.3 -%define new_version 2.8.5 -%define new_split_version 2.10.4 -%define two_twelve_version 2.12.10 -##### suse #### -%if 0%{?suse_version} -## which gtk version ### -%if %suse_version < 1010 -%define _version %old_version -%endif -%if %suse_version == 1010 -%define _version %new_version -%endif -%if %suse_version == 1020 -%define _version %new_split_version -%endif -%if %suse_version >= 1030 -%define _version %two_twelve_version -%endif -# Not needed with rpm .config dep search -#%define gtkhtml_requires gtkhtml2 -%define new_suse_buildrequires librsvg-devel mono-devel vte-devel monodoc-core update-desktop-files -%if %suse_version < 1130 -BuildRequires: gnome-panel-devel -%endif -%if %sles_version == 10 -BuildRequires: %{new_suse_buildrequires} -gnome-panel-devel gnome-panel-nld-devel -%endif -%if %suse_version >= 1020 -BuildRequires: %{new_suse_buildrequires} gtkhtml2-devel pkg-config -%endif -%if %suse_version == 1010 -BuildRequires: %{new_suse_buildrequires} gtkhtml2-devel -%endif -%endif -################# -#### fedora #### -%if 0%{?fedora_version} -%define env_options export MONO_SHARED_DIR=/tmp -%if 0%{?fedora_version} < 6 -%define _version %new_version -%endif -%if 0%{?fedora_version} == 6 -%define _version %new_split_version -%endif -%if 0%{?fedora_version} == 7 -%define _version %new_split_version -%endif -%if 0%{?fedora_version} >= 8 -%define _version %two_twelve_version -%endif -# All fedora distros (5 and 6) have the same names, requirements -BuildRequires: gnome-panel-devel gtkhtml3-devel libgnomeprintui22-devel librsvg2-devel mono-devel monodoc-core vte-devel -# Not needed with rpm .config dep search -#%define gtkhtml_requires gtkhtml2 -%endif -# RHEL -%if 0%{?rhel_version} >= 500 -%define env_options export MONO_SHARED_DIR=/tmp -%define _version %new_split_version -BuildRequires: gnome-panel-devel gtkhtml3-devel libgnomeprintui22-devel librsvg2-devel mono-devel monodoc-core vte-devel -%endif -################# -############## -### Options that relate to a version of gtk#, not necessarily a distro -# Define true for 2.10 and 2.12 -# (Must do this inside of shell... rpm can't handle this expression) -%define platform_desktop_split %(if test x%_version = x%new_split_version || test x%_version = x%two_twelve_version ; then echo "1" ; else echo "0" ; fi) -# define true for 2.12.0 -%define include_atk_glue %(if test x%_version = x%two_twelve_version ; then echo "1" ; else echo "0" ; fi ) -### -############## -# Need to put this stuff down here after Version: gets defined -Version: %_version -Release: 3 +BuildRequires: gtkhtml2-devel +BuildRequires: librsvg-devel +BuildRequires: mono-devel +BuildRequires: monodoc-core +BuildRequires: pkg-config +BuildRequires: update-desktop-files +BuildRequires: vte-devel +Version: 2.12.10 +Release: 26 Source: %{_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains Mono bindings for gtk+, gdk, atk, and pango. - - %package gapi License: GPLv2 Group: System/GUI/GNOME @@ -132,21 +57,14 @@ by the GTK if you want to bind GObject-based libraries, or need to compile a project that uses it to bind such a library. - - %package -n gtk-sharp2-doc License: LGPLv2.1 Summary: Monodoc documentation for gtk-sharp2 Group: System/GUI/GNOME -# Disable this for now, as it's a circular dep -# Works ok in autobuild/buildservice, not so well in monobuild -#Requires: mono-tools %description -n gtk-sharp2-doc This package contains the gtk-sharp2 documentation for monodoc. - - %package -n glib-sharp2 License: LGPLv2.1 Summary: Mono bindings for glib @@ -155,36 +73,14 @@ %description -n glib-sharp2 This package contains Mono bindings for glib. - - -%package -n glade-sharp2 -License: LGPLv2.1 -Group: System/GUI/GNOME -Summary: Mono bindings for glade - -%description -n glade-sharp2 -This package contains Mono bindings for glade. - - - %package -n gtk-sharp2-complete License: LGPLv2.1 Group: System/GUI/GNOME Summary: GTK+ and GNOME bindings for Mono (virtual package) -Requires: glade-sharp2 = %{version}-%{release} Requires: glib-sharp2 = %{version}-%{release} Requires: gtk-sharp2 = %{version}-%{release} Requires: gtk-sharp2-doc = %{version}-%{release} Requires: gtk-sharp2-gapi = %{version}-%{release} -%if %platform_desktop_split == 0 -Requires: art-sharp2 = %{version}-%{release} -Requires: gconf-sharp2 = %{version}-%{release} -Requires: gnome-sharp2 = %{version}-%{release} -Requires: gnome-vfs-sharp2 = %{version}-%{release} -Requires: gtkhtml-sharp2 = %{version}-%{release} -Requires: rsvg-sharp2 = %{version}-%{release} -Requires: vte-sharp2 = %{version}-%{release} -%endif %description -n gtk-sharp2-complete Gtk# is a library that allows you to build fully native graphical GNOME @@ -193,135 +89,24 @@ Atk, Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. (Virtual package which depends on all gtk-sharp2 subpackages) - - -%if %platform_desktop_split == 0 - -%package -n gnome-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for Gnome -Group: System/GUI/GNOME - -%description -n gnome-sharp2 -This package contains Mono bindings for Gnome. - - - -%package -n rsvg-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for rsvg -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: librsvg - -%description -n rsvg-sharp2 -This package contains Mono bindings for librsvg. - - - -%package -n gtkhtml-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for gtkhtml -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: %gtkhtml_requires - -%description -n gtkhtml-sharp2 -This package contains Mono bindings for gtkhtml. - - - -%package -n gnome-vfs-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for gnomevfs -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: gnome-vfs2 - -%description -n gnome-vfs-sharp2 -This package contains Mono bindings gnomevfs. - - - -%package -n art-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for libart -Group: System/GUI/GNOME -# Not needed with rpm .config dep search -#Requires: libart_lgpl - -%description -n art-sharp2 -This package contains Mono bindings for libart. - - - -%package -n vte-sharp2 -License: LGPLv2.1 -Group: System/GUI/GNOME -Summary: Mono bindings for vte -# Not needed with rpm .config dep search -#Requires: vte - -%description -n vte-sharp2 -This package contains Mono bindings for vte. - - - -%package -n gconf-sharp2 -License: LGPLv2.1 -Summary: Mono bindings for gconf -Group: System/GUI/GNOME - -%description -n gconf-sharp2 -This package contains Mono bindings for gconf and gconf peditors. - - - -%endif - %prep %setup -q -n %{_name}-%{version} -if [ %version \< 2.10.3 ] ; then -%patch0 -p1 -fi -%if %platform_desktop_split == 0 -%patch1 -p1 -# 2.8.4 and later on 2.8.x branch doesn't need this patch -if [ %version \< 2.8.4 ] ; then -%patch2 -fi -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%endif %build -%{?env_options} -autoreconf -f -i -# FIXME: windowmanager.c:*: warning: dereferencing type-punned pointer will break strict-aliasing rules export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure\ - --libexecdir=%{_prefix}/lib\ - --enable-debug +%configure --libexecdir=%{_prefix}/lib --enable-debug make %install -%{?env_options} -%makeinstall -rm $RPM_BUILD_ROOT%{_libdir}/*.*a -# Special handling for new files -touch %name.files -# atk glue for now... -%define atk_glue %{_libdir}/libatksharpglue-2.so -%if 0%{?include_atk_glue} -echo "%atk_glue" >> %name.files -%endif +make install DESTDIR=%{buildroot} +rm %{buildroot}%{_libdir}/*.*a %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f %name.files +%files %defattr(-, root, root) +%{_libdir}/libatksharpglue-2.so %{_libdir}/libgdksharpglue-2.so %{_libdir}/libgtksharpglue-2.so %{_libdir}/libpangosharpglue-2.so @@ -363,79 +148,9 @@ %{_prefix}/lib/mono/gac/*glib-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*glib-sharp.dll -%files -n glade-sharp2 -%defattr(-, root, root) -%{_libdir}/libgladesharpglue-2.so -%{_libdir}/pkgconfig/glade-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*glade-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*glade-sharp.dll - %files -n gtk-sharp2-complete %defattr(-, root, root) -## This is the 'base' package so we put the common dirs of all in this package -# Otherwise, this package doesn't get created! %dir %{_prefix}/lib/mono/gtk-sharp-2.0 %dir %{_prefix}/lib/gtk-sharp-2.0 -############################################################################## -############# FILELIST START of packages split as gnome-sharp ################ -%if %platform_desktop_split == 0 - -%files -n gnome-sharp2 -%defattr(-,root,root) -%{_libdir}/libgnomesharpglue-2.so -%{_libdir}/pkgconfig/gnome-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*gnome-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-sharp.dll - -%files -n rsvg-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/rsvg-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*rsvg-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*rsvg-sharp.dll - -%files -n gtkhtml-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/gtkhtml-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*gtkhtml-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gtkhtml-sharp.dll - -%files -n gnome-vfs-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/gnome-vfs-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*gnome-vfs-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-vfs-sharp.dll - -%files -n art-sharp2 -%defattr(-,root,root) -%{_libdir}/pkgconfig/art-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*art-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*art-sharp.dll - -%files -n vte-sharp2 -%defattr(-, root, root) -%{_libdir}/libvtesharpglue-2.so -%{_libdir}/pkgconfig/vte-sharp-2.0.pc -%{_prefix}/lib/mono/gac/*vte-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*vte-sharp.dll - -%files -n gconf-sharp2 -%defattr(-, root, root) -%{_bindir}/gconfsharp2-schemagen -%{_libdir}/pkgconfig/gconf-sharp-2.0.pc -%{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe -%{_prefix}/lib/mono/gac/*gconf-sharp -%{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp.dll -# Other distros place these in gnome-sharp2?? -%{_prefix}/lib/mono/gac/*gconf-sharp-peditors -%{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp-peditors.dll -%endif -############### FILELIST END of packages split as gnome-sharp ################ -############################################################################## -%if 0%{?fedora_version} || 0%{?rhel_version} -# Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) -%define _use_internal_dependency_generator 0 -%endif -%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' -%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ImageMagick for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Fri Nov 5 14:39:52 CET 2010. -------- --- ImageMagick/ImageMagick.changes 2010-10-15 09:34:45.000000000 +0200 +++ ImageMagick/ImageMagick.changes 2010-11-04 10:10:59.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Nov 4 10:11:15 CET 2010 - pgajdos(a)suse.cz + +- updated to 6.6.5-5: + * Revised PNG palette optimization + * Added some debug logging in coders/png.c. + * More precise blur values for Lanczos2Sharp and LanczosSharp. + * Added location of first Mitchell crossing (=8/7) to the filters data + structure. + * Added Lanczos2D* filters now named Lanczos2* + * Reorganization of AcquireFilter() to make it work better + * Clearer EWA filters (LanczosSharp etc) comments. + * Added LanczosSharp (3-lobe Lanczos with sharpening) + * Filter sharpening factors are also always applied regardless of usage. + * CubicBC filter formulas simplified by constant folding. In + particular, P1 coefficient (always zero) removed from coeff. + * Revert the Robidoux filter to a Keys cubic with C=(108 sqrt 2-29)/398 + (as already specified in the documentation). + * Ignore PS bounding box offsets if -page is set. + * Add support for -evaluate exp. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ImageMagick-6.6.5-0.tar.bz2 ImageMagick-6.6.5.0-doc.patch ImageMagick-6.6.5.0-examples.patch New: ---- ImageMagick-6.6.5-5.tar.bz2 ImageMagick-6.6.5.5-doc.patch ImageMagick-6.6.5.5-examples.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.S6p2Vy/_old 2010-11-05 14:39:23.000000000 +0100 +++ /var/tmp/diff_new_pack.S6p2Vy/_new 2010-11-05 14:39:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ImageMagick (Version 6.6.5.0) +# spec file for package ImageMagick (Version 6.6.5.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,9 +29,9 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.5.0 +Version: 6.6.5.5 Release: 1 -%define source_version 6.6.5-0 +%define source_version 6.6.5-5 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org ++++++ ImageMagick-6.6.5-0.tar.bz2 -> ImageMagick-6.6.5-5.tar.bz2 ++++++ ImageMagick/ImageMagick-6.6.5-0.tar.bz2 ImageMagick/ImageMagick-6.6.5-5.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.6.5.0-doc.patch -> ImageMagick-6.6.5.5-doc.patch ++++++ ++++++ ImageMagick-6.6.5.0-examples.patch -> ImageMagick-6.6.5.5-examples.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Fri Nov 5 14:39:02 CET 2010. -------- --- KDE/kdelibs4/kdelibs4-apidocs.changes 2010-10-07 23:58:28.000000000 +0200 +++ kdelibs4/kdelibs4-apidocs.changes 2010-11-05 14:36:56.028219000 +0100 @@ -1,0 +2,26 @@ +Thu Oct 28 22:12:22 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.3 + * see http://kde.org/announcements/changelogs/changelog4_5_2to4_5_3.php for details + +------------------------------------------------------------------- +Tue Oct 12 12:37:10 UTC 2010 - wstephenson(a)novell.com + +- update branch diff for various bugs in 4.5: + * Crash on configure toolbars (bko#170806) + * KCookieJar can't read cookies from another port (bko#149991) + * Fix oversized number input widgets (bko#221989) + * CSS conformance issue (bko#252280) + * Fix helper protocols such as mailto: and telnet: + * Plasma crash on comic applet switch (bko#253387) + * HTTPS urls in KMail do not open properly in browser (bko#253294) + * Mailto: links in FireFox started by kmailservice fail (bnc#644236) + * Crash in directory listings when toggling + show hidden files flag (bko#193364) + +------------------------------------------------------------------- +Fri Oct 8 19:54:27 UTC 2010 - tittiatcoke(a)gmail.com + +- Upstream patch added for kmail issue (bko#253414) + +------------------------------------------------------------------- kdelibs4.changes: same change calling whatdependson for head-i586 Old: ---- kdelibs-4.5.2.tar.bz2 New: ---- kdelibs-4.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.eNQNLX/_old 2010-11-05 14:37:09.000000000 +0100 +++ /var/tmp/diff_new_pack.eNQNLX/_new 2010-11-05 14:37:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4-apidocs (Version 4.5.2) +# spec file for package kdelibs4-apidocs (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: System/GUI/KDE Summary: KDE 4 API documentation Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.eNQNLX/_old 2010-11-05 14:37:09.000000000 +0100 +++ /var/tmp/diff_new_pack.eNQNLX/_new 2010-11-05 14:37:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.5.2) +# spec file for package kdelibs4 (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,26 +25,15 @@ BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel BuildRequires: libattica-devel shared-desktop-ontologies-devel soprano-backend-redland BuildRequires: docbook-xsl-stylesheets docbook_4 libdbusmenu-qt-devel -%if %suse_version > 1110 +BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel +BuildRequires: libgssglue-devel +%if 0%{?suse_version} > 1110 BuildRequires: xz-devel -%else -%if %suse_version > 1030 -BuildRequires: lzma-devel -%endif -%endif -%if %suse_version > 1110 BuildRequires: libpolkit-qt-1-devel %else +BuildRequires: lzma-devel BuildRequires: libpolkit-qt-devel %endif -%if %suse_version > 1030 -BuildRequires: libgssglue-devel -%endif -%if %suse_version > 1020 -BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel -%else -BuildRequires: libjasper libqt4-debuginfo -%endif %if 0%{?suse_version} > 1130 BuildRequires: utempter-devel %else @@ -54,7 +43,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -86,11 +75,7 @@ Patch25: ksuseinstall_11.2.diff Patch26: nepomuk-final.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1010 %requires_ge libqt4-x11 -%else -Requires: qt-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' qt-x11`) -%endif %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo %endif @@ -112,7 +97,6 @@ applications. - Authors: -------- The KDE Team <kde(a)kde.org> @@ -201,9 +185,6 @@ $RPM_BUILD_ROOT/usr/share/man/man7/kde4options.7 mv $RPM_BUILD_ROOT/usr/share/man/man7/qtoptions.7 \ $RPM_BUILD_ROOT/usr/share/man/man7/qt4options.7 - %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT - %endif mkdir -p $RPM_BUILD_ROOT/usr/share/autostart/ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/panel.desktop install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/ktip.desktop @@ -212,6 +193,7 @@ install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/etc/ mkdir -p $RPM_BUILD_ROOT/%_libdir/kconf_update_bin %kde_post_install + %fdupes -s $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -307,10 +289,11 @@ %config %_kde_config_dir/kdebug.areas %config %_kde_config_dir/kdebugrc %config %_kde4_sysconfdir/kde4rc +%config %_kde4_sysconfdir/dbus-1/system.d/org.kde.auth.conf %package -n libkdecore4-devel License: LGPLv2.1+ -Group: System/GUI/KDE +Group: Development/Libraries/KDE Summary: KDE Core Libraries: Build Environment Requires: libkdecore4 = %{version} Requires: kdelibs4-core = %version cmake automoc4 @@ -401,7 +384,7 @@ %package -n libkde4-devel License: LGPLv2.1+ -Group: System/GUI/KDE +Group: Development/Libraries/KDE Summary: KDE Base Libraries: Build Environment Requires: kdelibs4 = %version Requires: kdelibs4-doc = %version @@ -413,22 +396,16 @@ %else Requires: libpolkit-qt-devel %endif -%if %suse_version > 1010 Requires: libqt4-devel -%else -Requires: qt-devel -%endif Requires: giflib-devel alsa-devel cups-devel -%if %suse_version > 1020 Requires: avahi-compat-mDNSResponder-devel -%endif Requires: libjpeg-devel libidn-devel libbz2-devel libattica-devel Requires: libxml2-devel update-desktop-files strigi-devel Requires: fam-devel enchant-devel OpenEXR-devel enchant-devel Requires: phonon-devel libacl-devel shared-desktop-ontologies-devel Requires: docbook-xsl-stylesheets docbook_4 libsoprano-devel Provides: libknotificationitem-devel = 4.3.66svn1016707 -Obsoletes: libknotificationitem-devel <= 4.3.66svn1016707 +Obsoletes: libknotificationitem-devel < 4.3.66svn1016707 Provides: kde4-webkitpart-devel = 4.3.73svn1042829 Obsoletes: kde4-webkitpart-devel < 4.3.73svn1042829 @@ -444,7 +421,8 @@ %files -n libkde4-devel -f filelists/exclude %defattr(-,root,root) -/usr/include/* +%_includedir/* +%_kde4_libdir/kde4/plugins/script/libkrossqtsplugin.so %exclude /usr/include/ksuseinstall* %_kde4_appsdir/cmake %exclude %_kde4_libdir/libkdeinit4_*.so @@ -460,6 +438,7 @@ %exclude %_kde4_appsdir/cmake %exclude %_kde4_appsdir/kdeui/about/body-background.png %config %_kde_config_dir/* +%config %_kde4_sysconfdir/xdg/menus/applications.menu.kde4 %dir %_kde4_sysconfdir/xdg/menus %dir %_kde4_libdir/kde4 %dir %_kde4_libdir/kconf_update_bin @@ -491,6 +470,7 @@ %_kde4_iconsdir/hicolor/scalable/apps/ktexteditorautobrace.* %_kde4_mandir/man*/* /usr/share/mime/packages/kde.xml +%exclude %_kde4_libdir/kde4/plugins/script/libkrossqtsplugin.so # IMPORTANT: When this is obsolete, do not just remove this, but create # a separate package (for backwards compatibility). @@ -499,7 +479,7 @@ License: X11 Group: Development/Libraries/KDE Summary: On-demand installation of packages -%if %suse_version >= 1130 +%if 0%{?suse_version} >= 1130 # see ksuseinstall_11.2.diff Requires: yast2-packager >= 2.19.7 zypper %else ++++++ 4_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.eNQNLX/_old 2010-11-05 14:37:09.000000000 +0100 +++ /var/tmp/diff_new_pack.eNQNLX/_new 2010-11-05 14:37:09.000000000 +0100 @@ -1,7 +1,7 @@ -package: kdelibs-4.4.93svn1149349.tar.bz2 -kdemod: kdelibs --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1150993 -+svn di between //branches/KDE/4.5/kdelibs@1149349 and //branches/KDE/4.5/kdelibs ++current HEAD: 1185156 ++svn di between //tags/KDE/4.5.2/kdelibs and //branches/KDE/4.5/kdelibs + +Index: doc/kded4/man-kded4.8.docbook ++++++ kdelibs-4.5.2.tar.bz2 -> kdelibs-4.5.3.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.5.2.tar.bz2 kdelibs4/kdelibs-4.5.3.tar.bz2 differ: char 11, line 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 kde4-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at Fri Nov 5 14:36:36 CET 2010. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2010-09-30 23:41:52.000000000 +0200 +++ kde4-filesystem/kde4-filesystem.changes 2010-10-28 22:06:11.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 28 22:05:56 CEST 2010 - dmueller(a)suse.de + +-bump version requirements to 4.5.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.gSsCJU/_old 2010-11-05 14:36:19.000000000 +0100 +++ /var/tmp/diff_new_pack.gSsCJU/_new 2010-11-05 14:36:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-filesystem (Version 4.5.2) +# spec file for package kde4-filesystem (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 4.5.2 +Version: 4.5.3 Release: 1 License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ macros.kde4 ++++++ --- /var/tmp/diff_new_pack.gSsCJU/_old 2010-11-05 14:36:19.000000000 +0100 +++ /var/tmp/diff_new_pack.gSsCJU/_new 2010-11-05 14:36:19.000000000 +0100 @@ -27,8 +27,8 @@ %_kde4_modules %{_kde4_modulesdir} %_kde4_servicetypes %{_kde4_servicetypesdir} -%_kde_platform_version 4.5.2 -%_kde_pimlibs_version 4.5.2 +%_kde_platform_version 4.5.3 +%_kde_pimlibs_version 4.5.3 %_kde_akonadi_version 1.4.0 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version libqt4-x11 >= 4.7.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