August 2015 - openSUSE Commits - openSUSE Mailing Lists

commit erlang for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2015-08-01 11:37:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "erlang" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2015-07-22 09:19:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2015-08-01 11:37:40.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 24 15:38:54 UTC 2015 - seife+obs(a)b1-systems.com + +- fix RHEL/CentOS 7 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.plcbfl/_old 2015-08-01 11:37:41.000000000 +0200 +++ /var/tmp/diff_new_pack.plcbfl/_new 2015-08-01 11:37:41.000000000 +0200 @@ -16,6 +16,10 @@ # +%if 0%{?rhel} >= 7 +%undefine _missing_build_ids_terminate_build +%endif + Name: erlang Version: 18.0.2 Release: 0 @@ -115,7 +119,9 @@ %package doc Summary: Erlang documentation Group: Development/Languages/Other +%if 0%{?suse_version} Recommends: %{name} = %{version} +%endif %description doc Documentation for Erlang.

1 0

commit claws-mail for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package claws-mail for openSUSE:Factory checked in at 2015-08-01 11:37:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/claws-mail (Old) and /work/SRC/openSUSE:Factory/.claws-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "claws-mail" Changes: -------- --- /work/SRC/openSUSE:Factory/claws-mail/claws-mail.changes 2014-11-10 17:28:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail.changes 2015-08-01 11:37:39.000000000 +0200 @@ -1,0 +2,56 @@ +Thu Jul 23 21:34:20 UTC 2015 - kieltux(a)gmail.com + +- Update to version 3.12.0: + + New plugin: ManageSieve. Manage sieve filters on a server using + the ManageSieve protocol. + + Filtering/Processing: + - Increase range for age matcher condition. + - 'mark_as_spam' now only marks as spam, it does not do an + additional move. + + Compose window: + - From line gets its own label with mnemonic. + - More intuitive right-click behaviour in attachments list. + + QuickSearch: 'Cc' added to the mixed search: + From/To/Cc/Subject/Tag. + + Folder list: Added 'Mark all read recursively' to context menu. + + Support for Mac-cyrillic encoding. + + IMAP: Support for SCRAM-SHA-1 authentication mechanism. + + PGP plugins: Display validity of signatures. + + Bogofilter plugin: 3rd spam handling option, 'Only mark as + spam'. + + RSSyl plugin: Per-feed support for HTTP basic auth. + + Several layout improvements to preferences pages. + + Updated user manual. + + Updated man page. + + Bugs fixed: claws#1769, claws#1901, claws#2435, claws#2577, + claws#2601, claws#2965, claws#2981, claws#3211, claws#3321, + claws#3345, claws#3349, claws#3351, claws#3354, claws#3364, + claws#3365, claws#3380, claws#3389, claws#3407, claws#3419, + claws#3421, claws#3432, claws#3438, claws#3466, deb#771360, + deb#771737, deb#779824. + + CVE fixed: CVE 2010-5109. + + Misc bugs fixed: + - Fix LDAP access using TLS protocol. + - claws-mail.desktop installation. + - Compose window Subject mnemonic. + - Archiver plguin: compatibility with libarchive 2.8.x. + - Remove draft when cancelling a message written with an + external editor. + - Remove superfluous dynamic link against libarchive. + - Fix labels referring to 'SSL' instead of 'TLS'. + - Allow single-click to select mailboxes in the mailbox order + dialog. + - tbird2claws.py: set encoding to UTF-8. + + Updated translations. +- Dropped fix_categories_and_recover_keywords_in_desktop_file.patch + as fixed in upstream +- Dropped recover_desktop_file_installation.patch: fixed upstream. +- Dropped recover_desktop_file_installation_part2.patch: fixed + upstream. +- Set pkgconfig(libgdata) BuildRequires: conditionally for 1330 and + newer as the needed version is an unstable branch. Due to this, + conditionally pass --enable-gdata-plugin to configure. As a + result, libgdata is not beeing built for any current version of + openSUSE. + +------------------------------------------------------------------- Old: ---- claws-mail-3.11.1.tar.xz fix_categories_and_recover_keywords_in_desktop_file.patch recover_desktop_file_installation.patch recover_desktop_file_installation_part2.patch New: ---- claws-mail-3.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ claws-mail.spec ++++++ --- /var/tmp/diff_new_pack.RfJNvd/_old 2015-08-01 11:37:40.000000000 +0200 +++ /var/tmp/diff_new_pack.RfJNvd/_new 2015-08-01 11:37:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package claws-mail # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,18 +22,15 @@ %endif Name: claws-mail -Version: 3.11.1 +Version: 3.12.0 Release: 0 Url: http://www.claws-mail.org/ Summary: A lightweight and highly configurable email client License: GPL-3.0+ Group: Productivity/Networking/Email/Clients -Source0: http://sourceforge.net/projects/claws-mail/files/Claws%20Mail/%{version}/cl… -# Recover desktop file installation -Patch0: recover_desktop_file_installation.patch -Patch1: recover_desktop_file_installation_part2.patch -# Fix categories and recover keywords in desktop file -Patch2: fix_categories_and_recover_keywords_in_desktop_file.patch +# Both sourceforge and project url fails, so just have source manually. +#Source: http://www.claws-mail.org/download.php?file=releases/claws-mail-3.12.0.tar.… +Source0: claws-mail-%{version}.tar.xz BuildRequires: NetworkManager-devel BuildRequires: compface BuildRequires: db-devel @@ -65,7 +62,10 @@ BuildRequires: pkgconfig(dbus-1) >= 0.60 BuildRequires: pkgconfig(dbus-glib-1) >= 0.60 BuildRequires: pkgconfig(gnutls) >= 2.2 -BuildRequires: pkgconfig(libgdata) >= 0.6 +# Set version to 1330 as the branch it needs is a unstable release +%if 0%{?suse_version} > 1330 +BuildRequires: pkgconfig(libgdata) >= 0.17.1 +%endif BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(sm) @@ -128,9 +128,6 @@ %lang_package %prep %setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 %build %configure \ @@ -152,7 +149,9 @@ --enable-clamd-plugin \ --enable-fancy-plugin \ --enable-fetchinfo-plugin \ +%if 0%{?suse_version} > 1330 --enable-gdata-plugin \ +%endif --enable-mailmbox-plugin \ --enable-newmail-plugin \ --enable-notification-plugin \ ++++++ claws-mail-3.11.1.tar.xz -> claws-mail-3.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/claws-mail/claws-mail-3.11.1.tar.xz /work/SRC/openSUSE:Factory/.claws-mail.new/claws-mail-3.12.0.tar.xz differ: char 26, line 1

1 0

