* [gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/, kde-apps/krfb/
@ 2014-12-01 12:24 Manuel Rüger
0 siblings, 0 replies; 2+ messages in thread
From: Manuel Rüger @ 2014-12-01 12:24 UTC (permalink / raw
To: gentoo-commits
commit: cef843262b526cf66c1740979c35fd9e3b2768eb
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 1 12:23:58 2014 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Dec 1 12:23:58 2014 +0000
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-9999.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..0000000
--- 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 <johu@gentoo.org>
-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 0000000..5927ab2
---- /dev/null
-+++ b/cmake/modules/FindLibVNCServer.cmake
-@@ -0,0 +1,41 @@
-+# cmake macro to test LIBVNCSERVER LIB
-+
-+# Copyright (c) 2006, Alessandro Praduroux <pradu@pradu.it>
-+# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
-+#
-+# 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}
-+ ${LIBVNCSERVER_LIBRARIES}
- )
-
- set_target_properties (krfbprivate PROPERTIES
-@@ -103,6 +104,7 @@ target_link_libraries (krfb
- ${QT_QTNETWORK_LIBRARY}
- ${KDE4_KDNSSD_LIBS}
- ${KDE4_KDEUI_LIBS}
-+ ${LIBVNCSERVER_LIBRARIES}
- )
-
- if(TelepathyQt4_FOUND)
-diff --git a/krfb/rfb.h b/krfb/rfb.h
-index 40308a2..fa94eda 100644
---- a/krfb/rfb.h
-+++ b/krfb/rfb.h
-@@ -6,7 +6,7 @@
- #ifndef KRFB_RFB_H
- #define KRFB_RFB_H
-
--#include "../libvncserver/rfb/rfb.h"
-+#include "rfb/rfb.h"
-
- #undef TRUE
- #undef FALSE
---
-2.0.2
-
diff --git a/kde-apps/krfb/krfb-14.11.97.ebuild b/kde-apps/krfb/krfb-14.11.97.ebuild
index 283bc48..53f1671 100644
--- a/kde-apps/krfb/krfb-14.11.97.ebuild
+++ b/kde-apps/krfb/krfb-14.11.97.ebuild
@@ -27,13 +27,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-src_prepare() {
- # bug 518824, patch before eclass magic
- epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch"
-
- kde4-base_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with telepathy TelepathyQt4)
diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild
index dda9d22..9e89eab 100644
--- a/kde-apps/krfb/krfb-9999.ebuild
+++ b/kde-apps/krfb/krfb-9999.ebuild
@@ -27,13 +27,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-src_prepare() {
- # bug 518824, patch before eclass magic
- epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch"
-
- kde4-base_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with telepathy TelepathyQt4)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/, kde-apps/krfb/
@ 2022-02-02 19:46 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-02-02 19:46 UTC (permalink / raw
To: gentoo-commits
commit: db44558034838ac7e7f8ee9237fc27cb830461f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 2 19:33:42 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 2 19:33:46 2022 +0000
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 <asturm <AT> 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.9999.ebuild | 43 +++++++++++++++-------
kde-apps/krfb/krfb-9999.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 0000000000..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 <luke-jr+git@utopios.org>
+Date: Mon, 24 Jan 2022 01:35:21 +0000
+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.9999.ebuild b/kde-apps/krfb/krfb-21.12.49.9999.ebuild
index d3256ed5fc..459aee1c0d 100644
--- a/kde-apps/krfb/krfb-21.12.49.9999.ebuild
+++ b/kde-apps/krfb/krfb-21.12.49.9999.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]
- >=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}/${PN}-21.12.2-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-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild
index d3256ed5fc..00cd6ffc44 100644
--- a/kde-apps/krfb/krfb-9999.ebuild
+++ b/kde-apps/krfb/krfb-9999.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]
- >=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,40 @@ 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] )
"
+
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-02 19:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-02 19:46 [gentoo-commits] proj/kde:master commit in: kde-apps/krfb/files/, kde-apps/krfb/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2014-12-01 12:24 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox