diff --git a/app/main.cpp b/app/main.cpp index 7d51e7a7dea5cd3a981185d5a9e778540b0304dd..c7b216e3978df73fa575e99194ed7d24e3f9e4f3 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -392,7 +392,7 @@ int main( int argc, char *argv[] ) KAboutData aboutData( QStringLiteral("kdevelop"), i18n("KDevelop"), QStringLiteral(KDEVELOP_VERSION_STRING), i18n("The KDevelop Integrated Development Environment"), KAboutLicense::GPL, - i18n("Copyright 1999-%1, The KDevelop developers", QStringLiteral("2019")), + i18n("Copyright 1999-%1, The KDevelop developers", QStringLiteral("2020")), QString(), QStringLiteral("https://www.kdevelop.org/")); aboutData.setDesktopFileName(QStringLiteral("org.kde.kdevelop")); aboutData.addAuthor( i18n("Kevin Funk"), i18n( "Co-maintainer, C++/Clang, QA, Windows Support" ), QStringLiteral("kfunk@kde.org") ); diff --git a/appimage/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch b/appimage/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch deleted file mode 100644 index ca783c1368fd86d4e4a8e51ac42c27a942c2414c..0000000000000000000000000000000000000000 --- a/appimage/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e78beb2e..9963e353 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,9 +52,7 @@ function(generate_binary_resource target outfile) - ${RESOURCES_WORKING_DIR}/.gitignore - ${RESOURCES_WORKING_DIR}/CMakeLists.txt - COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -- COMMAND ${CMAKE_COMMAND} -E env -- $,PATH,LD_LIBRARY_PATH>=$ -- $ -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE} -+ COMMAND $ -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE} - - WORKING_DIRECTORY ${RESOURCES_WORKING_DIR} - DEPENDS breeze-${target}-mkdir diff --git a/appimage/kate-unbreak-cmake3.5.patch b/appimage/kate-unbreak-cmake3.5.patch new file mode 100644 index 0000000000000000000000000000000000000000..1d936625de95c7f6814be80d3ac259a0b7197c7d --- /dev/null +++ b/appimage/kate-unbreak-cmake3.5.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e2829c83..c10f1c831 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} + ) + + # Qt 5.13 deprecated QComboBox::currentIndexChanged(QString) and Qt 5.14 undid that... +-if (Qt5Widgets_VERSION VERSION_GREATER_EQUAL 5.14.0) ++if (NOT Qt5Widgets_VERSION VERSION_LESS 5.14.0) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) + endif() + diff --git a/appimage/kdevelop-recipe-centos6.sh b/appimage/kdevelop-recipe-centos6.sh index c7c835d874877a708faeb51a0577b09cdb322363..5a92d5d7f32cb1c0f86689b24970d9442edd70ce 100755 --- a/appimage/kdevelop-recipe-centos6.sh +++ b/appimage/kdevelop-recipe-centos6.sh @@ -27,9 +27,9 @@ fi if [ -z "$KDEV_PG_QT_VERSION" ]; then KDEV_PG_QT_VERSION=v2.2.0 fi -KF5_VERSION=v5.64.0 -PLASMA_VERSION=v5.17.3 -KDE_APPLICATIONS_VERSION=v19.08.3 +KF5_VERSION=v5.65.0 +PLASMA_VERSION=v5.17.4 +KDE_RELEASESERVICE_VERSION=v19.12.0 GRANTLEE_VERSION=v5.1.0 OKTETA_VERSION=v0.26.2 @@ -191,7 +191,7 @@ build_framework kcmutils (PATCH_FILE=$SCRIPT_DIR/knotifications_no_phonon.patch build_framework knotifications) build_framework knotifyconfig build_framework kdoctools -(PATCH_FILE=$SCRIPT_DIR/breeze-icons_revert_qrcAlias_breakage_cmake_3.5.patch build_framework breeze-icons -DBINARY_ICONS_RESOURCE=1) +build_framework breeze-icons -DBINARY_ICONS_RESOURCE=1 build_framework kpty build_framework kinit fi @@ -202,9 +202,9 @@ build_project kdecoration $PLASMA_VERSION # needed by breeze build_project breeze $PLASMA_VERSION # KDE Applications -build_project libkomparediff2 $KDE_APPLICATIONS_VERSION -build_project kate $KDE_APPLICATIONS_VERSION -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_addons=TRUE -DBUILD_snippets=TRUE -DBUILD_kate-ctags=TRUE # for snippet plugin, see T3826 -build_project konsole $KDE_APPLICATIONS_VERSION +build_project libkomparediff2 $KDE_RELEASESERVICE_VERSION +(PATCH_FILE=$SCRIPT_DIR/kate-unbreak-cmake3.5.patch build_project kate $KDE_RELEASESERVICE_VERSION -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_addons=TRUE -DBUILD_snippets=TRUE -DBUILD_kate-ctags=TRUE) +build_project konsole $KDE_RELEASESERVICE_VERSION build_project okteta $OKTETA_VERSION -DBUILD_DESIGNERPLUGIN=OFF -DBUILD_OKTETAKASTENLIBS=OFF # Extra diff --git a/kdevplatform/shell/core.cpp b/kdevplatform/shell/core.cpp index 2df962778c435b81298c059f70974c11134330d7..cfe9d7e7fa08ecb52191da00adbe2376f429a2a3 100644 --- a/kdevplatform/shell/core.cpp +++ b/kdevplatform/shell/core.cpp @@ -95,7 +95,7 @@ KAboutData createAboutData() i18n("KDevelop Platform"), QStringLiteral(KDEVPLATFORM_VERSION_STRING), i18n("Development Platform for IDE-like Applications"), KAboutLicense::LGPL_V2, - i18n("Copyright 2004-%1, The KDevelop developers", QStringLiteral("2019")), + i18n("Copyright 2004-%1, The KDevelop developers", QStringLiteral("2020")), QString(), QStringLiteral("https://www.kdevelop.org/")); aboutData.addAuthor( i18n("Andreas Pakulat"), i18n( "Architecture, VCS Support, Project Management Support, QMake Projectmanager" ), QStringLiteral("apaku@gmx.de") ); diff --git a/org.kde.kdevelop.appdata.xml b/org.kde.kdevelop.appdata.xml index d58ccc7241d878db6bdbb94113fdcb9df0fbc1c8..29652925ad124bfdcf7ffc497be4886ff70cb0c7 100644 --- a/org.kde.kdevelop.appdata.xml +++ b/org.kde.kdevelop.appdata.xml @@ -146,5 +146,8 @@ Development IDE + + + kfunk@kde.org