Accepting request 840677 from KDE:Applications
KDE release 20.08.2 OBS-URL: https://build.opensuse.org/request/show/840677 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krfb?expand=0&rev=96
This commit is contained in:
commit
77622e6f10
@ -23,10 +23,10 @@ Adds the following logging categories:
|
||||
krfb/rfbservermanager.cpp | 1 -
|
||||
13 files changed, 78 insertions(+), 47 deletions(-)
|
||||
|
||||
Index: krfb-20.08.1/CMakeLists.txt
|
||||
Index: krfb-20.08.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/CMakeLists.txt 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/CMakeLists.txt 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/CMakeLists.txt 2020-10-09 23:44:31.733046725 +0200
|
||||
+++ krfb-20.08.2/CMakeLists.txt 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
include(ECMInstallIcons)
|
||||
include(ECMAddAppIcon)
|
||||
@ -48,10 +48,10 @@ Index: krfb-20.08.1/CMakeLists.txt
|
||||
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
||||
ki18n_install(po)
|
||||
if (KF5DocTools_FOUND)
|
||||
Index: krfb-20.08.1/framebuffers/qt/CMakeLists.txt
|
||||
Index: krfb-20.08.2/framebuffers/qt/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/framebuffers/qt/CMakeLists.txt 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/framebuffers/qt/CMakeLists.txt 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/framebuffers/qt/CMakeLists.txt 2020-10-09 23:44:31.733046725 +0200
|
||||
+++ krfb-20.08.2/framebuffers/qt/CMakeLists.txt 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -7,6 +7,14 @@
|
||||
qtframebufferplugin.cpp
|
||||
)
|
||||
@ -67,10 +67,10 @@ Index: krfb-20.08.1/framebuffers/qt/CMakeLists.txt
|
||||
add_library(krfb_framebuffer_qt
|
||||
MODULE
|
||||
${krfb_framebuffer_qt_SRCS}
|
||||
Index: krfb-20.08.1/framebuffers/xcb/CMakeLists.txt
|
||||
Index: krfb-20.08.2/framebuffers/xcb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/framebuffers/xcb/CMakeLists.txt 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/framebuffers/xcb/CMakeLists.txt 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/framebuffers/xcb/CMakeLists.txt 2020-10-09 23:44:31.733046725 +0200
|
||||
+++ krfb-20.08.2/framebuffers/xcb/CMakeLists.txt 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -7,6 +7,14 @@
|
||||
xcb_framebuffer.cpp
|
||||
)
|
||||
@ -86,10 +86,10 @@ Index: krfb-20.08.1/framebuffers/xcb/CMakeLists.txt
|
||||
add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
|
||||
|
||||
target_link_libraries (krfb_framebuffer_xcb
|
||||
Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
Index: krfb-20.08.2/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/framebuffers/xcb/xcb_framebuffer.cpp 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/framebuffers/xcb/xcb_framebuffer.cpp 2020-10-09 23:44:31.733046725 +0200
|
||||
+++ krfb-20.08.2/framebuffers/xcb/xcb_framebuffer.cpp 2020-10-09 23:45:35.296788997 +0200
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
@ -115,16 +115,16 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
xdamage_version->major_version << "." << xdamage_version->minor_version;
|
||||
#endif
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
|
||||
QScreen *primaryScreen = QGuiApplication::primaryScreen();
|
||||
if (primaryScreen) {
|
||||
@@ -166,7 +166,7 @@
|
||||
qreal scaleFactor = primaryScreen->devicePixelRatio();
|
||||
d->area = { primaryScreen->geometry().topLeft() * scaleFactor,
|
||||
primaryScreen->geometry().bottomRight() * scaleFactor };
|
||||
- qDebug() << "xcb framebuffer: Primary screen: " << primaryScreen->name()
|
||||
+ qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
|
||||
+ qDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
|
||||
<< ", geometry: " << primaryScreen->geometry()
|
||||
<< ", depth: " << primaryScreen->depth();
|
||||
//
|
||||
@@ -183,7 +183,7 @@
|
||||
<< ", device scaling: " << scaleFactor
|
||||
<< ", native size: " << d->area
|
||||
@@ -186,7 +186,7 @@
|
||||
XCB_IMAGE_FORMAT_Z_PIXMAP);
|
||||
if (d->framebufferImage) {
|
||||
#ifdef _DEBUG
|
||||
@ -133,7 +133,7 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
<< ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
|
||||
<< ", depth: " << d->framebufferImage->depth
|
||||
<< ", padded width: " << d->framebufferImage->stride;
|
||||
@@ -211,15 +211,15 @@
|
||||
@@ -214,15 +214,15 @@
|
||||
nullptr); // data = 0
|
||||
if (d->updateTile) {
|
||||
#ifdef _DEBUG
|
||||
@ -158,7 +158,7 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
#endif
|
||||
|
||||
// allocate shared memory block only once, make its size large enough
|
||||
@@ -237,7 +237,7 @@
|
||||
@@ -240,7 +240,7 @@
|
||||
xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
|
||||
|
||||
#ifdef _DEBUG
|
||||
@ -167,7 +167,7 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
#endif
|
||||
|
||||
// will return 1 on success (yes!)
|
||||
@@ -273,7 +273,7 @@
|
||||
@@ -276,7 +276,7 @@
|
||||
}
|
||||
|
||||
#ifdef _DEBUG
|
||||
@ -176,7 +176,7 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
<< ", xshm base error = " << d->x11EvtFilter->xdamageBaseError
|
||||
<< ", xdamage base event = " << d->x11EvtFilter->xdamageBaseEvent
|
||||
<< ", xdamage base error = " << d->x11EvtFilter->xdamageBaseError;
|
||||
@@ -420,10 +420,12 @@
|
||||
@@ -423,10 +423,12 @@
|
||||
format.blueMax = root_visualtype->blue_mask >> format.blueShift;
|
||||
|
||||
#ifdef _DEBUG
|
||||
@ -193,10 +193,10 @@ Index: krfb-20.08.1/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
format.redMax, format.greenMax, format.blueMax);
|
||||
#endif
|
||||
} else {
|
||||
Index: krfb-20.08.1/krfb/CMakeLists.txt
|
||||
Index: krfb-20.08.2/krfb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/CMakeLists.txt 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/krfb/CMakeLists.txt 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/CMakeLists.txt 2020-10-09 23:44:31.733046725 +0200
|
||||
+++ krfb-20.08.2/krfb/CMakeLists.txt 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -66,6 +66,14 @@
|
||||
invitationsrfbclient.cpp
|
||||
)
|
||||
@ -212,10 +212,10 @@ Index: krfb-20.08.1/krfb/CMakeLists.txt
|
||||
kconfig_add_kcfg_files (krfb_SRCS
|
||||
krfbconfig.kcfgc
|
||||
)
|
||||
Index: krfb-20.08.1/krfb/eventsmanager.cpp
|
||||
Index: krfb-20.08.2/krfb/eventsmanager.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/eventsmanager.cpp 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/krfb/eventsmanager.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/eventsmanager.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/eventsmanager.cpp 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -23,8 +23,8 @@
|
||||
#include "eventsplugin.h"
|
||||
#include "krfbconfig.h"
|
||||
@ -257,10 +257,10 @@ Index: krfb-20.08.1/krfb/eventsmanager.cpp
|
||||
+ qCDebug(KRFB) << "No valid event handlers found. returning null.";
|
||||
return QSharedPointer<EventHandler>();
|
||||
}
|
||||
Index: krfb-20.08.1/krfb/framebuffermanager.cpp
|
||||
Index: krfb-20.08.2/krfb/framebuffermanager.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/framebuffermanager.cpp 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/krfb/framebuffermanager.cpp 2020-09-02 07:06:44.709582831 +0200
|
||||
--- krfb-20.08.2.orig/krfb/framebuffermanager.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/framebuffermanager.cpp 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#include "framebufferplugin.h"
|
||||
@ -311,10 +311,10 @@ Index: krfb-20.08.1/krfb/framebuffermanager.cpp
|
||||
+ qDebug(KRFB) << "No valid framebuffer found. returning null.";
|
||||
return QSharedPointer<FrameBuffer>();
|
||||
}
|
||||
Index: krfb-20.08.1/krfb/invitationsrfbclient.cpp
|
||||
Index: krfb-20.08.2/krfb/invitationsrfbclient.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/invitationsrfbclient.cpp 2020-09-02 07:05:32.869344897 +0200
|
||||
+++ krfb-20.08.1/krfb/invitationsrfbclient.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/invitationsrfbclient.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/invitationsrfbclient.cpp 2020-10-09 23:44:44.155940985 +0200
|
||||
@@ -24,11 +24,11 @@
|
||||
#include "krfbconfig.h"
|
||||
#include "sockethelpers.h"
|
||||
@ -346,10 +346,10 @@ Index: krfb-20.08.1/krfb/invitationsrfbclient.cpp
|
||||
|
||||
if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
|
||||
InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
|
||||
Index: krfb-20.08.1/krfb/invitationsrfbserver.cpp
|
||||
Index: krfb-20.08.2/krfb/invitationsrfbserver.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/invitationsrfbserver.cpp 2020-09-02 07:05:32.873344910 +0200
|
||||
+++ krfb-20.08.1/krfb/invitationsrfbserver.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/invitationsrfbserver.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/invitationsrfbserver.cpp 2020-10-09 23:44:44.159944496 +0200
|
||||
@@ -22,10 +22,10 @@
|
||||
#include "invitationsrfbclient.h"
|
||||
#include "krfbconfig.h"
|
||||
@ -362,7 +362,7 @@ Index: krfb-20.08.1/krfb/invitationsrfbserver.cpp
|
||||
#include <QRandomGenerator>
|
||||
|
||||
#include <KLocalizedString>
|
||||
@@ -188,7 +188,7 @@
|
||||
@@ -182,7 +182,7 @@
|
||||
|
||||
} else {
|
||||
|
||||
@ -371,10 +371,10 @@ Index: krfb-20.08.1/krfb/invitationsrfbserver.cpp
|
||||
KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
|
||||
|
||||
desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
|
||||
Index: krfb-20.08.1/krfb/main.cpp
|
||||
Index: krfb-20.08.2/krfb/main.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/main.cpp 2020-09-02 07:05:32.873344910 +0200
|
||||
+++ krfb-20.08.1/krfb/main.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/main.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/main.cpp 2020-10-09 23:44:44.159944496 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "invitationsrfbserver.h"
|
||||
#include "krfbconfig.h"
|
||||
@ -416,10 +416,10 @@ Index: krfb-20.08.1/krfb/main.cpp
|
||||
}
|
||||
}
|
||||
}
|
||||
Index: krfb-20.08.1/krfb/rfbclient.cpp
|
||||
Index: krfb-20.08.2/krfb/rfbclient.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/rfbclient.cpp 2020-09-02 07:05:32.873344910 +0200
|
||||
+++ krfb-20.08.1/krfb/rfbclient.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/rfbclient.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/rfbclient.cpp 2020-10-09 23:44:44.159944496 +0200
|
||||
@@ -23,7 +23,6 @@
|
||||
#include "sockethelpers.h"
|
||||
#include "eventsmanager.h"
|
||||
@ -428,10 +428,10 @@ Index: krfb-20.08.1/krfb/rfbclient.cpp
|
||||
#include <poll.h>
|
||||
#include <strings.h> //for bzero()
|
||||
|
||||
Index: krfb-20.08.1/krfb/rfbserver.cpp
|
||||
Index: krfb-20.08.2/krfb/rfbserver.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/rfbserver.cpp 2020-09-02 07:05:32.873344910 +0200
|
||||
+++ krfb-20.08.1/krfb/rfbserver.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/rfbserver.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/rfbserver.cpp 2020-10-09 23:44:44.159944496 +0200
|
||||
@@ -19,11 +19,11 @@
|
||||
*/
|
||||
#include "rfbserver.h"
|
||||
@ -471,10 +471,10 @@ Index: krfb-20.08.1/krfb/rfbserver.cpp
|
||||
rfbShutdownServer(d->screen, false);
|
||||
return false;
|
||||
};
|
||||
Index: krfb-20.08.1/krfb/rfbservermanager.cpp
|
||||
Index: krfb-20.08.2/krfb/rfbservermanager.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.1.orig/krfb/rfbservermanager.cpp 2020-09-02 07:05:32.873344910 +0200
|
||||
+++ krfb-20.08.1/krfb/rfbservermanager.cpp 2020-09-02 07:05:40.725370922 +0200
|
||||
--- krfb-20.08.2.orig/krfb/rfbservermanager.cpp 2020-10-09 23:44:31.737050235 +0200
|
||||
+++ krfb-20.08.2/krfb/rfbservermanager.cpp 2020-10-09 23:44:44.159944496 +0200
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <QDesktopWidget>
|
||||
#include <QGlobalStatic>
|
||||
|
@ -12,11 +12,11 @@ so QLineEdit suffices.
|
||||
krfb/mainwindow.h | 4 ++--
|
||||
4 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aadd4b7..bd9ed41 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,7 +29,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extr
|
||||
Index: krfb-20.08.2/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.2.orig/CMakeLists.txt 2020-10-09 23:46:03.405438902 +0200
|
||||
+++ krfb-20.08.2/CMakeLists.txt 2020-10-09 23:46:05.847580539 +0200
|
||||
@@ -30,7 +30,6 @@
|
||||
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
I18n
|
||||
@ -24,11 +24,11 @@ index aadd4b7..bd9ed41 100644
|
||||
Config
|
||||
CoreAddons
|
||||
Crash
|
||||
diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
|
||||
index a292226..43752b5 100644
|
||||
--- a/krfb/CMakeLists.txt
|
||||
+++ b/krfb/CMakeLists.txt
|
||||
@@ -93,7 +93,6 @@ target_link_libraries (krfb
|
||||
Index: krfb-20.08.2/krfb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- krfb-20.08.2.orig/krfb/CMakeLists.txt 2020-10-09 23:46:03.405438902 +0200
|
||||
+++ krfb-20.08.2/krfb/CMakeLists.txt 2020-10-09 23:46:05.847580539 +0200
|
||||
@@ -101,7 +101,6 @@
|
||||
${X11_X11_LIB}
|
||||
${X11_Xdamage_LIB}
|
||||
Qt5::Network
|
||||
@ -36,10 +36,10 @@ index a292226..43752b5 100644
|
||||
KF5::CoreAddons
|
||||
KF5::DBusAddons
|
||||
KF5::DNSSD
|
||||
diff --git a/krfb/mainwindow.cpp b/krfb/mainwindow.cpp
|
||||
index 555d301..14924f6 100644
|
||||
--- a/krfb/mainwindow.cpp
|
||||
+++ b/krfb/mainwindow.cpp
|
||||
Index: krfb-20.08.2/krfb/mainwindow.cpp
|
||||
===================================================================
|
||||
--- krfb-20.08.2.orig/krfb/mainwindow.cpp 2020-10-05 07:07:12.000000000 +0200
|
||||
+++ krfb-20.08.2/krfb/mainwindow.cpp 2020-10-09 23:46:05.847580539 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
#include <KMessageWidget>
|
||||
#include <KStandardAction>
|
||||
@ -48,7 +48,7 @@ index 555d301..14924f6 100644
|
||||
#include <KNewPasswordDialog>
|
||||
#include <KPluginLoader>
|
||||
#include <KPluginMetaData>
|
||||
@@ -107,7 +106,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
@@ -107,7 +106,7 @@
|
||||
setAttribute(Qt::WA_DeleteOnClose, false);
|
||||
|
||||
m_passwordEditable = false;
|
||||
@ -57,10 +57,10 @@ index 555d301..14924f6 100644
|
||||
m_passwordLineEdit->setVisible(false);
|
||||
m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
|
||||
|
||||
diff --git a/krfb/mainwindow.h b/krfb/mainwindow.h
|
||||
index 9f2939e..bbe69cd 100644
|
||||
--- a/krfb/mainwindow.h
|
||||
+++ b/krfb/mainwindow.h
|
||||
Index: krfb-20.08.2/krfb/mainwindow.h
|
||||
===================================================================
|
||||
--- krfb-20.08.2.orig/krfb/mainwindow.h 2020-10-05 07:07:12.000000000 +0200
|
||||
+++ krfb-20.08.2/krfb/mainwindow.h 2020-10-09 23:46:05.847580539 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include <KXmlGuiWindow>
|
||||
@ -70,7 +70,7 @@ index 9f2939e..bbe69cd 100644
|
||||
|
||||
class MainWindow : public KXmlGuiWindow
|
||||
{
|
||||
@@ -43,7 +43,7 @@ class MainWindow : public KXmlGuiWindow
|
||||
@@ -43,7 +43,7 @@
|
||||
private:
|
||||
Ui::MainWidget m_ui;
|
||||
bool m_passwordEditable;
|
||||
@ -79,6 +79,3 @@ index 9f2939e..bbe69cd 100644
|
||||
};
|
||||
|
||||
#endif
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
@ -1,40 +0,0 @@
|
||||
From a5656776a21f8b6f893431f9e18327a24ad1fa9c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Thu, 13 Aug 2020 09:30:06 +0200
|
||||
Subject: [PATCH 3/3] Compensate for global scale factor when using xcb fb
|
||||
plugin
|
||||
|
||||
The screen geometry is reported in device independent pixels, so it has
|
||||
to be multiplied by the devicePixelRatio to get the size of the underlying
|
||||
framebuffer. Otherwise, only the top left of the screen will be captured.
|
||||
|
||||
This matches the behavior of QScreen::grabWindow(...), which also
|
||||
returns a QPixmap of the given size scaled by devicePixelRatio.
|
||||
---
|
||||
framebuffers/xcb/xcb_framebuffer.cpp | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/framebuffers/xcb/xcb_framebuffer.cpp b/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
index 07569bf..626b3ad 100644
|
||||
--- a/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
+++ b/framebuffers/xcb/xcb_framebuffer.cpp
|
||||
@@ -163,11 +163,15 @@ XCBFrameBuffer::XCBFrameBuffer(WId winid, QObject *parent):
|
||||
|
||||
QScreen *primaryScreen = QGuiApplication::primaryScreen();
|
||||
if (primaryScreen) {
|
||||
+ qreal scaleFactor = primaryScreen->devicePixelRatio();
|
||||
+ d->area = { primaryScreen->geometry().topLeft() * scaleFactor,
|
||||
+ primaryScreen->geometry().bottomRight() * scaleFactor };
|
||||
qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
|
||||
<< ", geometry: " << primaryScreen->geometry()
|
||||
+ << ", device scaling: " << scaleFactor
|
||||
+ << ", native size: " << d->area
|
||||
<< ", depth: " << primaryScreen->depth();
|
||||
//
|
||||
- d->area = primaryScreen->geometry();
|
||||
} else {
|
||||
qWarning() << "xcb framebuffer: ERROR: Failed to get application's primary screen info!";
|
||||
return;
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda
|
||||
size 1280460
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl9N7n4ACgkQ29LOiT4t
|
||||
HIeD2QgAmqpMQRBIjNzuu1DB9LMbqurkKP/a8Gv54tKTMw7R2In2ZaVCILjS9FS6
|
||||
wKrNspIouJORSELpL7AqXW8vUTDVqiGPUHwW/vZarm+INcsZGhtAoOPs63wm32ya
|
||||
X+fmNWNcAvHLiTNQ/3BVsA120LZKI+MT8UxKsPLSVkTcNJdfjdPZKK1cUwekF3uS
|
||||
1q6voS5VO/JsY+8opoqCzYBvX/3zaeIHBiXP2pCq7ViteMZDvnMKlglGV61Aossa
|
||||
s5QrYrxvF0qczv+iZwcOfTihrGHcatLb5P3m0WQUYYzbZs/1nnea9flySu2NttWI
|
||||
ihcH4aoIq2be6toERkQO6AtVtWy4IA==
|
||||
=K8Q2
|
||||
-----END PGP SIGNATURE-----
|
3
krfb-20.08.2.tar.xz
Normal file
3
krfb-20.08.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4
|
||||
size 1281460
|
11
krfb-20.08.2.tar.xz.sig
Normal file
11
krfb-20.08.2.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl978pkACgkQ29LOiT4t
|
||||
HIfjCAf/dS9CB9FzbsZ7wkWVtJ2NHodoeZW0C4ARtJodF5cGoSvTZ2aYpJpbyhE1
|
||||
avt0kdBhoup1mlMEwitNwKUEFNs8PMkinT61P5R8dm1gi1wVdIudKAwDhhnM8xWB
|
||||
spg1DJ8veMfGoTeIfhoYzc5qF2RbHd2kgCKusBxgULCupOA6yA1Y4bxwBLgZ9UKQ
|
||||
aF3d+2OCg8c5EUdoKZeUQ0JTOYPQCz0JNmbEouGNJI1OCttSJTl1YFfRbkM4OxOV
|
||||
esMGDtS7Wz/RCkLUAzlrSKwYfXFgJENKQVpVI3VisHCL5s5sKPQClTAJdgW8A7Bb
|
||||
HmWVXpnVwH0iAw71eKPvpZWi+ddwfw==
|
||||
=s9DE
|
||||
-----END PGP SIGNATURE-----
|
18
krfb.changes
18
krfb.changes
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 9 05:44:37 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Update to 20.08.2
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/releases/2020-10-apps-update
|
||||
- Changes since 20.08.1:
|
||||
* Make sure to save security settings each time they are modified (kde#340411)
|
||||
* pipewire: Only aspire to use dmabuf if linux/dma-buf.h is present
|
||||
* Fixes for builds without pipewire3
|
||||
* Support DMABuf streams
|
||||
* Compensate for global scale factor when using xcb fb plugin (kde#419814)
|
||||
- Dropped patches, now upstream:
|
||||
* 0003-Compensate-for-global-scale-factor-when-using-xcb-fb.patch
|
||||
- Rebased patches against 20.08.2:
|
||||
- 0001-Declare-and-use-logging-categories.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 1 20:50:40 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: krfb
|
||||
Version: 20.08.1
|
||||
Version: 20.08.2
|
||||
Release: 0
|
||||
Summary: Screen sharing using the VNC/RFB protocol
|
||||
License: GPL-2.0-or-later
|
||||
@ -31,8 +31,6 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/%
|
||||
Patch0: 0001-Declare-and-use-logging-categories.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Replace-KLineEdit-with-QLineEdit.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: 0003-Compensate-for-global-scale-factor-when-using-xcb-fb.patch
|
||||
BuildRequires: LibVNCServer-devel
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: pipewire-devel
|
||||
@ -74,7 +72,6 @@ VNC-compatible server to share KDE desktops.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%ifarch ppc ppc64
|
||||
|
Loading…
Reference in New Issue
Block a user