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

2024-05-17 Thread Andreas Sturmlechner
commit: 03d718c346e39cb27ec64c2c31530f6ee6f3b5ce
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 17 14:31:00 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 17 14:31:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=03d718c3

kde-apps/krfb: Drop obsolete dependency

Upstream commit a600986562c3c1ae50a4338b267306980d2231bb

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-24.04.90.ebuild  | 4 
 kde-apps/krfb/krfb-24.05.49..ebuild | 4 
 kde-apps/krfb/krfb-.ebuild  | 4 
 3 files changed, 12 deletions(-)

diff --git a/kde-apps/krfb/krfb-24.04.90.ebuild 
b/kde-apps/krfb/krfb-24.04.90.ebuild
index 19385d6426..b47436a723 100644
--- a/kde-apps/krfb/krfb-24.04.90.ebuild
+++ b/kde-apps/krfb/krfb-24.04.90.ebuild
@@ -39,10 +39,6 @@ COMMON_DEPEND="
x11-libs/xcb-util-image
wayland? (
dev-libs/wayland
-   || (
-   >=dev-qt/qtbase-${QTMIN}:6[libinput]
-   >=dev-qt/qtbase-${QTMIN}:6[X]
-   )
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6

diff --git a/kde-apps/krfb/krfb-24.05.49..ebuild 
b/kde-apps/krfb/krfb-24.05.49..ebuild
index e28a464014..b26973d695 100644
--- a/kde-apps/krfb/krfb-24.05.49..ebuild
+++ b/kde-apps/krfb/krfb-24.05.49..ebuild
@@ -39,10 +39,6 @@ COMMON_DEPEND="
x11-libs/xcb-util-image
wayland? (
dev-libs/wayland
-   || (
-   >=dev-qt/qtbase-${QTMIN}:6[libinput]
-   >=dev-qt/qtbase-${QTMIN}:6[X]
-   )
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index e28a464014..b26973d695 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -39,10 +39,6 @@ COMMON_DEPEND="
x11-libs/xcb-util-image
wayland? (
dev-libs/wayland
-   || (
-   >=dev-qt/qtbase-${QTMIN}:6[libinput]
-   >=dev-qt/qtbase-${QTMIN}:6[X]
-   )
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6



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

2024-03-15 Thread Andreas Sturmlechner
commit: c42c75954a4a2dc79ef21ebfc3071f94b7dbb223
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 15 12:57:55 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 15 13:19:01 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c42c7595

kde-apps/krfb: Explain dev-qt/qtbase:6= slot op

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-24.02.49..ebuild | 1 +
 kde-apps/krfb/krfb-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/krfb/krfb-24.02.49..ebuild 
b/kde-apps/krfb/krfb-24.02.49..ebuild
index a26abd0ab8..e28a464014 100644
--- a/kde-apps/krfb/krfb-24.02.49..ebuild
+++ b/kde-apps/krfb/krfb-24.02.49..ebuild
@@ -16,6 +16,7 @@ SLOT="6"
 KEYWORDS=""
 IUSE="wayland"
 
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
 COMMON_DEPEND="
>=dev-qt/qtbase-${QTMIN}:6=[dbus,network,widgets]
>=kde-frameworks/kcompletion-${KFMIN}:6

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index a26abd0ab8..e28a464014 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -16,6 +16,7 @@ SLOT="6"
 KEYWORDS=""
 IUSE="wayland"
 
+# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
 COMMON_DEPEND="
>=dev-qt/qtbase-${QTMIN}:6=[dbus,network,widgets]
>=kde-frameworks/kcompletion-${KFMIN}:6



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

2024-02-25 Thread Sam James
commit: 4d9c2ffee85446f588ac1ef88d185985e37fe156
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 20:38:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 20:39:16 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d9c2ffe

kde-apps/krfb: refresh deps

* Add explicit pipewire dep (upstream commit 
b3e3042bd8de7e474b15d863c9dadc584d47553f)
* Drop kcrash (upstream commit f4e97af144a3b8f0d645b6164ba0ca31de0ee4a2)

Signed-off-by: Sam James  gentoo.org>

 kde-apps/krfb/krfb-24.02.0.ebuild   | 2 +-
 kde-apps/krfb/krfb-24.02.49..ebuild | 2 +-
 kde-apps/krfb/krfb-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/krfb/krfb-24.02.0.ebuild 
b/kde-apps/krfb/krfb-24.02.0.ebuild
index 16f7336160..b1bccc814d 100644
--- a/kde-apps/krfb/krfb-24.02.0.ebuild
+++ b/kde-apps/krfb/krfb-24.02.0.ebuild
@@ -22,7 +22,6 @@ COMMON_DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
-   >=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/kdnssd-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6
+   >=media-video/pipewire-0.3
)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/krfb/krfb-24.02.49..ebuild 
b/kde-apps/krfb/krfb-24.02.49..ebuild
index 9628ee4310..c9648e438a 100644
--- a/kde-apps/krfb/krfb-24.02.49..ebuild
+++ b/kde-apps/krfb/krfb-24.02.49..ebuild
@@ -22,7 +22,6 @@ COMMON_DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
-   >=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/kdnssd-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6
+   >=media-video/pipewire-0.3
)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 9628ee4310..c9648e438a 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -22,7 +22,6 @@ COMMON_DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
-   >=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/kdnssd-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
@@ -46,6 +45,7 @@ COMMON_DEPEND="
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
kde-plasma/kwayland:6
+   >=media-video/pipewire-0.3
)
 "
 DEPEND="${COMMON_DEPEND}



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