commit icu4j for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package icu4j for openSUSE:Factory checked in at 2015-08-01 11:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu4j (Old) and /work/SRC/openSUSE:Factory/.icu4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icu4j" Changes: -------- --- /work/SRC/openSUSE:Factory/icu4j/icu4j.changes 2015-04-02 15:56:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icu4j.new/icu4j.changes 2015-08-01 11:37:37.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 28 10:56:40 UTC 2015 - tchvatal(a)suse.com + +- Version bump to 55.1: + * various bugfixes to match up regular icu-c +- Add patch to build with jdk8: + * java8-compatibility.patch + +------------------------------------------------------------------- Old: ---- icu4j-54.1.1.tar.xz New: ---- icu4j-55.1.tar.xz java8-compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu4j.spec ++++++ --- /var/tmp/diff_new_pack.fLksO8/_old 2015-08-01 11:37:38.000000000 +0200 +++ /var/tmp/diff_new_pack.fLksO8/_new 2015-08-01 11:37:38.000000000 +0200 @@ -18,7 +18,7 @@ Name: icu4j -Version: 54.1.1 +Version: 55.1 Release: 0 Summary: International Components for Unicode for Java License: MIT and EPL-1.0 @@ -29,6 +29,8 @@ #svn co http://source.icu-project.org/repos/icu/icu4j/tags/release-54-1-1 icu4j-<version> #tar caf icu4j-<version>.tar.xz icu4j-<version>/ Source0: %{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM: fix jdk8 build +Patch0: java8-compatibility.patch BuildRequires: ant BuildRequires: java-devel BuildRequires: unzip @@ -63,6 +65,7 @@ %prep %setup -q +%patch0 -p1 sed -i 's/\r//' APIChangeReport.html sed -i 's/\r//' readme.html ++++++ icu4j-54.1.1.tar.xz -> icu4j-55.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/icu4j/icu4j-54.1.1.tar.xz /work/SRC/openSUSE:Factory/.icu4j.new/icu4j-55.1.tar.xz differ: char 25, line 1 ++++++ java8-compatibility.patch ++++++ Description: Fixes the detection of the JDK to allow the compilation with Java 8. Do not compile the ICUTaglet class which relies on internal JDK classes no longer available in Java 8. Author: Emmanuel Bourg <ebourg(a)apache.org> Forwarded: no Index: icu4j-55.1/build.xml =================================================================== --- icu4j-55.1.orig/build.xml +++ icu4j-55.1/build.xml @@ -87,6 +87,7 @@ <or> <contains string="${java.version}" substring="1.7."/> <contains string="${java.version}" substring="1.8."/> + <contains string="${java.version}" substring="1.9."/> </or> </condition> Index: icu4j-55.1/tools/build/build.xml =================================================================== --- icu4j-55.1.orig/tools/build/build.xml +++ icu4j-55.1/tools/build/build.xml @@ -21,7 +21,20 @@ <target name="clean" depends="@clean" description="Clean up the build outputs"/> - <target name="compile" depends="@compile" description="Compile java source files"/> + <target name="compile" description="Compile java source files"> + <mkdir dir="${bin.dir}"/> + <javac + srcdir="${src.dir}" + destdir="${bin.dir}" + classpathref="javac.classpathref" + source="${javac.source}" + target="${javac.target}" + encoding="${java.src.encoding}" + debug="${javac.debug}"> + <compilerarg value="${javac.compilerarg}"/> + <exclude name="**/ICUTaglet*"/> + </javac> + </target> <target name="copy" depends="@copy" description="Copy non-java runtime files to the project's binary directory"/>

1 0

commit python-h5py for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package python-h5py for openSUSE:Factory checked in at 2015-08-01 11:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-h5py (Old) and /work/SRC/openSUSE:Factory/.python-h5py.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-h5py" Changes: -------- --- /work/SRC/openSUSE:Factory/python-h5py/python-h5py.changes 2015-04-12 00:10:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-h5py.new/python-h5py.changes 2015-08-01 11:37:35.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 10:34:21 UTC 2015 - toddrme2178(a)gmail.com + +- Fix hdf5 version ambiguity + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-h5py.spec ++++++ --- /var/tmp/diff_new_pack.RL4usv/_old 2015-08-01 11:37:35.000000000 +0200 +++ /var/tmp/diff_new_pack.RL4usv/_new 2015-08-01 11:37:35.000000000 +0200 @@ -30,6 +30,7 @@ BuildRequires: python-numpy-devel >= 1.6.1 BuildRequires: python-pkgconfig BuildRequires: python-six +Requires: hdf5 Requires: python-Cython Requires: python-numpy >= 1.6.1 Requires: python-six

1 0

commit python3-h5py for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package python3-h5py for openSUSE:Factory checked in at 2015-08-01 11:37:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-h5py (Old) and /work/SRC/openSUSE:Factory/.python3-h5py.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-h5py" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-h5py/python3-h5py.changes 2015-04-10 10:20:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-h5py.new/python3-h5py.changes 2015-08-01 11:37:36.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 10:38:04 UTC 2015 - toddrme2178(a)gmail.com + +- Resolve hdf5 dependency ambiguity + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-h5py.spec ++++++ --- /var/tmp/diff_new_pack.UGK0R2/_old 2015-08-01 11:37:36.000000000 +0200 +++ /var/tmp/diff_new_pack.UGK0R2/_new 2015-08-01 11:37:36.000000000 +0200 @@ -31,6 +31,7 @@ BuildRequires: python3-numpy-devel BuildRequires: python3-pkgconfig BuildRequires: python3-six +Requires: hdf5 Requires: python3-Cython Requires: python3-numpy Requires: python3-six

1 0

commit python3-virtualenv for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package python3-virtualenv for openSUSE:Factory checked in at 2015-08-01 11:37:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-virtualenv (Old) and /work/SRC/openSUSE:Factory/.python3-virtualenv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-virtualenv" Changes: -------- New Changes file: --- /dev/null 2015-07-22 21:25:44.928025004 +0200 +++ /work/SRC/openSUSE:Factory/.python3-virtualenv.new/python3-virtualenv-doc.changes 2015-08-01 11:37:28.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Jul 28 09:11:02 UTC 2015 - toddrme2178(a)gmail.com + +- Split documentation into a separate subpackage to avoid a + dependency loop. + --- /work/SRC/openSUSE:Factory/python3-virtualenv/python3-virtualenv.changes 2015-07-12 22:53:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-virtualenv.new/python3-virtualenv.changes 2015-08-01 11:37:28.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 28 10:18:51 UTC 2015 - toddrme2178(a)gmail.com + +- Don't depend on pip for python >= 3.4, since it is built-in. + +------------------------------------------------------------------- +Tue Jul 28 09:11:02 UTC 2015 - toddrme2178(a)gmail.com + +- Split documentation into a separate subpackage to avoid a + dependency loop. + +------------------------------------------------------------------- New: ---- python3-virtualenv-doc.changes python3-virtualenv-doc.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-virtualenv-doc.spec ++++++ # # spec file for package python3-virtualenv-doc # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: python3-virtualenv-doc Version: 13.1.0 Release: 0 Url: http://www.virtualenv.org/ Summary: Documentation for python3-virtualenv License: MIT Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3-devel # Documentation requirements BuildRequires: python3-Sphinx Requires: python3-pip Requires: python3-setuptools BuildArch: noarch %description This package contains the documentation and help files for python3-virtualenv. %prep %setup -q -n virtualenv-%{version} %build python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install mkdir -p %{buildroot}%{_docdir}/python3-virtualenv cp -r build/sphinx/html %{buildroot}%{_docdir}/python3-virtualenv %files %defattr(-,root,root,-) %doc LICENSE.txt %{_docdir}/python3-virtualenv/ %changelog ++++++ python3-virtualenv.spec ++++++ --- /var/tmp/diff_new_pack.urMtUs/_old 2015-08-01 11:37:29.000000000 +0200 +++ /var/tmp/diff_new_pack.urMtUs/_new 2015-08-01 11:37:29.000000000 +0200 @@ -26,9 +26,12 @@ Source: https://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3-devel -# Documentation requirements -BuildRequires: python3-Sphinx +BuildRequires: python3-setuptools +%if 0%{?suse_version} <= 1310 +# pip is built-in for python 3.4 +BuildRequires: python3-pip Requires: python3-pip +%endif Requires: python3-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives @@ -61,7 +64,6 @@ %build python3 setup.py build -python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -85,7 +87,7 @@ %files %defattr(-,root,root,-) -%doc LICENSE.txt README.rst build/sphinx/html +%doc LICENSE.txt README.rst %ghost %{_bindir}/virtualenv %{_bindir}/virtualenv-%{py3_ver} %{python3_sitelib}/virtualenv-%{version}-py%{py3_ver}.egg-info

1 0

commit python-rst2pdf for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package python-rst2pdf for openSUSE:Factory checked in at 2015-08-01 11:37:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rst2pdf (Old) and /work/SRC/openSUSE:Factory/.python-rst2pdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rst2pdf" Changes: -------- --- /work/SRC/openSUSE:Factory/python-rst2pdf/python-rst2pdf.changes 2014-08-20 10:51:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-rst2pdf.new/python-rst2pdf.changes 2015-08-01 11:37:26.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 28 08:13:40 UTC 2015 - olaf(a)aepfle.de + +- Relax path to egg-info to fix build in Leap + +------------------------------------------------------------------- +Mon Jul 13 13:12:38 UTC 2015 - toddrme2178(a)gmail.com + +- Fix building on SLES 11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rst2pdf.spec ++++++ --- /var/tmp/diff_new_pack.6AJ9rC/_old 2015-08-01 11:37:27.000000000 +0200 +++ /var/tmp/diff_new_pack.6AJ9rC/_new 2015-08-01 11:37:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-rst2pdf # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,9 @@ Requires: python-svg2rlg Recommends: python-wordaxe %{py_requires} +%if 0%{?suse_version} && 0%{?suse_version} > 1110 BuildArch: noarch +%endif %description The usual way of creating PDF from reStructuredText is by going through LaTeX. @@ -68,6 +70,6 @@ %{_bindir}/rst2pdf %dir %{python_sitelib}/rst2pdf %{python_sitelib}/rst2pdf/* -%{python_sitelib}/rst2pdf-%{version}.dev_r0-py%{py_ver}.egg-info +%{python_sitelib}/rst2pdf-%{version}.*-py%{py_ver}.egg-info %changelog

1 0

commit sap-locale for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package sap-locale for openSUSE:Factory checked in at 2015-08-01 11:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sap-locale (Old) and /work/SRC/openSUSE:Factory/.sap-locale.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sap-locale" Changes: -------- --- /work/SRC/openSUSE:Factory/sap-locale/sap-locale.changes 2015-04-10 10:20:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sap-locale.new/sap-locale.changes 2015-08-01 11:37:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 29 12:30:07 UTC 2015 - schwab(a)suse.de + +- Handle old style transliteration step + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sap-locale.spec ++++++ --- /var/tmp/diff_new_pack.6uOldx/_old 2015-08-01 11:37:26.000000000 +0200 +++ /var/tmp/diff_new_pack.6uOldx/_new 2015-08-01 11:37:26.000000000 +0200 @@ -37,8 +37,10 @@ Requires(post): sed Requires(postun): coreutils Requires(postun): sed +%if 0%{?suse_version} > 1320 # Needed for reference to __gconv_transliterate %define __filter_GLIBC_PRIVATE 1 +%endif %description This package contains all the SAP specific locales needed for running ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.6uOldx/_old 2015-08-01 11:37:26.000000000 +0200 +++ /var/tmp/diff_new_pack.6uOldx/_new 2015-08-01 11:37:26.000000000 +0200 @@ -1,3 +1,7 @@ sap-locale + targettype ia32 block + targettype 64bit block + targettype 32bit +/usr/lib/gconv/gconv-modules.SAP-32 -> /usr/lib/gconv/gconv-modules.SAP + targettype x86 +/usr/lib/gconv/gconv-modules.SAP targettype x86 obsoletes "sap-locale-32bit" targettype x86 provides "sap-locale-32bit" ++++++ sap-locale.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sap-locale/.gitignore new/sap-locale/.gitignore --- old/sap-locale/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/sap-locale/.gitignore 2015-06-29 14:22:43.000000000 +0200 @@ -0,0 +1,5 @@ +*.so +gconv/ +locale/ +locales/de_DE@HP +locales/sk_SK@SAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sap-locale/gconvdata/iconv/loop.c new/sap-locale/gconvdata/iconv/loop.c --- old/sap-locale/gconvdata/iconv/loop.c 2015-03-31 15:19:04.000000000 +0200 +++ new/sap-locale/gconvdata/iconv/loop.c 2015-06-29 14:22:43.000000000 +0200 @@ -207,6 +207,25 @@ continue; \ } +#if __GLIBC_PREREQ (2, 21) +# define GCONV_TRANSLIT_STEP \ + if ((step_data->__flags & __GCONV_TRANSLIT) != 0) \ + result = __gconv_transliterate \ + (step, step_data, *inptrp, \ + &inptr, inend, &outptr, irreversible) +#else +# define GCONV_TRANSLIT_STEP \ + struct __gconv_trans_data *trans; \ + for (trans = step_data->__trans; trans != NULL; trans = trans->__next) \ + { \ + result = DL_CALL_FCT (trans->__trans_fct, \ + (step, step_data, trans->__data, *inptrp, \ + &inptr, inend, &outptr, irreversible)); \ + if (result != __GCONV_ILLEGAL_INPUT) \ + break; \ + } +#endif + /* Error handling for the TO_LOOP direction, with use of transliteration/ transcription functions and ignoring of errors. Note that we cannot use the do while (0) trick since `break' and `continue' must reach certain @@ -225,10 +244,7 @@ UPDATE_PARAMS; \ \ /* First try the transliteration methods. */ \ - if ((step_data->__flags & __GCONV_TRANSLIT) != 0) \ - result = __gconv_transliterate \ - (step, step_data, *inptrp, \ - &inptr, inend, &outptr, irreversible); \ + GCONV_TRANSLIT_STEP; \ \ REINIT_PARAMS; \ \

1 0

commit jsoncpp for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package jsoncpp for openSUSE:Factory checked in at 2015-08-01 11:37:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jsoncpp (Old) and /work/SRC/openSUSE:Factory/.jsoncpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jsoncpp" Changes: -------- --- /work/SRC/openSUSE:Factory/jsoncpp/jsoncpp.changes 2015-04-21 10:53:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jsoncpp.new/jsoncpp.changes 2015-08-01 11:37:22.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 28 07:34:49 UTC 2015 - mpluskal(a)suse.com + +- Update to 1.6.5 + * Other changes are just comments. + +------------------------------------------------------------------- Old: ---- 1.6.2.tar.gz New: ---- 1.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jsoncpp.spec ++++++ --- /var/tmp/diff_new_pack.rQZkrS/_old 2015-08-01 11:37:22.000000000 +0200 +++ /var/tmp/diff_new_pack.rQZkrS/_new 2015-08-01 11:37:22.000000000 +0200 @@ -18,7 +18,7 @@ %define libname lib%{name}1 Name: jsoncpp -Version: 1.6.2 +Version: 1.6.5 Release: 0 Summary: C++ library that allows manipulating with JSON License: MIT ++++++ 1.6.2.tar.gz -> 1.6.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/.travis.yml new/jsoncpp-1.6.5/.travis.yml --- old/jsoncpp-1.6.2/.travis.yml 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/.travis.yml 2015-07-23 07:26:13.000000000 +0200 @@ -2,16 +2,42 @@ # http://about.travis-ci.org/docs/user/build-configuration/ # This file can be validated on: # http://lint.travis-ci.org/ -before_install: sudo apt-get install cmake +# See also +# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c1… +# to allow C++11, though we are not yet building with -std=c++11 + +install: +# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available. +- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi +# /usr/bin/clang is our version already, and clang-X.Y does not exist. +#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi +- echo ${PATH} +- ls /usr/local +- ls /usr/local/bin +- export PATH=/usr/local/bin:/usr/bin:${PATH} +- echo ${CXX} +- ${CXX} --version +- which valgrind +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.9 + - g++-4.9 + - clang + - valgrind +os: + - linux language: cpp compiler: - gcc - clang -script: cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make && make jsoncpp_check +script: ./travis.sh env: matrix: - SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE_MAKE=true VERBOSE notifications: - email: - - aaronjjacobs(a)gmail.com + email: false +sudo: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/CMakeLists.txt new/jsoncpp-1.6.5/CMakeLists.txt --- old/jsoncpp-1.6.2/CMakeLists.txt 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/CMakeLists.txt 2015-07-23 07:26:13.000000000 +0200 @@ -9,6 +9,8 @@ OPTION(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF) OPTION(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON) OPTION(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" OFF) +OPTION(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF) +OPTION(BUILD_STATIC_LIBS "Build jsoncpp_lib static library." ON) # Ensures that CMAKE_BUILD_TYPE is visible in cmake-gui on Unix IF(NOT WIN32) @@ -19,15 +21,16 @@ ENDIF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT WIN32) +SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build") SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory") SET(RUNTIME_INSTALL_DIR bin CACHE PATH "Install dir for executables and dlls") -SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX} +SET(ARCHIVE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Install dir for static libraries") -SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX} +SET(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Install dir for shared libraries") -SET(INCLUDE_INSTALL_DIR include +SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Install dir for headers") SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake CACHE PATH "Install dir for cmake package config files") @@ -60,7 +63,7 @@ #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.6.2 ) +SET( JSONCPP_VERSION 1.6.5 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) #IF(NOT JSONCPP_VERSION_FOUND) # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") @@ -94,10 +97,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # using regular Clang or AppleClang - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wno-sign-conversion") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # using GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -pedantic") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wextra -pedantic") + # not yet ready for -Wsign-conversion endif() IF(JSONCPP_WITH_WARNING_AS_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/README.md new/jsoncpp-1.6.5/README.md --- old/jsoncpp-1.6.2/README.md 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/README.md 2015-07-23 07:26:13.000000000 +0200 @@ -19,12 +19,14 @@ * `0.y.z` can be used with older compilers. * Major versions maintain binary-compatibility. -Using JsonCpp in your project +# Using JsonCpp in your project ----------------------------- -The recommended approach to integrating JsonCpp in your project is to build -the amalgamated source (a single `.cpp` file) with your own build system. This -ensures consistency of compilation flags and ABI compatibility. See the section -"Generating amalgamated source and header" for instructions. +The recommended approach to integrating JsonCpp in your project is to include +the [amalgamated source](#generating-amalgamated-source-and-header) (a single +`.cpp` file and two `.h` files) in your project, and compile and build as you +would any other source file. This ensures consistency of compilation flags and +ABI compatibility, issues which arise when building shared or static +libraries. See the next section for instructions. The `include/` should be added to your compiler include path. Jsoncpp headers should be included as follow: @@ -34,6 +36,31 @@ If JsonCpp was built as a dynamic library on Windows, then your project needs to define the macro `JSON_DLL`. +Generating amalgamated source and header +---------------------------------------- +JsonCpp is provided with a script to generate a single header and a single +source file to ease inclusion into an existing project. The amalgamated source +can be generated at any time by running the following command from the +top-directory (this requires Python 2.6): + + python amalgamate.py + +It is possible to specify header name. See the `-h` option for detail. + +By default, the following files are generated: +* `dist/jsoncpp.cpp`: source file that needs to be added to your project. +* `dist/json/json.h`: corresponding header file for use in your project. It is + equivalent to including `json/json.h` in non-amalgamated source. This header + only depends on standard headers. +* `dist/json/json-forwards.h`: header that provides forward declaration of all + JsonCpp types. + +The amalgamated sources are generated by concatenating JsonCpp source in the +correct order and defining the macro `JSON_IS_AMALGAMATION` to prevent inclusion +of other headers. + +# Contributing to JsonCpp + Building and testing with CMake ------------------------------- [CMake][] is a C++ Makefiles/Solution generator. It is usually available on most @@ -58,7 +85,7 @@ * Make "source code" point to the source directory. * Make "where to build the binary" point to the directory to use for the build. * Click on the "Grouped" check box. -* Review JsonCpp build options (tick `JSONCPP_LIB_BUILD_SHARED` to build as a +* Review JsonCpp build options (tick `BUILD_SHARED_LIBS` to build as a dynamic library). * Click the configure button at the bottom, then the generate button. * The generated solution/makefiles can be found in the binary directory. @@ -67,10 +94,10 @@ mkdir -p build/debug cd build/debug - cmake -DCMAKE_BUILD_TYPE=debug -DJSONCPP_LIB_BUILD_STATIC=ON -DJSONCPP_LIB_BUILD_SHARED=OFF -G "Unix Makefiles" ../.. + cmake -DCMAKE_BUILD_TYPE=debug -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF -DARCHIVE_INSTALL_DIR=. -G "Unix Makefiles" ../.. make -Running `cmake -`" will display the list of available generators (passed using +Running `cmake -h` will display the list of available generators (passed using the `-G` option). By default CMake hides compilation commands. This can be modified by specifying @@ -106,7 +133,7 @@ environment by running `vcvars32.bat` (e.g. MSVC 2008 command prompt) before running SCons. -# Running the tests manually +## Running the tests manually You need to run tests manually only if you are troubleshooting an issue. In the instructions below, replace `path/to/jsontest` with the path of the @@ -142,29 +169,6 @@ See `doxybuild.py --help` for options. -Generating amalgamated source and header ----------------------------------------- -JsonCpp is provided with a script to generate a single header and a single -source file to ease inclusion into an existing project. The amalgamated source -can be generated at any time by running the following command from the -top-directory (this requires Python 2.6): - - python amalgamate.py - -It is possible to specify header name. See the `-h` option for detail. - -By default, the following files are generated: -* `dist/jsoncpp.cpp`: source file that needs to be added to your project. -* `dist/json/json.h`: corresponding header file for use in your project. It is - equivalent to including `json/json.h` in non-amalgamated source. This header - only depends on standard headers. -* `dist/json/json-forwards.h`: header that provides forward declaration of all - JsonCpp types. - -The amalgamated sources are generated by concatenating JsonCpp source in the -correct order and defining the macro `JSON_IS_AMALGAMATION` to prevent inclusion -of other headers. - Adding a reader/writer test --------------------------- To add a test, you need to create two files in test/data: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/appveyor.yml new/jsoncpp-1.6.5/appveyor.yml --- old/jsoncpp-1.6.2/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/jsoncpp-1.6.5/appveyor.yml 2015-07-23 07:26:13.000000000 +0200 @@ -0,0 +1,35 @@ +# This is a comment. + +version: build.{build} + +os: Windows Server 2012 R2 + +clone_folder: c:\projects\jsoncpp + +platform: + - Win32 + - x64 + +configuration: + - Debug + - Release + +# scripts to run before build +before_build: + - echo "Running cmake..." + - cd c:\projects\jsoncpp + - cmake --version + - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% + - if %PLATFORM% == Win32 cmake . + - if %PLATFORM% == x64 cmake -G "Visual Studio 12 2013 Win64" . + +build: + project: jsoncpp.sln # path to Visual Studio solution or project + +deploy: + provider: GitHub + auth_token: + secure: K2Tp1q8pIZ7rs0Ot24ZMWuwr12Ev6Tc6QkhMjGQxoQG3ng1pXtgPasiJ45IDXGdg + on: + branch: master + appveyor_repo_tag: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/dev.makefile new/jsoncpp-1.6.5/dev.makefile --- old/jsoncpp-1.6.2/dev.makefile 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/dev.makefile 2015-07-23 07:26:13.000000000 +0200 @@ -16,7 +16,7 @@ # Then 'git add -A' and 'git push' in jsoncpp-docs. build: mkdir -p build/debug - cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DJSONCPP_LIB_BUILD_SHARED=ON -G "Unix Makefiles" ../.. + cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DBUILD_SHARED_LIBS=ON -G "Unix Makefiles" ../.. make -C build/debug # Currently, this depends on include/json/version.h generated @@ -26,6 +26,9 @@ python3.4 amalgamate.py cd dist; gcc -I. -c jsoncpp.cpp +valgrind: + valgrind --error-exitcode=42 --leak-check=full ./build/debug/src/test_lib_json/jsoncpp_test + clean: \rm -rf *.gz *.asc dist/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/devtools/agent_vmw7.json new/jsoncpp-1.6.5/devtools/agent_vmw7.json --- old/jsoncpp-1.6.2/devtools/agent_vmw7.json 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/devtools/agent_vmw7.json 2015-07-23 07:26:13.000000000 +0200 @@ -19,8 +19,8 @@ }, {"name": "shared_dll", "variables": [ - ["JSONCPP_LIB_BUILD_SHARED=true"], - ["JSONCPP_LIB_BUILD_SHARED=false"] + ["BUILD_SHARED_LIBS=true"], + ["BUILD_SHARED_LIBS=false"] ] }, {"name": "build_type", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/devtools/agent_vmxp.json new/jsoncpp-1.6.5/devtools/agent_vmxp.json --- old/jsoncpp-1.6.2/devtools/agent_vmxp.json 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/devtools/agent_vmxp.json 2015-07-23 07:26:13.000000000 +0200 @@ -12,8 +12,8 @@ }, {"name": "shared_dll", "variables": [ - ["JSONCPP_LIB_BUILD_SHARED=true"], - ["JSONCPP_LIB_BUILD_SHARED=false"] + ["BUILD_SHARED_LIBS=true"], + ["BUILD_SHARED_LIBS=false"] ] }, {"name": "build_type", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/devtools/fixeol.py new/jsoncpp-1.6.5/devtools/fixeol.py --- old/jsoncpp-1.6.2/devtools/fixeol.py 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/devtools/fixeol.py 2015-07-23 07:26:13.000000000 +0200 @@ -5,6 +5,7 @@ from __future__ import print_function import os.path +import sys def fix_source_eol(path, is_dry_run = True, verbose = True, eol = '\n'): """Makes sure that all sources have the specified eol sequence (default: unix).""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/doxybuild.py new/jsoncpp-1.6.5/doxybuild.py --- old/jsoncpp-1.6.2/doxybuild.py 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/doxybuild.py 2015-07-23 07:26:13.000000000 +0200 @@ -72,7 +72,7 @@ if silent: status, output = getstatusoutput(cmd) else: - status, output = os.system(' '.join(cmd)), '' + status, output = subprocess.call(cmd), '' if status: msg = 'Error while %s ...\n\terror=%d, output="""%s"""' %(info, status, output) raise Exception(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/include/json/reader.h new/jsoncpp-1.6.5/include/json/reader.h --- old/jsoncpp-1.6.2/include/json/reader.h 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/include/json/reader.h 2015-07-23 07:26:13.000000000 +0200 @@ -346,13 +346,13 @@ /** Called by ctor, but you can use this to reset settings_. * \pre 'settings' != NULL (but Json::null is fine) * \remark Defaults: - * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode + * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults */ static void setDefaults(Json::Value* settings); /** Same as old Features::strictMode(). * \pre 'settings' != NULL (but Json::null is fine) * \remark Defaults: - * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults + * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode */ static void strictMode(Json::Value* settings); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/include/json/value.h new/jsoncpp-1.6.5/include/json/value.h --- old/jsoncpp-1.6.2/include/json/value.h 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/include/json/value.h 2015-07-23 07:26:13.000000000 +0200 @@ -37,21 +37,36 @@ * * We use nothing but these internally. Of course, STL can throw others. */ -class JSON_API Exception; +class JSON_API Exception : public std::exception { +public: + Exception(std::string const& msg); + virtual ~Exception() throw(); + virtual char const* what() const throw(); +protected: + std::string const msg_; +}; + /** Exceptions which the user cannot easily avoid. * * E.g. out-of-memory (when we use malloc), stack-overflow, malicious input * * \remark derived from Json::Exception */ -class JSON_API RuntimeError; +class JSON_API RuntimeError : public Exception { +public: + RuntimeError(std::string const& msg); +}; + /** Exceptions thrown by JSON_ASSERT/JSON_FAIL macros. * * These are precondition-violations (user bugs) and internal errors (our bugs). * * \remark derived from Json::Exception */ -class JSON_API LogicError; +class JSON_API LogicError : public Exception { +public: + LogicError(std::string const& msg); +}; /// used internally void throwRuntimeError(std::string const& msg); @@ -211,7 +226,7 @@ void swap(CZString& other); struct StringStorage { - DuplicationPolicy policy_: 2; + unsigned policy_: 2; unsigned length_: 30; // 1GB max }; @@ -255,7 +270,7 @@ #endif // if defined(JSON_HAS_INT64) Value(double value); Value(const char* value); ///< Copy til first 0. (NULL causes to seg-fault.) - Value(const char* beginValue, const char* endValue); ///< Copy all, incl zeroes. + Value(const char* begin, const char* end); ///< Copy all, incl zeroes. /** \brief Constructs a value from a static string. * Like other value string constructor but do not duplicate the string for @@ -306,7 +321,7 @@ * \return false if !string. (Seg-fault if str or end are NULL.) */ bool getString( - char const** str, char const** end) const; + char const** begin, char const** end) const; #ifdef JSON_USE_CPPTL CppTL::ConstString asConstString() const; #endif @@ -435,8 +450,8 @@ Value get(const char* key, const Value& defaultValue) const; /// Return the member named key if it exist, defaultValue otherwise. /// \note deep copy - /// \param key may contain embedded nulls. - Value get(const char* key, const char* end, const Value& defaultValue) const; + /// \note key may contain embedded nulls. + Value get(const char* begin, const char* end, const Value& defaultValue) const; /// Return the member named key if it exist, defaultValue otherwise. /// \note deep copy /// \param key may contain embedded nulls. @@ -448,12 +463,12 @@ #endif /// Most general and efficient version of isMember()const, get()const, /// and operator[]const - /// \note As stated elsewhere, behavior is undefined if (end-key) >= 2^30 - Value const* find(char const* key, char const* end) const; + /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30 + Value const* find(char const* begin, char const* end) const; /// Most general and efficient version of object-mutators. - /// \note As stated elsewhere, behavior is undefined if (end-key) >= 2^30 + /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30 /// \return non-zero, but JSON_ASSERT if this is neither object nor nullValue. - Value const* demand(char const* key, char const* end); + Value const* demand(char const* begin, char const* end); /// \brief Remove and return the named member. /// /// Do nothing if it did not exist. @@ -466,7 +481,7 @@ /// \param key may contain embedded nulls. /// \deprecated Value removeMember(const std::string& key); - /// Same as removeMember(const char* key, const char* end, Value* removed), + /// Same as removeMember(const char* begin, const char* end, Value* removed), /// but 'key' is null-terminated. bool removeMember(const char* key, Value* removed); /** \brief Remove the named map member. @@ -477,7 +492,7 @@ */ bool removeMember(std::string const& key, Value* removed); /// Same as removeMember(std::string const& key, Value* removed) - bool removeMember(const char* key, const char* end, Value* removed); + bool removeMember(const char* begin, const char* end, Value* removed); /** \brief Remove the indexed array element. O(n) expensive operations. @@ -493,7 +508,7 @@ /// \param key may contain embedded nulls. bool isMember(const std::string& key) const; /// Same as isMember(std::string const& key)const - bool isMember(const char* key, const char* end) const; + bool isMember(const char* begin, const char* end) const; #ifdef JSON_USE_CPPTL /// Return true if the object has a member named key. bool isMember(const CppTL::ConstString& key) const; @@ -512,6 +527,7 @@ //# endif /// \deprecated Always pass len. + JSONCPP_DEPRECATED("Use setComment(std::string const&) instead.") void setComment(const char* comment, CommentPlacement placement); /// Comments must be //... or /* ... */ void setComment(const char* comment, size_t len, CommentPlacement placement); @@ -652,9 +668,6 @@ typedef int difference_type; typedef ValueIteratorBase SelfType; - ValueIteratorBase(); - explicit ValueIteratorBase(const Value::ObjectValues::iterator& current); - bool operator==(const SelfType& other) const { return isEqual(other); } bool operator!=(const SelfType& other) const { return !isEqual(other); } @@ -702,6 +715,12 @@ Value::ObjectValues::iterator current_; // Indicates that iterator is for a null value. bool isNull_; + +public: + // For some reason, BORLAND needs these at the end, rather + // than earlier. No idea why. + ValueIteratorBase(); + explicit ValueIteratorBase(const Value::ObjectValues::iterator& current); }; /** \brief const iterator for object and array value. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/include/json/version.h new/jsoncpp-1.6.5/include/json/version.h --- old/jsoncpp-1.6.2/include/json/version.h 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/include/json/version.h 2015-07-23 07:26:13.000000000 +0200 @@ -1,13 +1,12 @@ -// DO NOT EDIT. This file is generated by CMake from "version" -// and "version.h.in" files. +// DO NOT EDIT. This file (and "version") is generated by CMake. // Run CMake configure step to update it. #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.6.2" +# define JSONCPP_VERSION_STRING "1.6.5" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 6 -# define JSONCPP_VERSION_PATCH 2 +# define JSONCPP_VERSION_PATCH 5 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/pkg-config/jsoncpp.pc.in new/jsoncpp-1.6.5/pkg-config/jsoncpp.pc.in --- old/jsoncpp-1.6.2/pkg-config/jsoncpp.pc.in 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/pkg-config/jsoncpp.pc.in 2015-07-23 07:26:13.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@ -includedir=${prefix}/@INCLUDE_INSTALL_DIR@ +libdir=@LIBRARY_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@ Name: jsoncpp Description: A C++ library for interacting with JSON diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/jsontestrunner/CMakeLists.txt new/jsoncpp-1.6.5/src/jsontestrunner/CMakeLists.txt --- old/jsoncpp-1.6.2/src/jsontestrunner/CMakeLists.txt 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/jsontestrunner/CMakeLists.txt 2015-07-23 07:26:13.000000000 +0200 @@ -1,18 +1,15 @@ FIND_PACKAGE(PythonInterp 2.6) -IF(JSONCPP_LIB_BUILD_SHARED) - ADD_DEFINITIONS( -DJSON_DLL ) -ENDIF(JSONCPP_LIB_BUILD_SHARED) - ADD_EXECUTABLE(jsontestrunner_exe main.cpp ) -IF(JSONCPP_LIB_BUILD_SHARED) +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS( -DJSON_DLL ) TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib) -ELSE(JSONCPP_LIB_BUILD_SHARED) +ELSE(BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib_static) -ENDIF(JSONCPP_LIB_BUILD_SHARED) +ENDIF(BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_exe) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/CMakeLists.txt new/jsoncpp-1.6.5/src/lib_json/CMakeLists.txt --- old/jsoncpp-1.6.2/src/lib_json/CMakeLists.txt 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/CMakeLists.txt 2015-07-23 07:26:13.000000000 +0200 @@ -1,15 +1,8 @@ -OPTION(JSONCPP_LIB_BUILD_SHARED "Build jsoncpp_lib as a shared library." OFF) -OPTION(JSONCPP_LIB_BUILD_STATIC "Build jsoncpp_lib static library." ON) - -IF(BUILD_SHARED_LIBS) - SET(JSONCPP_LIB_BUILD_SHARED ON) -ENDIF(BUILD_SHARED_LIBS) - if( CMAKE_COMPILER_IS_GNUCXX ) #Get compiler version. execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GNUCXX_VERSION ) - + #-Werror=* was introduced -after- GCC 4.1.2 if( GNUCXX_VERSION VERSION_GREATER 4.1.2 ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing") @@ -46,11 +39,12 @@ SET(INSTALL_EXPORT) ENDIF(JSONCPP_WITH_CMAKE_PACKAGE) -IF(JSONCPP_LIB_BUILD_SHARED) +IF(BUILD_SHARED_LIBS) ADD_DEFINITIONS( -DJSON_DLL_BUILD ) ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources}) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR}) - SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp ) + SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp + DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} ) INSTALL( TARGETS jsoncpp_lib ${INSTALL_EXPORT} RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} @@ -65,10 +59,11 @@ ENDIF() -IF(JSONCPP_LIB_BUILD_STATIC) +IF(BUILD_STATIC_LIBS) ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources}) SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR}) - SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp ) + SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp + DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} ) INSTALL( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT} RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/json_reader.cpp new/jsoncpp-1.6.5/src/lib_json/json_reader.cpp --- old/jsoncpp-1.6.2/src/lib_json/json_reader.cpp 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/json_reader.cpp 2015-07-23 07:26:13.000000000 +0200 @@ -597,33 +597,9 @@ bool Reader::decodeDouble(Token& token, Value& decoded) { double value = 0; - const int bufferSize = 32; - int count; - int length = int(token.end_ - token.start_); - - // Sanity check to avoid buffer overflow exploits. - if (length < 0) { - return addError("Unable to parse token length", token); - } - - // Avoid using a string constant for the format control string given to - // sscanf, as this can cause hard to debug crashes on OS X. See here for more - // info: - // - // http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.… - char format[] = "%lf"; - - if (length <= bufferSize) { - Char buffer[bufferSize + 1]; - memcpy(buffer, token.start_, length); - buffer[length] = 0; - count = sscanf(buffer, format, &value); - } else { - std::string buffer(token.start_, token.end_); - count = sscanf(buffer.c_str(), format, &value); - } - - if (count != 1) + std::string buffer(token.start_, token.end_); + std::istringstream is(buffer); + if (!(is >> value)) return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/json_tool.h new/jsoncpp-1.6.5/src/lib_json/json_tool.h --- old/jsoncpp-1.6.2/src/lib_json/json_tool.h 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/json_tool.h 2015-07-23 07:26:13.000000000 +0200 @@ -30,8 +30,8 @@ } else if (cp <= 0xFFFF) { result.resize(3); result[2] = static_cast<char>(0x80 | (0x3f & cp)); - result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6))); - result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12))); + result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 6))); + result[0] = static_cast<char>(0xE0 | (0xf & (cp >> 12))); } else if (cp <= 0x10FFFF) { result.resize(4); result[3] = static_cast<char>(0x80 | (0x3f & cp)); @@ -43,7 +43,7 @@ return result; } -/// Returns true if ch is a control character (in range [0,32[). +/// Returns true if ch is a control character (in range [1,31]). static inline bool isControlCharacter(char ch) { return ch > 0 && ch <= 0x1F; } enum { @@ -63,7 +63,7 @@ static inline void uintToString(LargestUInt value, char*& current) { *--current = 0; do { - *--current = char(value % 10) + '0'; + *--current = static_cast<signed char>(value % 10U + static_cast<unsigned>('0')); value /= 10; } while (value != 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/json_value.cpp new/jsoncpp-1.6.5/src/lib_json/json_value.cpp --- old/jsoncpp-1.6.2/src/lib_json/json_value.cpp 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/json_value.cpp 2015-07-23 07:26:13.000000000 +0200 @@ -108,7 +108,7 @@ JSON_ASSERT_MESSAGE(length <= (unsigned)Value::maxInt - sizeof(unsigned) - 1U, "in Json::Value::duplicateAndPrefixStringValue(): " "length too big for prefixing"); - unsigned actualLength = length + sizeof(unsigned) + 1U; + unsigned actualLength = length + static_cast<unsigned>(sizeof(unsigned)) + 1U; char* newString = static_cast<char*>(malloc(actualLength)); if (newString == 0) { throwRuntimeError( @@ -125,7 +125,7 @@ unsigned* length, char const** value) { if (!isPrefixed) { - *length = strlen(prefixed); + *length = static_cast<unsigned>(strlen(prefixed)); *value = prefixed; } else { *length = *reinterpret_cast<unsigned const*>(prefixed); @@ -152,23 +152,6 @@ namespace Json { -class JSON_API Exception : public std::exception { -public: - Exception(std::string const& msg); - virtual ~Exception() throw(); - virtual char const* what() const throw(); -protected: - std::string const msg_; -}; -class JSON_API RuntimeError : public Exception { -public: - RuntimeError(std::string const& msg); -}; -class JSON_API LogicError : public Exception { -public: - LogicError(std::string const& msg); -}; - Exception::Exception(std::string const& msg) : msg_(msg) {} @@ -232,14 +215,14 @@ // Notes: policy_ indicates if the string was allocated when // a string is stored. -Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {} +Value::CZString::CZString(ArrayIndex aindex) : cstr_(0), index_(aindex) {} -Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate) +Value::CZString::CZString(char const* str, unsigned ulength, DuplicationPolicy allocate) : cstr_(str) { // allocate != duplicate - storage_.policy_ = allocate; - storage_.length_ = length; + storage_.policy_ = allocate & 0x3; + storage_.length_ = ulength & 0x3FFFFFFF; } Value::CZString::CZString(const CZString& other) @@ -248,9 +231,9 @@ : other.cstr_) { storage_.policy_ = (other.cstr_ - ? (other.storage_.policy_ == noDuplication + ? (static_cast<DuplicationPolicy>(other.storage_.policy_) == noDuplication ? noDuplication : duplicate) - : other.storage_.policy_); + : static_cast<DuplicationPolicy>(other.storage_.policy_)); storage_.length_ = other.storage_.length_; } @@ -312,9 +295,9 @@ * memset( this, 0, sizeof(Value) ) * This optimization is used in ValueInternalMap fast allocator. */ -Value::Value(ValueType type) { - initBasic(type); - switch (type) { +Value::Value(ValueType vtype) { + initBasic(vtype); + switch (vtype) { case nullValue: break; case intValue: @@ -478,7 +461,7 @@ std::swap(value_, other.value_); int temp2 = allocated_; allocated_ = other.allocated_; - other.allocated_ = temp2; + other.allocated_ = temp2 & 0x1; } void Value::swap(Value& other) { @@ -606,12 +589,12 @@ return this_str; } -bool Value::getString(char const** str, char const** end) const { +bool Value::getString(char const** str, char const** cend) const { if (type_ != stringValue) return false; if (value_.string_ == 0) return false; unsigned length; decodePrefixedString(this->allocated_, this->value_.string_, &length, str); - *end = *str + length; + *cend = *str + length; return true; } @@ -810,7 +793,8 @@ case uintValue: return value_.uint_ ? true : false; case realValue: - return value_.real_ ? true : false; + // This is kind of strange. Not recommended. + return (value_.real_ != 0.0) ? true : false; default: break; } @@ -960,8 +944,8 @@ return (*this)[ArrayIndex(index)]; } -void Value::initBasic(ValueType type, bool allocated) { - type_ = type; +void Value::initBasic(ValueType vtype, bool allocated) { + type_ = vtype; allocated_ = allocated; comments_ = 0; start_ = 0; @@ -990,7 +974,7 @@ } // @param key is not null-terminated. -Value& Value::resolveReference(char const* key, char const* end) +Value& Value::resolveReference(char const* key, char const* cend) { JSON_ASSERT_MESSAGE( type_ == nullValue || type_ == objectValue, @@ -998,7 +982,7 @@ if (type_ == nullValue) *this = Value(objectValue); CZString actualKey( - key, static_cast<unsigned>(end-key), CZString::duplicateOnCopy); + key, static_cast<unsigned>(cend-key), CZString::duplicateOnCopy); ObjectValues::iterator it = value_.map_->lower_bound(actualKey); if (it != value_.map_->end() && (*it).first == actualKey) return (*it).second; @@ -1016,13 +1000,13 @@ bool Value::isValidIndex(ArrayIndex index) const { return index < size(); } -Value const* Value::find(char const* key, char const* end) const +Value const* Value::find(char const* key, char const* cend) const { JSON_ASSERT_MESSAGE( type_ == nullValue || type_ == objectValue, "in Json::Value::find(key, end, found): requires objectValue or nullValue"); if (type_ == nullValue) return NULL; - CZString actualKey(key, static_cast<unsigned>(end-key), CZString::noDuplication); + CZString actualKey(key, static_cast<unsigned>(cend-key), CZString::noDuplication); ObjectValues::const_iterator it = value_.map_->find(actualKey); if (it == value_.map_->end()) return NULL; return &(*it).second; @@ -1066,9 +1050,9 @@ Value& Value::append(const Value& value) { return (*this)[size()] = value; } -Value Value::get(char const* key, char const* end, Value const& defaultValue) const +Value Value::get(char const* key, char const* cend, Value const& defaultValue) const { - Value const* found = find(key, end); + Value const* found = find(key, cend); return !found ? defaultValue : *found; } Value Value::get(char const* key, Value const& defaultValue) const @@ -1081,12 +1065,12 @@ } -bool Value::removeMember(const char* key, const char* end, Value* removed) +bool Value::removeMember(const char* key, const char* cend, Value* removed) { if (type_ != objectValue) { return false; } - CZString actualKey(key, static_cast<unsigned>(end-key), CZString::noDuplication); + CZString actualKey(key, static_cast<unsigned>(cend-key), CZString::noDuplication); ObjectValues::iterator it = value_.map_->find(actualKey); if (it == value_.map_->end()) return false; @@ -1131,8 +1115,8 @@ ArrayIndex oldSize = size(); // shift left all items left, into the place of the "removed" for (ArrayIndex i = index; i < (oldSize - 1); ++i){ - CZString key(i); - (*value_.map_)[key] = (*this)[i + 1]; + CZString keey(i); + (*value_.map_)[keey] = (*this)[i + 1]; } // erase the last one ("leftover") CZString keyLast(oldSize - 1); @@ -1148,9 +1132,9 @@ } #endif -bool Value::isMember(char const* key, char const* end) const +bool Value::isMember(char const* key, char const* cend) const { - Value const* value = find(key, end); + Value const* value = find(key, cend); return NULL != value; } bool Value::isMember(char const* key) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/json_valueiterator.inl new/jsoncpp-1.6.5/src/lib_json/json_valueiterator.inl --- old/jsoncpp-1.6.2/src/lib_json/json_valueiterator.inl 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/json_valueiterator.inl 2015-07-23 07:26:13.000000000 +0200 @@ -93,26 +93,26 @@ } std::string ValueIteratorBase::name() const { - char const* key; + char const* keey; char const* end; - key = memberName(&end); - if (!key) return std::string(); - return std::string(key, end); + keey = memberName(&end); + if (!keey) return std::string(); + return std::string(keey, end); } char const* ValueIteratorBase::memberName() const { - const char* name = (*current_).first.data(); - return name ? name : ""; + const char* cname = (*current_).first.data(); + return cname ? cname : ""; } char const* ValueIteratorBase::memberName(char const** end) const { - const char* name = (*current_).first.data(); - if (!name) { + const char* cname = (*current_).first.data(); + if (!cname) { *end = NULL; return NULL; } - *end = name + (*current_).first.length(); - return name; + *end = cname + (*current_).first.length(); + return cname; } // ////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/json_writer.cpp new/jsoncpp-1.6.5/src/lib_json/json_writer.cpp --- old/jsoncpp-1.6.2/src/lib_json/json_writer.cpp 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/json_writer.cpp 2015-07-23 07:26:13.000000000 +0200 @@ -29,10 +29,18 @@ #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below #define snprintf _snprintf +#elif defined(__ANDROID__) +#define snprintf snprintf #elif __cplusplus >= 201103L #define snprintf std::snprintf #endif +#if defined(__BORLANDC__) +#include <float.h> +#define isfinite _finite +#define snprintf _snprintf +#endif + #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 // Disable warning about strdup being deprecated. #pragma warning(disable : 4996) @@ -346,7 +354,7 @@ const std::string& name = *it; if (it != members.begin()) document_ += ','; - document_ += valueToQuotedStringN(name.data(), name.length()); + document_ += valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length())); document_ += yamlCompatiblityEnabled_ ? ": " : ":"; writeValue(value[name]); } @@ -906,7 +914,7 @@ std::string const& name = *it; Value const& childValue = value[name]; writeCommentBeforeValue(childValue); - writeWithIndent(valueToQuotedStringN(name.data(), name.length())); + writeWithIndent(valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length()))); *sout_ << colonSymbol_; writeValue(childValue); if (++it == members.end()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/lib_json/version.h.in new/jsoncpp-1.6.5/src/lib_json/version.h.in --- old/jsoncpp-1.6.2/src/lib_json/version.h.in 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/lib_json/version.h.in 2015-07-23 07:26:13.000000000 +0200 @@ -1,5 +1,4 @@ -// DO NOT EDIT. This file is generated by CMake from "version" -// and "version.h.in" files. +// DO NOT EDIT. This file (and "version") is generated by CMake. // Run CMake configure step to update it. #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/test_lib_json/CMakeLists.txt new/jsoncpp-1.6.5/src/test_lib_json/CMakeLists.txt --- old/jsoncpp-1.6.2/src/test_lib_json/CMakeLists.txt 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/test_lib_json/CMakeLists.txt 2015-07-23 07:26:13.000000000 +0200 @@ -1,9 +1,5 @@ # vim: et ts=4 sts=4 sw=4 tw=0 -IF(JSONCPP_LIB_BUILD_SHARED) - ADD_DEFINITIONS( -DJSON_DLL ) -ENDIF(JSONCPP_LIB_BUILD_SHARED) - ADD_EXECUTABLE( jsoncpp_test jsontest.cpp jsontest.h @@ -11,11 +7,12 @@ ) -IF(JSONCPP_LIB_BUILD_SHARED) +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS( -DJSON_DLL ) TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib) -ELSE(JSONCPP_LIB_BUILD_SHARED) +ELSE(BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib_static) -ENDIF(JSONCPP_LIB_BUILD_SHARED) +ENDIF(BUILD_SHARED_LIBS) # another way to solve issue #90 #set_target_properties(jsoncpp_test PROPERTIES COMPILE_FLAGS -ffloat-store) @@ -23,19 +20,19 @@ # Run unit tests in post-build # (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?) IF(JSONCPP_WITH_POST_BUILD_UNITTEST) - IF(JSONCPP_LIB_BUILD_SHARED) + IF(BUILD_SHARED_LIBS) # First, copy the shared lib, for Microsoft. # Then, run the test executable. ADD_CUSTOM_COMMAND( TARGET jsoncpp_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:jsoncpp_lib> $<TARGET_FILE_DIR:jsoncpp_test> COMMAND $<TARGET_FILE:jsoncpp_test>) - ELSE(JSONCPP_LIB_BUILD_SHARED) + ELSE(BUILD_SHARED_LIBS) # Just run the test executable. ADD_CUSTOM_COMMAND( TARGET jsoncpp_test POST_BUILD COMMAND $<TARGET_FILE:jsoncpp_test>) - ENDIF(JSONCPP_LIB_BUILD_SHARED) + ENDIF(BUILD_SHARED_LIBS) ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST) SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/src/test_lib_json/main.cpp new/jsoncpp-1.6.5/src/test_lib_json/main.cpp --- old/jsoncpp-1.6.2/src/test_lib_json/main.cpp 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/src/test_lib_json/main.cpp 2015-07-23 07:26:13.000000000 +0200 @@ -257,6 +257,20 @@ JSONTEST_ASSERT_EQUAL(Json::Value(17), got); JSONTEST_ASSERT_EQUAL(false, array1_.removeIndex(2, &got)); // gone now } +JSONTEST_FIXTURE(ValueTest, arrayIssue252) +{ + int count = 5; + Json::Value root; + Json::Value item; + root["array"] = Json::Value::nullRef; + for (int i = 0; i < count; i++) + { + item["a"] = i; + item["b"] = i; + root["array"][i] = item; + } + //JSONTEST_ASSERT_EQUAL(5, root["array"].size()); +} JSONTEST_FIXTURE(ValueTest, null) { JSONTEST_ASSERT_EQUAL(Json::nullValue, null_.type()); @@ -1542,7 +1556,7 @@ JSONTEST_FIXTURE(ValueTest, CommentBefore) { Json::Value val; // fill val - val.setComment("// this comment should appear before", Json::commentBefore); + val.setComment(std::string("// this comment should appear before"), Json::commentBefore); Json::StreamWriterBuilder wbuilder; wbuilder.settings_["commentStyle"] = "All"; { @@ -2209,6 +2223,7 @@ JSONTEST_ASSERT_STRING_EQUAL("x", root["a"].asString()); JSONTEST_ASSERT_STRING_EQUAL("y", root["b"].asString()); } + delete reader; } struct CharReaderAllowZeroesTest : JsonTest::TestCase {}; @@ -2241,6 +2256,7 @@ JSONTEST_ASSERT_STRING_EQUAL("x", root["a"].asString()); JSONTEST_ASSERT_STRING_EQUAL("y", root["b"].asString()); } + delete reader; } struct BuilderTest : JsonTest::TestCase {}; @@ -2324,6 +2340,7 @@ JSONTEST_REGISTER_FIXTURE(runner, ValueTest, memberCount); JSONTEST_REGISTER_FIXTURE(runner, ValueTest, objects); JSONTEST_REGISTER_FIXTURE(runner, ValueTest, arrays); + JSONTEST_REGISTER_FIXTURE(runner, ValueTest, arrayIssue252); JSONTEST_REGISTER_FIXTURE(runner, ValueTest, null); JSONTEST_REGISTER_FIXTURE(runner, ValueTest, strings); JSONTEST_REGISTER_FIXTURE(runner, ValueTest, bools); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/travis.sh new/jsoncpp-1.6.5/travis.sh --- old/jsoncpp-1.6.2/travis.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/jsoncpp-1.6.5/travis.sh 2015-07-23 07:26:13.000000000 +0200 @@ -0,0 +1,29 @@ +#!/usr/bin/env sh +# This is called by `.travis.yml` via Travis CI. +# Travis supplies $TRAVIS_OS_NAME. +# http://docs.travis-ci.com/user/multi-os/ +# Our .travis.yml also defines: +# - SHARED_LIB=ON/OFF +# - STATIC_LIB=ON/OFF +# - CMAKE_PKG=ON/OFF +# - BUILD_TYPE=release/debug +# - VERBOSE_MAKE=false/true +# - VERBOSE (set or not) + +# -e: fail on error +# -v: show commands +# -x: show expanded commands +set -vex + +env | sort + +cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DBUILD_SHARED_LIBS=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . +make + +# Python is not available in Travis for osx. +# https://github.com/travis-ci/travis-ci/issues/2320 +if [ "$TRAVIS_OS_NAME" != "osx" ] +then + make jsoncpp_check + valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.6.2/version new/jsoncpp-1.6.5/version --- old/jsoncpp-1.6.2/version 2015-04-11 21:45:33.000000000 +0200 +++ new/jsoncpp-1.6.5/version 2015-07-23 07:26:13.000000000 +0200 @@ -1 +1 @@ -1.6.2 +1.6.5

