GIT_SILENT Update Appstream for new release

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

CMakeLists.txt

@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
-set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "11")
-set (RELEASE_SERVICE_VERSION_MICRO "80")
+set (RELEASE_SERVICE_VERSION_MAJOR "21")
+set (RELEASE_SERVICE_VERSION_MINOR "04")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
 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.10.0)
+set(QT_MIN_VERSION 5.12.0)
 set(KF5_MIN_VERSION 5.68.0)
 
 find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED)

doc/CMakeLists.txt

@@ -1,2 +1,2 @@
 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krfb)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR krfb)

events/x11/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries (krfb_events_x11
                        krfbprivate
 )
 
-install (TARGETS krfb_events_x11 DESTINATION ${PLUGIN_INSTALL_DIR}/krfb)
+install (TARGETS krfb_events_x11 DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb)

events/x11/krfb_events_x11.desktop

@@ -13,6 +13,7 @@ Comment[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
 Comment[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
 Comment[fr]=Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb
 Comment[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
+Comment[ia]=Maneator de evento de X11 basate sur XFakeInput per KRfb
 Comment[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
 Comment[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러
 Comment[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb
@@ -40,6 +41,7 @@ Name[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
 Name[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
 Name[fr]=Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb
 Name[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
+Name[ia]=Maneator de evento de X11 basate sur XFakeInput per KRfb
 Name[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
 Name[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러
 Name[nl]=Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb

events/x11/krfb_events_x11.json

@@ -14,6 +14,7 @@
         "Description[fi]": "KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä",
         "Description[fr]": "Gestionnaire d'évènements utilisant XFakeInput de X11 pour KRfb",
         "Description[gl]": "Xestor de eventos para KRfb baseado no XFakeInput de X11",
+        "Description[ia]": "Maneator de evento de X11 basate sur XFakeInput per KRfb",
         "Description[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb",
         "Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러",
         "Description[nl]": "Op X11 XFakeInput gebaseerde behandelaar van gebeurtenis voor KRfb",

events/xdp/CMakeLists.txt

@@ -23,5 +23,5 @@ target_link_libraries (krfb_events_xdp
 )
 
 install (TARGETS krfb_events_xdp
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )

events/xdp/krfb_events_xdp.desktop

@@ -13,6 +13,7 @@ Comment[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
 Comment[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
 Comment[fr]=Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb
 Comment[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
+Comment[ia]=Maneator de evento basate sur Xdg-desktop-portal per KRfb
 Comment[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
 Comment[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러
 Comment[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb
@@ -40,6 +41,7 @@ Name[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
 Name[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
 Name[fr]=Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb
 Name[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
+Name[ia]=Mneator de evento basate sur Xdg-desktop-portal per KRfb
 Name[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
 Name[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러
 Name[nl]=Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb

events/xdp/krfb_events_xdp.json

@@ -14,6 +14,7 @@
         "Description[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
         "Description[fr]": "Gestionnaire d'évènements utilisant Xdg-desktop-portal pour KRfb",
         "Description[gl]": "Xestor de eventos para KRfb baseado en Xdg-desktop-portal",
+        "Description[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb",
         "Description[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb",
         "Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러",
         "Description[nl]": "Op Xdg-desktop-portal gebaseerde behandelaar van gebeurtenis voor KRfb",
@@ -44,6 +45,7 @@
         "Name[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
         "Name[fr]": "Gestionnaire d'évènements Xdg-desktop-portal pour KRfb",
         "Name[gl]": "Xestor de eventos de Xdg-desktop-portal para KRfb",
+        "Name[ia]": "Maneator de evento basate sur Xdg-desktop-portal per KRfb",
         "Name[it]": "Gestore eventi xdg-desktop-portal per KRfb",
         "Name[ko]": "KRfb  Xdg-desktop-portal 이벤트 핸들러",
         "Name[nl]": "Op Xdg-desktop-portal behandelaar van gebeurtenis voor KRfb",

framebuffers/pipewire/CMakeLists.txt

@@ -49,5 +49,5 @@ target_link_libraries (krfb_framebuffer_pw
 )
 
 install (TARGETS krfb_framebuffer_pw
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )

framebuffers/pipewire/pw_framebuffer.cpp

@@ -777,7 +777,14 @@ void PWFrameBuffer::Private::handleFrame(pw_buffer *pwBuffer)
     cleanup();
 
 #if PW_CHECK_VERSION(0, 2, 90)
-    if (videoFormat->format != SPA_VIDEO_FORMAT_RGB) {
+    if (videoFormat->format == SPA_VIDEO_FORMAT_BGRA || videoFormat->format == SPA_VIDEO_FORMAT_BGRx) {
+        for (uint y = 0; y < videoFormat->size.height; y++) {
+            for (uint x = 0; x < videoFormat->size.width; x++) {
+                uint offset = y * spaBuffer->datas->chunk->stride + x * 4;
+                std::swap(q->fb[offset], q->fb[offset + 2]);
+            }
+        }
+    } else if (videoFormat->format != SPA_VIDEO_FORMAT_RGB) {
         const QImage::Format format = videoFormat->format == SPA_VIDEO_FORMAT_BGR  ? QImage::Format_BGR888
                                     : videoFormat->format == SPA_VIDEO_FORMAT_RGBx ? QImage::Format_RGBX8888
                                                                                    : QImage::Format_RGB32;

framebuffers/qt/CMakeLists.txt

@@ -28,5 +28,5 @@ target_link_libraries (krfb_framebuffer_qt
 )
 
 install (TARGETS krfb_framebuffer_qt
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )

framebuffers/xcb/CMakeLists.txt

@@ -32,5 +32,5 @@ target_link_libraries (krfb_framebuffer_xcb
 )
 
 install (TARGETS krfb_framebuffer_xcb
-         DESTINATION ${PLUGIN_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_PLUGINDIR}/krfb
 )

krfb/CMakeLists.txt

@@ -36,14 +36,14 @@ set_target_properties (krfbprivate PROPERTIES
 )
 
 install (TARGETS krfbprivate
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
          LIBRARY NAMELINK_SKIP
 )
 
 install (FILES
          krfb-framebuffer.desktop
          krfb-events.desktop
-         DESTINATION ${SERVICETYPES_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
 )
 
 #####################################
@@ -120,13 +120,13 @@ if (X11_XTest_FOUND)
 endif (X11_XTest_FOUND)
 
 install (TARGETS krfb
-         ${INSTALL_TARGETS_DEFAULT_ARGS}
+         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 ########### install files ###############
 
 install (PROGRAMS org.kde.krfb.desktop
-         DESTINATION ${XDG_APPS_INSTALL_DIR}
+         DESTINATION ${KDE_INSTALL_APPDIR}
 )
 
 install(FILES org.kde.krfb.appdata.xml
@@ -134,6 +134,6 @@ install(FILES org.kde.krfb.appdata.xml
 )
 
 install (FILES krfb.notifyrc
-         DESTINATION ${DATA_INSTALL_DIR}/krfb
+         DESTINATION ${KDE_INSTALL_DATADIR}/krfb
 )
 

krfb/krfb-events.desktop

@@ -14,7 +14,7 @@ Comment[es]=Complementos de eventos para KRfb
 Comment[et]=KRfb sündmuste pluginad
 Comment[eu]=KRfb-rako gertaeren pluginak
 Comment[fi]=KRfb:n tapahtumaliitännäinen
-Comment[fr]=Modules externes d'événements pour Krfb
+Comment[fr]=Modules externes d'évènements pour Krfb
 Comment[gl]=Complementos de eventos para KRfb
 Comment[ia]=Plug-ins de evento per KRfb
 Comment[it]=Estensioni degli eventi per KRfb

krfb/org.kde.krfb.appdata.xml

@@ -48,17 +48,22 @@
   <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>
   <summary xml:lang="it">Condividi il desktop con un altro computer tramite VNC</summary>
   <summary xml:lang="ko">내 데스크톱을 VNC로 다른 컴퓨터와 공유</summary>
   <summary xml:lang="nl">Uw bureaublad delen naar een andere computer via VNC</summary>
   <summary xml:lang="nn">Del skrivebordet med ei anna maskin via VNC</summary>
+  <summary xml:lang="pl">Udostępnij swój pulpit innemu komputerowi przez VNC</summary>
   <summary xml:lang="pt">Partilhar o seu ecrã com outro computador por VNC</summary>
   <summary xml:lang="pt-BR">Compartilhar sua área de trabalho com outro computador via VNC</summary>
   <summary xml:lang="sl">Deli namizje z drugim računalnikom prek VNC</summary>
   <summary xml:lang="sv">Dela ditt skrivbord med en annan dator via VNC</summary>
   <summary xml:lang="uk">Надайте вашу стільницю у спільне користування з іншим комп'ютером за допомогою VNC</summary>
   <summary xml:lang="x-test">xxShare your desktop to another computer via VNCxx</summary>
+  <summary xml:lang="zh-CN">通过 VNC 分享您的桌面到另一台电脑</summary>
   <description>
     <p>Krfb Desktop Sharing is a server application that allows you to share your current session with a user on another machine, who can use a VNC client to view or even control the desktop.</p>
     <p xml:lang="ca">El Krfb és una aplicació de servidor que permet compartir la vostra sessió actual amb un usuari en una altra màquina, la qual pot emprar un client VNC per a veure o controlar l'escriptori.</p>
@@ -73,6 +78,7 @@
     <p xml:lang="fi">Krfb-työpöytäjako on palvelinsovellus, jolla voit jakaa nykyisen istuntosi toisen koneen käyttäjälle, joka voi VNC-asiakkaalla nähdä tai jopa hallita työpöytääsi.</p>
     <p xml:lang="fr">Le partage de bureau Krfb est une application de serveur qui vous permet de partager votre session courante avec un utilisateur sur une autre machine, qui peut utiliser un client VNC pour afficher et même contrôler le bureau.</p>
     <p xml:lang="gl">Krfb é unha aplicación de servidor que permite compartir a sesión actual cun usuario que está noutro equipo, que pode usar un cliente VNC para ver ou mesmo controlar o escritorio.</p>
+    <p xml:lang="ia">Krfb Desktop Sharing es un application de servitor que te permitte compartir tu session currente con un usator sur un altere machina,le qual pote usar un cliente VNC per vider o anque controlar le scriptorio.</p>
     <p xml:lang="id">Krfb Desktop Sharing adalah aplikasi server yang memungkinkan kamu untuk berbagi sesimu saat ini dengan pengguna di mesin lain, yang bisa menggunakan klien VNC untuk menampilkan atau bahkan mengendalikan desktop.</p>
     <p xml:lang="it">Condivisione del desktop Krfb è un'applicazione server che permette di condividere la sessione attuale con un utente su un'altra macchina, che potrà usare un client VNC per visualizzare ed anche controllare il desktop.</p>
     <p xml:lang="ko">Krfb 데스크톱 공유는 현재 세션을 다른 머신의 사용자와 VNC를 통해서 공유하거나 원격 제어를 요청할 수 있는 서버 프로그램입니다.</p>
@@ -115,6 +121,7 @@
       <caption xml:lang="fi">Työpöydän jakaminen Krfb:llä</caption>
       <caption xml:lang="fr">Partage de bureau grâce à Krfb</caption>
       <caption xml:lang="gl">Compartindo o escritorio con Krfb</caption>
+      <caption xml:lang="ia">Compartir scriptorio con Krfb</caption>
       <caption xml:lang="id">Berbagi desktop dengan Krfb</caption>
       <caption xml:lang="it">Condivisone del desktop con Krfb</caption>
       <caption xml:lang="ko">Krfb로 데스크톱 공유</caption>
@@ -139,9 +146,9 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
-    <release version="20.08.3" date="2020-11-05"/>
-    <release version="20.08.2" date="2020-10-08"/>
-    <release version="20.08.1" date="2020-09-03"/>
-    <release version="20.08.0" date="2020-08-13"/>
+    <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"/>
   </releases>
 </component>

krfb/org.kde.krfb.desktop

@@ -78,23 +78,28 @@ GenericName=Desktop Sharing (VNC)
 GenericName[ca]=Compartició de l'escriptori (VNC)
 GenericName[ca@valencia]=Compartició de l'escriptori (VNC)
 GenericName[cs]=Sdílení pracovní plochy (VNC)
+GenericName[da]=Skrivebordsdeling (VNC)
 GenericName[de]=Arbeitsflächen-Freigabe (VNC)
 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)
 GenericName[ko]=데스크톱 공유(VNC)
 GenericName[nl]=Bureaublad delen (VNC)
 GenericName[nn]=Skrivebordsdeling (VNC)
+GenericName[pl]=Współdzielenie pulpitu (VNC)
 GenericName[pt]=Partilha do Ecrã (VNC)
 GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
+GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
 GenericName[sl]=Souporaba namizja (VNC)
 GenericName[sv]=Skrivbordsdelning (VNC)
 GenericName[uk]=Спільні стільниці (VNC)
 GenericName[x-test]=xxDesktop Sharing (VNC)xx
+GenericName[zh_CN]=桌面共享 (VNC)
 Comment=Desktop Sharing
 Comment[af]=Werkskerm Deeling
 Comment[ar]=مشاركة سطح المكتب