Hello community, here is the log from the commit of package qxmledit for openSUSE:Factory checked in at 2016-05-29 03:12:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qxmledit (Old) and /work/SRC/openSUSE:Factory/.qxmledit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qxmledit" Changes: -------- --- /work/SRC/openSUSE:Factory/qxmledit/qxmledit.changes 2016-05-08 10:46:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qxmledit.new/qxmledit.changes 2016-05-29 03:13:51.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 26 09:39:18 UTC 2016 - lazy.k...@opensuse.org + +- Add qxmledit-c++11_compatibility.patch: fix compilation error in + openSUSE c++11 compatibility. + +------------------------------------------------------------------- +Sat May 21 08:45:35 UTC 2016 - lazy.k...@opensuse.org + +- Update to 0.9.3.1. + * No changes for Linux users. +- Correct the source URL. + +------------------------------------------------------------------- Old: ---- qxmledit-0.9.3-src.tgz New: ---- qxmledit-0.9.3.1.tar.gz qxmledit-c++11_compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qxmledit.spec ++++++ --- /var/tmp/diff_new_pack.ug76kZ/_old 2016-05-29 03:13:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ug76kZ/_new 2016-05-29 03:13:53.000000000 +0200 @@ -19,16 +19,19 @@ %define major 0 Name: qxmledit -Version: 0.9.3 +Version: 0.9.3.1 Release: 0 Summary: Simple XML Editor and XSD Viewer License: LGPL-2.0+ and LGPL-3.0+ Group: Productivity/Publishing/XML Url: http://qxmledit.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tgz -Source1: http://qxmledit.googlecode.com/svn/wiki/tutorials/xsltmode.pdf +Source0: https://github.com/lbellonda/qxmledit/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: http://qxmledit.org/tutorials/xsltmode.pdf Source99: baselibs.conf +# PATCH-FIX-UPSTREAM qxmledit-c++11_compatibility.patch gh#lbellonda/qxmledit#36 -- fix compilation error in openSUSE c++11 compatibility (fixed in git) +Patch0: qxmledit-c++11_compatibility.patch BuildRequires: hicolor-icon-theme +BuildRequires: pkgconfig BuildRequires: update-desktop-files %if 0%{?suse_version} > 1320 BuildRequires: pkgconfig(Qt5Concurrent) @@ -100,6 +103,7 @@ %prep %setup -q +%patch0 -p1 %build export QXMLEDIT_INST_DATA_DIR=%{_datadir}/%{name}/ ++++++ qxmledit-c++11_compatibility.patch ++++++ Index: qxmledit-0.9.3.1/src/sessions/data_access/sqllitegenericdata.cpp =================================================================== --- qxmledit-0.9.3.1.orig/src/sessions/data_access/sqllitegenericdata.cpp +++ qxmledit-0.9.3.1/src/sessions/data_access/sqllitegenericdata.cpp @@ -310,8 +310,8 @@ void SQLLiteDataAccess::Private::Generic list.append(model); } -#define QRY_READ_TAGS_TYPE "select tr.objectId, t.tag from "TABLE_TAGS_RELATIONS" tr join "TABLE_GENERIC_OBJECTS" o on o.type=:type and o.id=tr.objectId join " TABLE_TAGS " t on t.id=tr.tagId " -#define QRY_READ_TAGS_TYPE_AND_ID "select tr.objectId, t.tag from "TABLE_TAGS_RELATIONS" tr join "TABLE_GENERIC_OBJECTS" o on o.type=:type and o.id=tr.objectId and o.id=:id join " TABLE_TAGS " t on t.id=tr.tagId " +#define QRY_READ_TAGS_TYPE "select tr.objectId, t.tag from " TABLE_TAGS_RELATIONS " tr join " TABLE_GENERIC_OBJECTS " o on o.type=:type and o.id=tr.objectId join " TABLE_TAGS " t on t.id=tr.tagId " +#define QRY_READ_TAGS_TYPE_AND_ID "select tr.objectId, t.tag from " TABLE_TAGS_RELATIONS " tr join " TABLE_GENERIC_OBJECTS " o on o.type=:type and o.id=tr.objectId and o.id=:id join " TABLE_TAGS " t on t.id=tr.tagId " void SQLLiteDataAccess::Private::GenericObjectRead::readTagsForObjects(DataResult &dataResult, SQLLiteDataAccess::Private *db) {