1 0

commit screenfetch for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '15

01 Aug '15

Hello community, here is the log from the commit of package screenfetch for openSUSE:Factory checked in at 2015-08-01 11:37:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screenfetch (Old) and /work/SRC/openSUSE:Factory/.screenfetch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "screenfetch" Changes: -------- --- /work/SRC/openSUSE:Factory/screenfetch/screenfetch.changes 2014-12-01 14:01:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.screenfetch.new/screenfetch.changes 2015-08-01 11:37:23.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jul 28 08:18:21 UTC 2015 - mpluskal(a)suse.com + +- Update to 3.7.0 + * Fixing package detection in apt/dpkg distros + * Fix xmonad detection + * Add detection for Sabayon, Haiku, Logos and Chapeau + * Add ChromeOS logo (without distro detection) + * Add an option to supply custom ASCII art + * Combine GTK 2/3 themes if they are the same + * Reimplement '-d' (allows for setting what information is + displayed on the command line) + +------------------------------------------------------------------- Old: ---- v3.6.5.tar.gz New: ---- 3.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screenfetch.spec ++++++ --- /var/tmp/diff_new_pack.KZp6tP/_old 2015-08-01 11:37:23.000000000 +0200 +++ /var/tmp/diff_new_pack.KZp6tP/_new 2015-08-01 11:37:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package screenfetch # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,13 +17,13 @@ Name: screenfetch -Version: 3.6.5 +Version: 3.7.0 Release: 0 Summary: Fetches system/theme information in terminal for Linux desktop screenshots License: GPL-3.0 Group: Monitoring Url: https://github.com/KittyKatt/screenFetch -Source: https://github.com/KittyKatt/screenFetch/archive/v%{version}.tar.gz +Source: https://github.com/KittyKatt/screenFetch/archive/%{version}.tar.gz Requires: bash Requires: xdpyinfo Requires: xprop ++++++ v3.6.5.tar.gz -> 3.7.0.tar.gz ++++++ ++++ 2165 lines of diff (skipped)

1 0