2024-01-11 Thread Andreas Sturmlechner
commit: 6692df58d3080e576a6ebc1327eea7b59058eae0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 11 16:03:42 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 11 16:03:42 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6692df58

kde-apps/krfb: Fix kde-plasma/kwayland min version

No longer a Framework.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-24.01.90.ebuild  | 2 +-
 kde-apps/krfb/krfb-24.02.49..ebuild | 2 +-
 kde-apps/krfb/krfb-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/krfb/krfb-24.01.90.ebuild 
b/kde-apps/krfb/krfb-24.01.90.ebuild
index 084fe156b4..25da8d82a2 100644
--- a/kde-apps/krfb/krfb-24.01.90.ebuild
+++ b/kde-apps/krfb/krfb-24.01.90.ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="
)
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
-   >=kde-plasma/kwayland-${KFMIN}:6
+   kde-plasma/kwayland:6
)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/krfb/krfb-24.02.49..ebuild 
b/kde-apps/krfb/krfb-24.02.49..ebuild
index 91f80a4930..93c94d8b50 100644
--- a/kde-apps/krfb/krfb-24.02.49..ebuild
+++ b/kde-apps/krfb/krfb-24.02.49..ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="
)
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
-   >=kde-plasma/kwayland-${KFMIN}:6
+   kde-plasma/kwayland:6
)
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 91f80a4930..93c94d8b50 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="
)
>=dev-qt/qtwayland-${QTMIN}:6
kde-plasma/kpipewire:6
-   >=kde-plasma/kwayland-${KFMIN}:6
+   kde-plasma/kwayland:6
)
 "
 DEPEND="${COMMON_DEPEND}



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

2024-01-08 Thread Andreas Sturmlechner
commit: 253080760a85fa02ad62b1e393e61ac0d5ba58aa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  8 10:59:21 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  8 13:16:25 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=25308076

kde-apps/krfb: Port to KF6

Upstream commit 39c83720bf7241048ed695f94bf5405742708134

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-24.02.49..ebuild | 50 -
 kde-apps/krfb/krfb-.ebuild  | 50 -
 kde-apps/krfb/metadata.xml  |  1 +
 3 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/kde-apps/krfb/krfb-24.02.49..ebuild 
b/kde-apps/krfb/krfb-24.02.49..ebuild
index 3fbe58bcec..0a4c772480 100644
--- a/kde-apps/krfb/krfb-24.02.49..ebuild
+++ b/kde-apps/krfb/krfb-24.02.49..ebuild
@@ -4,36 +4,34 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://apps.kde.org/krfb/;
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="wayland"
 
 COMMON_DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdnssd-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,network,widgets]
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kcrash-${KFMIN}:6
+   >=kde-frameworks/kdbusaddons-${KFMIN}:6
+   >=kde-frameworks/kdnssd-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+   >=kde-frameworks/kwallet-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
>=net-libs/libvncserver-0.9.9
x11-libs/libX11
x11-libs/libxcb
@@ -42,12 +40,12 @@ COMMON_DEPEND="
wayland? (
dev-libs/wayland
|| (
-   >=dev-qt/qtgui-${QTMIN}:5[libinput]
-   >=dev-qt/qtgui-${QTMIN}:5[X]
+   >=dev-qt/qtbase-${QTMIN}:6[libinput]
+   >=dev-qt/qtbase-${QTMIN}:6[X]
)
-   >=dev-qt/qtwayland-${QTMIN}:5
-   kde-plasma/kpipewire:5
-   >=kde-plasma/kwayland-${KFMIN}:5
+   >=dev-qt/qtwayland-${QTMIN}:6
+   kde-plasma/kpipewire:6
+   >=kde-plasma/kwayland-${KFMIN}:6
)
 "
 DEPEND="${COMMON_DEPEND}
