GIT_SILENT Upgrade release service version to 21.07.80.

(cherry picked from commit 464d1a60a1)

.gitignore

@@ -0,0 +1,26 @@
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+/build*/
+.cmake/
+CMakeLists.txt.user*
+*.unc-backup*
+.clang-format
+/compile_commands.json
+.clangd
+.cache
+.idea
+/cmake-build*

CMakeLists.txt

@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "21")
 set (RELEASE_SERVICE_VERSION_MINOR "07")
-set (RELEASE_SERVICE_VERSION_MICRO "70")
+set (RELEASE_SERVICE_VERSION_MICRO "80")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})
 
-set(QT_MIN_VERSION 5.12.0)
-set(KF5_MIN_VERSION 5.68.0)
+set(QT_MIN_VERSION 5.15.0)
+set(KF5_MIN_VERSION 5.83.0)
 
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})

CMakePresets.json

@@ -0,0 +1,128 @@
+{
+    "version": 2,
+    "configurePresets": [
+        {
+            "name": "dev",
+            "displayName": "Build as debug",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "asan",
+            "displayName": "Build with Asan support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-asan",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "ECM_ENABLE_SANITIZERS" : "'address;undefined'",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "dev-clang",
+            "displayName": "dev-clang",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-clang",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            },
+            "environment": {
+                "CXX": "clang++",
+                "CCACHE_DISABLE": "ON"
+            }
+        },
+        {
+            "name": "unity",
+            "displayName": "Build with CMake unity support.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-unity",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+		"CMAKE_UNITY_BUILD": "ON",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "release",
+            "displayName": "Build as release mode.",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "profile",
+            "displayName": "profile",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-profile",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+		"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "clazy",
+            "displayName": "clazy",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-clazy",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            },
+            "environment": {
+                "CXX": "clazy",
+                "CCACHE_DISABLE": "ON"
+            }
+        }
+
+    ],
+    "buildPresets": [
+        {
+            "name": "dev",
+            "configurePreset": "dev"
+        },
+        {
+            "name": "release",
+            "configurePreset": "release"
+        },
+        {
+            "name": "dev-clang",
+            "configurePreset": "dev-clang"
+        },
+        {
+            "name": "asan",
+            "configurePreset": "asan"
+        },
+        {
+            "name": "unity",
+            "configurePreset": "unity"
+        },
+        {
+            "name": "clazy",
+            "configurePreset": "clazy",
+            "environment": {
+                "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
+                "CCACHE_DISABLE" : "ON"
+            }
+        }
+    ],
+    "testPresets": [
+    { 
+      "name": "dev",
+      "configurePreset": "dev",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": false}
+    },
+    { 
+      "name": "asan",
+      "configurePreset": "asan",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": true}
+    }
+    ]
+}

CMakePresets.json.license

@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2021 Laurent Montel <montel@kde.org>
+# SPDX-License-Identifier: BSD-3-Clause

framebuffers/pipewire/pw_framebuffer.cpp

