Hello community,
here is the log from the commit of package kdevelop5-plugin-php for
openSUSE:Factory checked in at 2019-08-08 14:23:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdevelop5-plugin-php (Old)
and /work/SRC/openSUSE:Factory/.kdevelop5-plugin-php.new.9556 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5-plugin-php"
Thu Aug 8 14:23:23 2019 rev:15 rq:721506 version:5.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kdevelop5-plugin-php/kdevelop5-plugin-php.changes
2019-07-26 17:35:05.864070230 +0200
+++
/work/SRC/openSUSE:Factory/.kdevelop5-plugin-php.new.9556/kdevelop5-plugin-php.changes
2019-08-08 14:23:25.740348839 +0200
@@ -1,0 +2,9 @@
+Tue Aug 6 11:46:35 UTC 2019 - [email protected]
+
+- New upstream release 5.4.0
+ * Always set maximum file size for internal parse job
+ * Bypass the 5 MB maximum file size limit for the
+ phpfunctions.php internal file
+ * Fix linking with ld.lld
+
+-------------------------------------------------------------------
Old:
----
kdev-php-5.3.3.tar.xz
New:
----
kdev-php-5.4.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop5-plugin-php.spec ++++++
--- /var/tmp/diff_new_pack.8LhZVW/_old 2019-08-08 14:23:26.228348764 +0200
+++ /var/tmp/diff_new_pack.8LhZVW/_new 2019-08-08 14:23:26.232348764 +0200
@@ -16,18 +16,16 @@
#
-# for compatibility with Leap 42.3 which doesn't have this macro yet
-%{!?_kf5_debugdir: %global _kf5_debugdir %{_kf5_configdir}}
%define rname kdev-php
-%define rversion 5.3
+%define rversion 5.4
Name: kdevelop5-plugin-php
-Version: 5.3.3
+Version: 5.4.0
Release: 0
Summary: PHP plugin for Kdevelop5 Integrated Development Environment
License: GPL-2.0-or-later
Group: Development/Tools/IDE
-URL: http://www.kdevelop.org
-Source0:
http://download.kde.org/stable/kdevelop/%{version}/src/%{rname}-%{version}.tar.xz
+URL: https://www.kdevelop.org
+Source0:
https://download.kde.org/stable/kdevelop/%{version}/src/%{rname}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: kcmutils-devel
BuildRequires: kdevelop5-pg-qt
++++++ kdev-php-5.3.3.tar.xz -> kdev-php-5.4.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/.gitignore
new/kdev-php-5.4.0/.gitignore
--- old/kdev-php-5.3.3/.gitignore 2019-07-18 00:43:05.380434952 +0200
+++ new/kdev-php-5.4.0/.gitignore 2019-08-06 00:59:02.000000000 +0200
@@ -1,6 +1,7 @@
apidocs
.kdev4
*~
+*.orig
doxygen.log
build
.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/CMakeLists.txt
new/kdev-php-5.4.0/CMakeLists.txt
--- old/kdev-php-5.3.3/CMakeLists.txt 2019-07-18 00:43:26.428468987 +0200
+++ new/kdev-php-5.4.0/CMakeLists.txt 2019-08-06 00:59:27.000000000 +0200
@@ -1,12 +1,9 @@
cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0048 NEW)
+project(kdev-php VERSION "5.4.0")
-set(KDEVPHP_VERSION_MAJOR 5)
-set(KDEVPHP_VERSION_MINOR 3)
-set(KDEVPHP_VERSION_PATCH 3)
-project(kdev-php VERSION
"${KDEVPHP_VERSION_MAJOR}.${KDEVPHP_VERSION_MINOR}.${KDEVPHP_VERSION_PATCH}")
-
-find_package (ECM "5.14.0" REQUIRED NO_MODULE)
+find_package(Threads)
+find_package (ECM "5.28.0" REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
include(KDECompilerSettings NO_POLICY_SCOPE)
@@ -19,9 +16,9 @@
include(ECMSetupVersion)
include(FeatureSummary)
-set(QT_MIN_VERSION "5.5.0")
+set(QT_MIN_VERSION "5.7.0")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
-set(KF5_DEP_VERSION "5.15.0")
+set(KF5_DEP_VERSION "5.28.0")
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS
ThreadWeaver
TextEditor
@@ -32,7 +29,7 @@
find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
endif()
# KDevplatform dependency version
-set(KDEVPLATFORM_VERSION "${KDEVPHP_VERSION_MAJOR}.${KDEVPHP_VERSION_MINOR}")
+set(KDEVPLATFORM_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
find_package(KDevPlatform ${KDEVPLATFORM_VERSION} CONFIG REQUIRED)
ecm_setup_version(
@@ -90,6 +87,8 @@
KF5::I18n
KF5::TextEditor
+
+ Threads::Threads
)
# not writeable so that the refactoring actions get hidden
@@ -98,10 +97,17 @@
install(FILES org.kde.kdev-php.metainfo.xml DESTINATION
${KDE_INSTALL_METAINFODIR})
# kdebugsettings file
+# kdebugsettings >= 18.12 supports/pushes for some newer, not
backward-compatible format.
+# For ECM >= 5.59 we install categories files to new location, which is only
supported by
+# newer kdebugsettings also supporting the new content format, so we use that
as base.
if (ECM_VERSION VERSION_GREATER "5.58.0")
- install(FILES kdevphpsupport.categories DESTINATION
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+ install(FILES kdevphpsupport-newformat.categories RENAME
kdevphpsupport.categories
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+ )
else()
- install(FILES kdevphpsupport.categories DESTINATION ${KDE_INSTALL_CONFDIR})
+ install(FILES kdevphpsupport-oldformat.categories RENAME
kdevphpsupport.categories
+ DESTINATION ${KDE_INSTALL_CONFDIR}
+ )
endif()
# create a Config.cmake and a ConfigVersion.cmake file and install them
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/codegen/refactoring.cpp
new/kdev-php-5.4.0/codegen/refactoring.cpp
--- old/kdev-php-5.3.3/codegen/refactoring.cpp 2019-07-18 00:43:05.380434952
+0200
+++ new/kdev-php-5.4.0/codegen/refactoring.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -19,10 +19,9 @@
*/
-#include <QtCore/QObject>
+#include <QObject>
#include <codegen/refactoring.h>
-
namespace Php
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/completion/tests/bench_completion.h
new/kdev-php-5.4.0/completion/tests/bench_completion.h
--- old/kdev-php-5.3.3/completion/tests/bench_completion.h 2019-07-18
00:43:05.384434959 +0200
+++ new/kdev-php-5.4.0/completion/tests/bench_completion.h 2019-08-06
00:59:02.000000000 +0200
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef PHP_BENCHMARKCODECOMPLETION_H
-#define PHP_BENCHMARKCODECOMPLETION_H
+#ifndef PHP_BENCH_COMPLETION_H
+#define PHP_BENCH_COMPLETION_H
#include "../../duchain/tests/duchaintestbase.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/docs/kdevphpdocsversion.h.cmake
new/kdev-php-5.4.0/docs/kdevphpdocsversion.h.cmake
--- old/kdev-php-5.3.3/docs/kdevphpdocsversion.h.cmake 2019-07-18
00:43:05.384434959 +0200
+++ new/kdev-php-5.4.0/docs/kdevphpdocsversion.h.cmake 1970-01-01
01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * This file is part of the KDE project
- * Copyright 2012 Milian Wolff <[email protected]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
-
*******************************************************************************/
-#ifndef KDEVPHPDOCS_VERSION_H
-#define KDEVPHPDOCS_VERSION_H
-
-#include <kdeversion.h>
-
-#define KDEVPHPDOCS_MAJOR_VERSION @KDEVPHPDOCS_VERSION_MAJOR@
-#define KDEVPHPDOCS_MINOR_VERSION @KDEVPHPDOCS_VERSION_MINOR@
-#define KDEVPHPDOCS_PATCH_VERSION @KDEVPHPDOCS_VERSION_PATCH@
-
-#define KDEVPHPDOCS_VERSION_STR
"@KDEVPHPDOCS_VERSION_MAJOR@.@KDEVPHPDOCS_VERSION_MINOR@.@KDEVPHPDOCS_VERSION_PATCH@"
-
-#define KDEVPHPDOCS_VERSION KDE_MAKE_VERSION(@KDEVPHPDOCS_VERSION_MAJOR@,
@KDEVPHPDOCS_VERSION_MINOR@, @KDEVPHPDOCS_VERSION_PATCH@)
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/docs/phpdocsplugin.cpp
new/kdev-php-5.4.0/docs/phpdocsplugin.cpp
--- old/kdev-php-5.3.3/docs/phpdocsplugin.cpp 2019-07-18 00:43:05.384434959
+0200
+++ new/kdev-php-5.4.0/docs/phpdocsplugin.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -40,7 +40,7 @@
#include <language/duchain/classmemberdeclaration.h>
#include <language/duchain/classfunctiondeclaration.h>
-#include <QtCore/QFile>
+#include <QFile>
#include "phpdocsdebug.h"
#include "phpdocumentation.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdev-php-5.3.3/duchain/navigation/declarationnavigationcontext.cpp
new/kdev-php-5.4.0/duchain/navigation/declarationnavigationcontext.cpp
--- old/kdev-php-5.3.3/duchain/navigation/declarationnavigationcontext.cpp
2019-07-18 00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/navigation/declarationnavigationcontext.cpp
2019-08-06 00:59:02.000000000 +0200
@@ -19,7 +19,7 @@
#include "declarationnavigationcontext.h"
-#include <QtGui/QTextDocument>
+#include <QTextDocument>
#include <klocalizedstring.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdev-php-5.3.3/duchain/navigation/magicconstantnavigationcontext.cpp
new/kdev-php-5.4.0/duchain/navigation/magicconstantnavigationcontext.cpp
--- old/kdev-php-5.3.3/duchain/navigation/magicconstantnavigationcontext.cpp
2019-07-18 00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/navigation/magicconstantnavigationcontext.cpp
2019-08-06 00:59:02.000000000 +0200
@@ -18,7 +18,7 @@
#include "magicconstantnavigationcontext.h"
-#include <QtGui/QTextDocument>
+#include <QTextDocument>
#include <KLocalizedString>
#include <language/duchain/topducontext.h>
#include <language/duchain/declaration.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdev-php-5.3.3/duchain/navigation/navigationwidget.cpp
new/kdev-php-5.4.0/duchain/navigation/navigationwidget.cpp
--- old/kdev-php-5.3.3/duchain/navigation/navigationwidget.cpp 2019-07-18
00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/navigation/navigationwidget.cpp 2019-08-06
00:59:02.000000000 +0200
@@ -26,7 +26,6 @@
using namespace KDevelop;
NavigationWidget::NavigationWidget(KDevelop::DeclarationPointer declaration,
KDevelop::TopDUContextPointer topContext,
- const QString& htmlPrefix, const QString&
htmlSuffix,
KDevelop::AbstractNavigationWidget::DisplayHints hints)
: AbstractNavigationWidget()
{
@@ -36,12 +35,10 @@
//The first context is registered so it is kept alive by the
shared-pointer mechanism
auto context = NavigationContextPointer(new
DeclarationNavigationContext(declaration, topContext));
- context->setPrefixSuffix(htmlPrefix, htmlSuffix);
setContext(context);
}
NavigationWidget::NavigationWidget(const IncludeItem& includeItem,
KDevelop::TopDUContextPointer topContext,
- const QString& htmlPrefix, const QString&
htmlSuffix,
KDevelop::AbstractNavigationWidget::DisplayHints hints)
: AbstractNavigationWidget()
{
@@ -51,7 +48,6 @@
//The first context is registered so it is kept alive by the shared-pointer
mechanism
auto context = NavigationContextPointer(new
IncludeNavigationContext(includeItem, topContext));
- context->setPrefixSuffix(htmlPrefix, htmlSuffix);
setContext(context);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/navigation/navigationwidget.h
new/kdev-php-5.4.0/duchain/navigation/navigationwidget.h
--- old/kdev-php-5.3.3/duchain/navigation/navigationwidget.h 2019-07-18
00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/navigation/navigationwidget.h 2019-08-06
00:59:02.000000000 +0200
@@ -36,18 +36,10 @@
Q_OBJECT
public:
- /**
- * @param htmlPrefix and @param htmlSuffix can be used to add own text
before/behind the
- * normal text in the navigation-widget.
- * The texts may contain links to files, using a simple special Syntax:
- * KDEV_FILE_LINK{File}. Every occurrence of KDEV_FILE_LINK will be
replaced.
- * */
NavigationWidget(KDevelop::DeclarationPointer declaration,
KDevelop::TopDUContextPointer topContext,
- const QString& htmlPrefix = QString(), const QString&
htmlSuffix = QString(),
KDevelop::AbstractNavigationWidget::DisplayHints hints =
KDevelop::AbstractNavigationWidget::NoHints);
NavigationWidget(const KDevelop::IncludeItem& includeItem,
KDevelop::TopDUContextPointer topContext,
- const QString& htmlPrefix = QString(), const QString&
htmlSuffix = QString(),
KDevelop::AbstractNavigationWidget::DisplayHints hints =
KDevelop::AbstractNavigationWidget::NoHints);
/// use this for magic constants
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/phpducontext.cpp
new/kdev-php-5.4.0/duchain/phpducontext.cpp
--- old/kdev-php-5.3.3/duchain/phpducontext.cpp 2019-07-18 00:43:05.388434965
+0200
+++ new/kdev-php-5.4.0/duchain/phpducontext.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -39,8 +39,7 @@
REGISTER_DUCHAIN_ITEM_WITH_DATA(PhpNormalDUContext, DUContextData);
template<>
-QWidget* PhpDUContext<TopDUContext>::createNavigationWidget(Declaration* decl,
TopDUContext* topContext, const QString& htmlPrefix,
- const QString&
htmlSuffix, KDevelop::AbstractNavigationWidget::DisplayHints hints) const
+KDevelop::AbstractNavigationWidget*
PhpDUContext<TopDUContext>::createNavigationWidget(Declaration* decl,
TopDUContext* topContext, KDevelop::AbstractNavigationWidget::DisplayHints
hints) const
{
if (decl == nullptr) {
return nullptr;
@@ -52,26 +51,22 @@
i.isDirectory = false;
i.basePath = KIO::upUrl(u);
- return new NavigationWidget( i, TopDUContextPointer(topContext),
htmlPrefix, htmlSuffix, hints );
+ return new NavigationWidget( i, TopDUContextPointer(topContext), hints
);
} else {
- return new NavigationWidget(DeclarationPointer(decl),
TopDUContextPointer(topContext ? topContext : this->topContext()),
- htmlPrefix, htmlSuffix, hints);
+ return new NavigationWidget(DeclarationPointer(decl),
TopDUContextPointer(topContext ? topContext : this->topContext()), hints);
}
}
template<>
-QWidget* PhpDUContext<DUContext>::createNavigationWidget(Declaration* decl,
TopDUContext* topContext, const QString& htmlPrefix,
- const QString&
htmlSuffix, KDevelop::AbstractNavigationWidget::DisplayHints hints) const
+KDevelop::AbstractNavigationWidget*
PhpDUContext<DUContext>::createNavigationWidget(Declaration* decl,
TopDUContext* topContext, KDevelop::AbstractNavigationWidget::DisplayHints
hints) const
{
if (decl == nullptr) {
if (owner())
- return new NavigationWidget(DeclarationPointer(owner()),
TopDUContextPointer(topContext ? topContext : this->topContext()),
- htmlPrefix, htmlSuffix, hints);
+ return new NavigationWidget(DeclarationPointer(owner()),
TopDUContextPointer(topContext ? topContext : this->topContext()), hints);
else
return nullptr;
} else {
- return new NavigationWidget(DeclarationPointer(decl),
TopDUContextPointer(topContext ? topContext : this->topContext()),
- htmlPrefix, htmlSuffix, hints);
+ return new NavigationWidget(DeclarationPointer(decl),
TopDUContextPointer(topContext ? topContext : this->topContext()), hints);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/phpducontext.h
new/kdev-php-5.4.0/duchain/phpducontext.h
--- old/kdev-php-5.3.3/duchain/phpducontext.h 2019-07-18 00:43:05.388434965
+0200
+++ new/kdev-php-5.4.0/duchain/phpducontext.h 2019-08-06 00:59:02.000000000
+0200
@@ -59,8 +59,7 @@
static_cast<KDevelop::DUChainBase*>(this)->d_func_dynamic()->setClassId(this);
}
- QWidget* createNavigationWidget(KDevelop::Declaration* decl,
KDevelop::TopDUContext* topContext,
- const QString& htmlPrefix, const
QString& htmlSuffix,
+ KDevelop::AbstractNavigationWidget*
createNavigationWidget(KDevelop::Declaration* decl, KDevelop::TopDUContext*
topContext,
KDevelop::AbstractNavigationWidget::DisplayHints hints) const override;
enum {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/tests/benchmarks.h
new/kdev-php-5.4.0/duchain/tests/benchmarks.h
--- old/kdev-php-5.3.3/duchain/tests/benchmarks.h 2019-07-18
00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/tests/benchmarks.h 2019-08-06
00:59:02.000000000 +0200
@@ -18,8 +18,8 @@
#ifndef BENCHMARKS_H
#define BENCHMARKS_H
-#include <QtCore/QObject>
-#include <QtCore/QFile>
+#include <QObject>
+#include <QFile>
#include "duchaintestbase.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/tests/duchain.cpp
new/kdev-php-5.4.0/duchain/tests/duchain.cpp
--- old/kdev-php-5.3.3/duchain/tests/duchain.cpp 2019-07-18
00:43:05.388434965 +0200
+++ new/kdev-php-5.4.0/duchain/tests/duchain.cpp 2019-08-06
00:59:02.000000000 +0200
@@ -18,7 +18,7 @@
#include "duchain.h"
-#include <QtTest/QtTest>
+#include <QtTest>
#include <language/duchain/parsingenvironment.h>
#include <language/duchain/problem.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/tests/expressionparser.cpp
new/kdev-php-5.4.0/duchain/tests/expressionparser.cpp
--- old/kdev-php-5.3.3/duchain/tests/expressionparser.cpp 2019-07-18
00:43:05.392434972 +0200
+++ new/kdev-php-5.4.0/duchain/tests/expressionparser.cpp 2019-08-06
00:59:02.000000000 +0200
@@ -18,7 +18,7 @@
#include "expressionparser.h"
-#include <QtTest/QtTest>
+#include <QtTest>
#include <language/duchain/parsingenvironment.h>
#include <language/duchain/problem.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/duchain/tests/uses.cpp
new/kdev-php-5.4.0/duchain/tests/uses.cpp
--- old/kdev-php-5.3.3/duchain/tests/uses.cpp 2019-07-18 00:43:05.392434972
+0200
+++ new/kdev-php-5.4.0/duchain/tests/uses.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -18,7 +18,7 @@
#include "uses.h"
-#include <QtTest/QtTest>
+#include <QtTest>
#include <language/duchain/duchain.h>
#include <language/duchain/duchainlock.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/kdevphpsupport-newformat.categories
new/kdev-php-5.4.0/kdevphpsupport-newformat.categories
--- old/kdev-php-5.3.3/kdevphpsupport-newformat.categories 1970-01-01
01:00:00.000000000 +0100
+++ new/kdev-php-5.4.0/kdevphpsupport-newformat.categories 2019-08-06
00:59:02.000000000 +0200
@@ -0,0 +1,10 @@
+# KDebugSettings data file
+# Format:
+# logname<space>description(optional <space> DEFAULT_SEVERITY
[DEFAULT_CATEGORY] as WARNING/DEBUG/INFO/CRITICAL) optional IDENTIFIER [...])
+
+kdevelop.plugins.php KDevelop plugin: PHP language support IDENTIFIER [PHP]
+kdevelop.plugins.php.completion KDevelop plugin: PHP language support -
codecompletion IDENTIFIER [COMPLETION]
+kdevelop.plugins.php.docs KDevelop plugin: PHP language support -
documentation IDENTIFIER [DOCS]
+kdevelop.plugins.php.duchain KDevelop plugin: PHP language support - duchain
IDENTIFIER [DUCHAIN]
+kdevelop.plugins.php.parser KDevelop plugin: PHP language support - parser
IDENTIFIER [PARSER]
+kdevelop.plugins.php.testprovider KDevelop plugin: PHP language support -
testprovider IDENTIFIER [TESTPROVIDER]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/kdevphpsupport-oldformat.categories
new/kdev-php-5.4.0/kdevphpsupport-oldformat.categories
--- old/kdev-php-5.3.3/kdevphpsupport-oldformat.categories 1970-01-01
01:00:00.000000000 +0100
+++ new/kdev-php-5.4.0/kdevphpsupport-oldformat.categories 2019-08-06
00:59:02.000000000 +0200
@@ -0,0 +1,10 @@
+# KDebugSettings data file
+# Format:
+# logname<space>description
+
+kdevelop.plugins.php KDevelop plugin: PHP language support
+kdevelop.plugins.php.completion KDevelop plugin: PHP language support -
codecompletion
+kdevelop.plugins.php.docs KDevelop plugin: PHP language support - documentation
+kdevelop.plugins.php.duchain KDevelop plugin: PHP language support - duchain
+kdevelop.plugins.php.parser KDevelop plugin: PHP language support - parser
+kdevelop.plugins.php.testprovider KDevelop plugin: PHP language support -
testprovider
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/kdevphpsupport.categories
new/kdev-php-5.4.0/kdevphpsupport.categories
--- old/kdev-php-5.3.3/kdevphpsupport.categories 2019-07-18
00:43:05.392434972 +0200
+++ new/kdev-php-5.4.0/kdevphpsupport.categories 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-# KDebugSettings data file
-# Format:
-# logname<space>description
-
-kdevelop.plugins.php KDevelop plugin: PHP language support
-kdevelop.plugins.php.completion KDevelop plugin: PHP language support -
codecompletion
-kdevelop.plugins.php.docs KDevelop plugin: PHP language support - documentation
-kdevelop.plugins.php.duchain KDevelop plugin: PHP language support - duchain
-kdevelop.plugins.php.parser KDevelop plugin: PHP language support - parser
-kdevelop.plugins.php.testprovider KDevelop plugin: PHP language support -
testprovider
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/org.kde.kdev-php.metainfo.xml
new/kdev-php-5.4.0/org.kde.kdev-php.metainfo.xml
--- old/kdev-php-5.3.3/org.kde.kdev-php.metainfo.xml 2019-07-18
00:43:05.392434972 +0200
+++ new/kdev-php-5.4.0/org.kde.kdev-php.metainfo.xml 2019-08-06
00:59:02.000000000 +0200
@@ -49,5 +49,10 @@
<url type="help">https://docs.kde.org/index.php?application=kdevelop</url>
<url
type="donation">https://www.kde.org/community/donations/?app=kdevelop</url>
<project_group>KDE</project_group>
+ <icon type="stock">kdevelop</icon>
+ <categories>
+ <category>Development</category>
+ <category>IDE</category>
+ </categories>
<update_contact>[email protected]</update_contact>
</component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/parser/parsesession.h
new/kdev-php-5.4.0/parser/parsesession.h
--- old/kdev-php-5.3.3/parser/parsesession.h 2019-07-18 00:43:05.392434972
+0200
+++ new/kdev-php-5.4.0/parser/parsesession.h 2019-08-06 00:59:02.000000000
+0200
@@ -19,7 +19,7 @@
#ifndef PHP_PARSESESSION_H
#define PHP_PARSESESSION_H
-#include <QtCore/QString>
+#include <QString>
#include "phpparser.h"
#include "parserexport.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/parser/phplexer.cpp
new/kdev-php-5.4.0/parser/phplexer.cpp
--- old/kdev-php-5.3.3/parser/phplexer.cpp 2019-07-18 00:43:05.392434972
+0200
+++ new/kdev-php-5.4.0/parser/phplexer.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -23,10 +23,10 @@
#include "phpparser.h"
#include "tokenstream.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QStringList>
+#include <QRegExp>
+#include <QDebug>
#include "parserdebug.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/parser/test/lexertest.cpp
new/kdev-php-5.4.0/parser/test/lexertest.cpp
--- old/kdev-php-5.3.3/parser/test/lexertest.cpp 2019-07-18
00:43:05.392434972 +0200
+++ new/kdev-php-5.4.0/parser/test/lexertest.cpp 2019-08-06
00:59:02.000000000 +0200
@@ -19,7 +19,7 @@
#include "lexertest.h"
-#include <QtTest/QtTest>
+#include <QtTest>
#include "parsesession.h"
#include "phplexer.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/phplanguagesupport.cpp
new/kdev-php-5.4.0/phplanguagesupport.cpp
--- old/kdev-php-5.3.3/phplanguagesupport.cpp 2019-07-18 00:43:05.420435019
+0200
+++ new/kdev-php-5.4.0/phplanguagesupport.cpp 2019-08-06 00:59:02.000000000
+0200
@@ -87,7 +87,15 @@
KDevelop::ParseJob *LanguageSupport::createParseJob(const IndexedString &url)
{
- return new ParseJob(url, this);
+ auto *job = new ParseJob(url, this);
+
+ // bypass the 5 MB maximum file size limit for the internal file
+ if (url == internalFunctionFile()) {
+ job->setMaximumFileSize(std::numeric_limits<qint64>::max());
+ job->setMinimumFeatures(TopDUContext::AllDeclarationsAndContexts);
+ }
+
+ return job;
}
QString LanguageSupport::name() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/phplanguagesupport.h
new/kdev-php-5.4.0/phplanguagesupport.h
--- old/kdev-php-5.3.3/phplanguagesupport.h 2019-07-18 00:43:05.420435019
+0200
+++ new/kdev-php-5.4.0/phplanguagesupport.h 2019-08-06 00:59:02.000000000
+0200
@@ -22,7 +22,7 @@
#include <interfaces/iplugin.h>
#include <language/interfaces/ilanguagesupport.h>
-#include <QtCore/QVariant>
+#include <QVariant>
namespace KDevelop
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/phpparsejob.cpp
new/kdev-php-5.4.0/phpparsejob.cpp
--- old/kdev-php-5.3.3/phpparsejob.cpp 2019-07-18 00:43:05.420435019 +0200
+++ new/kdev-php-5.4.0/phpparsejob.cpp 2019-08-06 00:59:02.000000000 +0200
@@ -42,11 +42,12 @@
#include "phpducontext.h"
#include "phpdebug.h"
-#include <QtCore/QReadLocker>
-#include <QtCore/QThread>
+#include <QReadLocker>
+#include <QThread>
#include <language/duchain/duchainutils.h>
#include <mutex>
+#include <memory>
using namespace KDevelop;
@@ -76,10 +77,9 @@
static std::once_flag once;
std::call_once(once, [phpSupport] {
qCDebug(PHP) << "Initializing internal function file" <<
internalFunctionFile();
- ParseJob internalJob(internalFunctionFile(), phpSupport);
-
internalJob.setMinimumFeatures(TopDUContext::AllDeclarationsAndContexts);
- internalJob.run({}, nullptr);
- Q_ASSERT(internalJob.success());
+ auto internalJob =
std::unique_ptr<ParseJob>(static_cast<ParseJob*>(phpSupport->createParseJob(internalFunctionFile())));
+ internalJob->run({}, nullptr);
+ Q_ASSERT(internalJob->success());
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/po/gl/kdevphp.po
new/kdev-php-5.4.0/po/gl/kdevphp.po
--- old/kdev-php-5.3.3/po/gl/kdevphp.po 2019-07-18 00:43:17.140454190 +0200
+++ new/kdev-php-5.4.0/po/gl/kdevphp.po 2019-08-06 00:59:17.000000000 +0200
@@ -1,55 +1,47 @@
# translation of kdevphp.po to Galician
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-#
# mvillarino <[email protected]>, 2009.
# Marce Villarino <[email protected]>, 2009.
# marce villarino <[email protected]>, 2009.
# Marce Villarino <[email protected]>, 2009, 2013, 2014.
# Xosé <[email protected]>, 2012, 2013.
-# Adrián Chaves Fernández <[email protected]>, 2015.
-# Adrian Chaves <[email protected]>, 2018, 2019.
+# Adrián Chaves Fernández <[email protected]>, 2015, 2016.
+# Adrian Chaves (Gallaecio) <[email protected]>, 2017, 2018, 2019.
+#
msgid ""
msgstr ""
"Project-Id-Version: kdevphp\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 07:35+0200\n"
-"PO-Revision-Date: 2019-03-19 12:34+0100\n"
+"PO-Revision-Date: 2019-03-02 22:00+0100\n"
"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n"
"Language-Team: Galician <[email protected]>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Environment: kde, development\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr ""
-"mvillarino,\n"
-"Xosé Calvo"
+msgstr "Adrian Chaves (Gallaecio)"
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr ""
-"[email protected],\n"
-"[email protected]"
+msgstr "[email protected]"
#: completion/implementationitem.cpp:73
#, kde-format
msgid "Override"
-msgstr "Anular"
+msgstr "Sobrepor"
#: completion/implementationitem.cpp:76
#, kde-format
msgid "Implement"
-msgstr "Implementar"
+msgstr "Realizar"
#: completion/implementationitem.cpp:88
#, kde-format
@@ -182,7 +174,7 @@
"or implement the method."
msgstr ""
"A clase %1 contén o método abstracto %2 e polo tanto debe declararse como "
-"abstracta ou implementar o método."
+"abstracta ou realizar o método."
#: duchain/builders/declarationbuilder.cpp:375
#, kde-format
@@ -193,7 +185,7 @@
#, kde-format
msgid "Cannot use the final modifier on an abstract class member."
msgstr ""
-"Non é posíbel empregar o modificador final nun membro dunha clase abstracta."
+"Non se pode empregar o modificador final nun membro dunha clase abstracta."
#: duchain/builders/declarationbuilder.cpp:388
#, kde-format
@@ -260,8 +252,8 @@
#, kde-format
msgid "Default value for parameters with a class type hint can only be NULL."
msgstr ""
-"O valor por omisión dos parámetros cunha suxestión de tipo de clase só pode "
-"ser NULL."
+"O valor predeterminado dos parámetros cunha suxestión de tipo de clase só "
+"pode ser NULL."
#: duchain/builders/declarationbuilder.cpp:822
#, kde-format
@@ -277,7 +269,7 @@
#: duchain/builders/declarationbuilder.cpp:964
#, kde-format
msgid "Cannot redeclare PHP internal %1."
-msgstr "Non é posíbel declarar de novo %1 interno de PHP."
+msgstr "Non se pode declarar de novo %1 interno de PHP."
#: duchain/builders/declarationbuilder.cpp:967
#, kde-format
@@ -293,7 +285,7 @@
#: duchain/builders/declarationbuilder.cpp:975
#, kde-format
msgid "Cannot redeclare %1, already declared in %2 on line %3."
-msgstr "Non é posíbel declarar de novo %1, xa foi declarado na liña %3 de %2."
+msgstr "Non se pode declarar de novo %1, xa se declarou na liña %3 de %2."
#: duchain/builders/declarationbuilder.cpp:1061
#, kde-format
@@ -307,7 +299,7 @@
#: duchain/builders/declarationbuilder.cpp:1068
#, kde-format
msgid "Cannot re-assign $this."
-msgstr "Non é posíbel asignar de novo $this."
+msgstr "Non se pode asignar de novo $this."
#: duchain/builders/declarationbuilder.cpp:1262
#, kde-format
@@ -353,7 +345,7 @@
#: duchain/builders/usebuilder.cpp:209
#, kde-format
msgid "Declaration not found: %1"
-msgstr "Non se atopou a declaración: %1"
+msgstr "Declaración non atopada: %1"
#: duchain/declarations/traitmemberaliasdeclaration.cpp:68
#: duchain/declarations/traitmethodaliasdeclaration.cpp:101
@@ -442,17 +434,17 @@
#: parser/parsesession.cpp:80
#, kde-format
msgid "Could not open file '%1'"
-msgstr "Non foi posíbel abrir o ficheiro «%1»"
+msgstr "Non se puido abrir o ficheiro «%1»"
#: parser/parsesession.cpp:83
#, kde-format
msgid "File could not be read from."
-msgstr "Non foi posíbel ler o ficheiro."
+msgstr "Non se puido ler o ficheiro."
#: parser/parsesession.cpp:86
#, kde-format
msgid "File could not be opened."
-msgstr "Non foi posíbel abrir o ficheiro."
+msgstr "Non se puido abrir o ficheiro."
#: parser/parsesession.cpp:89
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/po/zh_CN/kdevphp.po
new/kdev-php-5.4.0/po/zh_CN/kdevphp.po
--- old/kdev-php-5.3.3/po/zh_CN/kdevphp.po 2019-07-18 00:43:26.428468987
+0200
+++ new/kdev-php-5.4.0/po/zh_CN/kdevphp.po 2019-08-06 00:59:27.000000000
+0200
@@ -9,7 +9,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 07:35+0200\n"
-"PO-Revision-Date: 2019-06-02 13:18\n"
+"PO-Revision-Date: 2019-07-18 15:13\n"
"Last-Translator: Guo Yunhe (guoyunhe)\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/testprovider/phpunitprovider.cpp
new/kdev-php-5.4.0/testprovider/phpunitprovider.cpp
--- old/kdev-php-5.3.3/testprovider/phpunitprovider.cpp 2019-07-18
00:43:05.420435019 +0200
+++ new/kdev-php-5.4.0/testprovider/phpunitprovider.cpp 2019-08-06
00:59:02.000000000 +0200
@@ -69,7 +69,7 @@
DUChainReadLocker lock;
if (!context) {
- qCDebug(TESTPROVIDER) << "Recieved null context for file: " <<
document;
+ qCDebug(TESTPROVIDER) << "Received null context for file: " <<
document;
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdev-php-5.3.3/testprovider/testdoxdelegate.h
new/kdev-php-5.4.0/testprovider/testdoxdelegate.h
--- old/kdev-php-5.3.3/testprovider/testdoxdelegate.h 2019-07-18
00:43:05.420435019 +0200
+++ new/kdev-php-5.4.0/testprovider/testdoxdelegate.h 2019-08-06
00:59:02.000000000 +0200
@@ -21,7 +21,7 @@
#ifndef TESTDOXDELEGATE_H
#define TESTDOXDELEGATE_H
-#include <QtWidgets/QItemDelegate>
+#include <QItemDelegate>
#include <KColorScheme>
class TestDoxDelegate : public QItemDelegate