@@ -56,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
 "
-BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 3fbe58bcec..0a4c772480 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -4,36 +4,34 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://apps.kde.org/krfb/;
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="wayland"
 
 COMMON_DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdnssd-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-  

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

2023-08-25 Thread Andreas Sturmlechner
commit: f691bfdb77a81a225b30a2a831984a6471372f07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 25 19:29:19 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 25 19:29:19 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f691bfdb

kde-apps/krfb: Cleanup unused cmake vars

Follow-up to 51a04bf8b65229f6ee0136f60f50fce951a48acd

Bug: https://bugs.gentoo.org/913012
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-23.08.49..ebuild | 3 ---
 kde-apps/krfb/krfb-.ebuild  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/kde-apps/krfb/krfb-23.08.49..ebuild 
b/kde-apps/krfb/krfb-23.08.49..ebuild
index c8bd5db36f..bff69f2146 100644
--- a/kde-apps/krfb/krfb-23.08.49..ebuild
+++ b/kde-apps/krfb/krfb-23.08.49..ebuild
@@ -62,9 +62,6 @@ 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-.ebuild b/kde-apps/krfb/krfb-.ebuild
index c8bd5db36f..bff69f2146 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -62,9 +62,6 @@ 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
 }



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

2023-08-21 Thread Andreas Sturmlechner
commit: a8816a50e5a0f7139135fc6bcbdc18bd85622fc3
Author: Guillermo Joandet  gmail  com>
AuthorDate: Mon Aug 14 14:56:06 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 21 19:48:14 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8816a50

kde-apps/krfb: Prepare for sys-apps/xdg-desktop-portal w/o screencast

See also: https://github.com/gentoo/gentoo/pull/32180

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-23.08.0.ebuild   | 2 +-
 kde-apps/krfb/krfb-23.08.49..ebuild | 2 +-
 kde-apps/krfb/krfb-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/krfb/krfb-23.08.0.ebuild 
b/kde-apps/krfb/krfb-23.08.0.ebuild
index d73c94e6c2..90af66095a 100644
--- a/kde-apps/krfb/krfb-23.08.0.ebuild
+++ b/kde-apps/krfb/krfb-23.08.0.ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
wayland? ( >=dev-libs/plasma-wayland-protocols-1.5.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+   wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
 "
 BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
 

diff --git a/kde-apps/krfb/krfb-23.08.49..ebuild 
b/kde-apps/krfb/krfb-23.08.49..ebuild
index 2bbf6f75da..c8bd5db36f 100644
--- a/kde-apps/krfb/krfb-23.08.49..ebuild
+++ b/kde-apps/krfb/krfb-23.08.49..ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
wayland? ( >=dev-libs/plasma-wayland-protocols-1.5.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+   wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
 "
 BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
 

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 2bbf6f75da..c8bd5db36f 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -54,7 +54,7 @@ DEPEND="${COMMON_DEPEND}
wayland? ( >=dev-libs/plasma-wayland-protocols-1.5.0 )
 "
 RDEPEND="${COMMON_DEPEND}
-   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+   wayland? ( sys-apps/xdg-desktop-portal[screencast(+)] )
 "
 BDEPEND="wayland? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
 



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

2023-03-24 Thread Andreas Sturmlechner
commit: 63df979ffb3a460a801cb7c601a510e16942e4f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 25 00:01:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 25 00:01:21 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=63df979f

kde-apps/krfb: Add new dependency

Upstream commit 4db9c65083068ad5c11f2f1f772ddedad8252e30

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 3e8a783ae5..34e374e66d 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
)
>=dev-qt/qtwayland-${QTMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
+   kde-plasma/kpipewire:5
media-libs/libepoxy
media-libs/mesa[gbm(+)]
>=media-video/pipewire-0.3:=



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

2022-04-18 Thread Andreas Sturmlechner
commit: 8567449f6825dc90a823c5b5912cc6a458ebe65a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 18 11:22:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 18 11:23:06 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8567449f

kde-apps/krfb: Make dev-qt/qtwaylandscanner single provider

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

 kde-apps/krfb/krfb-22.03.90.ebuild  | 7 +--
 kde-apps/krfb/krfb-22.04.0.ebuild   | 7 +--
 kde-apps/krfb/krfb-22.04.49..ebuild | 7 +--
 kde-apps/krfb/krfb-.ebuild  | 7 +--
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/kde-apps/krfb/krfb-22.03.90.ebuild 
b/kde-apps/krfb/krfb-22.03.90.ebuild
index 0730a74637..220753f9f3 100644
--- a/kde-apps/krfb/krfb-22.03.90.ebuild
+++ b/kde-apps/krfb/krfb-22.03.90.ebuild
@@ -61,12 +61,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )
 "
-BDEPEND="
-   wayland? ( || (
-   >=dev-qt/qtwaylandscanner-${QTMIN}:5
-   

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

2022-03-16 Thread Andreas Sturmlechner
commit: a1b4e31d5d54f71384f2c55a7d63a156bb8abb14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 16 13:54:53 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 16 14:02:03 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1b4e31d

kde-apps/krfb: Add dev-qt/qtwaylandscanner BDEPEND

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

 kde-apps/krfb/krfb-.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 00cd6ffc44..4095c7177b 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -60,6 +60,12 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )
 "
+BDEPEND="
+   wayland? ( || (
+   >=dev-qt/qtwaylandscanner-${QTMIN}:5
+   

[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/

2021-11-16 Thread Andreas Sturmlechner
commit: d00d38b91a3f06f3fa49270ce28d8951955a8cba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 16 15:48:53 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 16 15:48:53 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d00d38b9

kde-apps/krfb: Update DEPENDs

Upstream commit 4707bde2362d78133406489a2af54ea0f07f4f3d

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

 kde-apps/krfb/krfb-.ebuild | 31 +--
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index bb21415b6a..3ac8c5b7a2 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -14,12 +14,18 @@ HOMEPAGE="https://apps.kde.org/krfb/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="wayland"
+IUSE=""
 
 COMMON_DEPEND="
+   >=dev-libs/plasma-wayland-protocols-1.5.0
+   dev-libs/wayland
>=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${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
@@ -35,29 +41,18 @@ 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? (
-   media-libs/libepoxy
-   media-libs/mesa[gbm(+)]
-   >=media-video/pipewire-0.3:=
-   )
 "
 DEPEND="${COMMON_DEPEND}
-   wayland? ( media-libs/libglvnd )
+   media-libs/libglvnd
 "
 RDEPEND="${COMMON_DEPEND}
-   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+   sys-apps/xdg-desktop-portal[screencast]
 "
-
-src_prepare() {
-   ecm_src_prepare
-
-   # TODO: try to get a build switch upstreamed
-   if ! use wayland; then
-   sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt 
|| die
-   fi
-}



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

2019-08-18 Thread Andreas Sturmlechner
commit: ef8d7d9abca5332d5cc07ac53ae571ed05ef3418
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 17 22:46:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 18 15:19:04 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ef8d7d9a

kde-apps/krfb: Add missing slot operator

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

 kde-apps/krfb/krfb-19.08.49..ebuild | 2 +-
 kde-apps/krfb/krfb-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/krfb/krfb-19.08.49..ebuild 
b/kde-apps/krfb/krfb-19.08.49..ebuild
index b11128982c..a3f44a2ea1 100644
--- a/kde-apps/krfb/krfb-19.08.49..ebuild
+++ b/kde-apps/krfb/krfb-19.08.49..ebuild
@@ -35,7 +35,7 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXtst
x11-libs/xcb-util-image
-   wayland? ( media-video/pipewire )
+   wayland? ( media-video/pipewire:= )
 "
 RDEPEND="${DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index b11128982c..a3f44a2ea1 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -35,7 +35,7 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXtst
x11-libs/xcb-util-image
-   wayland? ( media-video/pipewire )
+   wayland? ( media-video/pipewire:= )
 "
 RDEPEND="${DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )



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

2019-08-13 Thread Andreas Sturmlechner
commit: 54d4833a0d5075b68353768e8b93225fdd7fb812
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 13 19:07:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 13 19:07:37 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54d4833a

kde-apps: Tarballs respun

See also: https://mail.kde.org/pipermail/release-team/2019-August/011459.html

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 --
 kde-apps/krfb/krfb-19.08.0.ebuild  |  2 --
 2 files changed, 28 deletions(-)

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
deleted file mode 100644
index fc3220d4f4..00
--- a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-

diff --git a/kde-apps/krfb/krfb-19.08.0.ebuild 
b/kde-apps/krfb/krfb-19.08.0.ebuild
index baab086b4c..c2d6d4d7a0 100644
--- a/kde-apps/krfb/krfb-19.08.0.ebuild
+++ b/kde-apps/krfb/krfb-19.08.0.ebuild
@@ -41,8 +41,6 @@ RDEPEND="${DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-19.04.3-missing-header.patch" )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland PipeWire)



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

2019-08-10 Thread Andreas Sturmlechner
commit: d838ec80c13b3e8867e825d7dde918c528b2618a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 10 10:06:03 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 10 10:06:03 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d838ec80

kde-apps/krfb: Actually use the patch

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

 kde-apps/krfb/krfb-19.08.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/krfb/krfb-19.08.0.ebuild 
b/kde-apps/krfb/krfb-19.08.0.ebuild
index c2d6d4d7a0..baab086b4c 100644
--- a/kde-apps/krfb/krfb-19.08.0.ebuild
+++ b/kde-apps/krfb/krfb-19.08.0.ebuild
@@ -41,6 +41,8 @@ RDEPEND="${DEPEND}
wayland? ( sys-apps/xdg-desktop-portal[screencast] )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-19.04.3-missing-header.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland PipeWire)



[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/

2019-07-07 Thread Andreas Sturmlechner
commit: 2208910e0ae77f8b240ac5b546302c7212e69676
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  7 16:10:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  7 16:10:50 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2208910e

kde-apps/krfb: Add new DEPEND

Upstream commit 9828143609544df02638b11cf0cad4c6910e6345

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

 kde-apps/krfb/krfb-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index fd20e611c1..43a21ce9f5 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -23,6 +23,7 @@ DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)



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

2019-07-07 Thread Andreas Sturmlechner
commit: 5d8a8a451b30645c156393b5c11884ebf333afe6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  7 16:16:55 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  7 16:16:55 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d8a8a45

kde-apps/krfb: Add wayland remote desktop support (add USE wayland)

Upstream commit c05707884c17995bf22c5756075d0ad7c1046794

Closes: https://bugs.gentoo.org/686336
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/krfb/krfb-.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 43a21ce9f5..b11128982c 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://kde.org/applications/system/krfb/;
 KEYWORDS=""
-IUSE=""
+IUSE="wayland"
 
 DEPEND="
$(add_frameworks_dep kcompletion)
@@ -35,5 +35,16 @@ DEPEND="
x11-libs/libxcb
x11-libs/libXtst
x11-libs/xcb-util-image
+   wayland? ( media-video/pipewire )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package wayland PipeWire)
+   )
+
+   kde5_src_configure
+}



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

