rpm/krfb
SHA256
1
0
Fork 0
forked from pool/krfb
Code Pull Requests Activity

20.12 beta

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/krfb?expand=0&rev=139
This commit is contained in:
Christophe Giboudeaux 2020-11-21 12:58:34 +00:00 committed by Git OBS Bridge
parent 037f3645a1
commit d5d74c954d
8 changed files with 44 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

485
0001-Declare-and-use-logging-categories.patch
View File

@ -1,485 +0,0 @@
From 7299923943687a9e9e411c6b0a8d74e04d5a9b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Tue, 11 Aug 2020 19:50:46 +0200
Subject: [PATCH 1/3] Declare and use logging categories
Adds the following logging categories:
- kf.rfb
- kf.rfb.framebuffer.qt
- kf.rfb.framebuffer.xcb
---
CMakeLists.txt | 7 +++++
framebuffers/qt/CMakeLists.txt | 8 ++++++
framebuffers/xcb/CMakeLists.txt | 8 ++++++
framebuffers/xcb/xcb_framebuffer.cpp | 40 +++++++++++++++-------------
krfb/CMakeLists.txt | 8 ++++++
krfb/eventsmanager.cpp | 12 ++++-----
krfb/framebuffermanager.cpp | 14 +++++-----
krfb/invitationsrfbclient.cpp | 6 ++---
krfb/invitationsrfbserver.cpp | 4 +--
krfb/main.cpp | 8 +++---
krfb/rfbclient.cpp | 1 -
krfb/rfbserver.cpp | 8 +++---
krfb/rfbservermanager.cpp | 1 -
13 files changed, 78 insertions(+), 47 deletions(-)
Index: krfb-20.08.2/CMakeLists.txt
===================================================================
--- 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)
include(ECMSetupVersion)
+include(ECMQtDeclareLoggingCategory)
include(FeatureSummary)
include(CheckIncludeFile)
@@ -104,6 +105,12 @@
add_subdirectory(doc)
add_subdirectory(icons)
+ecm_qt_install_logging_categories(
+ EXPORT KRFB
+ FILE krfb.categories
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
+
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
ki18n_install(po)
if (KF5DocTools_FOUND)
Index: krfb-20.08.2/framebuffers/qt/CMakeLists.txt
===================================================================
--- 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
)
+ecm_qt_declare_logging_category(krfb_framebuffer_qt_SRCS
+ HEADER krfb_fb_qt_debug.h
+ IDENTIFIER KRFB_FB_QT
+ CATEGORY_NAME kf.rfb.framebuffer.qt
+ DESCRIPTION "KRFB Qt frambuffer plugin"
+ EXPORT KRFB
+)
+
add_library(krfb_framebuffer_qt
MODULE
${krfb_framebuffer_qt_SRCS}
Index: krfb-20.08.2/framebuffers/xcb/CMakeLists.txt
===================================================================
--- 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
)
+ecm_qt_declare_logging_category(krfb_framebuffer_xcb_SRCS
+ HEADER krfb_fb_xcb_debug.h
+ IDENTIFIER KRFB_FB_XCB
+ CATEGORY_NAME kf.rfb.framebuffer.xcb
+ DESCRIPTION "KRFB XCB frambuffer plugin"
+ EXPORT KRFB
+)
+
add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
target_link_libraries (krfb_framebuffer_xcb
Index: krfb-20.08.2/framebuffers/xcb/xcb_framebuffer.cpp
===================================================================
--- 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 @@
*/
#include "xcb_framebuffer.h"
+#include "krfb_fb_xcb_debug.h"
#include <xcb/xcb.h>
#include <xcb/xproto.h>
@@ -23,7 +24,6 @@
#include <QGuiApplication>
#include <QScreen>
#include <QAbstractNativeEventFilter>
-#include <QDebug>
class KrfbXCBEventFilter: public QAbstractNativeEventFilter
@@ -68,7 +68,7 @@
}
#ifdef _DEBUG
- qDebug() << "xcb framebuffer: XDamage extension version:" <<
+ qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XDamage extension version:" <<
xdamage_version->major_version << "." << xdamage_version->minor_version;
#endif
@@ -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()
+ qDebug(KRFB_FB_XCB) << "xcb framebuffer: Primary screen: " << primaryScreen->name()
<< ", geometry: " << primaryScreen->geometry()
<< ", device scaling: " << scaleFactor
<< ", native size: " << d->area
@@ -186,7 +186,7 @@
XCB_IMAGE_FORMAT_Z_PIXMAP);
if (d->framebufferImage) {
#ifdef _DEBUG
- qDebug() << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
+ qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Got primary screen image. bpp: " << d->framebufferImage->bpp
<< ", size (" << d->framebufferImage->width << d->framebufferImage->height << ")"
<< ", depth: " << d->framebufferImage->depth
<< ", padded width: " << d->framebufferImage->stride;
@@ -214,15 +214,15 @@
nullptr); // data = 0
if (d->updateTile) {
#ifdef _DEBUG
- qDebug() << "xcb framebuffer: Successfully created new empty image in native format";
- qDebug() << " size: " << d->updateTile->width << "x" << d->updateTile->height
- << "(stride: " << d->updateTile->stride << ")";
- qDebug() << " bpp, depth: " << d->updateTile->bpp << d->updateTile->depth; // 32, 24
- qDebug() << " addr of base, data: " << d->updateTile->base << (void *)d->updateTile->data;
- qDebug() << " size: " << d->updateTile->size;
- qDebug() << " image byte order = " << d->updateTile->byte_order; // == 0 .._LSB_FIRST
- qDebug() << " image bit order = " << d->updateTile->bit_order; // == 1 .._MSB_FIRST
- qDebug() << " image plane_mask = " << d->updateTile->plane_mask; // == 16777215 == 0x00FFFFFF
+ qCDebug(KRFB_FB_XCB) << "xcb framebuffer: Successfully created new empty image in native format"
+ << "\n size: " << d->updateTile->width << "x" << d->updateTile->height
+ << "(stride: " << d->updateTile->stride << ")"
+ << "\n bpp, depth: " << d->updateTile->bpp << d->updateTile->depth // 32, 24
+ << "\n addr of base, data: " << d->updateTile->base << (void *)d->updateTile->data
+ << "\n size: " << d->updateTile->size
+ << "\n image byte order = " << d->updateTile->byte_order // == 0 .._LSB_FIRST
+ << "\n image bit order = " << d->updateTile->bit_order // == 1 .._MSB_FIRST
+ << "\n image plane_mask = " << d->updateTile->plane_mask; // == 16777215 == 0x00FFFFFF
#endif
// allocate shared memory block only once, make its size large enough
@@ -240,7 +240,7 @@
xcb_shm_attach(QX11Info::connection(), d->shminfo.shmseg, d->shminfo.shmid, 0);
#ifdef _DEBUG
- qDebug() << " shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
+ qCDebug(KRFB_FB_XCB) << " shm id: " << d->shminfo.shmseg << ", addr: " << (void *)d->shminfo.shmaddr;
#endif
// will return 1 on success (yes!)
@@ -276,7 +276,7 @@
}
#ifdef _DEBUG
- qDebug() << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
+ qCDebug(KRFB_FB_XCB) << "xcb framebuffer: XCBFrameBuffer(), xshm base event = " << d->x11EvtFilter->xshmBaseEvent
<< ", xshm base error = " << d->x11EvtFilter->xdamageBaseError
<< ", xdamage base event = " << d->x11EvtFilter->xdamageBaseEvent
<< ", xdamage base error = " << d->x11EvtFilter->xdamageBaseError;
@@ -423,10 +423,12 @@
format.blueMax = root_visualtype->blue_mask >> format.blueShift;
#ifdef _DEBUG
- qDebug() << " Calculated redShift =" << (int)format.redShift;
- qDebug() << " Calculated greenShift =" << (int)format.greenShift;
- qDebug() << " Calculated blueShift =" << (int)format.blueShift;
- qDebug( " Calculated max values: R%d G%d B%d",
+ qCDebug(KRFB_FB_XCB,
+ " Calculated redShift = %d\n"
+ " Calculated greenShift = %d\n"
+ " Calculated blueShift = %d\n"
+ " Calculated max values: R%d G%d B%d",
+ format.redShift, format.greenShift, format.blueShift
format.redMax, format.greenMax, format.blueMax);
#endif
} else {
Index: krfb-20.08.2/krfb/CMakeLists.txt
===================================================================
--- 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
)
+ecm_qt_declare_logging_category(krfb_SRCS
+ HEADER krfbdebug.h
+ IDENTIFIER KRFB
+ CATEGORY_NAME kf.rfb
+ DESCRIPTION "KRFB Application"
+ EXPORT KRFB
+)
+
kconfig_add_kcfg_files (krfb_SRCS
krfbconfig.kcfgc
)
Index: krfb-20.08.2/krfb/eventsmanager.cpp
===================================================================
--- 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"
#include "rfbservermanager.h"
+#include "krfbdebug.h"
-#include <QDebug>
#include <QGlobalStatic>
#include <KPluginFactory>
@@ -79,18 +79,18 @@
KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
if (!factory) {
- qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
+ qCDebug(KRFB) << "KPluginFactory could not load the plugin:" << data.fileName();
continue;
} else {
- qDebug() << "found plugin at " << data.fileName();
+ qCDebug(KRFB) << "found plugin at " << data.fileName();
}
EventsPlugin *plugin = factory->create<EventsPlugin>(this);
if (plugin) {
m_plugins.insert(data.pluginId(), plugin);
- qDebug() << "Loaded plugin with name " << data.pluginId();
+ qCDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
} else {
- qDebug() << "unable to load plugin for " << data.fileName();
+ qCDebug(KRFB) << "unable to load plugin for " << data.fileName();
}
unique.insert (data.name());
}
@@ -113,6 +113,6 @@
}
// No valid events plugin found.
- qDebug() << "No valid event handlers found. returning null.";
+ qCDebug(KRFB) << "No valid event handlers found. returning null.";
return QSharedPointer<EventHandler>();
}
Index: krfb-20.08.2/krfb/framebuffermanager.cpp
===================================================================
--- 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"
#include "krfbconfig.h"
+#include "krfbdebug.h"
-#include <QDebug>
#include <QGlobalStatic>
#include <KPluginFactory>
@@ -78,18 +78,18 @@
KPluginFactory *factory = KPluginLoader(data.fileName()).factory();
if (!factory) {
- qDebug() << "KPluginFactory could not load the plugin:" << data.fileName();
+ qDebug(KRFB) << "KPluginFactory could not load the plugin:" << data.fileName();
continue;
} else {
- qDebug() << "found plugin at " << data.fileName();
+ qDebug(KRFB) << "found plugin at " << data.fileName();
}
FrameBufferPlugin *plugin = factory->create<FrameBufferPlugin>(this);
if (plugin) {
m_plugins.insert(data.pluginId(), plugin);
- qDebug() << "Loaded plugin with name " << data.pluginId();
+ qDebug(KRFB) << "Loaded plugin with name " << data.pluginId();
} else {
- qDebug() << "unable to load plugin for " << data.fileName();
+ qDebug(KRFB) << "unable to load plugin for " << data.fileName();
}
unique.insert (data.name());
}
@@ -118,7 +118,7 @@
while (iter != m_plugins.constEnd()) {
if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
- qDebug() << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
+ qDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
@@ -133,6 +133,6 @@
}
// No valid framebuffer plugin found.
- qDebug() << "No valid framebuffer found. returning null.";
+ qDebug(KRFB) << "No valid framebuffer found. returning null.";
return QSharedPointer<FrameBuffer>();
}
Index: krfb-20.08.2/krfb/invitationsrfbclient.cpp
===================================================================
--- 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"
#include "connectiondialog.h"
+#include "krfbdebug.h"
#include <KNotification>
#include <KLocalizedString>
-#include <QDebug>
#include <QSocketNotifier>
#include <poll.h>
#include <KConfigGroup>
@@ -115,7 +115,7 @@
//the clientGoneHook which in turn will remove this RfbClient instance
//from the server manager and will call deleteLater() to delete it
if (d->client->sock == -1) {
- qDebug() << "disconnected from socket signal";
+ qCDebug(KRFB) << "disconnected from socket signal";
d->notifier->setEnabled(false);
rfbClientConnectionGone(d->client);
break;
@@ -125,7 +125,7 @@
bool PendingInvitationsRfbClient::checkPassword(const QByteArray & encryptedPassword)
{
- qDebug() << "about to start authentication";
+ qCDebug(KRFB) << "about to start authentication";
if(InvitationsRfbServer::instance->allowUnattendedAccess() && vncAuthCheckPassword(
InvitationsRfbServer::instance->unattendedPassword().toLocal8Bit(),
Index: krfb-20.08.2/krfb/invitationsrfbserver.cpp
===================================================================
--- 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"
#include "rfbservermanager.h"
+#include "krfbdebug.h"
#include <QTimer>
#include <QApplication>
#include <QHostInfo>
-#include <QDebug>
#include <QRandomGenerator>
#include <KLocalizedString>
@@ -182,7 +182,7 @@
} else {
- qDebug() << "Could not open KWallet, Falling back to config file";
+ qCDebug(KRFB) << "Could not open KWallet, Falling back to config file";
KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
Index: krfb-20.08.2/krfb/main.cpp
===================================================================
--- 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"
#include "krfb_version.h"
+#include "krfbdebug.h"
#include <KAboutData>
#include <KDBusService>
@@ -27,7 +28,6 @@
#include <KMessageBox>
#include <KWindowSystem>
-#include <QDebug>
#include <QPixmap>
#include <qwindowdefs.h>
#include <QX11Info>
@@ -59,13 +59,13 @@
static void checkOldX11PluginConfig() {
if (KrfbConfig::preferredFrameBufferPlugin() == QStringLiteral("x11")) {
- qDebug() << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
+ qCDebug(KRFB) << "Detected deprecated configuration: preferredFrameBufferPlugin = x11";
KConfigSkeletonItem *config_item = KrfbConfig::self()->findItem(
QStringLiteral("preferredFrameBufferPlugin"));
if (config_item) {
config_item->setProperty(QStringLiteral("xcb"));
KrfbConfig::self()->save();
- qDebug() << " Fixed preferredFrameBufferPlugin from x11 to xcb.";
+ qCDebug(KRFB) << " Fixed preferredFrameBufferPlugin from x11 to xcb.";
}
}
}
@@ -81,7 +81,7 @@
if (config_item) {
config_item->setProperty(QStringLiteral("pw"));
KrfbConfig::self()->save();
- qDebug() << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
+ qCDebug(KRFB) << "Wayland: Fixed preferredFrameBufferPlugin to \"pw\".";
}
}
}
Index: krfb-20.08.2/krfb/rfbclient.cpp
===================================================================
--- 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"
#include <QSocketNotifier>
-#include <QDebug>
#include <poll.h>
#include <strings.h> //for bzero()
Index: krfb-20.08.2/krfb/rfbserver.cpp
===================================================================
--- 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"
#include "rfbservermanager.h"
+#include "krfbdebug.h"
#include <QSocketNotifier>
#include <QApplication>
#include <QClipboard>
#include <QPointer>
-#include <QDebug>
#include <QX11Info>
struct RfbServer::Private
@@ -92,7 +92,7 @@
if (!d->screen) {
d->screen = RfbServerManager::instance()->newScreen();
if (!d->screen) {
- qDebug() << "Unable to get rbfserver screen";
+ qCDebug(KRFB) << "Unable to get rbfserver screen";
return false;
}
@@ -125,14 +125,14 @@
d->screen->authPasswdData = (void *)nullptr;
}
- qDebug() << "Starting server. Listen port:" << listeningPort()
+ qCDebug(KRFB) << "Starting server. Listen port:" << listeningPort()
<< "Listen Address:" << listeningAddress()
<< "Password enabled:" << passwordRequired();
rfbInitServer(d->screen);
if (!rfbIsActive(d->screen)) {
- qDebug() << "Failed to start server";
+ qCDebug(KRFB) << "Failed to start server";
rfbShutdownServer(d->screen, false);
return false;
};
Index: krfb-20.08.2/krfb/rfbservermanager.cpp
===================================================================
--- 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>
#include <QHostInfo>
-#include <QDebug>
#include <KLocalizedString>
#include <KUser>

81
0001-Replace-KLineEdit-with-QLineEdit.patch
View File

@ -1,81 +0,0 @@
From 58eab99e6b5fbcd7c9bb4f9a5f0bd5feb0b3edf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 12 Aug 2020 18:27:23 +0200
Subject: [PATCH] Replace KLineEdit with QLineEdit
The password field uses none of the KLineEdit features like completion,
so QLineEdit suffices.
---
CMakeLists.txt | 1 -
krfb/CMakeLists.txt | 1 -
krfb/mainwindow.cpp | 3 +--
krfb/mainwindow.h | 4 ++--
4 files changed, 3 insertions(+), 6 deletions(-)
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
- Completion
Config
CoreAddons
Crash
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
- KF5::Completion
KF5::CoreAddons
KF5::DBusAddons
KF5::DNSSD
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>
#include <KActionCollection>
-#include <KLineEdit>
#include <KNewPasswordDialog>
#include <KPluginLoader>
#include <KPluginMetaData>
@@ -107,7 +106,7 @@
setAttribute(Qt::WA_DeleteOnClose, false);
m_passwordEditable = false;
- m_passwordLineEdit = new KLineEdit(this);
+ m_passwordLineEdit = new QLineEdit(this);
m_passwordLineEdit->setVisible(false);
m_passwordLineEdit->setAlignment(Qt::AlignHCenter);
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>
-class KLineEdit;
+class QLineEdit;
class MainWindow : public KXmlGuiWindow
{
@@ -43,7 +43,7 @@
private:
Ui::MainWidget m_ui;
bool m_passwordEditable;
- KLineEdit *m_passwordLineEdit;
+ QLineEdit *m_passwordLineEdit;
};
#endif

3
krfb-20.08.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d32986a6952723c5a5ae3744ef090f2f0165082e3f152e0ee6a340d8d8bade8e
size 1282352

11
krfb-20.08.3.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqjsACgkQ29LOiT4t
HIfzgwgAhG3iNXM4BBX54wYt5g3JnBeg8VHCYGkI22kS/1Q1jg+gd25NKzZ/LDfr
dS7XDhLA8ZJjyO8K7nuz2xs5whcEg3Qot/9L4JT4u98Ui7YVhDJ5eZ99zWJQyGjh
ubqR4sjYS3L48ERpIqX49mWkyqUP5Ro2/fRTJdgB12cR4fPj/B1QvGMmmznfnnAy
/pDNlIBpqri9JgaGVmpOlVEnWkjX2QOY54ma8eI0nYvVqXJy6cbZDg5Vd7X6SkBY
UJjuiyaprV4SuZXeafZ3HZdy1N04oY0ebq7/5WNtKa3LKA5BCnnRROupBJusvyAw
hYB0h0s1vAEx6xi0VwFfnV6vTTZgXA==
=Vyy7
-----END PGP SIGNATURE-----

3
krfb-20.11.80.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7413196e5ddc5ade24bf012ccfa49678c9d4e92c495fd1253093dbb0d6c1e5b8
size 1280960

16
krfb-20.11.80.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uonsACgkQOmpNuDnq
ptfIShAAoiT1jODm6Y0Sh/Q9QoJzlobhrKzoa1JEHMc6gqZ7AiQUGE7pikkfF67A
8IxwakrrPkv9h+kkC2Rxj63OpReKvYosDl/5tRs4c7hQuVgdIcxcDy85G/lqAJFm
aTh67jOdnNF5vFREChlkzcqJPoyiaLcUIheD9CgvIFTTF4kZ1CuJoEJrbbguBxNN
hOm7th+dkpHXKJAPABanFUbSkiD91bh1UwWxo/G/1DCZowlopOJFztFdRn6jqHDz
vzOysaEiSBktyD4AdCCtyy8VBCvcJjAL9N9rNTAvhv4g6t+qBquXs6C8anavTRep
BjmqF8aQu6koeAthB/weXkOhrbF/kUeIu1xtTtHgMJU98BK3Ip5zgGUUfWd2tBbr
tZy289UVzurcHLiFLeCSmzp+XLgagTYNrMMqgqHFHophn5nKu3RnNMGgDolRPKw+
wto6q35261wSMnjtecfFm1DRGvAmA/2702DkT8q631FnBe7dhrWbG24wjWG8FUOa
4P+KgsDORrSBRlihbJ7dByJosTBatLY41OIB6buRs2sf1Wdna/30gcvFlmLM1oDi
M2TdikhfEGReK5NPhRKx5WOFFx1IP9xi7deahNGerdC6J4kXh/hnFzpNyc5XY0FK
e4AWxN/w3zKcEZzwZnVkyAlzgUjcKHhtVz2ldcEOvliS6l05wg4=
=fi27
-----END PGP SIGNATURE-----

11
krfb.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Nov 14 00:02:17 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 20.11.80
* New feature release
- Too many changes since 20.08.3, only listing bugfixes:
* Compensate for global scale factor when using xcb fb plugin (kde#419814)
- Drop upstream patches:
* 0001-Declare-and-use-logging-categories.patch
* 0001-Replace-KLineEdit-with-QLineEdit.patch
-------------------------------------------------------------------
Thu Nov 5 22:47:07 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>

32
krfb.spec
View File

@ -21,16 +21,12 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: krfb
Version: 20.08.3
Version: 20.11.80
Release: 0
Summary: Screen sharing using the VNC/RFB protocol
License: GPL-2.0-or-later
Group: Productivity/Networking/Other
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: 0001-Declare-and-use-logging-categories.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Replace-KLineEdit-with-QLineEdit.patch
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: LibVNCServer-devel
BuildRequires: extra-cmake-modules
BuildRequires: pipewire-devel
@ -58,7 +54,7 @@ BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
%if %{with lang}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
Recommends: %{name}-lang
@ -70,23 +66,23 @@ VNC-compatible server to share KDE desktops.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kf5 -d build --
%cmake_build
%cmake_kf5 -d build
%cmake_build
%install
%make_install -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%{kf5_find_htmldocs}
%endif
%suse_update_desktop_file -r org.kde.krfb System RemoteAccess
%kf5_makeinstall -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%{kf5_find_htmldocs}
%endif
%suse_update_desktop_file -r org.kde.krfb System RemoteAccess
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -97,13 +93,13 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%{_kf5_applicationsdir}/org.kde.krfb.desktop
%{_kf5_appstreamdir}/
%{_kf5_bindir}/krfb
%{_kf5_debugdir}/krfb.categories
%{_kf5_iconsdir}/hicolor/*/apps/krfb.*
%{_kf5_libdir}/libkrfbprivate.so*
%{_kf5_plugindir}/krfb/
%{_kf5_servicetypesdir}/krfb-framebuffer*.desktop
%{_kf5_servicetypesdir}/krfb-events.desktop
%{_kf5_sharedir}/krfb/
%{_kf5_debugdir}/krfb.categories
%if %{with lang}
%files lang -f %{name}.lang