September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit converseen for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package converseen for openSUSE:Factory checked in at 2014-09-02 08:22:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/converseen (Old) and /work/SRC/openSUSE:Factory/.converseen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "converseen" Changes: -------- --- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2014-08-27 07:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2014-09-02 08:22:27.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 31 11:06:09 UTC 2014 - lazy.kent(a)opensuse.org + +- Update to 0.8.3. + * Various bugfixes. + +------------------------------------------------------------------- Old: ---- converseen-0.8.2.tar.bz2 New: ---- converseen-0.8.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ converseen.spec ++++++ --- /var/tmp/diff_new_pack.QRhjwB/_old 2014-09-02 08:22:29.000000000 +0200 +++ /var/tmp/diff_new_pack.QRhjwB/_new 2014-09-02 08:22:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: converseen -Version: 0.8.2 +Version: 0.8.3 Release: 0 Summary: Batch Image Conversion Tool License: GPL-3.0+ ++++++ converseen-0.8.2.tar.bz2 -> converseen-0.8.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.8.2/converseen.rc new/converseen-0.8.3/converseen.rc --- old/converseen-0.8.2/converseen.rc 2014-08-20 13:42:42.000000000 +0200 +++ new/converseen-0.8.3/converseen.rc 2014-08-27 22:47:57.000000000 +0200 @@ -60,8 +60,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,8,0,0 - PRODUCTVERSION 0,8,0,0 + FILEVERSION 0,8,3,0 + PRODUCTVERSION 0,8,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,13 +79,13 @@ VALUE "Comments", "The batch image converter and resizer" VALUE "CompanyName", "Faster" VALUE "FileDescription", "Converseen - The batch converter and resizer" - VALUE "FileVersion", "0.8.0.0" + VALUE "FileVersion", "0.8.3.0" VALUE "InternalName", "Converseen" VALUE "LegalCopyright", "(C) 2009 - 2014 Francesco Mondello GNU - GPL" VALUE "LegalTrademarks", "(C) 2009 - 2014 Francesco Mondello GNU - GPL" VALUE "OriginalFilename", "converseen.exe" VALUE "ProductName", "Converseen" - VALUE "ProductVersion", "0.8.0.0" + VALUE "ProductVersion", "0.8.3.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.8.2/src/formats.cpp new/converseen-0.8.3/src/formats.cpp --- old/converseen-0.8.2/src/formats.cpp 2014-08-20 13:42:42.000000000 +0200 +++ new/converseen-0.8.3/src/formats.cpp 2014-08-27 22:47:57.000000000 +0200 @@ -36,7 +36,7 @@ void Formats::loadFormats() { -#ifdef Q_OS_LINUX || Q_OS_FREEBSD +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) list<CoderInfo> coderList; coderInfoList(&coderList, CoderInfo::TrueMatch, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.8.2/src/globals.h new/converseen-0.8.3/src/globals.h --- old/converseen-0.8.2/src/globals.h 2014-08-20 13:42:42.000000000 +0200 +++ new/converseen-0.8.3/src/globals.h 2014-08-27 22:47:57.000000000 +0200 @@ -29,8 +29,8 @@ namespace globals { const QString PROGRAM_NAME = "Converseen"; - const int CURRENT_INTERNAL_VERSION = 820; - const QString VERSION = "0.8.2"; + const int CURRENT_INTERNAL_VERSION = 830; + const QString VERSION = "0.8.3"; } #endif // GLOBALS_H -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit i18nspector for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package i18nspector for openSUSE:Factory checked in at 2014-09-02 08:22:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i18nspector (Old) and /work/SRC/openSUSE:Factory/.i18nspector.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "i18nspector" Changes: -------- --- /work/SRC/openSUSE:Factory/i18nspector/i18nspector.changes 2014-08-11 10:08:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.i18nspector.new/i18nspector.changes 2014-09-02 08:22:26.000000000 +0200 @@ -1,0 +2,30 @@ +Mon Aug 25 21:12:53 UTC 2014 - lazy.kent(a)opensuse.org + +- Update to 0.16. + * Summary of tag changes: + + Added: + - c-format-string-missing-arguments + - qt-plural-format-mistaken-for-c-format + - stray-previous-msgid + * Check for C format strings in msgstr/msgstr_plural[N] consuming + less arguments than corresponding msgid/msgid_plural. + * Check for previous msgid annotations (#| msgid ...) attached to + non-fuzzy messages. + * Check for plural Qt format string mistakenly tagged as C format + strings. + * Temper checks for conflicting and redundant message flags: + + Don't complain about two different format flags applied to + the same message when the formats compatible are (to some + extent) compatible. + + Don't complain when a positive format flag (<lang1>-format) + and a negative format flag (no-<lang2>-format) apply to the + same message. The negative format flag might be still a useful + hint for the translator. + * Never consider non-ASCII characters and control-characters as + part of C format string conversion. + * Don't complain about unknown header fields starting with + lowercase “x-”. + * Improve descriptions of a few tags. + * Improve the test suite. + +------------------------------------------------------------------- Old: ---- i18nspector-0.15.tar.gz i18nspector-0.15.tar.gz.asc New: ---- i18nspector-0.16.tar.gz i18nspector-0.16.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i18nspector.spec ++++++ --- /var/tmp/diff_new_pack.rQGjOc/_old 2014-09-02 08:22:27.000000000 +0200 +++ /var/tmp/diff_new_pack.rQGjOc/_new 2014-09-02 08:22:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: i18nspector -Version: 0.15 +Version: 0.16 Release: 0 Summary: Tool for Checking gettext POT/PO/MO Files License: MIT ++++++ i18nspector-0.15.tar.gz -> i18nspector-0.16.tar.gz ++++++ ++++ 3731 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4 for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package kdevelop4 for openSUSE:Factory checked in at 2014-09-02 08:22:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop4 (Old) and /work/SRC/openSUSE:Factory/.kdevelop4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdevelop4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop4/kdevelop4.changes 2013-12-09 16:55:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdevelop4.new/kdevelop4.changes 2014-09-02 08:22:22.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 27 18:25:38 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 4.7.0 + * No upstream changelog provided + * Last feature release based on kdelibs4 and Qt4 +- Bump libkdevplatform-devel BuildRequires to 1.7.0 + +------------------------------------------------------------------- Old: ---- kdevelop-4.6.0.tar.xz New: ---- kdevelop-4.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.JowbJf/_old 2014-09-02 08:22:23.000000000 +0200 +++ /var/tmp/diff_new_pack.JowbJf/_new 2014-09-02 08:22:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdevelop4 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kdevelop4 -Version: 4.6.0 +Version: 4.7.0 Release: 0 Summary: Integrated Development Environment for the X Window System, Qt, KDE, and GNOME License: GPL-3.0+ @@ -26,7 +26,7 @@ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.… BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel -BuildRequires: libkdevplatform-devel >= 1.6.0 +BuildRequires: libkdevplatform-devel >= 1.7.0 BuildRequires: libqjson-devel BuildRequires: okteta-devel BuildRequires: valgrind-devel @@ -142,6 +142,7 @@ %{_kde4_appsdir}/kdevelop/ %{_kde4_appsdir}/kdevfiletemplates/ %{_kde4_appsdir}/kdevgdb/ +%{_kde4_appsdir}/kdevmanpage/ %{_kde4_appsdir}/kdevokteta %{_kde4_appsdir}/plasma/plasmoids/kdevelopsessions/ %{_kde4_appsdir}/plasma/services/org.kde.plasma.dataengine.kdevelopsessions.operations @@ -153,6 +154,7 @@ %{_kde4_libdir}/libkdev4cppduchain.so %{_kde4_libdir}/libkdev4cppparser.so %{_kde4_libdir}/libkdev4cpprpp.so +%{_kde4_libdir}/libkdev4includesdefinessettings.so %{_kde4_modulesdir}/kcm_kdev*.so %{_kde4_modulesdir}/kdev*.so %{_kde4_modulesdir}/krunner_kdevelopsessions.so ++++++ kdevelop-4.6.0.tar.xz -> kdevelop-4.7.0.tar.xz ++++++ ++++ 128025 lines of diff (skipped) -- 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-add-on for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2014-09-02 08:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2014-06-26 08:00:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2014-09-02 08:22:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 1 09:09:40 UTC 2014 - jreidinger(a)suse.com + +- make add-ons dialog consistent when going back (bnc#893103) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.1.8.tar.bz2 New: ---- yast2-add-on-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.5m1sk4/_old 2014-09-02 08:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.5m1sk4/_new 2014-09-02 08:22:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-3.1.8.tar.bz2 -> yast2-add-on-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.changes new/yast2-add-on-3.1.9/package/yast2-add-on.changes --- old/yast2-add-on-3.1.8/package/yast2-add-on.changes 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/package/yast2-add-on.changes 2014-09-01 11:31:08.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 1 09:09:40 UTC 2014 - jreidinger(a)suse.com + +- make add-ons dialog consistent when going back (bnc#893103) +- 3.1.9 + +------------------------------------------------------------------- Mon Jun 2 16:49:24 UTC 2014 - jreidinger(a)suse.com - always set correct state for add-on add checkbox dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.spec new/yast2-add-on-3.1.9/package/yast2-add-on.spec --- old/yast2-add-on-3.1.8/package/yast2-add-on.spec 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/package/yast2-add-on.spec 2014-09-01 11:31:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb 2014-06-02 19:01:29.000000000 +0200 +++ new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb 2014-09-01 11:31:08.000000000 +0200 @@ -48,8 +48,6 @@ Yast.include include_target, "packager/repositories_include.rb" Yast.include include_target, "add-on/misc.rb" - @going_back_in_workflow = GetInstArgs.going_back - # Used for adding sources @createResult = :again @@ -1072,12 +1070,10 @@ end # FATE #301928 - Saving one click - # Bugzilla #305809 if "going_back", do not save that click! - if no_addons && !@going_back_in_workflow + # Bugzilla #893103 be consistent, so always when there is no add-on skip + if no_addons Builtins.y2milestone("Skipping to media_select") - # only once - @going_back_in_workflow = false - ret = :first_time + ret = :skip_to_add end # Show Add-Ons table @@ -1097,7 +1093,7 @@ some_addon_changed = false begin # FATE #301928 - Saving one click - ret = Convert.to_symbol(UI.UserInput) unless ret == :first_time + ret = Convert.to_symbol(UI.UserInput) unless ret == :skip_to_add # aborting if ret == :abort || ret == :cancel @@ -1146,11 +1142,11 @@ ) # adding new add-on - elsif ret == :add || ret == :first_time + elsif ret == :add || ret == :skip_to_add # show checkbox only first time in installation when there is no # other addons, so allow to quickly skip adding addons, otherwise # it make no sense as user explicitelly want add addon - SourceDialogs.display_addon_checkbox = ret == :first_time + SourceDialogs.display_addon_checkbox = ret == :skip_to_add # bugzilla #293428 # Release all sources before adding a new one @@ -1175,7 +1171,7 @@ AddOnProduct.PrepareForRegistration(AddOnProduct.src_id) some_addon_changed = true # do not keep first_time, otherwise summary won't be shown during installation - ret = nil if ret == :first_time + ret = nil if ret == :skip_to_add elsif ret2 == :abort || ret2 == :cancel Builtins.y2milestone("Add-on sequence aborted") @@ -1196,9 +1192,9 @@ end end # properly return abort in installation - ret = :abort if ret == :first_time + ret = :abort if ret == :skip_to_add # extra handling for the global enable checkbox - elsif ret == :first_time + elsif ret == :skip_to_add ret = :back if ret2 == :back ret = :next if ret2 == :skip end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslogd for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package syslogd for openSUSE:Factory checked in at 2014-09-02 08:22:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslogd (Old) and /work/SRC/openSUSE:Factory/.syslogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syslogd" Changes: -------- --- /work/SRC/openSUSE:Factory/syslogd/syslogd.changes 2014-08-28 10:02:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syslogd.new/syslogd.changes 2014-09-02 08:22:18.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 1 09:17:40 UTC 2014 - werner(a)suse.de + +- Klog service: Move the Alias tag from Unit section to the Install + section bnc#893741 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klog.service ++++++ --- /var/tmp/diff_new_pack.HSYW6D/_old 2014-09-02 08:22:20.000000000 +0200 +++ /var/tmp/diff_new_pack.HSYW6D/_new 2014-09-02 08:22:20.000000000 +0200 @@ -23,7 +23,6 @@ Before=syslog.service default.target RefuseManualStart=true ConditionPathIsDirectory=/var/log -Alias=bootmsg.service [Service] Type=oneshot @@ -37,3 +36,4 @@ [Install] WantedBy=basic.target +Alias=bootmsg.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libevdev for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package libevdev for openSUSE:Factory checked in at 2014-09-02 08:22:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libevdev (Old) and /work/SRC/openSUSE:Factory/.libevdev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libevdev" Changes: -------- --- /work/SRC/openSUSE:Factory/libevdev/libevdev.changes 2014-05-16 07:30:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libevdev.new/libevdev.changes 2014-09-02 08:22:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 24 08:13:05 UTC 2014 - jengelh(a)inai.de + +- Add git repository metadata + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libevdev.spec ++++++ --- /var/tmp/diff_new_pack.4pfIAo/_old 2014-09-02 08:22:18.000000000 +0200 +++ /var/tmp/diff_new_pack.4pfIAo/_new 2014-09-02 08:22:18.000000000 +0200 @@ -25,6 +25,9 @@ License: MIT Group: System/Libraries Url: http://xorg.freedesktop.org/ + +#Git-Web: http://cgit.freedesktop.org/libevdev +#Git-Clone: git://anongit.freedesktop.org/libevdev Source0: http://freedesktop.org/software/libevdev/%{name}-%{version}.tar.xz Source1: baselibs.conf Patch0: n_buildfix_for_opensuse_12_2.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-09-02 08:22:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2014-08-25 11:03:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2014-09-02 08:22:14.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 1 08:06:59 UTC 2014 - tchvatal(a)suse.com + +- Add possible patch to fix random test failure + * cmake-fix-module-loading-test.patch + +------------------------------------------------------------------- New: ---- cmake-fix-module-loading-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.PPdiYX/_old 2014-09-02 08:22:16.000000000 +0200 +++ /var/tmp/diff_new_pack.PPdiYX/_new 2014-09-02 08:22:16.000000000 +0200 @@ -27,8 +27,10 @@ Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch -#PATCH-FIX-UPSTREAM dvaleev(a)suse.com https://github.com/Kitware/CMake/pull/111.patch +# PATCH-FIX-UPSTREAM dvaleev(a)suse.com https://github.com/Kitware/CMake/pull/111.patch Patch3: cmake-ppc64le-jni.patch +# PATCH-FIX-UPSTREAM: tchvatal(a)suse.com failing test due to include order +Patch4: cmake-fix-module-loading-test.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -50,6 +52,7 @@ %setup -q %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build export CXXFLAGS="%{optflags}" ++++++ cmake-fix-module-loading-test.patch ++++++ diff -urN cmake-3.0.1.old/Modules/FindCurses.cmake cmake-3.0.1/Modules/FindCurses.cmake --- cmake-3.0.1.old/Modules/FindCurses.cmake 2014-09-01 10:01:38.114937449 +0200 +++ cmake-3.0.1/Modules/FindCurses.cmake 2014-09-01 10:02:53.134937440 +0200 @@ -39,6 +39,7 @@ find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) set(CURSES_USE_NCURSES FALSE) +include(CheckLibraryExists) if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) set(CURSES_USE_NCURSES TRUE) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit traceroute for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package traceroute for openSUSE:Factory checked in at 2014-09-02 08:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/traceroute (Old) and /work/SRC/openSUSE:Factory/.traceroute.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "traceroute" Changes: -------- --- /work/SRC/openSUSE:Factory/traceroute/traceroute.changes 2013-03-08 11:20:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.traceroute.new/traceroute.changes 2014-09-02 08:22:12.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Aug 31 17:02:49 UTC 2014 - crrodriguez(a)opensuse.org + +- version 2.0.20 +* Describe all complementary long options in the man page +* Use correct service name for AS lookups +* Avoid some rare case null dereference +* Improve expiration check for simultaneous probes +- traceroute-secure_getenv.patch use secure_getenv +- traceroute-autotools.patch refresh + +------------------------------------------------------------------- Old: ---- traceroute-2.0.19.tar.gz New: ---- traceroute-2.0.20.tar.gz traceroute-secure_getenv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ traceroute.spec ++++++ --- /var/tmp/diff_new_pack.cfdGaR/_old 2014-09-02 08:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.cfdGaR/_new 2014-09-02 08:22:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package traceroute # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: traceroute -Version: 2.0.19 +Version: 2.0.20 Release: 0 Summary: A new modern implementation of traceroute(8) utility for Linux systems License: GPL-2.0+ @@ -25,7 +25,8 @@ Url: http://traceroute.sourceforge.net/ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: traceroute-autotools.patch +Patch0: traceroute-autotools.patch +Patch1: traceroute-secure_getenv.patch BuildRequires: libtool Provides: net-tools:%{_sbindir}/%{name} @@ -36,7 +37,8 @@ %prep %setup -q -%patch +%patch0 -p1 +%patch1 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now" ++++++ traceroute-2.0.19.tar.gz -> traceroute-2.0.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/CREDITS new/traceroute-2.0.20/CREDITS --- old/traceroute-2.0.19/CREDITS 2012-11-19 17:53:57.000000000 +0100 +++ new/traceroute-2.0.20/CREDITS 2014-06-14 21:01:38.000000000 +0200 @@ -15,6 +15,9 @@ Filip Holec (fholec(a)redhat.com) Samuel Jero (sj323707(a)ohio.edu) Jan Synacek (jsynacek(a)redhat.com) +Frederic Mangano (fmang(a)mg0.fr) +Jeff (geogriffin(a)jsgriff.com) +Andrew Schwartz (schwartz(a)amacapital.net) ... maybe you too? ;) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/ChangeLog new/traceroute-2.0.20/ChangeLog --- old/traceroute-2.0.19/ChangeLog 2012-11-19 17:51:54.000000000 +0100 +++ new/traceroute-2.0.20/ChangeLog 2014-06-14 21:00:40.000000000 +0200 @@ -1,3 +1,14 @@ +2014-06-14 Dmitry Butskoy <Dmitry(a)Butskoy.name> - 2.0.20 + + * Describe all complementary long options in the man page (Jan Synacek) + + * Use correct service name for AS lookups (Frederic Mangano) + + * Avoid some rare case null dereference (geogriffin(a)jsgriff.com) + + * Improve expiration check for simultaneous probes + + 2012-11-19 Dmitry Butskoy <Dmitry(a)Butskoy.name> - 2.0.19 * DCCP protocol support (rfc4340), by Samuel Jero diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/VERSION new/traceroute-2.0.20/VERSION --- old/traceroute-2.0.19/VERSION 2012-11-19 16:52:14.000000000 +0100 +++ new/traceroute-2.0.20/VERSION 2014-06-14 18:41:18.000000000 +0200 @@ -1 +1 @@ -#define VERSION 2.0.19 +#define VERSION 2.0.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/libsupp/clif.c new/traceroute-2.0.20/libsupp/clif.c --- old/traceroute-2.0.19/libsupp/clif.c 2007-08-06 17:20:17.000000000 +0200 +++ new/traceroute-2.0.20/libsupp/clif.c 2014-06-14 18:55:35.000000000 +0200 @@ -792,9 +792,9 @@ if (l > 0) { memset (buf, ' ', l); buf[l] = '\0'; - fprintf (stderr, buf); + fprintf (stderr, "%s", buf); } else - fprintf (stderr, spacer); + fprintf (stderr, "%s", spacer); endp = buf + width; @@ -833,7 +833,7 @@ *p = '\0'; fprintf (stderr, "%s", buf); - fprintf (stderr, spacer); + fprintf (stderr, "%s", spacer); p++; for (s = buf; *p; *s++ = *p++) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/traceroute/as_lookups.c new/traceroute-2.0.20/traceroute/as_lookups.c --- old/traceroute-2.0.19/traceroute/as_lookups.c 2010-07-14 15:57:10.000000000 +0200 +++ new/traceroute-2.0.20/traceroute/as_lookups.c 2014-06-14 18:38:25.000000000 +0200 @@ -19,7 +19,7 @@ #define DEF_RADB_SERVER "whois.radb.net" -#define DEF_RADB_SERVICE "whois" +#define DEF_RADB_SERVICE "nicname" static sockaddr_any ra_addr = {{ 0, }, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/traceroute/traceroute.8 new/traceroute-2.0.20/traceroute/traceroute.8 --- old/traceroute-2.0.19/traceroute/traceroute.8 2012-11-19 17:48:30.000000000 +0100 +++ new/traceroute-2.0.20/traceroute/traceroute.8 2014-06-14 18:52:02.000000000 +0200 @@ -115,16 +115,16 @@ .I traceroute will use IPv4. .TP -.B \-I +.B \-I, \-\-icmp Use ICMP ECHO for probes .TP -.B \-T +.B \-T, \-\-tcp Use TCP SYN for probes .TP -.B \-d +.B \-d, --debug Enable socket level debugging (when the Linux kernel supports it) .TP -.B \-F +.B \-F, --dont-fragment Do not fragment probe packets. (For IPv4 it also sets DF bit, which tells intermediate routers not to fragment remotely as well). .br @@ -148,10 +148,10 @@ the once the discovered final mtu only (from the route cache), which can be less than the actual mtu of a device. .TP -.BI \-f " first_ttl +.BI \-f " first_ttl" ", --first=" first_ttl Specifies with what TTL to start. Defaults to 1. .TP -.BI \-g " gateway +.BI \-g " gateway" ", --gateway=" gateway Tells traceroute to add an IP source routing option to the outgoing packet that tells the network to route the packet through the specified @@ -166,18 +166,18 @@ is a route header type (default is type 2). Note the type 0 route header is now deprecated (rfc5095). .TP -.BI \-i " interface +.BI \-i " interface" ", --interface=" interface Specifies the interface through which .I traceroute should send packets. By default, the interface is selected according to the routing table. .TP -.BI \-m " max_ttl +.BI \-m " max_ttl" ", --max-hops=" max_ttl Specifies the maximum number of hops (max time-to-live value) .I traceroute will probe. The default is 30. .TP -.BI \-N " squeries +.BI \-N " squeries" ", --sim-queries=" squeries Specifies the number of probe packets sent out simultaneously. Sending several probes concurrently can speed up .I traceroute @@ -189,7 +189,7 @@ .BI \-n Do not try to map IP addresses to host names when displaying them. .TP -.BI \-p " port +.BI \-p " port" ", --port=" port For UDP tracing, specifies the destination port base .I traceroute will use (the destination port number will be incremented by each probe). @@ -200,20 +200,20 @@ For TCP and others specifies just the (constant) destination port to connect. .TP -.BI \-t " tos +.BI \-t " tos" ", --tos=" tos For IPv4, set the Type of Service (TOS) and Precedence value. Useful values are 16 (low delay) and 8 (high throughput). Note that in order to use some TOS precedence values, you have to be super user. .br For IPv6, set the Traffic Control value. .TP -.BI \-l " flow_label +.BI \-l " flow_label" ", --flowlabel=" flow_label Use specified flow_label for IPv6 packets. .TP -.BI \-w " waittime +.BI \-w " waittime" ", --wait=" waittime Set the time (in seconds) to wait for a response to a probe (default 5.0 sec). .TP -.BI \-q " nqueries +.BI \-q " nqueries" ", --queries=" nqueries Sets the number of probe packets per hop. The default is 3. .TP .BI \-r @@ -222,18 +222,18 @@ network, an error is returned. This option can be used to ping a local host through an interface that has no route through it. .TP -.BI \-s " source_addr +.BI \-s " source_addr" ", --source=" source_addr Chooses an alternative source address. Note that you must select the address of one of the interfaces. By default, the address of the outgoing interface is used. .TP -.BI \-z " sendwait +.BI \-z " sendwait" ", --sendwait=" sendwait Minimal time interval between probes (default 0). If the value is more than 10, then it specifies a number in milliseconds, else it is a number of seconds (float point values allowed too). Useful when some routers use rate-limit for ICMP messages. .TP -.BI \-e +.B \-e, \-\-extensions Show ICMP extensions (rfc4884). The general form is .I CLASS\fB/\fITYPE\fB: followed by a hexadecimal dump. @@ -243,11 +243,11 @@ .B / ). .TP -.BI \-A +.B \-A, \-\-as\-path\-lookups Perform AS path lookups in routing registries and print results directly after the corresponding addresses. .TP -.BI \-V +.B \-V, \-\-version Print the version and exit. .br .P @@ -262,7 +262,7 @@ .B \--fwmark\fR=\fImark Set the firewall mark for outgoing packets (since the Linux kernel 2.6.25). .TP -.BI \-M " method +.BI \-M " method" ", --module=" name Use specified method for traceroute operations. Default traditional udp method has name .IR default , @@ -282,7 +282,7 @@ .BR "" ( "-I " means " -M icmp" , etc). .TP -.BI \-O " option +.BI \-O " option" ", --options=" options Specifies some method-specific option. Several options are separated by comma (or use several .B \-O on cmdline). @@ -290,17 +290,17 @@ To print information about available options, use .BR \-O\ help . .TP -.BI \-U +.B \-U, \-\-udp Use UDP to particular destination port for tracerouting (instead of increasing the port per each probe). Default port is 53 (dns). .TP .BI \-UL Use UDPLITE for tracerouting (default port is 53). .TP -.BI \-D +.B \-D, \-\-dccp Use DCCP Requests for probes. .TP -.BI \-P " protocol +.BI \-P " protocol" ", --protocol=" protocol Use raw packet of specified protocol for tracerouting. Default protocol is 253 (rfc3692). .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/traceroute/traceroute.c new/traceroute-2.0.20/traceroute/traceroute.c --- old/traceroute-2.0.19/traceroute/traceroute.c 2012-11-19 17:12:04.000000000 +0100 +++ new/traceroute-2.0.20/traceroute/traceroute.c 2014-06-14 20:57:38.000000000 +0200 @@ -148,7 +148,7 @@ void error_or_perm (const char *str) { if (errno == EPERM) - fprintf (stderr, "You have no enough privileges to use " + fprintf (stderr, "You do not have enough privileges to use " "this traceroute method."); error (str); } @@ -809,6 +809,15 @@ to the (pseudo-expired) "this" place. */ + /* It seems that the case of "answers for latest ones only" + occurs mostly with icmp_unreach error answers ("!H" etc.). + Icmp_echoreply, tcp_reset and even icmp_port_unreach looks + like going in the right order. + */ + if (!fp->err_str[0]) /* not an icmp_unreach error report... */ + return; + + if (pfp || (idx % probes_per_hop) + (fp - pb) < probes_per_hop ) { @@ -1338,10 +1347,9 @@ if (ee->ee_origin != SO_EE_ORIGIN_ICMP) ee = NULL; - /* dgram icmp sockets might return extra things... */ - if (ee->ee_type == ICMP_SOURCE_QUENCH || - ee->ee_type == ICMP_REDIRECT + else if (ee->ee_type == ICMP_SOURCE_QUENCH || + ee->ee_type == ICMP_REDIRECT ) return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/traceroute-2.0.19/traceroute.spec new/traceroute-2.0.20/traceroute.spec --- old/traceroute-2.0.19/traceroute.spec 2012-11-19 16:52:14.000000000 +0100 +++ new/traceroute-2.0.20/traceroute.spec 2014-06-14 18:41:18.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Traces the route taken by packets over an IPv4/IPv6 network Name: traceroute -Version: 2.0.19 +Version: 2.0.20 Release: 1%{?dist} Group: Applications/Internet License: GPLv2+ ++++++ traceroute-autotools.patch ++++++ --- /var/tmp/diff_new_pack.cfdGaR/_old 2014-09-02 08:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.cfdGaR/_new 2014-09-02 08:22:13.000000000 +0200 @@ -1,11 +1,11 @@ --- /dev/null -+++ Makefile.am ++++ traceroute-2.0.20/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = libsupp traceroute \ No newline at end of file --- /dev/null -+++ configure.ac -@@ -0,0 +1,40 @@ ++++ traceroute-2.0.20/configure.ac +@@ -0,0 +1,41 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + @@ -43,11 +43,12 @@ +AC_FUNC_REALLOC +AC_FUNC_STRTOD +AC_CHECK_FUNCS([dup2 gettimeofday memset setlocale socket strcasecmp strchr strdup strrchr strstr strtol strtoul uname]) ++AC_CHECK_FUNCS([__secure_getenv secure_getenv]) + +AC_CONFIG_FILES([Makefile libsupp/Makefile traceroute/Makefile]) +AC_OUTPUT --- /dev/null -+++ libsupp/Makefile.am ++++ traceroute-2.0.20/libsupp/Makefile.am @@ -0,0 +1,5 @@ +AM_CPPFLAGS = -include $(top_builddir)/config.h + @@ -55,7 +56,7 @@ + +libsupp_la_SOURCES = clif.c clif.h --- /dev/null -+++ traceroute/Makefile.am ++++ traceroute-2.0.20/traceroute/Makefile.am @@ -0,0 +1,18 @@ + + @@ -76,8 +77,8 @@ +traceroute_LDFLAGS = -pie +traceroute_LDADD = $(top_builddir)/libsupp/libsupp.la \ No newline at end of file ---- traceroute/traceroute.c.orig -+++ traceroute/traceroute.c +--- traceroute-2.0.20.orig/traceroute/traceroute.c ++++ traceroute-2.0.20/traceroute/traceroute.c @@ -28,7 +28,6 @@ #include "flowlabel.h" ++++++ traceroute-secure_getenv.patch ++++++ --- traceroute-2.0.20.orig/traceroute/traceroute.h +++ traceroute-2.0.20/traceroute/traceroute.h @@ -57,6 +57,13 @@ typedef struct tr_module_struct tr_modul #define DEF_DCCP_PORT DEF_START_PORT /* is it a good choice?... */ #define DEF_RAW_PROT 253 /* for experimentation and testing, rfc3692 */ +#ifndef HAVE_SECURE_GETENV +# ifdef HAVE___SECURE_GETENV +# define secure_getenv __secure_getenv +# else +# error neither secure_getenv nor __secure_getenv is available +# endif +#endif void error (const char *str) __attribute__((noreturn)); void error_or_perm (const char *str) __attribute__((noreturn)); --- traceroute-2.0.20.orig/traceroute/as_lookups.c +++ traceroute-2.0.20/traceroute/as_lookups.c @@ -39,10 +39,10 @@ const char *get_as_path (const char *que struct addrinfo *res; int ret; - server = getenv ("RA_SERVER"); + server = secure_getenv ("RA_SERVER"); if (!server) server = DEF_RADB_SERVER; - service = getenv ("RA_SERVICE"); + service = secure_getenv ("RA_SERVICE"); if (!service) service = DEF_RADB_SERVICE; --- traceroute-2.0.20.orig/libsupp/clif.c +++ traceroute-2.0.20/libsupp/clif.c @@ -398,7 +398,7 @@ int CLIF_parse_cmdline (int argc, char * unsigned int dirty_flags = 0; int dirty_plus = 0; int exclusive_cnt = 0; - int posix = getenv ("POSIXLY_CORRECT") != NULL || + int posix = secure_getenv ("POSIXLY_CORRECT") != NULL || (parse_flags & CLIF_POSIX); curr.argc = argc; --- traceroute-2.0.20.orig/libsupp/clif.h +++ traceroute-2.0.20/libsupp/clif.h @@ -118,4 +118,12 @@ extern int CLIF_arg_func (CLIF_argument { "V", "version", 0, "Print version info and exit", \ CLIF_version_handler, STR, 0, CLIF_EXTRA | CLIF_EXIT } +#ifndef HAVE_SECURE_GETENV +# ifdef HAVE___SECURE_GETENV +# define secure_getenv __secure_getenv +# else +# error neither secure_getenv nor __secure_getenv is available +# endif +#endif + #endif /* _CLIF_H */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtdeclarative for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package libqt5-qtdeclarative for openSUSE:Factory checked in at 2014-09-02 08:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtdeclarative (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtdeclarative/libqt5-qtdeclarative.changes 2014-08-11 10:06:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtdeclarative.new/libqt5-qtdeclarative.changes 2014-09-02 08:22:10.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 09:49:55 UTC 2014 - mlin(a)suse.com + +- Added upstream patch libqt5-fix-crash-with-early-QObject-property-access.patch + * Fix crash with early QObject property access, QTBUG-40018 + +------------------------------------------------------------------- New: ---- libqt5-fix-crash-with-early-QObject-property-access.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.CGjBA5/_old 2014-09-02 08:22:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CGjBA5/_new 2014-09-02 08:22:12.000000000 +0200 @@ -37,6 +37,8 @@ %endif Source: %{tar_version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM libqt5-fix-crash-with-early-QObject-property-access.patch -- QTBUG-40018 +Patch1000: libqt5-fix-crash-with-early-QObject-property-access.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} @@ -70,6 +72,7 @@ %else %setup -q -n qtdeclarative-opensource-src-%{real_version} %endif +%patch1000 -p1 %package -n %libname Summary: Qt 5 Declarative Library ++++++ libqt5-fix-crash-with-early-QObject-property-access.patch ++++++ >From b0835b31fd456c30ea3fcaae6edc58212556477d Mon Sep 17 00:00:00 2001 From: Simon Hausmann <simon.hausmann(a)digia.com> Date: Thu, 21 Aug 2014 13:10:33 +0200 Subject: [PATCH] Fix crash with early QObject property access In the reported bug, it can happen that we try to access the compile-time resolved QObject property of an object that is referenced by id. The binding that uses this is triggered when the property changes but _also_ when the id referenced object gets either created or deleted. The first time the binding is evaluated is very early on, when the id referenced object is not created yet, so the binding evaluation fails. However the dependency is set up, and so later then the id referenced object is created and the id property is set on the context, the notification triggers and the binding is re-evaluated. During that binding evaluation a QObject property access happens by index on an object that doesn't have its VME meta-object set up yet. Therefore the property access fails and a crash occurs or the Q_ASSERT(property) assertion fails. The fix is to set register the id named object in the context _after_ the VME meta-object is setup. Task-number: QTBUG-40018 Change-Id: Ic2d7b4a0c49635efe68e93f2f6c316eb65f0c309 Reviewed-by: Lars Knoll <lars.knoll(a)digia.com> --- src/qml/qml/qqmlobjectcreator.cpp | 18 ++++++++++++----- src/qml/qml/qqmlobjectcreator_p.h | 2 ++ .../qml/qqmllanguage/data/earlyIdObjectAccess.qml | 23 ++++++++++++++++++++++ tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 10 ++++++++++ 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 tests/auto/qml/qqmllanguage/data/earlyIdObjectAccess.qml --- qtdeclarative-opensource-src-5.3.1.orig/src/qml/qml/qqmlobjectcreator.cpp +++ qtdeclarative-opensource-src-5.3.1/src/qml/qml/qqmlobjectcreator.cpp @@ -1013,6 +1013,13 @@ void QQmlObjectCreator::recordError(cons errors << error; } +void QQmlObjectCreator::registerObjectWithContextById(int objectIndex, QObject *instance) const +{ + QHash<int, int>::ConstIterator idEntry = objectIndexToId.find(objectIndex); + if (idEntry != objectIndexToId.constEnd()) + context->setIdProperty(idEntry.value(), instance); +} + QObject *QQmlObjectCreator::createInstance(int index, QObject *parent, bool isContextObject) { QQmlObjectCreationProfiler profiler(sharedState->profiler.profiler); @@ -1112,10 +1119,6 @@ QObject *QQmlObjectCreator::createInstan parserStatus->d = &sharedState->allParserStatusCallbacks.top(); } - QHash<int, int>::ConstIterator idEntry = objectIndexToId.find(index); - if (idEntry != objectIndexToId.constEnd()) - context->setIdProperty(idEntry.value(), instance); - // Register the context object in the context early on in order for pending binding // initialization to find it available. if (isContextObject) @@ -1130,8 +1133,10 @@ QObject *QQmlObjectCreator::createInstan } } - if (isComponent) + if (isComponent) { + registerObjectWithContextById(index, instance); return instance; + } QQmlRefPointer<QQmlPropertyCache> cache = propertyCaches.at(index); Q_ASSERT(!cache.isNull()); @@ -1288,6 +1293,9 @@ bool QQmlObjectCreator::populateInstance } else { vmeMetaObject = QQmlVMEMetaObject::get(_qobject); } + + registerObjectWithContextById(index, _qobject); + qSwap(_propertyCache, cache); qSwap(_vmeMetaObject, vmeMetaObject); --- qtdeclarative-opensource-src-5.3.1.orig/src/qml/qml/qqmlobjectcreator_p.h +++ qtdeclarative-opensource-src-5.3.1/src/qml/qml/qqmlobjectcreator_p.h @@ -110,6 +110,8 @@ private: QString stringAt(int idx) const { return qmlUnit->header.stringAt(idx); } void recordError(const QV4::CompiledData::Location &location, const QString &description); + void registerObjectWithContextById(int objectIndex, QObject *instance) const; + enum Phase { Startup, CreatingObjects, --- /dev/null +++ qtdeclarative-opensource-src-5.3.1/tests/auto/qml/qqmllanguage/data/earlyIdObjectAccess.qml @@ -0,0 +1,23 @@ +import QtQuick 2.0 + +Item { + visible: false + property bool success: false + property bool loading: true + + Item { + visible: someOtherItem.someProperty + onVisibleChanged: { + if (!visible) { + success = loading + } + } + } + + Item { + id: someOtherItem + property bool someProperty: true + } + + Component.onCompleted: loading = false +} --- qtdeclarative-opensource-src-5.3.1.orig/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ qtdeclarative-opensource-src-5.3.1/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -240,6 +240,8 @@ private slots: void noChildEvents(); + void earlyIdObjectAccess(); + private: QQmlEngine engine; QStringList defaultImportPathList; @@ -3791,6 +3793,14 @@ void tst_qqmllanguage::noChildEvents() QCOMPARE(object->childAddedEventCount(), 0); } +void tst_qqmllanguage::earlyIdObjectAccess() +{ + QQmlComponent component(&engine, testFileUrl("earlyIdObjectAccess.qml")); + QScopedPointer<QObject> o(component.create()); + QVERIFY(!o.isNull()); + QVERIFY(o->property("success").toBool()); +} + QTEST_MAIN(tst_qqmllanguage) #include "tst_qqmllanguage.moc" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkolabxml for openSUSE:Factory
by root＠hilbert.suse.de 02 Sep '14