2017-06-17 Thread Andreas Sturmlechner
commit: 8d62613a080a16d272c5db1c8c6fae8fc37e5692
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 17 17:49:39 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 17 17:49:39 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d62613a

kde-apps/krfb: Drop unused DEPENDs, add new DEPENDs

Upstream commit b2cb3e8204aa86a11f9f597f2a5d8a7a22f387fc

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/krfb/krfb-17.04.49..ebuild | 4 +---
 kde-apps/krfb/krfb-.ebuild  | 8 +++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/kde-apps/krfb/krfb-17.04.49..ebuild 
b/kde-apps/krfb/krfb-17.04.49..ebuild
index bb14f0da1f..3950af046c 100644
--- a/kde-apps/krfb/krfb-17.04.49..ebuild
+++ b/kde-apps/krfb/krfb-17.04.49..ebuild
@@ -6,7 +6,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="VNC-compatible server to share KDE desktops"
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/;
 KEYWORDS=""
 IUSE=""
@@ -30,8 +30,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
>=net-libs/libvncserver-0.9.9
-   sys-libs/zlib
-   virtual/jpeg:0
x11-libs/libX11
x11-libs/libXdamage
x11-libs/libXext

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index bb14f0da1f..5a3a8a8160 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="VNC-compatible server to share KDE desktops"
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/;
 KEYWORDS=""
 IUSE=""
