public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kinit/, kde-frameworks/kinit/files/
@ 2015-11-18 18:39 Michael Palimaka
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2015-11-18 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     86df0445c797540c4523b8e9580a2ad3a5f66e6f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Nov 15 21:29:43 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 18:38:25 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86df0445

kde-frameworks/kinit: Fix bug with USE=-caps, Gentoo bug 560640

Added upstream patch from git master to fix longstanding bug.

Package-Manager: portage-2.2.20.1

 .../files/kinit-5.16.0-dont-wipe-groups.patch      | 56 ++++++++++++++++++++++
 kde-frameworks/kinit/kinit-5.16.0-r1.ebuild        | 42 ++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch b/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch
new file mode 100644
index 0000000..7427270
--- /dev/null
+++ b/kde-frameworks/kinit/files/kinit-5.16.0-dont-wipe-groups.patch
@@ -0,0 +1,56 @@
+From: Nicolás Alvarez <nicolas.alvarez@gmail.com>
+Date: Wed, 11 Nov 2015 05:52:37 +0000
+Subject: Revert "Call setgroups(0,0) before calling setgid()"
+X-Git-Url: http://quickgit.kde.org/?p=kinit.git&a=commitdiff&h=1086e110ae4c05af6704af0d56f93e8bb023eeff
+---
+Revert "Call setgroups(0,0) before calling setgid()"
+
+The reasoning for adding setgroups(0,0) was that when you drop privileges
+from root to regular user, there might be some extra groups left that, if
+not cleared, might grant the process privileges to do superuser things.
+
+However, this only happens if the process calls setgroups to alter its own
+supplementary groups while it's still running as root, and then drops
+privileges to a regular user. In that case there may be a security issue
+where the process ends up running as a regular user, but with supplemental
+groups the user doesn't normally belong to.
+
+Since start_kdeinit doesn't call setgroups to give itself superuser groups,
+there is no such security issue, and it doesn't need to clear the group
+list before dropping to a normal user.
+
+*In addition*, this was completely emptying the list of supplemental groups
+instead of setting them to what the user's groups actually are (eg. from
+getgrouplist), which means he would end up without 'plugdev', 'vboxusers',
+'wireshark', 'cdrom', and whatever other groups they may need for their
+software to work.
+
+CCMAIL:dvratil@redhat.com
+
+Daniel: if the latest version of rpmlint still complains about this use of
+setgid without setgroups, please file a bug against rpmlint.
+
+This reverts commit ff5ea1ab8568893c7d7b3a4518997080d3533308 from
+review 119011.
+---
+
+
+--- a/src/start_kdeinit/start_kdeinit.c
++++ b/src/start_kdeinit/start_kdeinit.c
+@@ -27,7 +27,6 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <grp.h>
+ #if HAVE_CAPABILITIES
+ #include <sys/capability.h>
+ #endif
+@@ -126,7 +125,6 @@
+         }
+         cap_free(caps);
+ #endif
+-	setgroups(0, 0); /* Remove any extraneous groups*/
+         if (setgid(getgid())) {
+             perror("setgid()");
+             return 1;
+

diff --git a/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild
new file mode 100644
index 0000000..e225d7b
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.16.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+caps +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	x11-libs/libX11
+	caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	x11-proto/xproto
+"
+
+PATCHES=( "${FILESDIR}/${P}-dont-wipe-groups.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kinit/, kde-frameworks/kinit/files/
@ 2018-12-25 21:23 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-12-25 21:23 UTC (permalink / raw
  To: gentoo-commits

commit:     9c90a731e9a00e9af8c86331a45e0348babfde7c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 20:49:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:23:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c90a731

kde-frameworks/kinit: Fix startup delay w/ systemd-240

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kinit-5.53.0-systemd-240-soft-rlimit.patch     | 27 +++++++++++++
 kde-frameworks/kinit/kinit-5.53.0-r1.ebuild        | 47 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch
new file mode 100644
index 00000000000..3f8823d5b2d
--- /dev/null
+++ b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch
@@ -0,0 +1,27 @@
+From 26620aef0bd6d01b543e7523dd15dddc1bb871df Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Mon, 24 Dec 2018 14:43:23 +0100
+Subject: use soft rlimit for number of open handles
+
+systemd 240 bumped the hard limit from the previous 4k (?) to 1G, which
+makes kdeinit essentially lock up at startup.
+to get around that, use the soft limit, which matches fd_setsize (1k).
+---
+ src/kdeinit/kinit.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 748bfca..02ab794 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -165,7 +165,7 @@ static void cleanup_fds()
+     int maxfd = FD_SETSIZE;
+     struct rlimit rl;
+     if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
+-        maxfd = rl.rlim_max;
++        maxfd = rl.rlim_cur;
+     }
+     for (int fd = 3; fd < maxfd; ++fd) {
+ #if KDEINIT_OOM_PROTECT
+-- 
+cgit v1.1

diff --git a/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild
new file mode 100644
index 00000000000..910c3df5286
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+caps +man X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${P}-systemd-240-soft-rlimit.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kinit/, kde-frameworks/kinit/files/
@ 2022-08-08 14:40 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-08-08 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     14765c4ecbdd43cd19a0d265d9e5c060d8cfafbf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 18:21:44 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 14:39:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14765c4e

kde-frameworks/kinit: Fix build with USE -X

Upstream commit 85ca4b6515ac2539fb31b74db6fe5ceae1590be1

Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kinit/files/kinit-5.96.0-with_x11.patch        | 72 ++++++++++++++++++++++
 kde-frameworks/kinit/kinit-5.96.0-r1.ebuild        | 51 +++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
new file mode 100644
index 000000000000..fd6efe2fae00
--- /dev/null
+++ b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
@@ -0,0 +1,72 @@
+From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Aug 2022 00:19:19 +0200
+Subject: [PATCH] Add CMake option to build WITH_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config. This is a behavior change as previously
+it was silently disabled if X11 was not found.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt             | 15 +++++++++------
+ src/kdeinit/CMakeLists.txt |  4 ++--
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90baa57..e27c41f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT
+ 
+ #optional features
+ if (NOT APPLE)
+-    find_package(X11)
++    option(WITH_X11 "Build with X11 integration" ON)
++    if(WITH_X11)
++        find_package(X11 REQUIRED)
++        set(HAVE_X11 1)
++
++        find_package(XCB MODULE COMPONENTS XCB)
++        set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
++        set(HAVE_XCB ${XCB_XCB_FOUND})
++    endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+-
+-find_package(XCB MODULE COMPONENTS XCB)
+-set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
+-set(HAVE_XCB ${XCB_XCB_FOUND})
+ 
+ # used by 4 executables in this module
+ if(HAVE_SOCKET_LIBRARY)
+diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt
+index af84a14..3fcbd1c 100644
+--- a/src/kdeinit/CMakeLists.txt
++++ b/src/kdeinit/CMakeLists.txt
+@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE
+     KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}"
+ )
+ 
+-if (X11_FOUND)
++if (HAVE_X11)
+   target_link_libraries(kdeinit5 ${X11_X11_LIB})
+ endif()
+ 
+@@ -63,7 +63,7 @@ if (NOT WIN32)
+ 
+   target_link_libraries(kdeinit5_wrapper  ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons)
+ 
+-  if (NOT X11_FOUND)
++  if (NOT HAVE_X11)
+     target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY)
+   endif ()
+ 
+-- 
+GitLab
+

diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..986e68c5fce6
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+caps +man X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+# Approved upstream: https://invent.kde.org/frameworks/kinit/-/merge_requests/13
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kinit/, kde-frameworks/kinit/files/
@ 2022-11-27 11:20 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-11-27 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     1c1fe267b3bd1b0c44977029c103bdcd4056caff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:13:33 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1fe267

kde-frameworks/kinit: drop 5.96.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kinit/Manifest                      |  1 -
 .../kinit/files/kinit-5.96.0-with_x11.patch        | 72 ----------------------
 kde-frameworks/kinit/kinit-5.96.0-r1.ebuild        | 51 ---------------
 3 files changed, 124 deletions(-)

diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 0b019f936f09..b347af3d6d41 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,3 +1,2 @@
 DIST kinit-5.100.0.tar.xz 2433276 BLAKE2B 289613d8d669f69fae4c0f302939ba80a648b2176c0588dbc481df9497774b720c1db23a84116abe2014c2fd574fee37a05e54b46a360c6d7bd254c6fdccc999 SHA512 092d7278a98693d60d1db31e1efad1d8f1e400fcb6953c63adeb8d2ecf79c4816fc5bdde825388890c6f58f97ad200ffadc9dad6a80357efd3a2e4fd4f97f78a
-DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d
 DIST kinit-5.99.0.tar.xz 119504 BLAKE2B 431b1640ad39dbf2d87fba02116431fedf9d5088d79cb39f33cc91905b1fae8d8d11304890c70da58e60e54bfaaa68e9a30c0d1ebdf4872529d235ac58c86c7f SHA512 5629c43949d13208fb1353c849aca9bab97b09e0aec365f914f43ca9f69c8c7844d10582509a999f63ccbbd178bacf87c8fc0947534d7848046e3d5bb5ab778d

diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
deleted file mode 100644
index fd6efe2fae00..000000000000
--- a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 2 Aug 2022 00:19:19 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config. This is a behavior change as previously
-it was silently disabled if X11 was not found.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt             | 15 +++++++++------
- src/kdeinit/CMakeLists.txt |  4 ++--
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90baa57..e27c41f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT
- 
- #optional features
- if (NOT APPLE)
--    find_package(X11)
-+    option(WITH_X11 "Build with X11 integration" ON)
-+    if(WITH_X11)
-+        find_package(X11 REQUIRED)
-+        set(HAVE_X11 1)
-+
-+        find_package(XCB MODULE COMPONENTS XCB)
-+        set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
-+        set(HAVE_XCB ${XCB_XCB_FOUND})
-+    endif()
- endif()
--set(HAVE_X11 ${X11_FOUND})
--
--find_package(XCB MODULE COMPONENTS XCB)
--set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
--set(HAVE_XCB ${XCB_XCB_FOUND})
- 
- # used by 4 executables in this module
- if(HAVE_SOCKET_LIBRARY)
-diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt
-index af84a14..3fcbd1c 100644
---- a/src/kdeinit/CMakeLists.txt
-+++ b/src/kdeinit/CMakeLists.txt
-@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE
-     KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}"
- )
- 
--if (X11_FOUND)
-+if (HAVE_X11)
-   target_link_libraries(kdeinit5 ${X11_X11_LIB})
- endif()
- 
-@@ -63,7 +63,7 @@ if (NOT WIN32)
- 
-   target_link_libraries(kdeinit5_wrapper  ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons)
- 
--  if (NOT X11_FOUND)
-+  if (NOT HAVE_X11)
-     target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY)
-   endif ()
- 
--- 
-GitLab
-

diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
deleted file mode 100644
index 60cf6e3ee5cd..000000000000
--- a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.4
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+caps +man X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-# Approved upstream: https://invent.kde.org/frameworks/kinit/-/merge_requests/13
-PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package man KF5DocTools)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-11-27 11:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-18 18:39 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kinit/, kde-frameworks/kinit/files/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2018-12-25 21:23 Andreas Sturmlechner
2022-08-08 14:40 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox