kdesu: update to 5.7.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-01-29 14:51:17 +01:00
parent 4b26b62e17
commit 3469a4310f
2 changed files with 3 additions and 87 deletions

View File

@@ -1,85 +0,0 @@
From d3288c56543300b7cb115e9fe8adde3a89391116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 9 Dec 2014 06:25:44 +0100
Subject: [PATCH] kdesud.cpp: check HAVE_X11 properly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/kdesud/kdesud.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/kdesud/kdesud.cpp b/src/kdesud/kdesud.cpp
index 1ca5fdf..f991727 100644
--- a/src/kdesud/kdesud.cpp
+++ b/src/kdesud/kdesud.cpp
@@ -73,7 +73,7 @@
#include "repo.h"
#include "handler.h"
-#ifdef HAVE_X11
+#if HAVE_X11
#include <X11/X.h>
#include <X11/Xlib.h>
#endif
@@ -94,7 +94,7 @@ using namespace KDESu;
Repository *repo;
QString Version(QStringLiteral("1.01"));
QByteArray sock;
-#ifdef HAVE_X11
+#if HAVE_X11
Display *x11Display;
#endif
int pipeOfDeath[2];
@@ -107,7 +107,7 @@ void kdesud_cleanup()
// Borrowed from kdebase/kaudio/kaudioserver.cpp
-#ifdef HAVE_X11
+#if HAVE_X11
extern "C" int xio_errhandler(Display *);
int xio_errhandler(Display *)
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
if (pid)
_exit(0);
-#ifdef HAVE_X11
+#if HAVE_X11
// Make sure we exit when the display gets closed.
int x11Fd = initXconnection();
maxfd = qMax(maxfd, x11Fd);
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
FD_ZERO(&active_fds);
FD_SET(sockfd, &active_fds);
FD_SET(pipeOfDeath[0], &active_fds);
-#ifdef HAVE_X11
+#if HAVE_X11
if (x11Fd != -1)
FD_SET(x11Fd, &active_fds);
#endif
@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
while (1)
{
tmp_fds = active_fds;
-#ifdef HAVE_X11
+#if HAVE_X11
if(x11Display)
XFlush(x11Display);
#endif
@@ -396,7 +396,7 @@ int main(int argc, char *argv[])
while(result > 0);
}
-#ifdef HAVE_X11
+#if HAVE_X11
if (i == x11Fd)
{
// Discard X events
--
1.8.3.1

View File

@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
require ../../kf5-version.inc
inherit kde cmake-lib
DEPENDS += " \
@@ -13,8 +15,7 @@ DEPENDS += " \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
"
SRCREV = "392db480bcd24f2481299d19bbaaff5d6aeb27a8"
SRC_URI += "file://0001-kdesud.cpp-check-HAVE_X11-properly.patch"
SRCREV = "d9e904b9d25cb68a413349e5af5a280be7731c52"
# cross libs / headers
CMAKE_HIDE_ERROR[1] = "KF5Su, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"