Hello community, here is the log from the commit of package openbabel for openSUSE:Factory checked in at 2018-05-16 18:43:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openbabel (Old) and /work/SRC/openSUSE:Factory/.openbabel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openbabel" Wed May 16 18:43:06 2018 rev:35 rq:609063 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openbabel/openbabel.changes 2018-05-16 11:43:49.143438906 +0200 +++ /work/SRC/openSUSE:Factory/.openbabel.new/openbabel.changes 2018-05-16 18:44:47.644354344 +0200 @@ -1,0 +2,8 @@ +Wed May 16 06:43:44 UTC 2018 - [email protected] + +- Backport https://github.com/openbabel/openbabel/commit/e26491 + * fix_narrowing.patch +- Backport https://github.com/openbabel/openbabel/commit/8d707b + * fix_yasara.patch + +------------------------------------------------------------------- New: ---- fix_narrowing.patch fix_yasara.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openbabel.spec ++++++ --- /var/tmp/diff_new_pack.IMd97J/_old 2018-05-16 18:44:48.360328471 +0200 +++ /var/tmp/diff_new_pack.IMd97J/_new 2018-05-16 18:44:48.364328326 +0200 @@ -26,6 +26,8 @@ Source0: https://sourceforge.net/projects/openbabel/files/openbabel/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.changes Source2: baselibs.conf +Patch0: fix_narrowing.patch +Patch1: fix_yasara.patch BuildRequires: cairo-devel BuildRequires: cmake >= 2.4.8 BuildRequires: eigen3-devel @@ -91,6 +93,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 # fix builddate info # Remove build time references so build-compare can do its work ++++++ fix_narrowing.patch ++++++ >From e26491017efefdc6aaf73d4d49f284f4e9436244 Mon Sep 17 00:00:00 2001 From: Noel O'Boyle <[email protected]> Date: Wed, 3 Jan 2018 21:27:53 +0000 Subject: [PATCH] Fix #1689 by using positive values and explicitly stating unsigned char --- src/formats/pngformat.cpp | 2 +- src/formats/yasaraformat.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/formats/pngformat.cpp b/src/formats/pngformat.cpp index 49bff17fc..79f8a4902 100644 --- a/src/formats/pngformat.cpp +++ b/src/formats/pngformat.cpp @@ -218,7 +218,7 @@ bool PNGFormat::ReadMolecule(OBBase* pOb, OBConversion* pConv) _count=0; _hasInputPngFile=true; } - const char pngheader[] = {-119,80,78,71,13,10,26,10,0}; + const unsigned char pngheader[] = {137,80,78,71,13,10,26,10,0}; char readbytes[9]; ifs.read(readbytes, 8); diff --git a/src/formats/yasaraformat.cpp b/src/formats/yasaraformat.cpp index 25f7d2295..e666d0176 100644 --- a/src/formats/yasaraformat.cpp +++ b/src/formats/yasaraformat.cpp @@ -472,7 +472,7 @@ bool YOBFormat::WriteMolecule(OBBase* pOb, OBConversion* pConv) // bool hetatom; char buffer[32],/*resname[4],*/atomname[5]; - char double1[8]={0,0,0,0,0,0,-16,0x3f}; + unsigned char double1[8]={0,0,0,0,0,0,0xf0,0x3f}; // char *str; int i,j,/*m,q,*/pos; int /*resno,chainNum,link,linktype,*/atoms,element,links/*,chain*/; ++++++ fix_yasara.patch ++++++ >From 8d707b8ebbe1742b0f626032cd6227eeb62393ac Mon Sep 17 00:00:00 2001 From: Noel O'Boyle <[email protected]> Date: Thu, 4 Jan 2018 07:16:48 +0000 Subject: [PATCH] Fix yasara compile --- src/formats/yasaraformat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/formats/yasaraformat.cpp b/src/formats/yasaraformat.cpp index e666d0176..884f13226 100644 --- a/src/formats/yasaraformat.cpp +++ b/src/formats/yasaraformat.cpp @@ -500,7 +500,7 @@ bool YOBFormat::WriteMolecule(OBBase* pOb, OBConversion* pConv) mem_set(buffer,0,8); for (i=0;i<4;i++) { for (j=0;j<4;j++) - { if (i==j) ofs.write(double1,8); + { if (i==j) ofs.write((char*)double1,8); else ofs.write(buffer,8); } } storeint32le(buffer,MOB_INFOEND); storeint32le(&buffer[4],MOB_INFOENDSIZE);