@@ -30,11 +30,9 @@ DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
>=net-libs/libvncserver-0.9.9
-   sys-libs/zlib
-   virtual/jpeg:0
x11-libs/libX11
-   x11-libs/libXdamage
-   x11-libs/libXext
+   x11-libs/libxcb
x11-libs/libXtst
+   x11-libs/xcb-util-image
 "
 RDEPEND="${DEPEND}"



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

2015-10-16 Thread Michael Palimaka
commit: 13519fab9f45bba04a9d6acfa1932ecc11a34ed5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Oct 15 23:04:23 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 16 18:24:09 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=13519fab

kde-apps/krfb: Frameworks merged to master

Package-Manager: portage-2.2.23

 kde-apps/krfb/krfb-5..ebuild | 43 --
 kde-apps/krfb/krfb-.ebuild   | 45 ++--
 2 files changed, 25 insertions(+), 63 deletions(-)

diff --git a/kde-apps/krfb/krfb-5..ebuild b/kde-apps/krfb/krfb-5..ebuild
deleted file mode 100644
index 38e7739..000
--- a/kde-apps/krfb/krfb-5..ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-KDE_DOXYGEN="true"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share KDE desktops"
-HOMEPAGE="https://www.kde.org/applications/system/krfb/;
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdnssd)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtx11extras:5
-   >=net-libs/libvncserver-0.9.9
-   sys-libs/zlib
-   virtual/jpeg:0
-   x11-libs/libX11
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 0157a97..649f1c4 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -4,34 +4,39 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="true"
+inherit kde5
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/;
 KEYWORDS=""
-IUSE="debug telepathy ktp"
-REQUIRED_USE="ktp? ( telepathy )"
+IUSE=""
 
 DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdnssd)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
>=net-libs/libvncserver-0.9.9
sys-libs/zlib
virtual/jpeg:0
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXtst
-   )
-   telepathy? ( >=net-libs/telepathy-qt-0.9 )
+   x11-libs/libX11
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXtst
 "
 RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with telepathy TelepathyQt4)
-   $(cmake-utils_use_with ktp KTp)
-   )
-
-   kde4-base_src_configure
-}



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

2015-10-15 Thread Michael Palimaka
commit: b467c5f97a33f172162e1d6da1d873ae908bba85
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Oct 15 16:04:47 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 15 16:24:10 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b467c5f9

kde-apps/krfb: Add kf5 version

Package-Manager: portage-2.2.23

 kde-apps/krfb/krfb-5..ebuild | 43 
 1 file changed, 43 insertions(+)

diff --git a/kde-apps/krfb/krfb-5..ebuild b/kde-apps/krfb/krfb-5..ebuild
new file mode 100644
index 000..38e7739
--- /dev/null
+++ b/kde-apps/krfb/krfb-5..ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="frameworks"
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+HOMEPAGE="https://www.kde.org/applications/system/krfb/;
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdnssd)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   >=net-libs/libvncserver-0.9.9
+   sys-libs/zlib
+   virtual/jpeg:0
+   x11-libs/libX11
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"



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

2015-08-26 Thread Johannes Huber
commit: 7ccffb1da4a81f4b4cfd9c65e8b4946fc72f41a8
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Aug 26 19:42:27 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Aug 26 19:42:27 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ccffb1d

kde-apps/krfb: Use https for HOMEPAGE

Package-Manager: portage-2.2.20.1

 kde-apps/krfb/krfb-15.04.3.ebuild   | 2 +-
 kde-apps/krfb/krfb-15.08.0.ebuild   | 2 +-
 kde-apps/krfb/krfb-15.08.49..ebuild | 2 +-
 kde-apps/krfb/krfb-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/krfb/krfb-15.04.3.ebuild 
b/kde-apps/krfb/krfb-15.04.3.ebuild
index 04ac57e..50c0f2c 100644
--- a/kde-apps/krfb/krfb-15.04.3.ebuild
+++ b/kde-apps/krfb/krfb-15.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=http://www.kde.org/applications/system/krfb/;
+HOMEPAGE=https://www.kde.org/applications/system/krfb/;
 KEYWORDS=~amd64 ~x86
 IUSE=debug telepathy ktp
 REQUIRED_USE=ktp? ( telepathy )

