Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package molsketch for openSUSE:Factory
checked in at 2021-03-30 20:58:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/molsketch (Old)
and /work/SRC/openSUSE:Factory/.molsketch.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "molsketch"
Tue Mar 30 20:58:39 2021 rev:5 rq:869496 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/molsketch/molsketch.changes 2020-07-03
00:03:28.722291805 +0200
+++ /work/SRC/openSUSE:Factory/.molsketch.new.2401/molsketch.changes
2021-03-30 20:58:53.180618142 +0200
@@ -1,0 +2,19 @@
+Sat Jan 23 19:47:39 UTC 2021 - Matthias Mail??nder <mailaen...@opensuse.org>
+
+- Put essential libraries in the main package
+
+-------------------------------------------------------------------
+Sat Jan 2 14:26:13 UTC 2021 - Matthias Mail??nder <mailaen...@opensuse.org>
+
+- Update to version 0.7.0
+ * New localizations: Greek, German, and Chinese
+ * Direction of attached hydrogen atoms can be set explicitly by user
+ * Atom shape can also be a circle instead of a rectangle
+ * Bitmap export with adjustable resolution
+ * Support OpenBabel 3
+ * Fixes for sum formula and molecule tooltip
+ * Fix clipping of bonds
+ * Fixed OpenBabel support
+- Add fix-compilation.patch
+
+-------------------------------------------------------------------
@@ -121 +140,2 @@
-- initial packaging, added QtAssistant include path to CMakeLists.txt, added
BuildRequires: -post-build-checks because of compiler warnings
+- initial packaging, added QtAssistant include path to CMakeLists.txt
+- added BuildRequires: -post-build-checks because of compiler warnings
Old:
----
Molsketch-0.6.0-src.tar.gz
New:
----
Molsketch-0.7.0-src.tar.gz
fix-compilation.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ molsketch.spec ++++++
--- /var/tmp/diff_new_pack.rUJhbl/_old 2021-03-30 20:58:54.048619096 +0200
+++ /var/tmp/diff_new_pack.rUJhbl/_new 2021-03-30 20:58:54.052619100 +0200
@@ -1,7 +1,7 @@
#
# spec file for package molsketch
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,15 @@
%define soname -qt5-%{sover}
%define binname %{name}-qt5
Name: molsketch
-Version: 0.6.0
+Version: 0.7.0
Release: 0
Summary: 2D molecular structures editor
License: GPL-2.0-or-later
Group: Productivity/Scientific/Chemistry
URL: https://molsketch.sourceforge.net
Source0:
https://downloads.sourceforge.net/molsketch/Molsketch-%{version}-src.tar.gz
+# PATCH-FIX-UPSTREAM https://sourceforge.net/p/molsketch/bugs/40/
+Patch0: fix-compilation.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -79,7 +81,7 @@
Help documentation for %{name}.
%prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -p1
dos2unix -k -c ascii doc/cs/%{name}.adp
%build
@@ -91,6 +93,10 @@
%install
%cmake_install
+# Fix program not finding its shared libraries.
+mv %{buildroot}%{_libdir}/%{name}/libmolsketch-qt5.so
%{buildroot}%{_libdir}/libmolsketch-qt5.so
+mv %{buildroot}%{_libdir}/%{name}/libobabeliface-qt5.so
%{buildroot}%{_libdir}/libobabeliface-qt5.so
+
for sz in 24 32 48 64 128 256 512
do
rsvg-convert -o %{name}-${sz}.png -w ${sz} molsketch/images/molsketch.svg
@@ -106,6 +112,7 @@
%license COPYING
%doc CHANGELOG
%{_bindir}/%{binname}
+%{_libdir}/*.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/molsketch.*
%{_datadir}/pixmaps/molsketch.xpm
@@ -115,7 +122,6 @@
%{_datadir}/mime/packages/molsketch.xml
%files devel
-%{_libdir}/%{name}/
%{_includedir}/lib%{name}/
%files doc
++++++ Molsketch-0.6.0-src.tar.gz -> Molsketch-0.7.0-src.tar.gz ++++++
++++ 20032 lines of diff (skipped)
++++++ fix-compilation.patch ++++++
>From 42949476e07960deaaa4907a2af87742d5c6eec0 Mon Sep 17 00:00:00 2001
Message-Id:
<42949476e07960deaaa4907a2af87742d5c6eec0.1609602170.git.matth...@mailaender.name>
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matth...@mailaender.name>
Date: Sat, 2 Jan 2021 16:42:43 +0100
Subject: [PATCH] Fix compilation.
---
libmolsketch/atom.cpp | 12 ++++++------
libmolsketch/bond.cpp | 4 ++--
libmolsketch/librarymodel.cpp | 2 +-
libmolsketch/molecule.cpp | 10 +++++-----
molsketch/mainwindow.cpp | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libmolsketch/atom.cpp b/libmolsketch/atom.cpp
index bdfba59..270faae 100644
--- a/libmolsketch/atom.cpp
+++ b/libmolsketch/atom.cpp
@@ -985,19 +985,19 @@ namespace Molsketch {
QPointF intersection;
QLineF topEdge{bounds.topLeft(), bounds.topRight()};
- if (topEdge.intersects(line, &intersection) == QLineF::BoundedIntersection)
+ if (topEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, topEdge);
QLineF bottomEdge{bounds.bottomLeft(), bounds.bottomRight()};
- if (bottomEdge.intersects(line, &intersection) ==
QLineF::BoundedIntersection)
+ if (bottomEdge.intersect(line, &intersection) ==
QLineF::BoundedIntersection)
return IntersectionData(intersection, bottomEdge);
QLineF leftEdge{bounds.topLeft(), bounds.bottomLeft()};
- if (leftEdge.intersects(line, &intersection) ==
QLineF::BoundedIntersection)
+ if (leftEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, leftEdge);
QLineF rightEdge{bounds.topRight(), bounds.bottomRight()};
- if (rightEdge.intersects(line, &intersection) ==
QLineF::BoundedIntersection)
+ if (rightEdge.intersect(line, &intersection) ==
QLineF::BoundedIntersection)
return IntersectionData(intersection, rightEdge);
// TODO pick the edge it intersects with first (i.e. closest to the middle)
return IntersectionData(QPointF(), QLineF());
@@ -1034,7 +1034,7 @@ namespace Molsketch {
qreal Atom::getExtentForIntersectionOfOuterLineAndEdge(const
IntersectionData &edgeIntersection, const QLineF &outer) const {
QPointF intersectionOfOuterAndEdge;
- QLineF::IntersectType intersectType =
edgeIntersection.getEdge().intersects(outer, &intersectionOfOuterAndEdge);
+ QLineF::IntersectType intersectType =
edgeIntersection.getEdge().intersect(outer, &intersectionOfOuterAndEdge);
return QLineF::BoundedIntersection == intersectType
? QLineF(intersectionOfOuterAndEdge, outer.p1()).length() /
outer.length()
: 0;
@@ -1098,7 +1098,7 @@ namespace Molsketch {
{
QLineF edge(corners[i], corners[i+1]);
QPointF result;
- if (connection.intersects(edge, &result) == QLineF::BoundedIntersection)
+ if (connection.intersect(edge, &result) == QLineF::BoundedIntersection)
return result;
}
return connection.p1();
diff --git a/libmolsketch/bond.cpp b/libmolsketch/bond.cpp
index 0a8f951..6dadd33 100644
--- a/libmolsketch/bond.cpp
+++ b/libmolsketch/bond.cpp
@@ -231,10 +231,10 @@ namespace Molsketch {
if (m_bondType != DoubleLegacy) return;
m_bondType = DoubleSymmetric;
auto beginBondList = m_beginAtom->bonds();
- auto beginBonds = QSet<Bond*>(beginBondList.begin(), beginBondList.end());
+ auto beginBonds = QSet<Bond*>::fromList(beginBondList);
beginBonds -= this;
auto endBondList = m_endAtom->bonds();
- auto endBonds = QSet<Bond*>(endBondList.begin(), endBondList.end());
+ auto endBonds = QSet<Bond*>::fromList(endBondList);
endBonds -= this;
// no other bonds: symmetric
if (beginBonds.empty() && endBonds.empty()) return;
diff --git a/libmolsketch/librarymodel.cpp b/libmolsketch/librarymodel.cpp
index 0da451a..ccb54c6 100644
--- a/libmolsketch/librarymodel.cpp
+++ b/libmolsketch/librarymodel.cpp
@@ -40,7 +40,7 @@ namespace Molsketch {
int fetchCount;
void cleanMolecules() {
qInfo("Clearing list of molecules. Count: %d", items.size());
- auto itemSet = QSet<MoleculeModelItem*>(items.begin(), items.end());
+ auto itemSet = QSet<MoleculeModelItem*>::fromList(items);
for (auto molecule : itemSet) delete molecule;
items.clear();
fetchCount = 0;
diff --git a/libmolsketch/molecule.cpp b/libmolsketch/molecule.cpp
index f18fd8d..3caa42a 100644
--- a/libmolsketch/molecule.cpp
+++ b/libmolsketch/molecule.cpp
@@ -127,7 +127,7 @@ namespace Molsketch {
{
setDefaults();
auto atoms = mol.atoms();
- auto atomSet = QSet<Atom*>(atoms.begin(), atoms.end());
+ auto atomSet = QSet<Atom*>::fromList(atoms);
clone(atomSet);
setPos(mol.pos());
updateElectronSystems();
@@ -304,7 +304,7 @@ namespace Molsketch {
QList<Molecule*> molList;
auto atomList = atoms();
- auto atomSet = QSet<Atom*>(atomList.begin(), atomList.end());
+ auto atomSet = QSet<Atom*>::fromList(atomList);
while (!atomSet.empty())
{
QSet<Atom*> subgroup = getConnectedAtoms(*(atomSet.begin()));
@@ -396,7 +396,7 @@ namespace Molsketch {
{
if (atoms().isEmpty()) return false;
auto atomList = atoms();
- auto atomSet = QSet<Atom*>(atomList.begin(), atomList.end());
+ auto atomSet = QSet<Atom*>::fromList(atomList);
return getConnectedAtoms(atoms().first()) != atomSet;
}
@@ -595,9 +595,9 @@ void Molecule::paintElectronSystems(QPainter *painter)
const {
bool canMerge(const ElectronSystem *es1, const ElectronSystem *es2)
{
auto firstListOfAtoms = es1->atoms();
- auto firstSetOfAtoms = QSet<Atom*>(firstListOfAtoms.begin(),
firstListOfAtoms.end());
+ auto firstSetOfAtoms = QSet<Atom*>::fromList(firstListOfAtoms);
auto secondListOfAtoms = es2->atoms();
- auto secondSetOfAtoms = QSet<Atom*>(secondListOfAtoms.begin(),
secondListOfAtoms.end()); // TODO utility function
+ auto secondSetOfAtoms = QSet<Atom*>::fromList(secondListOfAtoms); // TODO
utility function
// may not share an atom
if (!(firstSetOfAtoms & secondSetOfAtoms).empty()) return false;
diff --git a/molsketch/mainwindow.cpp b/molsketch/mainwindow.cpp
index 0cc54ea..8751c2e 100644
--- a/molsketch/mainwindow.cpp
+++ b/molsketch/mainwindow.cpp
@@ -399,7 +399,7 @@ void MainWindow::openAssistant()
stream << QLatin1String("setSource ")
<< file.absoluteFilePath()
<< QLatin1Char('\0')
- << Qt::endl;
+ << ('\n');
#endif
}
@@ -567,7 +567,7 @@ void MainWindow::initializeAssistant()
stream << QLatin1String("register ")
<< file.absoluteFilePath()
<< QLatin1Char('\0')
- << Qt::endl;
+ << ('\n');
#endif
}
--
2.26.2