@@ -561,7 +561,7 @@ void PWFrameBuffer::Private::onStreamStateChanged(void *data, pw_stream_state /*
 void PWFrameBuffer::Private::onStreamParamChanged(void *data, uint32_t id, const struct spa_pod *format)
 {
     qInfo() << "Stream format changed";
-    auto *d = static_cast<PWFrameBuffer::Private *>(data);
+    auto d = static_cast<PWFrameBuffer::Private *>(data);
 
     if (!format || id != SPA_PARAM_Format) {
         return;
@@ -614,7 +614,7 @@ void PWFrameBuffer::Private::onStreamParamChanged(void *data, uint32_t id, const
  */
 void PWFrameBuffer::Private::onStreamProcess(void *data)
 {
-    auto *d = static_cast<PWFrameBuffer::Private *>(data);
+    auto d = static_cast<PWFrameBuffer::Private *>(data);
 
     pw_buffer* next_buffer;
     pw_buffer* buffer = nullptr;
@@ -640,7 +640,7 @@ void PWFrameBuffer::Private::onStreamProcess(void *data)
 
 void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
 {
-    auto *spaBuffer = pwBuffer->buffer;
+    auto spaBuffer = pwBuffer->buffer;
     uint8_t *src = nullptr;
 
     if (spaBuffer->datas[0].chunk->size == 0) {
@@ -649,6 +649,7 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
     }
 
     std::function<void()> cleanup;
+    const qint64 srcStride = spaBuffer->datas[0].chunk->stride;
     if (spaBuffer->datas->type == SPA_DATA_MemFd) {
         uint8_t *map = static_cast<uint8_t*>(mmap(
             nullptr, spaBuffer->datas->maxsize + spaBuffer->datas->mapoffset,
@@ -704,7 +705,7 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
         glBindTexture(GL_TEXTURE_2D, texture);
         glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
 
-        src = static_cast<uint8_t*>(malloc(streamSize.width() * streamSize.height() * BYTES_PER_PIXEL));
+        src = static_cast<uint8_t*>(malloc(srcStride * streamSize.height()));
 
         GLenum glFormat = GL_BGRA;
         switch (videoFormat->format) {
@@ -792,7 +793,7 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
     }
 
     const qint32 dstStride = videoSize.width() * BYTES_PER_PIXEL;
-    const qint32 srcStride = spaBuffer->datas[0].chunk->stride;
+    Q_ASSERT(dstStride <= srcStride);
 
     if (!videoFullHeight && (videoMetadata->region.position.y + videoSize.height() <=  streamSize.height())) {
         src += srcStride * videoMetadata->region.position.y;

framebuffers/pipewire/pw_framebuffer.h

@@ -24,11 +24,11 @@ class PWFrameBuffer: public FrameBuffer
 {
     Q_OBJECT
 public:
-    typedef struct {
+    using Stream = struct {
         uint nodeId;
         QVariantMap map;
-    } Stream;
-    typedef QList<Stream> Streams;
+    };
+    using Streams = QList<Stream>;
 
     PWFrameBuffer(WId winid, QObject *parent = nullptr);
     virtual ~PWFrameBuffer() override;

framebuffers/qt/qtframebuffer.cpp

@@ -26,11 +26,7 @@ QtFrameBuffer::QtFrameBuffer(WId id, QObject *parent)
     if (screen) {
         primaryScreen = screen;
         fbImage = screen->grabWindow(win).toImage();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
         fb = new char[fbImage.sizeInBytes()];
-#else
-        fb = new char[fbImage.byteCount()];
-#endif
     } else {
         fb = nullptr;
         primaryScreen = nullptr;
@@ -108,11 +104,7 @@ void QtFrameBuffer::updateFrameBuffer()
     tiles.append(img.rect());
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
     memcpy(fb, img.bits(), static_cast<size_t>(img.sizeInBytes()));
-#else
-    memcpy(fb, img.bits(), img.byteCount());
-#endif
     fbImage = img;
 
 }

krfb/connectiondialog.cpp

@@ -37,9 +37,9 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowTitle(i18n("New Connection"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    auto mainWidget = new QWidget(this);
+    auto mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);

krfb/framebufferplugin.h

@@ -34,7 +34,7 @@ class KRFBPRIVATE_EXPORT FrameBufferPlugin : public QObject
     Q_OBJECT
 
 public:
-    FrameBufferPlugin(QObject *parent, const QVariantList &args);
+    explicit FrameBufferPlugin(QObject *parent, const QVariantList &args);
     ~FrameBufferPlugin() override;
 
     virtual FrameBuffer *frameBuffer(WId id) = 0;

krfb/invitationsrfbserver.cpp

@@ -33,7 +33,13 @@
 #include <KStringHandler>
 #include <KWallet/KWallet>
 
-#include <dnssd/publicservice.h>
+#include <kdnssd_version.h>
+#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
+#include <KDNSSD/PublicService>
+#else
+#include <DNSSD/PublicService>
+#endif
+
 using KWallet::Wallet;
 
 // used for KWallet folder name

krfb/mainwindow.cpp

@@ -47,7 +47,7 @@ public:
 class Security: public QWidget, public Ui::Security
 {
 public:
-    Security(QWidget *parent = nullptr) : QWidget(parent) {
+    explicit Security(QWidget *parent = nullptr) : QWidget(parent) {
         setupUi(this);
         walletWarning = new KMessageWidget(this);
         walletWarning->setText(i18n("Storing passwords in config file is insecure!"));
@@ -107,7 +107,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_passwordLineEdit->setVisible(false);
     m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
 
-    QWidget *mainWidget = new QWidget;
+    auto mainWidget = new QWidget;
     m_ui.setupUi(mainWidget);
     m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme(QStringLiteral("krfb")).pixmap(128));
     m_ui.enableUnattendedCheckBox->setChecked(
@@ -252,7 +252,7 @@ void MainWindow::showConfiguration()
         return;
     }
 
-    KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
+    auto dialog = new KConfigDialog(this, QStringLiteral("settings"), KrfbConfig::self());
     dialog->addPage(new TCP, i18n("Network"), QStringLiteral("network-wired"));
     dialog->addPage(new Security, i18n("Security"), QStringLiteral("security-high"));
     dialog->addPage(new ConfigFramebuffer, i18n("Screen capture"), QStringLiteral("video-display"));

krfb/mainwindow.h

@@ -43,7 +43,7 @@ class MainWindow : public KXmlGuiWindow
     private:
         Ui::MainWidget m_ui;
         bool m_passwordEditable;
-        QLineEdit *m_passwordLineEdit;
+        QLineEdit *m_passwordLineEdit = nullptr;
 };
 
 #endif

krfb/org.kde.krfb.appdata.xml

@@ -48,6 +48,7 @@
   <summary xml:lang="en-GB">Share your desktop to another computer via VNC</summary>
   <summary xml:lang="es">Compartir su escritorio con otro equipo usando VNC</summary>
   <summary xml:lang="et">Oma töölaua jagamine VNC kaudu teise arvutisse</summary>
+  <summary xml:lang="fi">Jaa työpöytä toiselle koneelle VNC:n kautta</summary>
   <summary xml:lang="fr">Partager votre bureau avec un autre ordinateur grâce à « VNC »</summary>
   <summary xml:lang="ia">Compartir tu scriptorio a un altere computator via VNC</summary>
   <summary xml:lang="id">Bagikan desktopmu ke komputer lainnya via VNC</summary>
@@ -145,9 +146,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
+    <release version="21.04.3" date="2021-07-08"/>
+    <release version="21.04.2" date="2021-06-10"/>
     <release version="21.04.1" date="2021-05-13"/>
     <release version="21.04.0" date="2021-04-22"/>
-    <release version="20.12.3" date="2021-03-04"/>
-    <release version="20.12.2" date="2021-02-04"/>
   </releases>
 </component>

krfb/org.kde.krfb.desktop

@@ -84,6 +84,7 @@ GenericName[el]=Κοινή χρήση επιφάνειας εργασίας (VNC
 GenericName[en_GB]=Desktop Sharing (VNC)
 GenericName[es]=Escritorio compartido (VNC)
 GenericName[et]=Töölaua jagamine (VNC)
+GenericName[fi]=Työpöydän jakaminen (VNC)
 GenericName[fr]=Partage de bureaux (VNC)
 GenericName[ia]=Compartir de scriptorio (VNC)
 GenericName[it]=Condivisione del desktop (VNC)