diff --git a/kde-apps/krfb/krfb-15.08.0.ebuild 
b/kde-apps/krfb/krfb-15.08.0.ebuild
index 04ac57e..50c0f2c 100644
--- a/kde-apps/krfb/krfb-15.08.0.ebuild
+++ b/kde-apps/krfb/krfb-15.08.0.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=http://www.kde.org/applications/system/krfb/;
+HOMEPAGE=https://www.kde.org/applications/system/krfb/;
 KEYWORDS=~amd64 ~x86
 IUSE=debug telepathy ktp
 REQUIRED_USE=ktp? ( telepathy )

diff --git a/kde-apps/krfb/krfb-15.08.49..ebuild 
b/kde-apps/krfb/krfb-15.08.49..ebuild
index 8df1794..0157a97 100644
--- a/kde-apps/krfb/krfb-15.08.49..ebuild
+++ b/kde-apps/krfb/krfb-15.08.49..ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=http://www.kde.org/applications/system/krfb/;
+HOMEPAGE=https://www.kde.org/applications/system/krfb/;
 KEYWORDS=
 IUSE=debug telepathy ktp
 REQUIRED_USE=ktp? ( telepathy )

diff --git a/kde-apps/krfb/krfb-.ebuild b/kde-apps/krfb/krfb-.ebuild
index 8df1794..0157a97 100644
--- a/kde-apps/krfb/krfb-.ebuild
+++ b/kde-apps/krfb/krfb-.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=http://www.kde.org/applications/system/krfb/;
+HOMEPAGE=https://www.kde.org/applications/system/krfb/;
 KEYWORDS=
 IUSE=debug telepathy ktp
 REQUIRED_USE=ktp? ( telepathy )



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

2015-08-26 Thread Johannes Huber
commit: bda1d8501bc2ba180171fdc4d780b0f0ee96ff6f
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Aug 26 19:43:56 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Aug 26 19:43:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bda1d850

kde-apps/krfb: Remove old

Moved to gentoo main repo.

Package-Manager: portage-2.2.20.1

 kde-apps/krfb/krfb-15.04.3.ebuild | 37 -
 kde-apps/krfb/krfb-15.08.0.ebuild | 37 -
 2 files changed, 74 deletions(-)

diff --git a/kde-apps/krfb/krfb-15.04.3.ebuild 
b/kde-apps/krfb/krfb-15.04.3.ebuild
deleted file mode 100644
index 50c0f2c..000
--- a/kde-apps/krfb/krfb-15.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=https://www.kde.org/applications/system/krfb/;
-KEYWORDS=~amd64 ~x86
-IUSE=debug telepathy ktp
-REQUIRED_USE=ktp? ( telepathy )
-
-DEPEND=
-   =net-libs/libvncserver-0.9.9
-   sys-libs/zlib
-   virtual/jpeg:0
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXtst
-   )
-   telepathy? ( =net-libs/telepathy-qt-0.9 )
-
-RDEPEND=${DEPEND}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with telepathy TelepathyQt4)
-   $(cmake-utils_use_with ktp KTp)
-   )
-
-   kde4-base_src_configure
-}

diff --git a/kde-apps/krfb/krfb-15.08.0.ebuild 
b/kde-apps/krfb/krfb-15.08.0.ebuild
deleted file mode 100644
index 50c0f2c..000
--- a/kde-apps/krfb/krfb-15.08.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION=VNC-compatible server to share KDE desktops
-HOMEPAGE=https://www.kde.org/applications/system/krfb/;
-KEYWORDS=~amd64 ~x86
-IUSE=debug telepathy ktp
-REQUIRED_USE=ktp? ( telepathy )
-
-DEPEND=
-   =net-libs/libvncserver-0.9.9
-   sys-libs/zlib
-   virtual/jpeg:0
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXtst
-   )
-   telepathy? ( =net-libs/telepathy-qt-0.9 )
-
-RDEPEND=${DEPEND}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with telepathy TelepathyQt4)
-   $(cmake-utils_use_with ktp KTp)
-   )
-
-   kde4-base_src_configure
-}



[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 mrueg AT gentoo DOT org
AuthorDate: Mon Dec  1 12:23:58 2014 +
Commit: Manuel Rüger mrueg AT gentoo DOT 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 j...@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 000..5927ab2
 /dev/null
-+++ b/cmake/modules/FindLibVNCServer.cmake
-@@ -0,0 +1,41 @@
-+# cmake macro to test LIBVNCSERVER LIB
-+
-+# Copyright (c) 2006, Alessandro Praduroux pr...@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}
-