[gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/, kde-apps/krfb/

2022-02-02 Thread Andreas Sturmlechner 
commit: db44558034838ac7e7f8ee9237fc27cb830461f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  2 19:33:42 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  2 19:33:46 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=db445580

kde-apps/krfb: Re-add IUSE=wayland

Upstream commit 1222c2067ccaeef69878bd3101fc579011b3e191

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/krfb-21.12.2-optional-pipewire.patch | 28 ++
 kde-apps/krfb/krfb-21.12.2.ebuild  | 43 +++---
 kde-apps/krfb/krfb-21.12.49..ebuild| 43 +++---
 kde-apps/krfb/krfb-.ebuild | 41 ++---
 4 files changed, 116 insertions(+), 39 deletions(-)

diff --git a/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch 
b/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch
new file mode 100644
index 00..42efc93ee6
--- /dev/null
+++ b/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch
@@ -0,0 +1,28 @@
+From 1222c2067ccaeef69878bd3101fc579011b3e191 Mon Sep 17 00:00:00 2001
+From: Luke Dashjr 
+Date: Mon, 24 Jan 2022 01:35:21 +
+Subject: [PATCH] Add CMake option DISABLE_PIPEWIRE to skip dependency check
+
+---
+ CMakeLists.txt | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4f8241f..01e6f57 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -79,7 +79,10 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
)
+ find_package(LibVNCServer REQUIRED)
+ 
+ 
+-pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
++option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
++if(NOT DISABLE_PIPEWIRE)
++pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
++endif()
+ add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast 
plugin")
+ find_package(PlasmaWaylandProtocols 1.5.0)
+ 
+-- 
+GitLab
+

diff --git a/kde-apps/krfb/krfb-21.12.2.ebuild 
b/kde-apps/krfb/krfb-21.12.2.ebuild
index a6011f97c5..eddcd8ff9b 100644
--- a/kde-apps/krfb/krfb-21.12.2.ebuild
+++ b/kde-apps/krfb/krfb-21.12.2.ebuild
@@ -14,18 +14,11 @@ HOMEPAGE="https://apps.kde.org/krfb/";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
+IUSE="wayland"
 
 COMMON_DEPEND="
-   >=dev-libs/plasma-wayland-protocols-1.5.0
-   dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
-   || (
-   >=dev-qt/qtgui-${QTMIN}:5[libinput]
-   >=dev-qt/qtgui-${QTMIN}:5[X]
-   )
>=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -41,18 +34,42 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-libs/libepoxy
-   media-libs/mesa[gbm(+)]
-   >=media-video/pipewire-0.3:=
>=net-libs/libvncserver-0.9.9
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXtst
x11-libs/xcb-util-image
+   wayland? (
+   dev-libs/wayland
+   || (
+   >=dev-qt/qtgui-${QTMIN}:5[libinput]
+   >=dev-qt/qtgui-${QTMIN}:5[X]
+   )
+   >=dev-qt/qtwayland-${QTMIN}:5
+   media-libs/libepoxy
+   media-libs/mesa[gbm(+)]
+   >=media-video/pipewire-0.3:=
+   )
 "
 DEPEND="${COMMON_DEPEND}
-   media-libs/libglvnd
+   wayland? (
+   >=dev-libs/plasma-wayland-protocols-1.5.0
+   media-libs/libglvnd
+   )
 "
 RDEPEND="${COMMON_DEPEND}
-   sys-apps/xdg-desktop-portal[screencast]
+   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
 "
+
+PATCHES=( "${FILESDIR}/${P}-optional-pipewire.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DDISABLE_PIPEWIRE=$(usex !wayland)
+   $(cmake_use_find_package wayland PlasmaWaylandProtocols)
+   $(cmake_use_find_package wayland gbm)
+   $(cmake_use_find_package wayland EGL)
+   $(cmake_use_find_package wayland epoxy)
+   )
+   ecm_src_configure
+}

diff --git a/kde-apps/krfb/krfb-21.12.49..ebuild 
b/kde-apps/krfb/krfb-21.12.49..ebuild
index d3256ed5fc..459aee1c0d 100644
--- a/kde-apps/krfb/krfb-21.12.49..ebuild
+++ b/kde-apps/krfb/krfb-21.12.49..ebuild
@@ -14,18 +14,11 @@ HOMEPAGE="https://apps.kde.org/krfb/";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE=""
+IUSE="wayland"
 
 COMMON_DEPEND="