02 Sep '14

Hello community, here is the log from the commit of package libkolabxml for openSUSE:Factory checked in at 2014-09-02 08:22:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old) and /work/SRC/openSUSE:Factory/.libkolabxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkolabxml" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2014-08-11 10:07:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2014-09-02 08:22:09.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 26 11:17:36 UTC 2014 - aj(a)ajaissle.de + +- New upstream release 1.0.2 + +- Dropped the following patches, as they're now included upstream: + - libkolabxml-1.0.1_xsd_type.patch + - libkolabxml-1.0.1_csharp_bindings.patch + +------------------------------------------------------------------- Old: ---- libkolabxml-1.0.1.tar.gz libkolabxml-1.0.1_csharp_bindings.patch libkolabxml-1.0.1_xsd_type.patch New: ---- libkolabxml-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolabxml.spec ++++++ --- /var/tmp/diff_new_pack.e562mQ/_old 2014-09-02 08:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.e562mQ/_new 2014-09-02 08:22:10.000000000 +0200 @@ -23,7 +23,7 @@ %bcond_without mono Name: libkolabxml -Version: 1.0.1 +Version: 1.0.2 Release: 0 %define soname 1 Summary: Kolab XML Format Schema Definitions Library @@ -33,12 +33,9 @@ Source: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz # PATCH-FIX-SLE libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -- Fix uuid.h path on SLE 11 Patch0: libkolabxml-0.8.3_fix_uuid_includes_SLE.patch -# PATCH-FIX-UPSTREAM libkolabxml-1.0.1_csharp_bindings.patch -- Fix csharp bindings -Patch1: libkolabxml-1.0.1_csharp_bindings.patch # PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and python bindings on SLE 11 Patch2: libkolabxml-1.0.1_no-maybe-uninitialized.patch -# PATCH-FIX-UPSTREAM -- Fix compatibility with xsd 4.0.0 -Patch3: libkolabxml-1.0.1_xsd_type.patch + BuildRequires: boost-devel BuildRequires: cmake >= 2.6 BuildRequires: gcc-c++ @@ -49,7 +46,7 @@ %if 0%{?sles_version} == 11 BuildRequires: uuid-devel = 1.6.2 %endif -BuildRequires: libXerces-c-devel +BuildRequires: libxerces-c-devel %if %{with mono} BuildRequires: mono-devel %endif @@ -192,8 +189,6 @@ %patch0 -p0 %patch2 -p1 %endif -%patch1 -p1 -%patch3 -p1 %build export CXXFLAGS="%{optflags}" ++++++ libkolabxml-1.0.1.tar.gz -> libkolabxml-1.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/CMakeLists.txt new/libkolabxml-1.0.2/CMakeLists.txt --- old/libkolabxml-1.0.1/CMakeLists.txt 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 @@ -43,7 +43,7 @@ set (Libkolabxml_VERSION_MAJOR 1) set (Libkolabxml_VERSION_MINOR 0) # Enable the full x.y.z version only for release versions -set (Libkolabxml_VERSION_PATCH 1) +set (Libkolabxml_VERSION_PATCH 2) set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" ) #set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" ) @@ -75,7 +75,7 @@ #C++ is required from here on enable_language(CXX) -set(LIB_INSTALL_DIR lib CACHE STRING "The directories where to install libraries to") +set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE STRING "The directories where to install libraries to") set(INCLUDE_INSTALL_DIR include CACHE STRING "The directory where to install headers to") set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kolabxml) set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/schemas/ical/kolabformat-xcal.xsd new/libkolabxml-1.0.2/schemas/ical/kolabformat-xcal.xsd --- old/libkolabxml-1.0.1/schemas/ical/kolabformat-xcal.xsd 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/schemas/ical/kolabformat-xcal.xsd 2014-08-26 12:53:07.000000000 +0200 @@ -41,7 +41,7 @@ <xs:complexContent mixed="false"> <xs:extension base="BasePropertyType"> <xs:sequence> - <xs:element name="text" type="xs:string" default="3.0dev1"/> + <xs:element name="text" type="xs:string" default="3.0"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -107,6 +107,7 @@ <xs:element name="recurrence-id" type="RecurrenceIdPropType" minOccurs="0"/> <xs:element name="summary" type="SummaryPropType" minOccurs="0"/> <xs:element name="description" type="DescriptionPropType" minOccurs="0"/> + <xs:element name="comment" type="CommentPropType" minOccurs="0"/> <xs:element name="priority" type="PriorityPropType" minOccurs="0"/> <xs:element name="status" type="StatusPropType" minOccurs="0"/> <xs:element name="location" type="LocationPropType" minOccurs="0"/> @@ -148,6 +149,7 @@ <xs:element name="recurrence-id" type="RecurrenceIdPropType" minOccurs="0"/> <xs:element name="summary" type="SummaryPropType" minOccurs="0"/> <xs:element name="description" type="DescriptionPropType" minOccurs="0"/> + <xs:element name="comment" type="CommentPropType" minOccurs="0"/> <xs:element name="priority" type="PriorityPropType" minOccurs="0"/> <xs:element name="status" type="StatusPropType" minOccurs="0"/> <xs:element name="percent-complete" type="PercentCompletePropType" minOccurs="0"/> @@ -185,6 +187,7 @@ <xs:element name="dtstart" type="DtstartPropType" minOccurs="0"/> <xs:element name="summary" type="SummaryPropType" minOccurs="0"/> <xs:element name="description" type="DescriptionPropType" minOccurs="0"/> + <xs:element name="comment" type="CommentPropType" minOccurs="0"/> <xs:element name="status" type="StatusPropType" minOccurs="0"/> <xs:element name="contact" type="ContactPropType" minOccurs="0"/> <xs:element name="attendee" type="AttendeePropType" minOccurs="0" maxOccurs="unbounded"/> @@ -247,4 +250,4 @@ -</xs:schema> \ No newline at end of file +</xs:schema> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/schemas/kolabformat-xcard.xsd new/libkolabxml-1.0.2/schemas/kolabformat-xcard.xsd --- old/libkolabxml-1.0.1/schemas/kolabformat-xcard.xsd 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/schemas/kolabformat-xcard.xsd 2014-08-26 12:53:07.000000000 +0200 @@ -10,7 +10,7 @@ <xs:complexContent mixed="false"> <xs:extension base="BasePropertyType"> <xs:sequence> - <xs:element name="text" type="xs:string" default="3.0dev1"/> + <xs:element name="text" type="xs:string" default="3.0"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -123,4 +123,4 @@ <xs:element name="vcards" type="VcardsType"/> -</xs:schema> \ No newline at end of file +</xs:schema> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/schemas/kolabformat.xsd new/libkolabxml-1.0.2/schemas/kolabformat.xsd --- old/libkolabxml-1.0.1/schemas/kolabformat.xsd 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/schemas/kolabformat.xsd 2014-08-26 12:53:07.000000000 +0200 @@ -7,7 +7,7 @@ <xs:complexType name="KolabBase"> - <xs:attribute name="version" type="xs:string" fixed="3.0dev1" /> + <xs:attribute name="version" type="xs:string" fixed="3.0" /> </xs:complexType> @@ -164,4 +164,4 @@ <xs:element name="configuration" type="Configuration"/> -</xs:schema> \ No newline at end of file +</xs:schema> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/incidence_p.h new/libkolabxml-1.0.2/src/containers/incidence_p.h --- old/libkolabxml-1.0.1/src/containers/incidence_p.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/incidence_p.h 2014-08-26 12:53:07.000000000 +0200 @@ -44,6 +44,7 @@ bool thisAndFuture; std::string summary; std::string description; + std::string comment; std::string location; int priority; Status status; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabcontainers.cpp new/libkolabxml-1.0.2/src/containers/kolabcontainers.cpp --- old/libkolabxml-1.0.1/src/containers/kolabcontainers.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabcontainers.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -536,11 +536,13 @@ std::string data; std::string mimetype; std::string label; + bool isValid; }; Attachment::Attachment() : d(new Attachment::Private) { + d->isValid = false; } Attachment::Attachment(const Kolab::Attachment &other) @@ -568,6 +570,7 @@ void Attachment::setUri(const std::string &uri, const std::string& mimetype) { + d->isValid = true; d->uri = uri; d->mimetype = mimetype; } @@ -594,6 +597,7 @@ void Attachment::setData(const std::string &data, const std::string& mimetype) { + d->isValid = true; d->data = data; d->mimetype = mimetype; } @@ -605,7 +609,7 @@ bool Attachment::isValid() const { - return !d->mimetype.empty(); //TODO use isValid variable + return d->isValid; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabcontainers.h new/libkolabxml-1.0.2/src/containers/kolabcontainers.h --- old/libkolabxml-1.0.1/src/containers/kolabcontainers.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabcontainers.h 2014-08-26 12:53:07.000000000 +0200 @@ -336,7 +336,9 @@ PartAccepted, PartDeclined, PartTentative, - PartDelegated + PartDelegated, + PartInProcess, + PartCompleted }; enum Role { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabevent.cpp new/libkolabxml-1.0.2/src/containers/kolabevent.cpp --- old/libkolabxml-1.0.1/src/containers/kolabevent.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabevent.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -180,6 +180,16 @@ return d->description; } +void Event::setComment(const std::string &comment) +{ + d->comment = comment; +} + +std::string Event::comment() const +{ + return d->comment; +} + void Event::setPriority(int priority) { d->priority = priority; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabevent.h new/libkolabxml-1.0.2/src/containers/kolabevent.h --- old/libkolabxml-1.0.1/src/containers/kolabevent.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabevent.h 2014-08-26 12:53:07.000000000 +0200 @@ -85,6 +85,9 @@ void setDescription(const std::string &); std::string description() const; + void setComment(const std::string &); + std::string comment() const; + void setPriority(int); int priority() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabjournal.cpp new/libkolabxml-1.0.2/src/containers/kolabjournal.cpp --- old/libkolabxml-1.0.1/src/containers/kolabjournal.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabjournal.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -146,6 +146,15 @@ return d->description; } +void Journal::setComment(const std::string &comment) +{ + d->comment = comment; +} + +std::string Journal::comment() const +{ + return d->comment; +} void Journal::setStatus(Status status) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabjournal.h new/libkolabxml-1.0.2/src/containers/kolabjournal.h --- old/libkolabxml-1.0.1/src/containers/kolabjournal.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabjournal.h 2014-08-26 12:53:07.000000000 +0200 @@ -61,6 +61,9 @@ void setDescription(const std::string &); std::string description() const; + void setComment(const std::string &); + std::string comment() const; + void setStatus(Status); Status status() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabtodo.cpp new/libkolabxml-1.0.2/src/containers/kolabtodo.cpp --- old/libkolabxml-1.0.1/src/containers/kolabtodo.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabtodo.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -195,6 +195,16 @@ return d->description; } +void Todo::setComment(const std::string &comment) +{ + d->comment = comment; +} + +std::string Todo::comment() const +{ + return d->comment; +} + void Todo::setPriority(int priority) { d->priority = priority; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/containers/kolabtodo.h new/libkolabxml-1.0.2/src/containers/kolabtodo.h --- old/libkolabxml-1.0.1/src/containers/kolabtodo.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/containers/kolabtodo.h 2014-08-26 12:53:07.000000000 +0200 @@ -84,6 +84,9 @@ void setDescription(const std::string &); std::string description() const; + void setComment(const std::string &); + std::string comment() const; + void setPriority(int); int priority() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/csharp/CMakeLists.txt new/libkolabxml-1.0.2/src/csharp/CMakeLists.txt --- old/libkolabxml-1.0.1/src/csharp/CMakeLists.txt 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/csharp/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 @@ -44,7 +44,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/Related.cs ${CMAKE_CURRENT_BINARY_DIR}/Relative.cs ${CMAKE_CURRENT_BINARY_DIR}/Role.cs + ${CMAKE_CURRENT_BINARY_DIR}/Snippet.cs + ${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs ${CMAKE_CURRENT_BINARY_DIR}/Status.cs + ${CMAKE_CURRENT_BINARY_DIR}/Snippet.cs + ${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.cs ${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs @@ -67,6 +71,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/vectorkey.cs ${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.cs ${CMAKE_CURRENT_BINARY_DIR}/vectors.cs + ${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.cs ${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.cs ${CMAKE_CURRENT_BINARY_DIR}/vectorurl.cs ${CMAKE_CURRENT_BINARY_DIR}/Weekday.cs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/java/CMakeLists.txt new/libkolabxml-1.0.2/src/java/CMakeLists.txt --- old/libkolabxml-1.0.1/src/java/CMakeLists.txt 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/java/CMakeLists.txt 2014-08-26 12:53:07.000000000 +0200 @@ -37,6 +37,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/Relative.java ${CMAKE_CURRENT_BINARY_DIR}/Role.java ${CMAKE_CURRENT_BINARY_DIR}/Status.java + ${CMAKE_CURRENT_BINARY_DIR}/Snippet.java + ${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.java ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.java ${CMAKE_CURRENT_BINARY_DIR}/Telephone.java ${CMAKE_CURRENT_BINARY_DIR}/Todo.java @@ -56,6 +58,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/vectorkey.java ${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.java ${CMAKE_CURRENT_BINARY_DIR}/vectors.java + ${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.java ${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.java ${CMAKE_CURRENT_BINARY_DIR}/vectorurl.java ${CMAKE_CURRENT_BINARY_DIR}/Weekday.java diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/kolabformat.cpp new/libkolabxml-1.0.2/src/kolabformat.cpp --- old/libkolabxml-1.0.1/src/kolabformat.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/kolabformat.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -49,7 +49,7 @@ std::string xCalVersion() { - return XCAL::global_xCalVersion; + return Utils::xCalVersion(); } std::string xKolabVersion() @@ -79,6 +79,7 @@ if (!ptr.get()) { return Kolab::Event(); } + validate(*ptr); return *ptr; } @@ -86,7 +87,13 @@ { Utils::clearErrors(); validate(event); - return XCAL::serializeIncidence< XCAL::IncidenceTrait<Kolab::Event> >(event, productId); + const std::string result = XCAL::serializeIncidence< XCAL::IncidenceTrait<Kolab::Event> >(event, productId); + //Validate + XCAL::deserializeIncidence< XCAL::IncidenceTrait<Kolab::Event> >(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Kolab::Todo readTodo(const std::string& s, bool isUrl) @@ -96,6 +103,7 @@ if (!ptr.get()) { return Kolab::Todo(); } + validate(*ptr); return *ptr; } @@ -103,7 +111,13 @@ { Utils::clearErrors(); validate(event); - return XCAL::serializeIncidence< XCAL::IncidenceTrait<Kolab::Todo> >(event, productId); + const std::string result = XCAL::serializeIncidence< XCAL::IncidenceTrait<Kolab::Todo> >(event, productId); + //Validate + XCAL::deserializeIncidence< XCAL::IncidenceTrait<Kolab::Todo> >(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Journal readJournal(const std::string& s, bool isUrl) @@ -113,6 +127,7 @@ if (!ptr.get()) { return Kolab::Journal(); } + validate(*ptr); return *ptr; } @@ -120,7 +135,13 @@ { Utils::clearErrors(); validate(j); - return XCAL::serializeIncidence<XCAL::IncidenceTrait<Kolab::Journal> >(j, productId); + const std::string result = XCAL::serializeIncidence< XCAL::IncidenceTrait<Kolab::Journal> >(j, productId); + //Validate + XCAL::deserializeIncidence< XCAL::IncidenceTrait<Kolab::Journal> >(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Kolab::Freebusy readFreebusy(const std::string& s, bool isUrl) @@ -130,6 +151,7 @@ if (!ptr.get()) { return Kolab::Freebusy(); } + validate(*ptr); return *ptr; } @@ -137,7 +159,12 @@ { Utils::clearErrors(); validate(f); - return XCAL::serializeFreebusy<XCAL::IncidenceTrait<Kolab::Freebusy> >(f, productId); + const std::string result = XCAL::serializeFreebusy<XCAL::IncidenceTrait<Kolab::Freebusy> >(f, productId); + XCAL::deserializeIncidence<XCAL::IncidenceTrait<Kolab::Freebusy> >(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Kolab::Contact readContact(const std::string& s, bool isUrl) @@ -147,6 +174,7 @@ if (!ptr.get()) { return Kolab::Contact(); } + validate(*ptr); return *ptr; } @@ -154,7 +182,13 @@ { Utils::clearErrors(); validate(contact); - return XCARD::serializeCard(contact, productId); + const std::string result = XCARD::serializeCard(contact, productId); + //Validate + XCARD::deserializeCard<Kolab::Contact>(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } DistList readDistlist(const std::string& s, bool isUrl) @@ -164,6 +198,7 @@ if (!ptr.get()) { return Kolab::DistList(); } + validate(*ptr); return *ptr; } @@ -171,7 +206,13 @@ { Utils::clearErrors(); validate(list); - return XCARD::serializeCard(list, productId); + const std::string result = XCARD::serializeCard(list, productId); + //Validate + XCARD::deserializeCard<Kolab::DistList>(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Note readNote(const std::string& s, bool isUrl) @@ -181,6 +222,7 @@ if (!ptr.get()) { return Kolab::Note(); } + validate(*ptr); return *ptr; } @@ -188,7 +230,13 @@ { Utils::clearErrors(); validate(note); - return Kolab::KolabObjects::serializeObject<Kolab::Note>(note, productId); + const std::string result = Kolab::KolabObjects::serializeObject<Kolab::Note>(note, productId); + //Validate + Kolab::KolabObjects::deserializeObject<Kolab::Note>(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } File readFile(const std::string& s, bool isUrl) @@ -198,6 +246,7 @@ if (!ptr.get()) { return Kolab::File(); } + validate(*ptr); return *ptr; } @@ -205,7 +254,13 @@ { Utils::clearErrors(); validate(file); - return Kolab::KolabObjects::serializeObject<Kolab::File>(file, productId); + const std::string result = Kolab::KolabObjects::serializeObject<Kolab::File>(file, productId); + //Validate + Kolab::KolabObjects::deserializeObject<Kolab::File>(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } Configuration readConfiguration(const std::string& s, bool isUrl) @@ -215,6 +270,7 @@ if (!ptr.get()) { return Kolab::Configuration(); } + validate(*ptr); return *ptr; } @@ -222,7 +278,13 @@ { Utils::clearErrors(); validate(config); - return Kolab::KolabObjects::serializeObject< Kolab::Configuration >(config, productId); + const std::string result = Kolab::KolabObjects::serializeObject<Kolab::Configuration>(config, productId); + //Validate + Kolab::KolabObjects::deserializeObject<Kolab::Configuration>(result, false); + if (errorOccurred()) { + LOG("Error occurred while writing.") + } + return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/kolabformat.i new/libkolabxml-1.0.2/src/kolabformat.i --- old/libkolabxml-1.0.1/src/kolabformat.i 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/kolabformat.i 2014-08-26 12:53:07.000000000 +0200 @@ -44,6 +44,7 @@ %template(vectorurl) vector<Kolab::Url>; %template(vectorkey) vector<Kolab::Key>; %template(vectorcategorycolor) vector<Kolab::CategoryColor>; + %template(vectorsnippet) vector<Kolab::Snippet>; }; %rename(readKolabFile) Kolab::readFile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/objectvalidation.cpp new/libkolabxml-1.0.2/src/objectvalidation.cpp --- old/libkolabxml-1.0.1/src/objectvalidation.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/objectvalidation.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -51,7 +51,7 @@ return false; } if (tzSet.find(tz) == tzSet.end()) { - Utils::logMessage("not a valid olson timezone.", "", 0, Error); + Utils::logMessage("Not a valid olson timezone: " + tz, "", 0, Error); return false; } } @@ -91,8 +91,8 @@ ASSERTEXISTING(event.start()); ASSERTVALID(event.start()); ASSERTVALID(event.end()); - if (event.end().isValid()) { - ASSERTEQUAL(event.start().timezone(), event.end().timezone()); + if (event.start().isValid() && event.end().isValid()) { + ASSERTEQUAL(event.start().isDateOnly(), event.end().isDateOnly()); } } @@ -101,7 +101,7 @@ ASSERTVALID(todo.start()); ASSERTVALID(todo.due()); if (todo.start().isValid() && todo.due().isValid()) { - ASSERTEQUAL(todo.start().timezone(), todo.due().timezone()); + ASSERTEQUAL(todo.start().isDateOnly(), todo.due().isDateOnly()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/shared_conversions.h new/libkolabxml-1.0.2/src/shared_conversions.h --- old/libkolabxml-1.0.1/src/shared_conversions.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/shared_conversions.h 2014-08-26 12:53:07.000000000 +0200 @@ -29,7 +29,11 @@ typedef boost::shared_ptr<cDateTime> cDateTimePtr; typedef ::xsd::cxx::tree::type type; +#if (XSD_INT_VERSION >= 4000000L) +typedef ::xsd::cxx::tree::simple_type< char, type > simple_type; +#else typedef ::xsd::cxx::tree::simple_type< type > simple_type; +#endif typedef ::xsd::cxx::tree::date< char, simple_type > date; typedef ::xsd::cxx::tree::date_time< char, simple_type > date_time; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/utils.cpp new/libkolabxml-1.0.2/src/utils.cpp --- old/libkolabxml-1.0.1/src/utils.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/utils.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -47,6 +47,7 @@ std::string createdUID; std::string productId; std::string xKolabVersion; + std::string xCalVersion; ErrorSeverity errorBit; std::string errorMessage; @@ -80,6 +81,16 @@ return ThreadLocal::inst().xKolabVersion; } +void setXCalVersion(const std::string &s) +{ + ThreadLocal::inst().xCalVersion = s; +} + +std::string xCalVersion() +{ + return ThreadLocal::inst().xCalVersion; +} + void setProductId(const std::string &s) { ThreadLocal::inst().productId = s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/utils.h new/libkolabxml-1.0.2/src/utils.h --- old/libkolabxml-1.0.1/src/utils.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/utils.h 2014-08-26 12:53:07.000000000 +0200 @@ -33,10 +33,10 @@ void logMessage(const std::string &,const std::string &, int, ErrorSeverity s); -#define LOG(message) logMessage(message,__FILE__, __LINE__, NoError); -#define WARNING(message) logMessage(message,__FILE__, __LINE__, Warning); -#define ERROR(message) logMessage(message,__FILE__, __LINE__, Error); -#define CRITICAL(message) logMessage(message,__FILE__, __LINE__, Critical); +#define LOG(message) Utils::logMessage(message,__FILE__, __LINE__, NoError); +#define WARNING(message) Utils::logMessage(message,__FILE__, __LINE__, Warning); +#define ERROR(message) Utils::logMessage(message,__FILE__, __LINE__, Error); +#define CRITICAL(message) Utils::logMessage(message,__FILE__, __LINE__, Critical); void logMessage(const std::string &, ErrorSeverity s = Warning); @@ -72,6 +72,12 @@ std::string kolabVersion(); /** + * The xCal Version of the last deserialized object + */ +void setXCalVersion(const std::string &); +std::string xCalVersion(); + +/** * A timestamp which overrides the one normally used. */ void setOverrideTimestamp(const cDateTime &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/src/xcalconversions.h new/libkolabxml-1.0.2/src/xcalconversions.h --- old/libkolabxml-1.0.1/src/xcalconversions.h 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/src/xcalconversions.h 2014-08-26 12:53:07.000000000 +0200 @@ -47,8 +47,6 @@ namespace Kolab { namespace XCAL { -std::string global_xCalVersion; - const char* const XCAL_VERSION = "2.0"; const char* const XCAL_NAMESPACE = "urn:ietf:params:xml:ns:icalendar-2.0"; @@ -59,7 +57,8 @@ const char* const BASE64 = "BASE64"; const char* const NEEDSACTION = "NEEDS-ACTION"; -const char* const COMPLETED = "OPAQUE"; +const char* const COMPLETED = "COMPLETED"; +const char* const COMPLETED_COMPAT = "OPAQUE"; const char* const INPROCESS = "IN-PROCESS"; const char* const CANCELLED = "CANCELLED"; const char* const TENTATIVE = "TENTATIVE"; @@ -76,6 +75,8 @@ const char* const PARTDELEGATED = "DELEGATED"; const char* const PARTNEEDSACTION = "NEEDS-ACTION"; const char* const PARTTENTATIVE = "TENTATIVE"; +const char* const PARTINPROCESS = "IN-PROCESS"; +const char* const PARTCOMPLETED = "COMPLETED"; const char* const CHAIR = "CHAIR"; const char* const NONPARTICIPANT = "NON-PARTICIPANT"; @@ -419,16 +420,13 @@ } } } - if (mimetype.empty()) { - ERROR("no mimetype"); - } if (aProp.uri()) { a.setUri(*aProp.uri(), mimetype); } else if (aProp.binary()) { a.setData(base64_decode(*aProp.binary()), mimetype); } else { - ERROR("not uri and no data available"); + ERROR("no uri and no data available"); } return a; } @@ -567,7 +565,6 @@ ptr->date_time().push_back(Shared::fromDateTime(dt)); } //TODO handle utc - //TODO check for equality of timezones? } if (!dtlist.empty() && !dtlist.at(0).timezone().empty()) { @@ -605,6 +602,10 @@ return PARTNEEDSACTION; case PartTentative: return PARTTENTATIVE; + case PartInProcess: + return PARTINPROCESS; + case PartCompleted: + return PARTCOMPLETED; } ERROR("PartStat not handled: " + status); return std::string(); @@ -622,6 +623,10 @@ return PartNeedsAction; } else if (status == PARTTENTATIVE) { return PartTentative; + } else if (status == PARTINPROCESS) { + return PartInProcess; + } else if (status == PARTCOMPLETED) { + return PartCompleted; } ERROR("PartStat not handled: " + status); return PartNeedsAction; @@ -847,11 +852,15 @@ inc.setDescription(toString(*prop.description())); } + if (prop.comment()) { + inc.setComment(toString(*prop.comment())); + } + if (prop.status()) { const std::string &status = toString(*prop.status()); if (status == NEEDSACTION) { inc.setStatus(StatusNeedsAction); - } else if (status == COMPLETED) { + } else if (status == COMPLETED || status == COMPLETED_COMPAT) { inc.setStatus(StatusCompleted); } else if (status == INPROCESS) { inc.setStatus(StatusInProcess); @@ -1123,6 +1132,10 @@ prop.description(typename properties::description_type(inc.description())); } + if (!inc.comment().empty()) { + prop.comment(typename properties::comment_type(inc.comment())); + } + if (inc.status() != StatusUndefined) { switch (inc.status()) { case StatusNeedsAction: @@ -1495,11 +1508,6 @@ if (prop.dtend()) { event.setEnd(*toDate(*prop.dtend())); - if (event.end().isUTC() != event.end().isUTC() && - event.end().timezone() != event.end().timezone() && - event.end().isDateOnly() != event.end().isDateOnly()) { - ERROR("dtEnd has wrong timespec"); - } } else if (prop.duration()) { event.setDuration(toDuration((*prop.duration()).duration())); } @@ -1948,7 +1956,7 @@ } setProductId( vcalendar.properties().prodid().text() ); - global_xCalVersion = vcalendar.properties().version().text(); + setXCalVersion(vcalendar.properties().version().text()); setKolabVersion( vcalendar.properties().x_kolab_version().text() ); if (incidences.empty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/tests/bindingstest.cpp new/libkolabxml-1.0.2/tests/bindingstest.cpp --- old/libkolabxml-1.0.1/tests/bindingstest.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/tests/bindingstest.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -212,6 +212,7 @@ ev.setRecurrenceID(Kolab::cDateTime("Europe/Zurich", 2006,1,6,12,0,0), true); ev.setSummary("summary"); ev.setDescription("description"); + ev.setComment("comment"); ev.setPriority(3); ev.setStatus(Kolab::StatusConfirmed); ev.setLocation("location"); @@ -324,6 +325,7 @@ QCOMPARE(ev.thisAndFuture(), re.thisAndFuture()); QCOMPARE(ev.summary(), re.summary()); QCOMPARE(ev.description(), re.description()); + QCOMPARE(ev.comment(), re.comment()); QCOMPARE(ev.priority(), re.priority()); QCOMPARE(ev.status(), re.status()); QCOMPARE(ev.location(), re.location()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-1.0.1/tests/validationtest.cpp new/libkolabxml-1.0.2/tests/validationtest.cpp --- old/libkolabxml-1.0.1/tests/validationtest.cpp 2013-10-30 17:48:07.000000000 +0100 +++ new/libkolabxml-1.0.2/tests/validationtest.cpp 2014-08-26 12:53:07.000000000 +0200 @@ -76,13 +76,13 @@ event.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1)); event.setEnd(cDateTime("Europe/London",2013,1,1,1,1,1)); writeEvent(event); - QCOMPARE(Kolab::error(), Kolab::Error); + QCOMPARE(Kolab::error(), Kolab::NoError); Todo todo; todo.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1)); todo.setDue(cDateTime("Europe/London",2013,1,1,1,1,1)); writeTodo(todo); - QCOMPARE(Kolab::error(), Kolab::Error); + QCOMPARE(Kolab::error(), Kolab::NoError); } void ValidationTest::testUTCwithTimezone() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0