Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdevelop5-pg-qt for openSUSE:Factory checked in at 2023-01-16 17:59:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop5-pg-qt (Old) and /work/SRC/openSUSE:Factory/.kdevelop5-pg-qt.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5-pg-qt" Mon Jan 16 17:59:04 2023 rev:7 rq:1058565 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop5-pg-qt/kdevelop5-pg-qt.changes 2020-02-03 11:16:21.277937011 +0100 +++ /work/SRC/openSUSE:Factory/.kdevelop5-pg-qt.new.32243/kdevelop5-pg-qt.changes 2023-01-16 18:01:39.387743222 +0100 @@ -1,0 +2,12 @@ +Sun Jan 15 19:27:54 UTC 2023 - Wolfgang Bauer <wba...@tmo.at> + +- Update to 2.2.2 + * Fix build with Qt 5.15.8 +- Add signature file and keyring + +------------------------------------------------------------------- +Thu Aug 27 09:04:32 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Spec cleanup + +------------------------------------------------------------------- Old: ---- kdevelop-pg-qt-2.2.1.tar.xz New: ---- kdevelop-pg-qt-2.2.2.tar.xz kdevelop-pg-qt-2.2.2.tar.xz.sig kdevelop-pg-qt.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop5-pg-qt.spec ++++++ --- /var/tmp/diff_new_pack.U8xqah/_old 2023-01-16 18:01:40.015746746 +0100 +++ /var/tmp/diff_new_pack.U8xqah/_new 2023-01-16 18:01:40.019746768 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdevelop5-pg-qt # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,26 @@ # +%bcond_without released %define rname kdevelop-pg-qt Name: kdevelop5-pg-qt -Version: 2.2.1 +Version: 2.2.2 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 +%if %{with released} +Source1: https://download.kde.org/stable/kdevelop-pg-qt/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source2: %{rname}.keyring +%endif BuildRequires: bison BuildRequires: extra-cmake-modules BuildRequires: flex BuildRequires: kf5-filesystem -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Test) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Test) Conflicts: kdevelop4-pg-qt %description @@ -42,18 +46,15 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %files %license COPYING* %{_kf5_bindir}/kdev-pg-qt +%{_kf5_libdir}/cmake/KDevelop-PG-Qt/ %{_kf5_prefix}/include/kdevelop-pg-qt/ -%{_kf5_libdir}/cmake/KDevelop-PG-Qt %changelog ++++++ kdevelop-pg-qt-2.2.1.tar.xz -> kdevelop-pg-qt-2.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/.gitlab-ci.yml new/kdevelop-pg-qt-2.2.2/.gitlab-ci.yml --- old/kdevelop-pg-qt-2.2.1/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/.gitlab-ci.yml 2023-01-10 20:34:28.000000000 +0100 @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +include: + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/.kde-ci.yml new/kdevelop-pg-qt-2.2.2/.kde-ci.yml --- old/kdevelop-pg-qt-2.2.1/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/.kde-ci.yml 2023-01-10 20:34:28.000000000 +0100 @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@stable' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/.reviewboardrc new/kdevelop-pg-qt-2.2.2/.reviewboardrc --- old/kdevelop-pg-qt-2.2.1/.reviewboardrc 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -REPOSITORY = "git://anongit.kde.org/kdevelop-pg-qt" -REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -TARGET_GROUPS = "kdevelop" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/CMakeLists.txt new/kdevelop-pg-qt-2.2.2/CMakeLists.txt --- old/kdevelop-pg-qt-2.2.1/CMakeLists.txt 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/CMakeLists.txt 2023-01-10 20:34:28.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -project(kdevelop-pg-qt VERSION 2.2.1) +project(kdevelop-pg-qt VERSION 2.2.2) find_package(ECM 5.14.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -81,10 +81,4 @@ add_subdirectory(tests) endif() -include(CTest) - -# CTestCustom.cmake has to be in the CTEST_BINARY_DIR. -# in the KDE build system, this is the same as CMAKE_BINARY_DIR. -configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/CTestConfig.cmake new/kdevelop-pg-qt-2.2.2/CTestConfig.cmake --- old/kdevelop-pg-qt-2.2.1/CTestConfig.cmake 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/CTestConfig.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "KDevelop-PG-Qt") -set(CTEST_NIGHTLY_START_TIME "00:05:00 EST") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=KDevelop-PG-Qt") -set(CTEST_DROP_SITE_CDASH TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/CTestCustom.cmake new/kdevelop-pg-qt-2.2.2/CTestCustom.cmake --- old/kdevelop-pg-qt-2.2.1/CTestCustom.cmake 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/CTestCustom.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -# This file contains all the specific settings that will be used -# when running 'make Experimental' - -# Change the maximum warnings that will be displayed -# on the report page (default 50) -set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1000) - -# Warnings that will be ignored -set(CTEST_CUSTOM_WARNING_EXCEPTION - ${CTEST_CUSTOM_WARNING_EXCEPTION} -# "/path/to/subfolder/" -) - -# Errors that will be ignored -set(CTEST_CUSTOM_ERROR_EXCEPTION - ${CTEST_CUSTOM_ERROR_EXCEPTION} -# "ICECC" -# "Segmentation fault" -# "GConf Error" -# "Client failed to connect to the D-BUS daemon" -# "Failed to connect to socket" - ) - -# No coverage for these files -set(CTEST_CUSTOM_COVERAGE_EXCLUDE ".moc$" "moc_" "ui_") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/README new/kdevelop-pg-qt-2.2.2/README --- old/kdevelop-pg-qt-2.2.1/README 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/README 2023-01-10 20:34:28.000000000 +0100 @@ -15,6 +15,6 @@ about KDevelop-PG-Qt-Development and ideas for future you could implement. Questions? -#kdevelop@freenode +irc://irc.libera.chat/#kdevelop kdevelop-de...@kdevelop.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/examples/cc/CMakeLists.txt new/kdevelop-pg-qt-2.2.2/examples/cc/CMakeLists.txt --- old/kdevelop-pg-qt-2.2.1/examples/cc/CMakeLists.txt 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/examples/cc/CMakeLists.txt 2023-01-10 20:34:28.000000000 +0100 @@ -37,7 +37,7 @@ SET_SOURCE_FILES_PROPERTIES( ${CMAKE_CURRENT_SOURCE_DIR}/cclexer.cpp PROPERTIES - GENERATED TUE + GENERATED TRUE SKIP_AUTOMOC ON ) ELSE(FLEX_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.cpp new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-code-gen.cpp --- old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.cpp 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-code-gen.cpp 2023-01-10 20:34:28.000000000 +0100 @@ -1014,35 +1014,34 @@ DefaultVisitor::visitVariableDeclaration(node); } -template<bool printType, bool printName> -void GenerateVariableDeclaration<printType, printName>::operator()(Model::VariableDeclarationItem *node) +namespace GenerateVariableDeclarationImpl { - if(printType) +void printType(QTextStream &out, Model::VariableDeclarationItem *node) +{ + if (node->mIsSequence) + out << "const KDevPG::ListNode<"; + + if (node->mVariableType == Model::VariableDeclarationItem::TypeToken) + out << "qint64 "; + else if (node->mVariableType == Model::VariableDeclarationItem::TypeNode) { - if (node->mIsSequence) - out << "const KDevPG::ListNode<"; + out << node->mCapitalizedType << "Ast *"; + }else if (node->mVariableType == Model::VariableDeclarationItem::TypeVariable) + out << node->mType << " "; + else + Q_ASSERT(0); // ### not supported - if (node->mVariableType == Model::VariableDeclarationItem::TypeToken) - out << "qint64 "; - else if (node->mVariableType == Model::VariableDeclarationItem::TypeNode) - { - out << node->mCapitalizedType << "Ast *"; - }else if (node->mVariableType == Model::VariableDeclarationItem::TypeVariable) - out << node->mType << " "; - else - Q_ASSERT(0); // ### not supported - - if (node->mIsSequence) - out << "> *"; - } + if (node->mIsSequence) + out << "> *"; +} - if(printName) - { - out << node->mName; +void printName(QTextStream &out, Model::VariableDeclarationItem *node) +{ + out << node->mName; - if (node->mIsSequence) - out << "Sequence"; - } + if (node->mIsSequence) + out << "Sequence"; +} } void GenerateMemberCode::operator()(Settings::MemberItem* m) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.h new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-code-gen.h --- old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-code-gen.h 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-code-gen.h 2023-01-10 20:34:28.000000000 +0100 @@ -136,6 +136,12 @@ void operator()(Model::SymbolItem *node); }; +namespace GenerateVariableDeclarationImpl +{ + void printType(QTextStream &out, Model::VariableDeclarationItem *node); + void printName(QTextStream &out, Model::VariableDeclarationItem *node); +}; + template<bool printType, bool printName> class GenerateVariableDeclaration { @@ -146,7 +152,13 @@ GenerateVariableDeclaration(QTextStream& o): out(o) {} - void operator()(Model::VariableDeclarationItem *node); + void operator()(Model::VariableDeclarationItem *node) + { + if (printType) + GenerateVariableDeclarationImpl::printType(out, node); + if (printName) + GenerateVariableDeclarationImpl::printName(out, node); + } }; class GenerateTokenVariableInitialization : public DefaultVisitor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-main.cpp new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-main.cpp --- old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-main.cpp 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-main.cpp 2023-01-10 20:34:28.000000000 +0100 @@ -30,6 +30,7 @@ #include "kdev-pg-inline-checker.h" #include "kdev-pg-generate.h" #include "kdev-pg-regexp.h" +#include <../kdevelop-pg-qt_version.h> #include <QFile> #include <QStringList> @@ -97,7 +98,7 @@ void version() { - KDevPG::checkOut << "KDevelop-PG-Qt: 1.0.0" << endl; + KDevPG::checkOut << "KDevelop-PG-Qt: " << KDEVELOP_PG_QT_VERSION_STRING << endl; exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-regexp.cpp --- old/kdevelop-pg-qt-2.2.1/kdev-pg/kdev-pg-regexp.cpp 2020-02-02 21:02:00.000000000 +0100 +++ new/kdevelop-pg-qt-2.2.2/kdev-pg/kdev-pg-regexp.cpp 2023-01-10 20:34:28.000000000 +0100 @@ -35,9 +35,6 @@ // TODO: Line-End etc. // TODO: Deactivate/activate rules (have to keep the bitsets of possible final states) - -#define NC(...) __VA_ARGS__ - #define q_Hash_to_tr1_hash(type) \ namespace std \ { \ @@ -189,7 +186,7 @@ size_t state = 0; foreach(const QChar c, str) { - foreach(NC(const pair<CharSet, size_t>& r), rules[state]) + foreach(const auto& r, rules[state]) { if(r.first.accepts(c.unicode())) // make it more portable!! { @@ -216,7 +213,7 @@ action = accept[state]; } quint64 chr = iter.next(); // make it more portable!! - foreach(NC(const pair<CharSet, size_t>& r), rules[state]) + foreach(const auto& r, rules[state]) { if(r.first.accepts(chr)) { @@ -275,7 +272,7 @@ { size_t curr = todo.top(); todo.pop(); - foreach(NC(const pair<CharSet, size_t>& i), rules[curr]) + foreach(const auto& i, rules[curr]) { if(!arrivable[i.second]) { @@ -319,9 +316,9 @@ bool sameGroup(size_t ngroups, const vector<size_t>& ogroups, size_t x, size_t y) { vector<CharSet> xsets(ngroups), ysets(ngroups); - foreach(NC(const pair<CharSet, size_t>& i), rules[x]) + foreach(const auto& i, rules[x]) xsets[ogroups[i.second]].unite(i.first); - foreach(NC(const pair<CharSet, size_t>& i), rules[y]) + foreach(const auto& i, rules[y]) ysets[ogroups[i.second]].unite(i.first); return xsets == ysets; } @@ -362,7 +359,7 @@ for(size_t i = 0; i != nstates; ++i) { _accept[groups[i]] = accept[i]; - foreach(NC(const pair<CharSet, size_t>& j), rules[i]) + foreach(const auto& j, rules[i]) _rules[groups[i]].push_back(make_pair(j.first, groups[j.second])); } rules = _rules; @@ -371,7 +368,7 @@ for(size_t i = 0; i != nstates; ++i) { vector<CharSet> mapping(nstates, CharSet::emptySet()); - foreach(NC(const pair<CharSet, size_t>& j), rules[i]) + foreach(const auto& j, rules[i]) mapping[j.second].unite(j.first); rules[i].clear(); for(size_t j = 0; j != nstates; ++j) @@ -575,7 +572,7 @@ { if(s[i]) { - foreach(NC(const pair<CharSet, size_t>& r), rules[i]) + foreach(const auto& r, rules[i]) { UsedBitArray nxt(nstates); nxt[r.second] = true; @@ -650,7 +647,7 @@ states.insert(x); rules[x]; vector<pair<CharSet, UsedBitArray > > nxt = follow(x); - foreach(NC(const pair<CharSet, UsedBitArray >& nx), nxt) + foreach(const auto& nx, nxt) { if(!nx.first.epsilon()) { @@ -694,7 +691,7 @@ for(auto i = rules.begin(); i != rules.end(); ++i) { size_t key = st[i->first]; - foreach(NC(const pair<CharSet, UsedBitArray > nx), i->second) + foreach(const auto& nx, i->second) _.rules[key].push_back(make_pair(nx.first, st[nx.second])); } return _;