-   >=dev-libs/plasma-wayland-protocols-1.5.0
-   dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
-   || (
-   >=dev-qt/qtgui-${QTMIN}:5[libinput]
-

[gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/

2019-08-10 Thread Andreas Sturmlechner 
commit: 18b03bcf3570cc1f0a0614d3d046ecbd78c32e74
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug  9 19:33:58 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 10 10:04:15 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18b03bcf

kde-apps/krfb: Fix missing header w/ future Frameworks

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krfb/files/krfb-19.04.3-missing-header.patch   | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch 
b/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
new file mode 100644
index 00..fc3220d4f4
--- /dev/null
+++ b/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
@@ -0,0 +1,26 @@
+From 9290ba179c5d1e3a0a829666f4cb24177cb49395 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 9 Aug 2019 21:19:23 +0200
+Subject: [PATCH] Add missing QHash
+
+Fixes build with future Frameworks.
+---
+ krfb/trayicon.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krfb/trayicon.h b/krfb/trayicon.h
+index 6517e4a..166e97b 100644
+--- a/krfb/trayicon.h
 b/krfb/trayicon.h
+@@ -18,6 +18,8 @@
+ #ifndef TRAYICON_H
+ #define TRAYICON_H
+ 
++#include 
++
+ #include 
+ 
+ class RfbClient;
+-- 
+2.22.0
+

[gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/, kde-apps/krfb/

2014-12-01 Thread Manuel Rüger 
commit: cef843262b526cf66c1740979c35fd9e3b2768eb
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Dec  1 12:23:58 2014 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Dec  1 12:23:58 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cef84326

[kde-apps/krfb] Drop patch.

Package-Manager: portage-2.2.14

---
 14.0-CVE-2014-4607-unbundle-libvncserver.patch | 133 -
 kde-apps/krfb/krfb-14.11.97.ebuild |   7 --
 kde-apps/krfb/krfb-.ebuild |   7 --
 3 files changed, 147 deletions(-)

diff --git 
a/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch 
b/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
deleted file mode 100644
index 202519b..000
--- a/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 766fc7694a58b7e01c003356db94276f07b791b5 Mon Sep 17 00:00:00 2001
-From: Johannes Huber 
-Date: Thu, 31 Jul 2014 19:41:01 +0200
-Subject: [PATCH] CVE-2014-4607: Unbundle libvncserver
-
-http://seclists.org/oss-sec/2014/q2/676
-
-REVIEW: 119548

- CMakeLists.txt   |  7 +++---
- cmake/modules/FindLibVNCServer.cmake | 41 
- krfb/CMakeLists.txt  |  2 ++
- krfb/rfb.h   |  2 +-
- 4 files changed, 47 insertions(+), 5 deletions(-)
- create mode 100644 cmake/modules/FindLibVNCServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4aa24dd..0b29da0 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH
- ${CMAKE_MODULE_PATH}
- )
- 
-+find_package(LibVNCServer REQUIRED)
-+
- macro_optional_find_package(TelepathyQt4)
- macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" 
"http://telepathy.freedesktop.org"; FALSE "0.9" "Needed to build Telepathy Tubes 
support.")
- 
-@@ -44,8 +46,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
- include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
-  "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
-- "${CMAKE_CURRENT_SOURCE_DIR}/libvncserver/"
-- "${CMAKE_CURRENT_BINARY_DIR}/libvncserver/"
- )
- 
- if(Q_WS_X11)
-@@ -54,9 +54,8 @@ if(Q_WS_X11)
-   endif(NOT X11_XTest_FOUND)
- endif(Q_WS_X11)
- 
--add_subdirectory(libvncserver)
- add_subdirectory(krfb)
--add_subdirectory (framebuffers)
-+add_subdirectory(framebuffers)
- add_subdirectory(doc)
- 
- if (NOT INSIDE_KDENETWORK)
-diff --git a/cmake/modules/FindLibVNCServer.cmake 
b/cmake/modules/FindLibVNCServer.cmake
-new file mode 100644
-index 000..5927ab2
 /dev/null
-+++ b/cmake/modules/FindLibVNCServer.cmake
-@@ -0,0 +1,41 @@
-+# cmake macro to test LIBVNCSERVER LIB
-+
-+# Copyright (c) 2006, Alessandro Praduroux 
-+# Copyright (c) 2007, Urs Wolfer 
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+INCLUDE(CheckPointerMember)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+# Already in cache, be silent
-+SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
-+
-+FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
-+
-+# libvncserver and libvncclient are in the same package, so it does
-+# not make sense to add a new cmake script for finding libvncclient.
-+# instead just find the libvncclient also in this file.
-+FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
-+FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+   SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" 
"${CMAKE_REQUIRED_INCLUDES}")
-+   CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h 
LIBVNCSERVER_FOUND)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+IF (LIBVNCSERVER_FOUND)
-+  IF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
-+  ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+ELSE (LIBVNCSERVER_FOUND)
-+  IF (LIBVNCSERVER_FIND_REQUIRED)
-+MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer 
(version 0.9 or later required).")
-+  ENDIF (LIBVNCSERVER_FIND_REQUIRED)
-+ENDIF (LIBVNCSERVER_FOUND)
-+
-+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
-\ No newline at end of file
-diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
-index a65eea8..100b49b 100644
 a/krfb/CMakeLists.txt
-+++ b/krfb/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
-${QT_QTCORE_LIBRARY}
-${QT_QTGUI_LIBRARY}
-${X11_X11_LIB}
-+   ${LIBVNCSER