Hello community, here is the log from the commit of package kdevelop5-pg-qt for openSUSE:Factory checked in at 2020-02-03 11:15:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop5-pg-qt (Old) and /work/SRC/openSUSE:Factory/.kdevelop5-pg-qt.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5-pg-qt" Mon Feb 3 11:15:54 2020 rev:6 rq:769445 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop5-pg-qt/kdevelop5-pg-qt.changes 2019-12-29 15:49:42.367176470 +0100 +++ /work/SRC/openSUSE:Factory/.kdevelop5-pg-qt.new.26092/kdevelop5-pg-qt.changes 2020-02-03 11:16:21.277937011 +0100 @@ -1,0 +2,9 @@ +Mon Feb 3 06:04:02 UTC 2020 - wba...@tmo.at + +- Update to 2.2.1 + * Fix build with Qt 5.14 + * New flag ENFORCE_COMPATIBLE_ERROR_AWARE_CODE for the + kdevpgqt_generate() CMake macro +- Drop Fix-build-with-Qt-5.14.patch, merged upstream + +------------------------------------------------------------------- Old: ---- Fix-build-with-Qt-5.14.patch kdevelop-pg-qt-2.2.0.tar.xz New: ---- kdevelop-pg-qt-2.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop5-pg-qt.spec ++++++ --- /var/tmp/diff_new_pack.5t2QTZ/_old 2020-02-03 11:16:22.565937662 +0100 +++ /var/tmp/diff_new_pack.5t2QTZ/_new 2020-02-03 11:16:22.573937666 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdevelop5-pg-qt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ %define rname kdevelop-pg-qt Name: kdevelop5-pg-qt -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: Supporting package for the additional plugins for Kdevelop5 License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Development/Tools/IDE URL: https://www.kdevelop.org/ Source0: https://download.kde.org/stable/kdevelop-pg-qt/%{version}/src/%{rname}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: Fix-build-with-Qt-5.14.patch BuildRequires: bison BuildRequires: extra-cmake-modules BuildRequires: flex @@ -41,7 +39,6 @@ %prep %setup -q -n %{rname}-%{version} -%autopatch -p1 %build %cmake_kf5 -d build ++++++ kdevelop-pg-qt-2.2.0.tar.xz -> kdevelop-pg-qt-2.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.0/CMakeLists.txt new/kdevelop-pg-qt-2.2.1/CMakeLists.txt --- old/kdevelop-pg-qt-2.2.0/CMakeLists.txt 2019-05-24 09:10:38.000000000 +0200 +++ new/kdevelop-pg-qt-2.2.1/CMakeLists.txt 2020-02-02 21:02:00.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -project(kdevelop-pg-qt VERSION 2.2.0) +project(kdevelop-pg-qt VERSION 2.2.1) find_package(ECM 5.14.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.0/KDevelop-PG-QtConfig.cmake.in new/kdevelop-pg-qt-2.2.1/KDevelop-PG-QtConfig.cmake.in --- old/kdevelop-pg-qt-2.2.0/KDevelop-PG-QtConfig.cmake.in 2019-05-24 09:10:38.000000000 +0200 +++ new/kdevelop-pg-qt-2.2.1/KDevelop-PG-QtConfig.cmake.in 2020-02-02 21:02:00.000000000 +0100 @@ -23,6 +23,8 @@ # function that returns a readable name of a token # DUMP_INFO will tell kdevelop-pg to dump extra information about symbols, terminals and rules # into files in the binary dir +# ENFORCE_COMPATIBLE_ERROR_AWARE_CODE will ensure that --compatible-error-aware-code is also +# passed in case of GCC. By default it only is set for non-GNU compilers. # Note: The macro only exists when KDEVPG was found # # Copyright (c) 2007 Andreas Pakulat <ap...@gmx.de> @@ -139,6 +141,9 @@ elseif( ${_arg} STREQUAL "BEAUTIFUL_CODE" ) list(REMOVE_AT _depList 0) set(_beautifulCode --beautiful-code) + elseif( ${_arg} STREQUAL "ENFORCE_COMPATIBLE_ERROR_AWARE_CODE" ) + list(REMOVE_AT _depList 0) + set(_beautifulCode --compatible-error-aware-code) elseif( ${_arg} STREQUAL "STRICT_CONFLICTS" ) list(REMOVE_AT _depList 0) set(_conflicts --strict-conflicts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.0/kdev-pg/kdev-pg-checker.cpp new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-checker.cpp --- old/kdevelop-pg-qt-2.2.0/kdev-pg/kdev-pg-checker.cpp 2019-05-24 09:10:38.000000000 +0200 +++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-checker.cpp 2020-02-02 21:02:00.000000000 +0100 @@ -171,8 +171,8 @@ mVisited.insert(node); World::FollowDep &D = globalSystem.followDep(node); - QList<Model::Node*> FD = D.first.toList(); - QList<Model::Node*> FLD = D.second.toList(); + QList<Model::Node*> FD = D.first.values(); + QList<Model::Node*> FLD = D.second.values(); QTextStream& str( checkOut ); PrettyPrinter p(str); #ifdef FOLLOW_CHECKER_DEBUG @@ -193,7 +193,7 @@ for(auto jt = set2.begin(); jt != set2.end(); ++jt) if(!BnfVisitor::isInternal(*jt)) FD.append(*jt); - FD.append(set.toList()); + FD.append(set.values()); } else { @@ -227,7 +227,7 @@ World::NodeSet set = globalSystem.followDep(FLD[i]).second; for(auto jt = FLD.begin(); jt != FLD.end(); ++jt) set.remove(*jt); - FLD.append(set.toList()); + FLD.append(set.values()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.0/kdev-pg/kdev-pg-regexp.cpp new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp --- old/kdevelop-pg-qt-2.2.0/kdev-pg/kdev-pg-regexp.cpp 2019-05-24 09:10:38.000000000 +0200 +++ new/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp 2020-02-02 21:02:00.000000000 +0100 @@ -50,7 +50,10 @@ }; \ } +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) +// Qt >= 5.14 already has std::hash for QBitArray q_Hash_to_tr1_hash(QBitArray) +#endif namespace KDevPG {