[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 27b89078477bda615579f985e5095fe9fa00da45
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 1 21:37:33 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 1 21:49:27 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=27b89078
x11-misc/sddm: Drop unnecessary test USEdeps
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 1551bfb0..e719cf22 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
!systemd? ( sys-power/upower )
"
DEPEND="${COMMON_DEPEND}
- test? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6 )
"
RDEPEND="${COMMON_DEPEND}
X? ( x11-base/xorg-server )
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: aa9966c05405006588c07f288b92b0553473bf25
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 1 18:00:52 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 1 21:49:27 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa9966c0
x11-misc/sddm: re-add optfeature advertise weston[kiosk]
Bug: https://bugs.gentoo.org/935166
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e5d80033..1551bfb0 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -13,7 +13,7 @@ else
fi
QTMIN=6.7.1
-inherit cmake linux-info pam systemd tmpfiles
+inherit cmake linux-info optfeature pam systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
@@ -142,5 +142,8 @@ pkg_postinst() {
elog " to the troubleshooting section."
fi
+ optfeature "Weston DisplayServer support (EXPERIMENTAL)"
"dev-libs/weston[kiosk]"
+ optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin"
+
systemd_reenable sddm.service
}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 9a5bd6baa88bdba4b5d8a5ef527c0ea5012e5ccd
Author: Paul Zander gmail com>
AuthorDate: Tue May 28 10:28:57 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 1 21:49:27 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9a5bd6ba
x11-misc/sddm: 0.21.0_p20240302 simplify depspec
>From "^^ ( elogind systemd )" follows "!systemd == elogind" so use that to
simplify the depspec
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e719cf22..68772651 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -34,9 +34,11 @@ COMMON_DEPEND="
sys-libs/pam
x11-libs/libXau
x11-libs/libxcb:=
- elogind? ( sys-auth/elogind[pam] )
+ elogind? (
+ sys-auth/elogind[pam]
+ sys-power/upower
+ )
systemd? ( sys-apps/systemd:=[pam] )
- !systemd? ( sys-power/upower )
"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qtbase-${QTMIN}:6 )
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: c2cbd1a4fdadea80643ef6a2bcc841caf0d4b5d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 27 22:17:37 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 27 22:17:37 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c2cbd1a4
x11-misc/sddm: Drop IUSE qt5, build only Qt6-based version
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 29 -
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 001fca99..e5d80033 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64"
fi
-QTMIN=6.6.2
+QTMIN=6.7.1
inherit cmake linux-info pam systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
@@ -21,7 +21,7 @@ SRC_URI+="
https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="+elogind +qt5 systemd test +X"
+IUSE="+elogind systemd test +X"
REQUIRED_USE="^^ ( elogind systemd )"
RESTRICT="!test? ( test )"
@@ -29,29 +29,17 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
acct-group/sddm
acct-user/sddm
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
sys-libs/pam
x11-libs/libXau
x11-libs/libxcb:=
elogind? ( sys-auth/elogind[pam] )
- qt5? (
- >=dev-qt/qtcore-5.15.12:5
- >=dev-qt/qtdbus-5.15.12:5
- >=dev-qt/qtdeclarative-5.15.12:5
- >=dev-qt/qtgui-5.15.12:5
- >=dev-qt/qtnetwork-5.15.12:5
- )
- !qt5? (
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network]
- >=dev-qt/qtdeclarative-${QTMIN}:6
- )
systemd? ( sys-apps/systemd:=[pam] )
!systemd? ( sys-power/upower )
"
DEPEND="${COMMON_DEPEND}
- test? (
- qt5? ( >=dev-qt/qttest-5.15.12:5 )
- !qt5? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] )
- )
+ test? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] )
"
RDEPEND="${COMMON_DEPEND}
X? ( x11-base/xorg-server )
@@ -60,8 +48,7 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
dev-python/docutils
>=dev-build/cmake-3.25.0
- qt5? ( >=dev-qt/linguist-tools-5.15.12:5 )
- !qt5? ( >=dev-qt/qttools-${QTMIN}[linguist] )
+ >=dev-qt/qttools-${QTMIN}[linguist]
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
"
@@ -107,7 +94,7 @@ EOF
src_configure() {
local mycmakeargs=(
-DBUILD_MAN_PAGES=ON
- -DBUILD_WITH_QT6=$(usex !qt5)
+ -DBUILD_WITH_QT6=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-DRUNTIME_DIR=/run/sddm
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 9bef01085372a9410fe059df79b946768a904fb7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 8 23:02:21 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 8 23:02:52 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9bef0108
x11-misc/sddm: fix SRC_URI
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 7f2ae187..001fca99 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -17,7 +17,7 @@ inherit cmake linux-info pam systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz;
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 6f421347e559d5801240a74a255ae5b901462684
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 7 18:09:33 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 7 18:18:02 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6f421347
x11-misc/sddm: Ship our own pam files
Closes: https://github.com/gentoo/qt/pull/278
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/Manifest | 1 +
.../files/sddm-0.20.0-sddm.pam-use-substack.patch | 37 --
.../sddm-0.21.0-disable-etc-debian-check.patch | 26 -
...sddm-0.21.0-no-default-pam_systemd-module.patch | 44 --
x11-misc/sddm/sddm-.ebuild | 21 +--
5 files changed, 18 insertions(+), 111 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
new file mode 100644
index ..92b91be4
--- /dev/null
+++ b/x11-misc/sddm/Manifest
@@ -0,0 +1 @@
+DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B
06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144
SHA512
6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
diff --git a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
deleted file mode 100644
index 6267adc7..
--- a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9cbeb07664f4bd4273c2b62a522a864f6d4f27ae Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sat, 4 Feb 2023 13:31:36 +0100
-Subject: [PATCH] sddm.pam: Change to substack for system-login
-
-Signed-off-by: Andreas Sturmlechner
- services/sddm.pam | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/services/sddm.pam b/services/sddm.pam
-index df11003..0a073f4 100644
a/services/sddm.pam
-+++ b/services/sddm.pam
-@@ -1,15 +1,15 @@
- #%PAM-1.0
-
--authinclude system-login
-+authsubstacksystem-login
- -auth optionalpam_gnome_keyring.so
- -auth optionalpam_kwallet5.so
-
--account include system-login
-+account substacksystem-login
-
--passwordinclude system-login
-+passwordsubstacksystem-login
- -password optionalpam_gnome_keyring.souse_authtok
-
- session optionalpam_keyinit.so force revoke
--session include system-login
-+session substacksystem-login
- -sessionoptionalpam_gnome_keyring.soauto_start
- -sessionoptionalpam_kwallet5.so auto_start
---
-2.39.1
-
diff --git a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
deleted file mode 100644
index b0a13259..
--- a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cef0ad9776d9349e85020b529d20dcc88113015a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH 4/5] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner
- services/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 5158e87..441e46a 100644
a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -20,7 +20,7 @@ endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in"
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
-
- if(INSTALL_PAM_CONFIGURATION)
--if(EXISTS "/etc/debian_version")
-+if(0)
- install(FILES debian.sddm-autologin.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
- install(FILES debian.sddm-greeter.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
- install(FILES debian.sddm.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
---
-2.43.0
-
diff --git
a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
deleted file mode 100644
index 4a213d85..
--- a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6f618b6862d625796c13677ff265bae21b44e029 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 13 Oct 2020 01:10:00 +0200
-Subject: [PATCH 5/5] Don't add pam_systemd.so to pam.d/sddm-greeter in case of
- NO_SYSTEMD
-
- services/CMakeLists.txt | 7 +--
- services/sddm-greeter.pam.in | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 441e46a..8e70fb1 100644
a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -12,10
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 34fbc14bc2423dcf9783f97657723b080a3e2520
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 27 12:12:54 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 27 12:13:46 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=34fbc14b
x11-misc/sddm: Rename patches after 0.21.0 release, update SRC_URI
See also: https://github.com/gentoo/qt/pull/273
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../{sddm--Xsession.patch => sddm-0.21.0-Xsession.patch} | 0
...ian-check.patch => sddm-0.21.0-disable-etc-debian-check.patch} | 0
...dule.patch => sddm-0.21.0-no-default-pam_systemd-module.patch} | 0
x11-misc/sddm/sddm-.ebuild| 8
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--Xsession.patch
b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm--Xsession.patch
rename to x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
diff --git a/x11-misc/sddm/files/sddm--disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm--disable-etc-debian-check.patch
rename to x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
diff --git a/x11-misc/sddm/files/sddm--no-default-pam_systemd-module.patch
b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm--no-default-pam_systemd-module.patch
rename to x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 177c1c2e..9c8c10c4 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
else
-
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
@@ -67,10 +67,10 @@ BDEPEND="
PATCHES=(
# Downstream patches
"${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
- "${FILESDIR}/${P}-Xsession.patch" # bug 611210
+ "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
- "${FILESDIR}/${P}-disable-etc-debian-check.patch"
- "${FILESDIR}/${P}-no-default-pam_systemd-module.patch" # bug 669980
+ "${FILESDIR}/${PN}-0.21.0-disable-etc-debian-check.patch"
+ "${FILESDIR}/${PN}-0.21.0-no-default-pam_systemd-module.patch" # bug
669980
)
pkg_setup() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: b348e68385d5b0020393469f9abc6b9238995925
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 22 10:31:48 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 11:17:52 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b348e683
x11-misc/sddm: Add IUSE qt5
Even built-in themes are only "semi-compatible" right now,
so Qt5 remains default.
Qt5 minimum version won't change anymore so simply set it to current
latest version in ::gentoo and repurpose QTMIN to Qt6 minimum version.
Thanks-to: Mike Lothian fireburn.co.uk>
Closes: https://github.com/gentoo/qt/pull/276
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 30 +-
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index f210629a..177c1c2e 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
-QTMIN=5.15.2
+QTMIN=6.6.2
inherit cmake linux-info systemd tmpfiles
DESCRIPTION="Simple Desktop Display Manager"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="+elogind systemd test +X"
+IUSE="+elogind +qt5 systemd test +X"
REQUIRED_USE="^^ ( elogind systemd )"
RESTRICT="!test? ( test )"
@@ -27,20 +27,29 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
acct-group/sddm
acct-user/sddm
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
sys-libs/pam
x11-libs/libXau
x11-libs/libxcb:=
elogind? ( sys-auth/elogind[pam] )
+ qt5? (
+ >=dev-qt/qtcore-5.15.12:5
+ >=dev-qt/qtdbus-5.15.12:5
+ >=dev-qt/qtdeclarative-5.15.12:5
+ >=dev-qt/qtgui-5.15.12:5
+ >=dev-qt/qtnetwork-5.15.12:5
+ )
+ !qt5? (
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ )
systemd? ( sys-apps/systemd:=[pam] )
!systemd? ( sys-power/upower )
"
DEPEND="${COMMON_DEPEND}
- test? ( >=dev-qt/qttest-${QTMIN}:5 )
+ test? (
+ qt5? ( >=dev-qt/qttest-5.15.12:5 )
+ !qt5? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] )
+ )
"
RDEPEND="${COMMON_DEPEND}
X? ( x11-base/xorg-server )
@@ -48,7 +57,9 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-python/docutils
- >=dev-qt/linguist-tools-${QTMIN}:5
+ >=dev-build/cmake-3.25.0
+ qt5? ( >=dev-qt/linguist-tools-5.15.12:5 )
+ !qt5? ( >=dev-qt/qttools-${QTMIN}[linguist] )
kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
"
@@ -87,6 +98,7 @@ EOF
src_configure() {
local mycmakeargs=(
-DBUILD_MAN_PAGES=ON
+ -DBUILD_WITH_QT6=$(usex !qt5)
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-DRUNTIME_DIR=/run/sddm
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: ca0238e2836bfc97cd7c4d3813189ff60519d2c8
Author: Alexander Golubev gmail com>
AuthorDate: Mon Dec 25 01:30:39 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 22 10:28:14 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca0238e2
x11-misc/sddm: add logrotate config
Bug: https://bugs.gentoo.org/565862
Signed-off-by: Alexander Golubev gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34466
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm.logrotate | 5 +
x11-misc/sddm/sddm-.ebuild | 8 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/files/sddm.logrotate
b/x11-misc/sddm/files/sddm.logrotate
new file mode 100644
index ..ba6199c4
--- /dev/null
+++ b/x11-misc/sddm/files/sddm.logrotate
@@ -0,0 +1,5 @@
+/var/log/sddm.log {
+ missingok
+ notifempty
+ copytruncate
+}
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index bc905539..f210629a 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -101,6 +101,12 @@ src_install() {
insinto /etc/sddm.conf.d/
doins "${S}"/01gentoo.conf
+
+ # with systemd logs are sent to journald, so no point to bother in that
case
+ if ! use systemd; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/sddm.logrotate" sddm
+ fi
}
pkg_postinst() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 5eae66259c02474e086039397bb15d24fbd04cf7
Author: Mike Lothian fireburn co uk>
AuthorDate: Tue Jan 2 01:57:38 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 10 09:08:31 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5eae6625
x11-misc/sddm: Update patches
* asturm 2024-01-10:
- Kept patch names intact where nothing actually changed
- Fixed historic attribution and original commit dates
Signed-off-by: Mike Lothian fireburn.co.uk>
Closes: https://github.com/gentoo/qt/pull/273
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm-0.19.0-Xsession.patch | 24 -
.../sddm-0.20.0-disable-etc-debian-check.patch | 26 --
.../files/sddm-0.20.0-respect-user-flags.patch | 16 -
x11-misc/sddm/files/sddm--Xsession.patch | 41 ++
.../files/sddm--disable-etc-debian-check.patch | 26 ++
... sddm--no-default-pam_systemd-module.patch} | 13 +++
x11-misc/sddm/sddm-.ebuild | 6 ++--
7 files changed, 92 insertions(+), 60 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
deleted file mode 100644
index e1e3c152..
--- a/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -50,6 +50,10 @@
- ;;
- esac
-
-+# Make D-Bus start properly, see:
-+# /etc/X11/xinit/xinitrc.d/80-dbus
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-@@ -94,8 +98,8 @@
- . "$USERXSESSION"
- fi
-
--if [ -z "$*" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION
is no valid session."
- else
--exec $@
-+exec $command
- fi
diff --git a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
deleted file mode 100644
index b851c852..
--- a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner
- services/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 5032f33..afa5fd5 100644
a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -11,7 +11,7 @@ else()
- endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in"
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
-
--if(EXISTS "/etc/debian_version")
-+if(0)
- install(FILES debian.sddm-autologin.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
- install(FILES debian.sddm-greeter.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
- install(FILES debian.sddm.pam DESTINATION
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
---
-2.39.1
-
diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
index daaf9f52..7f5bc400 100644
--- a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch
@@ -1,6 +1,17 @@
+From f03f4c977b8038559c4f26e0e10cec4a3167c00c Mon Sep 17 00:00:00 2001
+From: Lorenzo Porta
+Date: Wed, 23 Sep 2015 23:34:38 2015 +0100
+Subject: Respect user flags
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b883a5e..77cd263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@
+@@ -39,7 +39,7 @@ if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
message(STATUS "Debug build")
add_definitions(-DDEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
@@ -9,3 +20,6 @@
message(STATUS "Release build")
add_definitions(-DNDEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+--
+2.43.0
+
diff --git a/x11-misc/sddm/files/sddm--Xsession.patch
b/x11-misc/sddm/files/sddm--Xsession.patch
new file mode 100644
index ..0388ee89
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--Xsession.patch
@@ -0,0 +1,41 @@
+From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 21 Oct 2017 14:44:59 2017 +0200
+Subject: [PATCH 2/5] Xsession
+
+Thanks-to: Joakim Tjernlund
+Bug: https://bugs.gentoo.org/611210
+
+---
+ data/scripts/Xsession | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a971d40..2d84a5a 100755
+--- a/data/scripts/Xsession
b/data/scripts/Xsession
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: ab7a1de4c22d7ba80f56aa075d133e50b26f37d9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 27 10:04:22 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 27 10:04:22 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab7a1de4
x11-misc/sddm: ECM slot moved to 0
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 0217d56b..75e5fdcc 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
dev-python/docutils
>=dev-qt/linguist-tools-${QTMIN}:5
- kde-frameworks/extra-cmake-modules:5
+ kde-frameworks/extra-cmake-modules:0
virtual/pkgconfig
"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: f99237635f0e12ee1b2ed039fb25182315c7b877
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 22 19:16:59 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 22 19:16:59 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9923763
x11-misc/sddm: Drop IUSE pam, require elogind or systemd
Upstream commit 346ab53f22b35c9d73b1264872bb7f6c42d7003d
Bug: https://bugs.gentoo.org/790713
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 3716a8aa..0217d56b 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="https://github.com/sddm/sddm;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="+elogind +pam systemd test +X"
+IUSE="+elogind systemd test +X"
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -32,12 +32,11 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
+ sys-libs/pam
x11-libs/libXau
x11-libs/libxcb:=
- elogind? ( sys-auth/elogind )
- pam? ( sys-libs/pam )
- !pam? ( virtual/libcrypt:= )
- systemd? ( sys-apps/systemd:= )
+ elogind? ( sys-auth/elogind[pam] )
+ systemd? ( sys-apps/systemd:=[pam] )
!systemd? ( sys-power/upower )
"
DEPEND="${COMMON_DEPEND}
@@ -91,7 +90,6 @@ src_configure() {
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-DRUNTIME_DIR=/run/sddm
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
- -DENABLE_PAM=$(usex pam)
-DNO_SYSTEMD=$(usex !systemd)
-DUSE_ELOGIND=$(usex elogind)
)
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 2423f1f7cbadc5cb13babc9539a069ba8ad5722c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 10 07:53:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 10 07:53:27 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2423f1f7
x11-misc/sddm: Drop obsolete default settings now upstream
Upstream commits:
909699342cad094000b24f35bcd3e9287c1b7f74
5341b0660d729fa300a9e03a66185e99098fceaf
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 21 -
1 file changed, 21 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index d4499b5d..3716a8aa 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -73,29 +73,8 @@ src_prepare() {
cat <<-EOF >> 01gentoo.conf
[General]
-EOF
-
- if use elogind || use systemd; then
-cat <<-EOF >> 01gentoo.conf
-# Halt/Reboot command
-HaltCommand=$(usex elogind "loginctl" "systemctl") poweroff
-RebootCommand=$(usex elogind "loginctl" "systemctl") reboot
-
-EOF
- fi
-
-cat <<-EOF >> 01gentoo.conf
# Remove qtvirtualkeyboard as InputMethod default
InputMethod=
-
-[Users]
-ReuseSession=true
-
-[Wayland]
-EnableHiDPI=true
-
-[X11]
-EnableHiDPI=true
EOF
cmake_src_prepare
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 89c3b54f581b42fbfab5e6f7c443255449f3a711
Author: Robert Buhren robertbuhren de>
AuthorDate: Sun Feb 12 23:41:54 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 13 07:53:24 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=89c3b54f
x11-misc/sddm: Change RUNTIME_DIR path to "/run/sddm"
The systemd tmpfiles config provided with sddm sets the permission for
RUNTIME_DIR to 0711. Setting RUNTIME_DIR to "/run" results in the
wrong permission set for this directory leading to bugs similar to:
"systemd-networkd fails to start before dbus.socket with selinux enabled"
Closes: https://github.com/gentoo/qt/pull/265
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index b8117a94..d4499b5d 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -110,7 +110,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
- -DRUNTIME_DIR=/run
+ -DRUNTIME_DIR=/run/sddm
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-DENABLE_PAM=$(usex pam)
-DNO_SYSTEMD=$(usex !systemd)
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: a933ee7b5c1795f5eadc3cc68c500cf6320fefb4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Feb 10 19:15:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 10 19:16:07 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a933ee7b
x11-misc/sddm: Use upstream sddm-tmpfiles.conf
Upstream commit 0a54d3abbb896d652bac7a495ed98b0617306a6c
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm.tmpfiles | 1 -
x11-misc/sddm/sddm-.ebuild| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/x11-misc/sddm/files/sddm.tmpfiles
b/x11-misc/sddm/files/sddm.tmpfiles
deleted file mode 100644
index 300d6461..
--- a/x11-misc/sddm/files/sddm.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/sddm 0755 sddm sddm
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e67ddc99..b8117a94 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -110,6 +110,8 @@ src_configure() {
local mycmakeargs=(
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+ -DRUNTIME_DIR=/run
+ -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-DENABLE_PAM=$(usex pam)
-DNO_SYSTEMD=$(usex !systemd)
-DUSE_ELOGIND=$(usex elogind)
@@ -120,8 +122,6 @@ src_configure() {
src_install() {
cmake_src_install
- newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
insinto /etc/sddm.conf.d/
doins "${S}"/01gentoo.conf
}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 2714b5a6d644fa9d2c71aed7327c90ba7fbef01f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 8 18:47:38 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 8 18:47:38 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2714b5a6
x11-misc/sddm: Add new dependency
Upstream commit cb5c07b4c5bafa27b21981a8f4039eadbe0fafdf
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index ba7c4f44..e67ddc99 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -32,6 +32,7 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
+ x11-libs/libXau
x11-libs/libxcb:=
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
@@ -60,8 +61,6 @@ PATCHES=(
"${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
"${FILESDIR}/${PN}-0.20.0-disable-etc-debian-check.patch"
"${FILESDIR}/${PN}-0.20.0-no-default-pam_systemd-module.patch" # bug
669980
- # TODO: add this: https://github.com/sddm/sddm/pull/1230 ...ACK'd
- # for merge but pending testing. by openSUSE, Fedora usage for >1y
)
pkg_setup() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: af37fb9223adfaa66399a426d785ced4f9ae1bd6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 5 16:22:32 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 5 16:22:32 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=af37fb92
x11-misc/sddm: Hide x11-base/xorg-server behind IUSE=X for now
It is certainly not required for build, and likely only existed to
ensure xdm init script was there.
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 1c137b41..ba7c4f44 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="+elogind +pam systemd test"
+IUSE="+elogind +pam systemd test +X"
REQUIRED_USE="?? ( elogind systemd )"
RESTRICT="!test? ( test )"
@@ -32,7 +32,6 @@ COMMON_DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- x11-base/xorg-server
x11-libs/libxcb:=
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
@@ -44,6 +43,7 @@ DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qttest-${QTMIN}:5 )
"
RDEPEND="${COMMON_DEPEND}
+ X? ( x11-base/xorg-server )
!systemd? ( gui-libs/display-manager-init )
"
BDEPEND="
@@ -72,9 +72,12 @@ pkg_setup() {
src_prepare() {
touch 01gentoo.conf || die
- if use elogind || use systemd; then
cat <<-EOF >> 01gentoo.conf
[General]
+EOF
+
+ if use elogind || use systemd; then
+cat <<-EOF >> 01gentoo.conf
# Halt/Reboot command
HaltCommand=$(usex elogind "loginctl" "systemctl") poweroff
RebootCommand=$(usex elogind "loginctl" "systemctl") reboot
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 5119f2a32eb9b30c2291efb03a1f28437e28f484 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 29 21:00:20 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 4 11:27:51 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5119f2a3 x11-misc/sddm: Add slot op on x11-libs/libxcb Bug: https://bugs.gentoo.org/875989 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/sddm-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild index 18b7836c..bd2e2d38 100644 --- a/x11-misc/sddm/sddm-.ebuild +++ b/x11-misc/sddm/sddm-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,7 +32,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-base/xorg-server - x11-libs/libxcb + x11-libs/libxcb:= elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 9eee85d6bcee340888304e15e134a99ffc0f137a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 6 09:14:09 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 4 12:38:52 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9eee85d6 x11-misc/sddm: add cpe upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index 4250b6ff..86353a72 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -16,5 +16,6 @@ sddm/sddm + cpe:/a:sddm_project:sddm
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 82d9c1dc8e5ed2a8b2df6ccc41c3a8314365a75d Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 1 07:54:17 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 4 12:38:52 2023 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=82d9c1dc x11-misc/sddm: Cleanup metadata.xml, drop X11 mention, fix typos Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/metadata.xml | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index 7c582311..4250b6ff 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -9,14 +9,10 @@ k...@gentoo.org Gentoo KDE Project - - Use sys-auth/elogind for session tracking. - - SDDM is a modern display manager for X11 aiming to be fast, simple - and beatiful. It uses modern technologies like QtQuick, which in - turn gives the designer the ability to create smooth, animated - user interfaces. + SDDM is a modern display manager aiming to be fast, simple + and beautiful. It uses modern technologies like QtQuick, which + gives the designer the ability to create smooth, animated UIs. sddm/sddm
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 874d04dd36d01a9bb6f07d2bad6427c7b6883cbb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 4 11:22:59 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 4 12:56:46 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=874d04dd
x11-misc/sddm: Adapt to upstream changes for 0.20.0 release prep
- Set QTMIN to 5.15.2
- Switch SDDM configuration to /etc/sddm.conf.d/
- New Gentoo defaults file: 01gentoo.conf
- For IUSE="elogind", fix path to /bin/loginctl
- Don't look for pam_systemd.so by default
- Respin pam-1.4 substack patch, dropping upstreamed changes
- Respin *-respect-user-flags.patch for minimal context
See also: https://github.com/gentoo/gentoo/pull/18935
See also: https://github.com/gentoo/gentoo/pull/25853
Bug: https://bugs.gentoo.org/669980
Bug: https://bugs.gentoo.org/728550
Bug: https://bugs.gentoo.org/790713
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/pam-1.4-substack.patch | 31 -
.../files/sddm-0.18.1-respect-user-flags.patch | 25
.../sddm-0.20.0-disable-etc-debian-check.patch | 26
...sddm-0.20.0-no-default-pam_systemd-module.patch | 43 +
.../files/sddm-0.20.0-respect-user-flags.patch | 11
.../files/sddm-0.20.0-sddm.pam-use-substack.patch | 37 +++
x11-misc/sddm/sddm-.ebuild | 74 ++
7 files changed, 166 insertions(+), 81 deletions(-)
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch
b/x11-misc/sddm/files/pam-1.4-substack.patch
deleted file mode 100644
index b0467b26..
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
sddm-0.18.1/services/sddm-autologin.pam.bak2020-06-19
22:27:57.305580696 +0200
-+++ sddm-0.18.1/services/sddm-autologin.pam2020-06-19 22:30:50.513583973
+0200
-@@ -1,6 +1,5 @@
- #%PAM-1.0
- authrequiredpam_env.so
--authrequiredpam_tally.so file=/var/log/faillog onerr=succeed
- authrequiredpam_shells.so
- authrequiredpam_nologin.so
- authrequiredpam_permit.so
sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200
-+++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200
-@@ -1,15 +1,15 @@
- #%PAM-1.0
-
--auth include system-login
-+auth substacksystem-login
- -auth optionalpam_gnome_keyring.so
- -auth optional pam_kwallet5.so
-
--account include system-login
-+account substacksystem-login
-
--password include system-login
-+password substacksystem-login
- -password optionalpam_gnome_keyring.so use_authtok
-
- session optionalpam_keyinit.so force revoke
--session include system-login
-+session substacksystem-login
- -session optionalpam_gnome_keyring.so auto_start
- -session optional pam_kwallet5.so auto_start
\ No newline at end of file
diff --git a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
deleted file mode 100644
index 6801fa79..
--- a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/CMakeLists.txt 2020-10-12 13:03:39.0 +0200
-+++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200
-@@ -41,22 +41,6 @@
- # Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
-
--# Default build type
--if(NOT CMAKE_BUILD_TYPE)
--set(CMAKE_BUILD_TYPE Release)
--endif()
--
--# Handle build type
--if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
--message(STATUS "Debug build")
--add_definitions(-DDEBUG)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
--else()
--message(STATUS "Release build")
--add_definitions(-DNDEBUG)
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
--endif()
--
- # Default absolute paths
- if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
- set(CMAKE_INSTALL_SYSCONFDIR "/etc")
diff --git a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
new file mode 100644
index ..b851c852
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
@@ -0,0 +1,26 @@
+From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner
+---
+ services/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 5032f33..afa5fd5 100644
+--- a/services/CMakeLists.txt
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: bec8df2e1912e6ac362c7e36669da79873e0e257 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 8 10:30:21 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 8 10:51:00 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bec8df2e x11-misc/sddm: Drop obsolete x11-libs/libxcb[xkb] USEdep Bug: https://bugs.gentoo.org/875989 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/sddm-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild index fd6d2f6b..18b7836c 100644 --- a/x11-misc/sddm/sddm-.ebuild +++ b/x11-misc/sddm/sddm-.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtnetwork:5 x11-base/xorg-server - x11-libs/libxcb[xkb] + x11-libs/libxcb elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: bf0725ff5d83277677e3216c6d7b84b8832f3b7e Author: Sam James gentoo org> AuthorDate: Sat Jul 16 15:08:44 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 16 15:08:44 2022 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf0725ff x11-misc/sddm: add missing sddm.tmpfiles Signed-off-by: Sam James gentoo.org> x11-misc/sddm/files/sddm.tmpfiles | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/sddm/files/sddm.tmpfiles b/x11-misc/sddm/files/sddm.tmpfiles new file mode 100644 index ..300d6461 --- /dev/null +++ b/x11-misc/sddm/files/sddm.tmpfiles @@ -0,0 +1 @@ +d /var/lib/sddm 0755 sddm sddm
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 105ba0f819e429f86c8b0ca1456ae704ffb4d527
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 10 14:51:11 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 10 14:51:11 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=105ba0f8
x11-misc/sddm: Sync Gentoo ebuild repo changes, drop broken patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/pam-1.4-substack.patch | 31
...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 -
...18.1-revert-honor-PAM-supplemental-groups.patch | 87 --
x11-misc/sddm/sddm-.ebuild | 88 +-
4 files changed, 82 insertions(+), 306 deletions(-)
diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch
b/x11-misc/sddm/files/pam-1.4-substack.patch
new file mode 100644
index ..b0467b26
--- /dev/null
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -0,0 +1,31 @@
+--- sddm-0.18.1/services/sddm-autologin.pam.bak2020-06-19
22:27:57.305580696 +0200
sddm-0.18.1/services/sddm-autologin.pam2020-06-19 22:30:50.513583973
+0200
+@@ -1,6 +1,5 @@
+ #%PAM-1.0
+ authrequiredpam_env.so
+-authrequiredpam_tally.so file=/var/log/faillog onerr=succeed
+ authrequiredpam_shells.so
+ authrequiredpam_nologin.so
+ authrequiredpam_permit.so
+--- sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200
sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+
+-auth include system-login
++auth substacksystem-login
+ -auth optionalpam_gnome_keyring.so
+ -auth optional pam_kwallet5.so
+
+-account include system-login
++account substacksystem-login
+
+-password include system-login
++password substacksystem-login
+ -password optionalpam_gnome_keyring.so use_authtok
+
+ session optionalpam_keyinit.so force revoke
+-session include system-login
++session substacksystem-login
+ -session optionalpam_gnome_keyring.so auto_start
+ -session optional pam_kwallet5.so auto_start
\ No newline at end of file
diff --git
a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
deleted file mode 100644
index f4ce7ae7..
--- a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
-From: "J. Konrad Tegtmeier-Rottach"
-Date: Thu, 9 May 2019 03:06:48 +0200
-Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
-
-This moves the supplemental group initialization step from
-UserSession.cpp to the Backend system, so that the Pam Backend can
-inject additional supplemental groups via modules like pam_group.so.
-
-pam_setcred(3) assumes that it operates on an already initialized
-supplemental group list. However, PamBackend calls
-pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
-PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
-must be issued to repeat the injection of PAM's supplemental groups.
- src/helper/Backend.cpp| 5 +
- src/helper/Backend.h | 3 +++
- src/helper/HelperApp.cpp | 4
- src/helper/HelperApp.h| 1 +
- src/helper/UserSession.cpp| 13 -
- src/helper/backend/PamBackend.cpp | 18 ++
- src/helper/backend/PamBackend.h | 2 ++
- 7 files changed, 41 insertions(+), 5 deletions(-)
-
-diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
-index d6bb4d0a..35ae2bdf 100644
a/src/helper/Backend.cpp
-+++ b/src/helper/Backend.cpp
-@@ -29,6 +29,7 @@
- #include
-
- #include
-+#include
-
- namespace SDDM {
- Backend::Backend(HelperApp* parent)
-@@ -79,4 +80,8 @@ namespace SDDM {
- bool Backend::closeSession() {
- return true;
- }
-+
-+bool Backend::setupSupplementalGroups(struct passwd *pw) {
-+return !initgroups(pw->pw_name, pw->pw_gid);
-+}
- }
-diff --git a/src/helper/Backend.h b/src/helper/Backend.h
-index b790e001..3caf1592 100644
a/src/helper/Backend.h
-+++ b/src/helper/Backend.h
-@@ -22,6 +22,7 @@
- #define BACKEND_H
-
- #include
-+#include
-
- namespace SDDM {
- class HelperApp;
-@@ -38,6 +39,8 @@ namespace SDDM {
- void setAutologin(bool on = true);
- void setGreeter(bool on = true);
-
-+virtual bool setupSupplementalGroups(struct passwd *pw);
-+
- public slots:
- virtual bool start(const QString = QString()) = 0;
- virtual bool
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 83abdc3b4920de7374f78aacc16bb8384b00589c
Author: Alex Fan yahoo com>
AuthorDate: Sun Jul 25 08:24:09 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 22 17:41:26 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=83abdc3b
x11-misc/sddm: keyword for ~riscv
Signed-off-by: Alex Fan yahoo.com>
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index c101a452..f9b3950f 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
else
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is it ja kk ko lt lv nb nl
nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk
zh_CN zh_TW"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 59171e27454155763cb77554dd80e6f5474b45a1
Author: Jimi Huotari gentoo org>
AuthorDate: Fri Aug 13 15:12:08 2021 +
Commit: Jimi Huotari gentoo org>
CommitDate: Fri Aug 13 15:12:08 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=59171e27
x11-misc/sddm: use plocale instead of the l10n eclass
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jimi Huotari gentoo.org>
x11-misc/sddm/sddm-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 30319842..c101a452 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -12,7 +12,7 @@ else
fi
PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is it ja kk ko lt lv nb nl
nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk
zh_CN zh_TW"
-inherit cmake l10n systemd user
+inherit cmake plocale systemd user
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
@@ -64,8 +64,8 @@ src_prepare() {
disable_locale() {
sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
}
- l10n_find_plocales_changes "data/translations" "" ".ts"
- l10n_for_each_disabled_locale_do disable_locale
+ plocale_find_changes "data/translations" "" ".ts"
+ plocale_for_each_disabled_locale disable_locale
if ! use test; then
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 255c77d9f60c74e05cdda384da3b3c06bf62b9a6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 1 18:51:25 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 1 18:51:25 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=255c77d9
x11-misc/sddm: Update patches
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
...t-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 -
.../{sddm-0.18.0-Xsession.patch => sddm-0.19.0-Xsession.patch} | 8
x11-misc/sddm/sddm-.ebuild | 10 ++
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
similarity index 69%
rename from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
index fc450169..6801fa79 100644
--- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
@@ -1,9 +1,8 @@
-diff -u CMakeLists.txt CMakeLists.txt
a/CMakeLists.txt 2015-09-05 22:40:50.0 +0200
-+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
-@@ -35,22 +35,6 @@
+--- a/CMakeLists.txt 2020-10-12 13:03:39.0 +0200
b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200
+@@ -41,22 +41,6 @@
# Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
-# Default build type
-if(NOT CMAKE_BUILD_TYPE)
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
similarity index 62%
rename from x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
rename to x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
index 41c813a0..e1e3c152 100644
--- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
+++ b/x11-misc/sddm/files/sddm-0.19.0-Xsession.patch
@@ -1,11 +1,11 @@
a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
+--- a/data/scripts/Xsession
b/data/scripts/Xsession
@@ -50,6 +50,10 @@
;;
esac
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
+command="$@"
+
[ -f /etc/xprofile ] && . /etc/xprofile
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e5d3a7ec..30319842 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -49,11 +49,13 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags
handling and bug 563108
- "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+ # Pending upstream
# fix for groups: https://github.com/sddm/sddm/issues/1159
- "${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch"
- "${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch"
+ "${FILESDIR}"/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch
+ "${FILESDIR}"/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch
+ # Downstream patches
+ "${FILESDIR}"/${PN}-0.18.1-respect-user-flags.patch # bug 563108
+ "${FILESDIR}"/${PN}-0.19.0-Xsession.patch # bug 611210
)
src_prepare() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 5d29b281bbcdaabddd3ff40009ab6ed6428fda17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 1 17:37:58 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 1 17:37:58 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d29b281
x11-misc/sddm: Drop IUSE=consolekit
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20
x11-misc/sddm/metadata.xml | 1 -
x11-misc/sddm/sddm-.ebuild | 7 ++-
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
deleted file mode 100644
index bbe2a272..
--- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
-has the same interface names as logind.
-
-This patch forces sddm to use legacy behaviour when consolekit2 is detected.
-
-Bug: https://bugs.gentoo.org/633920
-Bug: https://github.com/sddm/sddm/issues/903
-Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
-
a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -60,7 +60,7 @@
-
- if
(QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")))
{
- qDebug() << "Console kit interface found";
--available = true;
-+available = false;
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
- managerIfaceName =
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't
match logind
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 43cf40aa..9f20b6da 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -10,7 +10,6 @@
Gentoo KDE Project
- Use ck-launch-session from
sys-auth/consolekit (no native support)
Use sys-auth/elogind for
session tracking.
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index e2ddf0c9..e5d3a7ec 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm;
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
@@ -39,7 +39,6 @@ RDEPEND="
>=dev-qt/qtnetwork-5.9.4:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
- consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )
@@ -55,8 +54,6 @@ PATCHES=(
# fix for groups: https://github.com/sddm/sddm/issues/1159
"${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch"
"${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch"
- # TODO: fix properly
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
)
src_prepare() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 850d7df04f6b68e4b9d54260ad300ca2c3472f91
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 31 16:30:13 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 31 16:35:35 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=850d7df0
x11-misc/sddm: Switch to cmake.eclass
Add missing RESTRICT="!test? ( test )"
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
x11-misc/sddm/sddm-.ebuild | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 64e6785b..e2ddf0c9 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -12,7 +12,7 @@ else
fi
PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu ie is it ja kk ko lt lv nb nl
nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk
zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
+inherit cmake l10n systemd user
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
@@ -23,6 +23,8 @@ IUSE="consolekit elogind +pam systemd test"
REQUIRED_USE="?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
BDEPEND="
dev-python/docutils
>=dev-qt/linguist-tools-5.9.4:5
@@ -58,7 +60,7 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
disable_locale() {
sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
@@ -80,11 +82,11 @@ src_configure() {
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# Create a default.conf as upstream dropped /etc/sddm.conf w/o
replacement
local confd="/usr/lib/sddm/sddm.conf.d"
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 1702c34efe03cd2511d01260f45e5e8e1b46fc99
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 26 17:22:44 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 26 17:22:44 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1702c34e
x11-misc/sddm: EAPI-7 bump, sync with Gentoo ebuild repo
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 +
...18.1-revert-honor-PAM-supplemental-groups.patch | 87 ++
x11-misc/sddm/sddm-.ebuild | 29 ++--
3 files changed, 288 insertions(+), 10 deletions(-)
diff --git
a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
new file mode 100644
index ..f4ce7ae7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
@@ -0,0 +1,182 @@
+From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach"
+Date: Thu, 9 May 2019 03:06:48 +0200
+Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
+
+This moves the supplemental group initialization step from
+UserSession.cpp to the Backend system, so that the Pam Backend can
+inject additional supplemental groups via modules like pam_group.so.
+
+pam_setcred(3) assumes that it operates on an already initialized
+supplemental group list. However, PamBackend calls
+pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
+PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
+must be issued to repeat the injection of PAM's supplemental groups.
+---
+ src/helper/Backend.cpp| 5 +
+ src/helper/Backend.h | 3 +++
+ src/helper/HelperApp.cpp | 4
+ src/helper/HelperApp.h| 1 +
+ src/helper/UserSession.cpp| 13 -
+ src/helper/backend/PamBackend.cpp | 18 ++
+ src/helper/backend/PamBackend.h | 2 ++
+ 7 files changed, 41 insertions(+), 5 deletions(-)
+
+diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
+index d6bb4d0a..35ae2bdf 100644
+--- a/src/helper/Backend.cpp
b/src/helper/Backend.cpp
+@@ -29,6 +29,7 @@
+ #include
+
+ #include
++#include
+
+ namespace SDDM {
+ Backend::Backend(HelperApp* parent)
+@@ -79,4 +80,8 @@ namespace SDDM {
+ bool Backend::closeSession() {
+ return true;
+ }
++
++bool Backend::setupSupplementalGroups(struct passwd *pw) {
++return !initgroups(pw->pw_name, pw->pw_gid);
++}
+ }
+diff --git a/src/helper/Backend.h b/src/helper/Backend.h
+index b790e001..3caf1592 100644
+--- a/src/helper/Backend.h
b/src/helper/Backend.h
+@@ -22,6 +22,7 @@
+ #define BACKEND_H
+
+ #include
++#include
+
+ namespace SDDM {
+ class HelperApp;
+@@ -38,6 +39,8 @@ namespace SDDM {
+ void setAutologin(bool on = true);
+ void setGreeter(bool on = true);
+
++virtual bool setupSupplementalGroups(struct passwd *pw);
++
+ public slots:
+ virtual bool start(const QString = QString()) = 0;
+ virtual bool authenticate() = 0;
+diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
+index cad93bd8..d0891d75 100644
+--- a/src/helper/HelperApp.cpp
b/src/helper/HelperApp.cpp
+@@ -253,6 +253,10 @@ namespace SDDM {
+ return m_session;
+ }
+
++Backend *HelperApp::backend() {
++return m_backend;
++}
++
+ const QString& HelperApp::user() const {
+ return m_user;
+ }
+diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
+index 3742df12..cb5959a7 100644
+--- a/src/helper/HelperApp.h
b/src/helper/HelperApp.h
+@@ -39,6 +39,7 @@ namespace SDDM {
+ virtual ~HelperApp();
+
+ UserSession *session();
++Backend *backend();
+ const QString () const;
+ const QString () const;
+
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index f71fd358..62fd4d70 100644
+--- a/src/helper/UserSession.cpp
b/src/helper/UserSession.cpp
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include "Backend.h"
+ #include "Configuration.h"
+ #include "UserSession.h"
+ #include "HelperApp.h"
+@@ -129,7 +130,8 @@ namespace SDDM {
+ #endif
+
+ // switch user
+-const QByteArray username =
qobject_cast(parent())->user().toLocal8Bit();
++HelperApp* app = qobject_cast(parent());
++const QByteArray username = app->user().toLocal8Bit();
+ struct passwd pw;
+ struct passwd *rpw;
+ long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+@@ -146,12 +148,13 @@ namespace SDDM {
+ qCritical() << "getpwnam_r(" << username << ") failed with
error: " << strerror(err);
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+-if (setgid(pw.pw_gid) != 0) {
+-qCritical() <<
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 63dc5de0f0108967ade6a8339b917f19c5e1e882
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Nov 13 17:36:00 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 13 17:38:11 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=63dc5de0
x11-misc/sddm: Sync with 0.18.0 from Gentoo ebuild repository
Add USE elogind support
Use l10n and systemd eclass
Raise to Qt 5.9.4 minimum
Switch to https
Update maintainers
Closes: https://bugs.gentoo.org/671076
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
patch => sddm-0.12.0-respect-user-flags.patch} | 0
x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20
x11-misc/sddm/files/sddm-0.18.0-Xsession.patch | 24 +
x11-misc/sddm/files/sddm--consolekit.patch | 11 ---
x11-misc/sddm/metadata.xml | 14 ++-
x11-misc/sddm/sddm-.ebuild | 104 +
6 files changed, 116 insertions(+), 57 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--respect-user-flags.patch
b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
similarity index 100%
rename from x11-misc/sddm/files/sddm--respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index ..bbe2a272
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+
+ if
(QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")))
{
+ qDebug() << "Console kit interface found";
+-available = true;
++available = false;
+ serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+ managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+ managerIfaceName =
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't
match logind
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
new file mode 100644
index ..41c813a0
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+ ;;
+ esac
+
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+
+@@ -94,8 +98,8 @@
+ . "$USERXSESSION"
+ fi
+
+-if [ -z "$*" ]; then
++if [ -z "$command" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION
is no valid session."
+ else
+-exec $@
++exec $command
+ fi
diff --git a/x11-misc/sddm/files/sddm--consolekit.patch
b/x11-misc/sddm/files/sddm--consolekit.patch
deleted file mode 100644
index 692ee174..
--- a/x11-misc/sddm/files/sddm--consolekit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index 0c923a8..eae4f28 100755
a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -91,5 +91,5 @@ fi
- if [ -z "$@" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION
is no valid session."
- else
--exec $@
-+exec ck-launch-session $@
- fi
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 292acc2a..43cf40aa 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,16 +1,17 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- jauh...@gentoo.org
- Jauhien Piatlicki
-
l...@gentoo.org
LXQt
+
+ k...@gentoo.org
+ Gentoo KDE Project
+
- Use ck-launch-session from
sys-auth/consolekit by default in Xsession (no native support)
+ Use ck-launch-session from
sys-auth/consolekit (no native support)
+ Use sys-auth/elogind for
session tracking.
SDDM is a modern display manager for X11 aiming to be fast,
simple
@@ -18,4 +19,7 @@
turn gives the designer the ability to create smooth, animated
user interfaces.
+
+
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: cc650e40210b611cc9f4ad5cfbd640c54e0f1d77 Author: Michael Palimaka gentoo org> AuthorDate: Sun Aug 27 05:48:20 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 27 05:49:57 2017 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc650e40 x11-misc/sddm: remove stray space Package-Manager: Portage-2.3.6, Repoman-2.3.3 x11-misc/sddm/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index f6768610..292acc2a 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -17,5 +17,5 @@ and beatiful. It uses modern technologies like QtQuick, which in turn gives the designer the ability to create smooth, animated user interfaces. - +
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 2224a25412ba0fc7d3007b0384c912829971f181
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 28 15:26:04 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 28 15:31:32 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2224a254
x11-misc/sddm: sync with main tree
Package-Manager: portage-2.3.2
.../sddm/files/sddm--respect-user-flags.patch | 4 +-
x11-misc/sddm/sddm-.ebuild | 57 --
2 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--respect-user-flags.patch
b/x11-misc/sddm/files/sddm--respect-user-flags.patch
index 67a6621..fc45016 100644
--- a/x11-misc/sddm/files/sddm--respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm--respect-user-flags.patch
@@ -1,6 +1,6 @@
diff -u CMakeLists.txt CMakeLists.txt
CMakeLists.txt 2015-09-05 22:40:50.0 +0200
-+++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
+--- a/CMakeLists.txt 2015-09-05 22:40:50.0 +0200
b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
@@ -35,22 +35,6 @@
# Definitions
add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 869ae35..44740c2 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit cmake-utils git-r3 toolchain-funcs user
+EAPI=6
+inherit cmake-utils git-r3 user
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm;
@@ -14,12 +14,11 @@ LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
IUSE="consolekit +pam systemd"
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtdeclarative:5
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
+RDEPEND=">=dev-qt/qtcore-5.6:5
+ >=dev-qt/qtdbus-5.6:5
+ >=dev-qt/qtgui-5.6:5
+ >=dev-qt/qtdeclarative-5.6:5
+ >=dev-qt/qtnetwork-5.6:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb(-)]
consolekit? ( >=sys-auth/consolekit-0.9.4 )
@@ -29,7 +28,9 @@ RDEPEND="dev-qt/qtcore:5
DEPEND="${RDEPEND}
dev-python/docutils
- dev-qt/linguist-tools:5
+ >=dev-qt/linguist-tools-5.6:5
+ >=dev-qt/qttest-5.6:5
+ kde-frameworks/extra-cmake-modules
virtual/pkgconfig"
pkg_pretend() {
@@ -41,27 +42,17 @@ pkg_pretend() {
}
src_prepare() {
- cmake-utils_src_prepare
-
- epatch "${FILESDIR}/${P}-respect-user-flags.patch"
- use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_no pam PAM)
- $(cmake-utils_use_no systemd SYSTEMD)
- -DBUILD_MAN_PAGES=ON
- -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
- )
+ # fix for flags handling and bug 563108
+ eapply "${FILESDIR}/${P}-respect-user-flags.patch"
+ use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
- cmake-utils_src_configure
+ cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_no pam PAM)
- $(cmake-utils_use_no systemd SYSTEMD)
+ -DENABLE_PAM=$(usex pam)
+ -DNO_SYSTEMD=$(usex '!systemd')
-DBUILD_MAN_PAGES=ON
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
)
@@ -71,5 +62,19 @@ src_configure() {
pkg_postinst() {
enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login
]]; then
+ local line=$(grep "pam_ck_connector.*nox11"
"${ROOT}"/etc/pam.d/system-login)
+ if [[ -z ${line} ]]; then
+ ewarn
+ ewarn "Erroneous /etc/pam.d/system-login settings
detected!"
+ ewarn "Please restore 'nox11' option in the line
containing pam_ck_connector:"
+ ewarn
+ ewarn "session optional pam_ck_connector.so
nox11"
+ ewarn
+ ewarn "or 'emerge -1 sys-auth/pambase' and run
etc-update."
+ ewarn
+ fi
+ fi
}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: f35a07ec72e72b4220a941d1442b6d81606a7a0d Author: Michael Palimaka gentoo org> AuthorDate: Fri Oct 28 13:05:46 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Oct 28 13:05:54 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f35a07ec x11-misc/sddm: rebase consolekit patch Gentoo-bug: 595658 Package-Manager: portage-2.3.2 x11-misc/sddm/files/sddm--consolekit.patch | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/x11-misc/sddm/files/sddm--consolekit.patch b/x11-misc/sddm/files/sddm--consolekit.patch index acdfdc1..692ee17 100644 --- a/x11-misc/sddm/files/sddm--consolekit.patch +++ b/x11-misc/sddm/files/sddm--consolekit.patch @@ -1,13 +1,11 @@ diff --git a/data/scripts/Xsession b/data/scripts/Xsession -index a5d270d..4b48524 100755 +index 0c923a8..eae4f28 100755 --- a/data/scripts/Xsession +++ b/data/scripts/Xsession -@@ -74,7 +74,7 @@ case $session in - exec xterm -geometry 80x24-0-0 - ;; - *) --eval exec "$session" -+eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." +@@ -91,5 +91,5 @@ fi + if [ -z "$@" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +-exec $@ ++exec ck-launch-session $@ + fi
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 3348be2713c7da6efdce081eee337f6e20293eb7
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 1 13:27:50 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 1 14:27:44 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3348be27
x11-misc/sddm: dev-qt/linguist-tools is a build-time dependency
Package-Manager: portage-2.2.20.1
x11-misc/sddm/sddm-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index ed31b37..5bd6649 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -19,7 +19,6 @@ RDEPEND="dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtdeclarative:5
dev-qt/qtnetwork:5
- dev-qt/linguist-tools:5
dev-qt/qttest:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb(-)]
@@ -30,6 +29,7 @@ RDEPEND="dev-qt/qtcore:5
DEPEND="${RDEPEND}
dev-python/docutils
+ dev-qt/linguist-tools:5
virtual/pkgconfig"
pkg_pretend() {
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/, x11-misc/sddm/
commit: 9f3b848a1fc10768f6f55f0c523c8e039acd8723
Author: Joao Carreira gmail com>
AuthorDate: Wed Sep 23 22:34:38 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 24 19:24:56 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9f3b848a
x11-misc/sddm: sync live ebuild with tree
Update live ebuild to cope with changes
in the version 0.12.0
.../sddm/files/sddm--respect-user-flags.patch | 26 +
x11-misc/sddm/files/sddm--upower.patch | 12
x11-misc/sddm/sddm-.ebuild | 64 --
3 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/x11-misc/sddm/files/sddm--respect-user-flags.patch
b/x11-misc/sddm/files/sddm--respect-user-flags.patch
new file mode 100644
index 000..67a6621
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--respect-user-flags.patch
@@ -0,0 +1,26 @@
+diff -u CMakeLists.txt CMakeLists.txt
+--- CMakeLists.txt 2015-09-05 22:40:50.0 +0200
CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200
+@@ -35,22 +35,6 @@
+ # Definitions
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+
+-# Default build type
+-if(NOT CMAKE_BUILD_TYPE)
+-set(CMAKE_BUILD_TYPE Release)
+-endif()
+-
+-# Handle build type
+-if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
+-message(STATUS "Debug build")
+-add_definitions(-DDEBUG)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+-else()
+-message(STATUS "Release build")
+-add_definitions(-DNDEBUG)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+-endif()
+-
+ # Default absolute paths
+ if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+ set(CMAKE_INSTALL_SYSCONFDIR "/etc")
diff --git a/x11-misc/sddm/files/sddm--upower.patch
b/x11-misc/sddm/files/sddm--upower.patch
deleted file mode 100644
index 8c0f34c..000
--- a/x11-misc/sddm/files/sddm--upower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp
sddm-0.9.0/src/daemon/PowerManager.cpp
sddm-0.9.0.orig/src/daemon/PowerManager.cpp2014-10-01
18:40:37.402683578 +0200
-+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164
+0200
-@@ -197,7 +197,7 @@
- m_backends << new Login1Backend();
-
- // check if upower interface exists
--if (interface->isServiceRegistered(UPOWER_SERVICE))
-+//if (interface->isServiceRegistered(UPOWER_SERVICE))
- m_backends << new UPowerBackend();
- }
-
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 150b6c7..ed31b37 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -10,62 +10,66 @@ HOMEPAGE="https://github.com/sddm/sddm;
EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
KEYWORDS=""
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
-IUSE="consolekit systemd +upower"
-REQUIRED_USE="?? ( upower systemd )"
+IUSE="consolekit +pam systemd"
-RDEPEND="sys-libs/pam
- >=x11-base/xorg-server-1.15.1
- x11-libs/libxcb[xkb(-)]
- dev-qt/qtcore:5
+RDEPEND="dev-qt/qtcore:5
dev-qt/qtdbus:5
+ dev-qt/qtgui:5
dev-qt/qtdeclarative:5
+ dev-qt/qtnetwork:5
dev-qt/linguist-tools:5
dev-qt/qttest:5
+ >=x11-base/xorg-server-1.15.1
+ x11-libs/libxcb[xkb(-)]
+ consolekit? ( >=sys-auth/consolekit-0.9.4 )
+ pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )
- upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+
DEPEND="${RDEPEND}
- >=sys-devel/gcc-4.7.0
+ dev-python/docutils
virtual/pkgconfig"
pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-version) < 4.7 ]] && \
+ if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+ if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4
&& $(gcc-minor-version) -lt 7 ]] ; then
die 'The active compiler needs to be gcc 4.7 (or newer)'
+ fi
fi
}
src_prepare() {
- use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
- use upower && epatch "${FILESDIR}/${P}-upower.patch"
+ cmake-utils_src_prepare
- # respect user's cflags
- sed -e 's|-Wall -march=native||' \
- -e 's|-O2||' \
- -i CMakeLists.txt || die 'sed failed'
+ epatch "${FILESDIR}/${P}-respect-user-flags.patch"
+ use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
}
src_configure() {
local mycmakeargs=(
+ $(cmake-utils_use_no pam PAM)
$(cmake-utils_use_no systemd SYSTEMD)
- )
+ -DBUILD_MAN_PAGES=ON
+ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+ )
+
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 3543e0ac77a51f975e1c6175f2a64d2eacacd404
Author: Jauhien Piatlicki jpiatlicki AT zertisa DOT com
AuthorDate: Sat Oct 18 18:12:53 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Oct 18 18:12:53 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3543e0ac
[x11-misc/sddm] sync with tree: fix bug 524072 and temporary fix bug 523630
---
x11-misc/sddm/files/sddm--upower.patch | 12
x11-misc/sddm/sddm-.ebuild | 2 ++
2 files changed, 14 insertions(+)
diff --git a/x11-misc/sddm/files/sddm--upower.patch
b/x11-misc/sddm/files/sddm--upower.patch
new file mode 100644
index 000..8c0f34c
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--upower.patch
@@ -0,0 +1,12 @@
+diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp
sddm-0.9.0/src/daemon/PowerManager.cpp
+--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp2014-10-01
18:40:37.402683578 +0200
sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164
+0200
+@@ -197,7 +197,7 @@
+ m_backends new Login1Backend();
+
+ // check if upower interface exists
+-if (interface-isServiceRegistered(UPOWER_SERVICE))
++//if (interface-isServiceRegistered(UPOWER_SERVICE))
+ m_backends new UPowerBackend();
+ }
+
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 548297a..48ba4c8 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -16,6 +16,7 @@ IUSE=consolekit systemd +upower
REQUIRED_USE=?? ( upower systemd )
RDEPEND=sys-libs/pam
+ =x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb(-)]
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -37,6 +38,7 @@ pkg_pretend() {
src_prepare() {
use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
+ use upower epatch ${FILESDIR}/${P}-upower.patch
# respect user's cflags
sed -e 's|-Wall -march=native||' \
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: b1f0fd27bd51f66131bbb134236195535bffdf1e
Author: Jauhien Piatlicki (jauhien) jauhien AT gentoo DOT org
AuthorDate: Sun Sep 21 18:57:12 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Sep 21 18:57:12 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b1f0fd27
[x11-misc/sddm] fix dependencies
---
x11-misc/sddm/sddm-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 0c45479..548297a 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -16,14 +16,14 @@ IUSE=consolekit systemd +upower
REQUIRED_USE=?? ( upower systemd )
RDEPEND=sys-libs/pam
- sys-auth/qauth[qt5(-)]
x11-libs/libxcb[xkb(-)]
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/linguist-tools:5
+ dev-qt/qttest:5
systemd? ( sys-apps/systemd:= )
- upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
DEPEND=${RDEPEND}
=sys-devel/gcc-4.7.0
virtual/pkgconfig
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 2cf83e435c3d4dbc5e4ae6b499744ad7ea634cd0
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Mon Aug 4 10:35:46 2014 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Mon Aug 4 10:35:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2cf83e43
[x11-misc/sddm] fix ebuild accordingly to upstream changes
---
x11-misc/sddm/sddm-.ebuild | 31 ++-
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index f317bb7..257a101 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -12,19 +12,16 @@ KEYWORDS=
LICENSE=GPL-2+ MIT CC-BY-3.0 public-domain
SLOT=0
-IUSE=consolekit +qt4 qt5 systemd +upower
-REQUIRED_USE=
- ^^ ( qt4 qt5 )
- ?? ( upower systemd )
-
+IUSE=consolekit systemd +upower
+REQUIRED_USE=?? ( upower systemd )
RDEPEND=sys-libs/pam
- sys-auth/qauth[qt4?,qt5?]
+ sys-auth/qauth[qt5(-)]
x11-libs/libxcb[xkb(-)]
- qt4? ( dev-qt/qtdeclarative:4
- dev-qt/qtdbus:4 )
- qt5? ( dev-qt/qtdeclarative:5
- dev-qt/qtdbus:5 )
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/linguist-tools:5
systemd? ( sys-apps/systemd:= )
upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )
DEPEND=${RDEPEND}
@@ -38,6 +35,13 @@ pkg_pretend() {
fi
}
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_no systemd SYSTEMD)
+ )
+ cmake-utils_src_configure
+}
+
src_prepare() {
use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
@@ -47,13 +51,6 @@ src_prepare() {
-i CMakeLists.txt || die 'sed failed'
}
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5 QT5)
- )
- cmake-utils_src_configure
-}
-
pkg_postinst() {
if use consolekit; then
ewarn This display manager doesn't have native built-in
ConsoleKit support.
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: 1eb67b9be0d5a0de870ef0c60f4ef51736c89cc2 Author: Jauhien Piatlicki jauhien AT gentoo DOT org AuthorDate: Mon Aug 4 10:43:25 2014 + Commit: Jauhien Piatlicki jauhien AT gentoo DOT org CommitDate: Mon Aug 4 10:43:25 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1eb67b9b [x11-misc/sddm] fix bug #518192 --- x11-misc/sddm/files/sddm--consolekit.patch | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/x11-misc/sddm/files/sddm--consolekit.patch b/x11-misc/sddm/files/sddm--consolekit.patch index a5ac62a..acdfdc1 100644 --- a/x11-misc/sddm/files/sddm--consolekit.patch +++ b/x11-misc/sddm/files/sddm--consolekit.patch @@ -1,19 +1,13 @@ data/scripts/Xsession -+++ data/scripts/Xsession -@@ -74,13 +74,13 @@ +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a5d270d..4b48524 100755 +--- a/data/scripts/Xsession b/data/scripts/Xsession +@@ -74,7 +74,7 @@ case $session in exec xterm -geometry 80x24-0-0 ;; - custom) --exec $HOME/.xsession -+exec ck-launch-session $HOME/.xsession - ;; - default) --exec /usr/bin/startkde -+exec ck-launch-session /usr/bin/startkde - ;; *) -eval exec $session -+eval ck-launch-session $session ++eval exec ck-launch-session $session ;; esac exec xmessage -center -buttons OK:0 -default OK Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 67ecce49ae6785fd5432a4536b10d82b7c7871eb
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Mon Aug 4 12:47:09 2014 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Mon Aug 4 12:47:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=67ecce49
[x11-misc/sddm] fix functions order
---
x11-misc/sddm/sddm-.ebuild | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 257a101..0c45479 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -35,13 +35,6 @@ pkg_pretend() {
fi
}
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_no systemd SYSTEMD)
- )
- cmake-utils_src_configure
-}
-
src_prepare() {
use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
@@ -51,6 +44,13 @@ src_prepare() {
-i CMakeLists.txt || die 'sed failed'
}
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_no systemd SYSTEMD)
+ )
+ cmake-utils_src_configure
+}
+
pkg_postinst() {
if use consolekit; then
ewarn This display manager doesn't have native built-in
ConsoleKit support.
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 0855533d35065ec7c200752415cb827a9998483a
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat Jul 26 09:03:12 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Jul 26 09:03:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0855533d
[x11-misc/sddm] Partial sync with portage.
Fixes upower dependency wrt bug 517230.
Package-Manager: portage-2.2.10
---
x11-misc/sddm/metadata.xml | 3 ++-
x11-misc/sddm/sddm-.ebuild | 22 --
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index dbd986c..d867da7 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,12 +1,13 @@
?xml version=1.0 encoding=UTF-8?
!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
pkgmetadata
+ herdlxqt/herd
maintainer
emailjauh...@gentoo.org/email
nameJauhien Piatlicki/name
/maintainer
use
-flag name=consolekitEnable ConsoleKit support/flag
+flag name=consolekitUse ck-launch-session from sys-auth/consolekit by
default in Xsession (no native support)/flag
/use
longdescription lang=en
SDDM is a modern display manager for X11 aiming to be fast, simple
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index f079a17..f317bb7 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -13,8 +13,10 @@ KEYWORDS=
LICENSE=GPL-2+ MIT CC-BY-3.0 public-domain
SLOT=0
IUSE=consolekit +qt4 qt5 systemd +upower
-REQUIRED_USE=^^ ( qt4 qt5 )
- ?? ( upower systemd )
+REQUIRED_USE=
+ ^^ ( qt4 qt5 )
+ ?? ( upower systemd )
+
RDEPEND=sys-libs/pam
sys-auth/qauth[qt4?,qt5?]
@@ -24,11 +26,18 @@ RDEPEND=sys-libs/pam
qt5? ( dev-qt/qtdeclarative:5
dev-qt/qtdbus:5 )
systemd? ( sys-apps/systemd:= )
- upower? ( sys-power/upower:= )
+ upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )
DEPEND=${RDEPEND}
=sys-devel/gcc-4.7.0
virtual/pkgconfig
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-version) 4.7 ]] \
+ die 'The active compiler needs to be gcc 4.7 (or newer)'
+ fi
+}
+
src_prepare() {
use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
@@ -38,13 +47,6 @@ src_prepare() {
-i CMakeLists.txt || die 'sed failed'
}
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-version) 4.7 ]] \
- die 'The active compiler needs to be gcc 4.7 (or newer)'
- fi
-}
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_use qt5 QT5)
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: d9e2714cb0758dd4765ae6447d1aa18cd86bd783 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Thu Jul 24 17:01:17 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Thu Jul 24 17:01:17 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d9e2714c [x11-misc/sddm] Remove local description of global USE flag. Package-Manager: portage-2.2.10 --- x11-misc/sddm/metadata.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index adf6fc4..dbd986c 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -6,8 +6,6 @@ nameJauhien Piatlicki/name /maintainer use -flag name=upowerUse pkgsys-power/upower/pkg for power -management/flag flag name=consolekitEnable ConsoleKit support/flag /use longdescription lang=en
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: 85a64cdabb2f1d10439f342571d3e3653d76e50a Author: Elias Probst mail AT eliasprobst DOT eu AuthorDate: Tue Jun 17 18:00:23 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Tue Jun 17 18:48:20 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=85a64cda [x11-misc/sddm] Add dependency on sys-auth/qauth Package-Manager: portage-2.2.10 --- x11-misc/sddm/sddm-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild index 67d6ec6..f079a17 100644 --- a/x11-misc/sddm/sddm-.ebuild +++ b/x11-misc/sddm/sddm-.ebuild @@ -17,6 +17,7 @@ REQUIRED_USE=^^ ( qt4 qt5 ) ?? ( upower systemd ) RDEPEND=sys-libs/pam + sys-auth/qauth[qt4?,qt5?] x11-libs/libxcb[xkb(-)] qt4? ( dev-qt/qtdeclarative:4 dev-qt/qtdbus:4 )
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 9d5fba9a8ff1a3a5a4d964776348d906d9291cdd
Author: Mika Kobayashi wjn AT inter7 DOT jp
AuthorDate: Mon Jun 2 22:05:32 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Jun 2 22:09:45 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9d5fba9a
[x11-misc/sddm] added the patch for consolekit (equally official gentoo
repository)
---
x11-misc/sddm/files/sddm--consolekit.patch | 19 +++
x11-misc/sddm/sddm-.ebuild | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/files/sddm--consolekit.patch
b/x11-misc/sddm/files/sddm--consolekit.patch
new file mode 100644
index 000..a5ac62a
--- /dev/null
+++ b/x11-misc/sddm/files/sddm--consolekit.patch
@@ -0,0 +1,19 @@
+--- data/scripts/Xsession
data/scripts/Xsession
+@@ -74,13 +74,13 @@
+ exec xterm -geometry 80x24-0-0
+ ;;
+ custom)
+-exec $HOME/.xsession
++exec ck-launch-session $HOME/.xsession
+ ;;
+ default)
+-exec /usr/bin/startkde
++exec ck-launch-session /usr/bin/startkde
+ ;;
+ *)
+-eval exec $session
++eval ck-launch-session $session
+ ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK Sorry, cannot execute
$session. Check $DESKTOP_SESSION.desktop.
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 89850bc..b5bf554 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=
LICENSE=GPL-2+ MIT CC-BY-3.0 public-domain
SLOT=0
-IUSE=+qt4 qt5 systemd +upower
+IUSE=consolekit +qt4 qt5 systemd +upower
REQUIRED_USE=^^ ( qt4 qt5 )
?? ( upower systemd )
@@ -29,6 +29,8 @@ DEPEND=${RDEPEND}
virtual/pkgconfig
src_prepare() {
+use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
+
# respect user's cflags
sed -e 's|-Wall -march=native||' \
-e 's|-O2||' \
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: ad0f4ea7cb3de48727eb6b9397e5c424a3b4c658
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Wed Jun 4 13:00:52 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Jun 4 13:00:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ad0f4ea7
x11-misc/sddm: add warnings for users/ fix metadata.xml
---
x11-misc/sddm/metadata.xml | 4 +++-
x11-misc/sddm/sddm-.ebuild | 14 +-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index d2d2be4..adf6fc4 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -6,7 +6,9 @@
nameJauhien Piatlicki/name
/maintainer
use
-flag name=upowerUse pkgsys-power/upower/pkg for power
management/flag
+flag name=upowerUse pkgsys-power/upower/pkg for power
+management/flag
+flag name=consolekitEnable ConsoleKit support/flag
/use
longdescription lang=en
SDDM is a modern display manager for X11 aiming to be fast, simple
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index b5bf554..67d6ec6 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -29,7 +29,7 @@ DEPEND=${RDEPEND}
virtual/pkgconfig
src_prepare() {
-use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
+ use consolekit epatch ${FILESDIR}/${P}-consolekit.patch
# respect user's cflags
sed -e 's|-Wall -march=native||' \
@@ -51,6 +51,18 @@ src_configure() {
cmake-utils_src_configure
}
+pkg_postinst() {
+ if use consolekit; then
+ ewarn This display manager doesn't have native built-in
ConsoleKit support.
+ ewarn In order to use ConsoleKit pam module with this display
manager,
+ ewarn you should remove the \nox11\ parameter from
pm_ck_connector.so
+ ewarn line in /etc/pam.d/system-login
+ fi
+ ewarn Add the sddm user manually to the video group
+ ewarn if you experience flickering or other rendering issues of
sddm-greeter
+ ewarn see https://github.com/gentoo/qt/pull/52;
+}
+
pkg_setup() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/sddm ${PN}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
commit: ce09fda49a9f4ec94f85d0f1475ce9b8572be04f
Author: Elias Probst mail AT eliasprobst DOT eu
AuthorDate: Sat May 31 15:08:56 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat May 31 15:08:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ce09fda4
[x11-misc/sddm] Add user/group creation
Upstream introduced support for running SDDM as non-root user in
https://github.com/sddm/sddm/commit/484395d23f2cdbde9df5d1efb25d5d2751b43aa9
Package-Manager: portage-2.2.10
---
x11-misc/sddm/sddm-.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/x11-misc/sddm/sddm-.ebuild b/x11-misc/sddm/sddm-.ebuild
index 21df8f3..89850bc 100644
--- a/x11-misc/sddm/sddm-.ebuild
+++ b/x11-misc/sddm/sddm-.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-inherit cmake-utils git-r3 toolchain-funcs
+inherit cmake-utils git-r3 toolchain-funcs user
DESCRIPTION=Simple Desktop Display Manager
HOMEPAGE=https://github.com/sddm/sddm;
@@ -48,3 +48,8 @@ src_configure() {
)
cmake-utils_src_configure
}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/sddm ${PN}
+}
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 0799475d4dfa9eface07e9469792dce835890372
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Fri May 23 18:41:40 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat May 24 18:55:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0799475d
prepare =x11-misc/sddm-0.1.0 for importing into the Gentoo tree
---
x11-misc/sddm/files/sddm-0.1.0-clang.patch | 58 ++
x11-misc/sddm/files/sddm-0.1.0-cmake.patch | 53 +++
x11-misc/sddm/metadata.xml | 32 +-
x11-misc/sddm/sddm-0.1.0.ebuild| 67 +-
x11-misc/sddm/sddm-.ebuild | 63
5 files changed, 187 insertions(+), 86 deletions(-)
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
new file mode 100644
index 000..7f0a0e7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
@@ -0,0 +1,58 @@
+clang-3.4 and earlier has a bug with intitialization of QStringList with
initialization lists
+--- src/daemon/Authenticator.cpp
src/daemon/Authenticator.cpp
+@@ -314,7 +314,7 @@
+ process-setProcessEnvironment(env);
+
+ // start session
+-process-start(Configuration::instance()-sessionCommand(), { command
});
++process-start(Configuration::instance()-sessionCommand(),
QStringList(command));
+
+ // connect signal
+ connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this,
SLOT(finished()));
+
+--- src/daemon/DisplayServer.cpp
src/daemon/DisplayServer.cpp
+@@ -60,6 +60,7 @@
+ // log message
+ qDebug() DAEMON: Display server starting...;
+
++QStringList start_parameters;
+ #if !TEST
+ // set process environment
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+@@ -72,9 +73,11 @@
+ Display *display = qobject_castDisplay *(parent());
+
+ // start display server
+-process-start(Configuration::instance()-serverPath(), { m_display,
-auth, m_authPath, -nolisten, tcp,
QString(vt%1).arg(QString::number(display-vtNumber()), 2, '0')});
++start_parameters m_display -auth m_authPath -nolisten
tcp QString(vt%1).arg(QString::number(display-vtNumber()), 2, '0');
++process-start(Configuration::instance()-serverPath(),
start_parameters);
+ #else
+-process-start(/usr/bin/Xephyr, { m_display, -ac, -br,
-noreset, -screen, 800x600});
++start_parameters m_display -ac -br -noreset
-screen 800x600;
++process-start(/usr/bin/Xephyr, start_parameters);
+ #endif
+ // wait for display server to start
+ if (!process-waitForStarted()) {
+
+--- src/daemon/Greeter.cpp
src/daemon/Greeter.cpp
+@@ -70,12 +70,15 @@
+ env.insert(XCURSOR_THEME, Configuration::instance()-cursorTheme());
+ process-setProcessEnvironment(env);
+
++QStringList start_parameters;
+ #if !TEST
+ // start greeter
+-process-start(QString(%1/sddm-greeter).arg(BIN_INSTALL_DIR), {
--socket, m_socket, --theme, m_theme });
++start_parameters --socket m_socket --theme m_theme;
++process-start(QString(%1/sddm-greeter).arg(BIN_INSTALL_DIR),
start_parameters);
+ #else
+ // start greeter
+-process-start(QString(%1/sddm-greeter).arg(.), { --socket,
m_socket, --theme, m_theme });
++start_parameters --socket m_socket --theme m_theme;
++process-start(QString(%1/sddm-greeter).arg(.), start_parameters);
+ #endif
+ // wait for greeter to start
+ if (!process-waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
new file mode 100644
index 000..f0e68ac
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
@@ -0,0 +1,53 @@
+--- CMakeLists.txt
CMakeLists.txt
+@@ -6,7 +6,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_definitions(-Wall -march=native -std=c++11)
++add_definitions(-Wall -std=c++11)
+
+ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release)
+@@ -19,7 +19,6 @@
+ else()
+ message(STATUS Release build)
+ add_definitions(-DNDEBUG)
+-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -O2)
+ endif()
+
+ # PKG-CONFIG
+@@ -52,26 +51,26 @@
+
+ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+
++if(USE_systemd)
+ # login1
+-pkg_check_modules(LOGIN1 libsystemd-login)
++pkg_check_modules(LOGIN1 REQUIRED libsystemd-login)
+
+-if(LOGIN1_FOUND)
+-# do nothing
+ else()
+ set(LOGIN1_FOUND 0)
+ endif()
+
++if(USE_upower)
+ # upower
+-pkg_check_modules(UPOWER upower-glib)
++pkg_check_modules(UPOWER REQUIRED upower-glib)
+
+-if(UPOWER_FOUND)
+-# do nothing
+ else()
+ set(UPOWER_FOUND 0)
+ endif()
+
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/files/
commit: 3689679276e46b350788a78f17bf1c60bbd08d20
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat May 24 19:25:41 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat May 24 19:25:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=36896792
[x11-misc/sddm] Delete unused files.
Package-Manager: portage-2.2.10
---
x11-misc/sddm/files/Xsession| 69 ---
x11-misc/sddm/files/pid-support.patch | 52 --
x11-misc/sddm/files/sddm-pm-utils-support.patch | 92 -
3 files changed, 213 deletions(-)
diff --git a/x11-misc/sddm/files/Xsession b/x11-misc/sddm/files/Xsession
deleted file mode 100755
index 70cdc66..000
--- a/x11-misc/sddm/files/Xsession
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-# Modified LightDM wrapper to run around X sessions.
-
-echo Running X session wrapper
-
-# Load profile
-for file in /etc/profile $HOME/.profile /etc/xprofile $HOME/.xprofile;
do
-if [ -f $file ]; then
-echo Loading profile from $file;
-. $file
-fi
-done
-
-# Load resources
-for file in /etc/X11/Xresources $HOME/.Xresources; do
-if [ -f $file ]; then
-echo Loading resource: $file
-xrdb -nocpp -merge $file
-fi
-done
-
-# Load keymaps
-for file in /etc/X11/Xkbmap $HOME/.Xkbmap; do
-if [ -f $file ]; then
-echo Loading keymap: $file
-setxkbmap `cat $file`
-XKB_IN_USE=yes
-fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z $XKB_IN_USE ]; then
-for file in /etc/X11/Xmodmap $HOME/.Xmodmap; do
-if [ -f $file ]; then
- echo Loading modmap: $file
- xmodmap $file
-fi
-done
-fi
-
-unset XKB_IN_USE
-
-## Run all system xinitrc shell scripts.
-#xinitdir=/etc/X11/xinit/xinitrc.d
-#if [ -d $xinitdir ]; then
-#for script in $xinitdir/*; do
-#echo Loading xinit script $script
-#if [ -x $script -a ! -d $script ]; then
-#. $script
-#fi
-#done
-#fi
-
-# Load Xsession scripts
-#xsessionddir=/etc/X11/Sessions
-#if [ -d $xsessionddir ]; then
-#for i in `ls $xsessionddir`; do
-#script=$xsessionddir/$i
-#echo Loading X session script $script
-#if [ -r $script -a -f $script ] expr $i :
'^[[:alnum:]_-]\+$' /dev/null; then
-#. $script
-#fi
-#done
-#fi
-
-echo X session wrapper complete, running session $@
-
-eval exec $@
diff --git a/x11-misc/sddm/files/pid-support.patch
b/x11-misc/sddm/files/pid-support.patch
deleted file mode 100644
index f0299b1..000
--- a/x11-misc/sddm/files/pid-support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 770b53b..2d4b2ef 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,6 +92,7 @@ set(DATA_INSTALL_DIR
${CMAKE_INSTALL_PREFIX}/share/apps/sddm CACH
- set(SYS_CONFIG_DIR /etc
CACHE PATH System config directory)
- set(DBUS_CONFIG_DIR ${SYS_CONFIG_DIR}/dbus-1/system.d
CACHE PATH DBus config files directory)
-
-+set(PID_FILE /run/sddm.pid
CACHE PATH Path to pid file)
- set(CONFIG_FILE ${SYS_CONFIG_DIR}/sddm.conf
CACHE PATH Path of the sddm config file)
- set(LOG_FILE/var/log/sddm.log
CACHE PATH Path of the sddm log file)
- set(COMPONENTS_TRANSLATION_DIR ${DATA_INSTALL_DIR}/translations
CACHE PATH Components translations directory)
-diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in
-index 75adfc6..1c9b9a5 100644
a/src/common/Constants.h.in
-+++ b/src/common/Constants.h.in
-@@ -28,5 +28,6 @@
-
- #define CONFIG_FILE @CONFIG_FILE@
- #define LOG_FILE@LOG_FILE@
-+#define PID_FILE@PID_FILE@
-
- #endif // SDDM_CONSTANTS_H
-diff --git a/src/daemon/DaemonApp.cpp b/src/daemon/DaemonApp.cpp
-index 9ad226b..b7d6cb5 100644
a/src/daemon/DaemonApp.cpp
-+++ b/src/daemon/DaemonApp.cpp
-@@ -33,6 +33,7 @@
- #include QDebug
- #include QHostInfo
- #include QTimer
-+#include QFile
-
- #include iostream
-
-@@ -50,6 +51,16 @@ namespace SDDM {
- // log message
- qDebug() DAEMON: Initializing...;
-
-+// Write PID File
-+if ( ! QString(PID_FILE).isEmpty() ) {
-+QFile pidFile(PID_FILE);
-+QString pid = QString::number(QCoreApplication::applicationPid());
-+if ( pidFile.open(QIODevice::WriteOnly | QIODevice::Text) ) {
-+pidFile.write(pid.toLatin1().data(),
qstrlen(pid.toLatin1().data()));
-+pidFile.close();
-+}
-+}
-+
- // create configuration
- m_configuration = new Configuration(CONFIG_FILE, this);
-
diff --git
[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
commit: 6835b13c0e3475b5a73250303fc39098a21c1055
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat May 24 19:52:59 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat May 24 19:52:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6835b13c
[x11-misc/sddm] Remove 0.1.0, moved to gx86 by jauhien.
Package-Manager: portage-2.2.10
---
x11-misc/sddm/Manifest | 1 -
x11-misc/sddm/files/sddm-0.1.0-clang.patch | 58 --
x11-misc/sddm/files/sddm-0.1.0-cmake.patch | 53 ---
x11-misc/sddm/metadata.xml | 4 ---
x11-misc/sddm/sddm-0.1.0.ebuild| 50 --
x11-misc/sddm/sddm-.ebuild | 1 +
6 files changed, 1 insertion(+), 166 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
deleted file mode 100644
index 4882162..000
--- a/x11-misc/sddm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sddm-0.1.0.tar.gz 4710358 SHA256
586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512
b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705
WHIRLPOOL
d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
deleted file mode 100644
index 7f0a0e7..000
--- a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-clang-3.4 and earlier has a bug with intitialization of QStringList with
initialization lists
src/daemon/Authenticator.cpp
-+++ src/daemon/Authenticator.cpp
-@@ -314,7 +314,7 @@
- process-setProcessEnvironment(env);
-
- // start session
--process-start(Configuration::instance()-sessionCommand(), { command
});
-+process-start(Configuration::instance()-sessionCommand(),
QStringList(command));
-
- // connect signal
- connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this,
SLOT(finished()));
-
src/daemon/DisplayServer.cpp
-+++ src/daemon/DisplayServer.cpp
-@@ -60,6 +60,7 @@
- // log message
- qDebug() DAEMON: Display server starting...;
-
-+QStringList start_parameters;
- #if !TEST
- // set process environment
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-@@ -72,9 +73,11 @@
- Display *display = qobject_castDisplay *(parent());
-
- // start display server
--process-start(Configuration::instance()-serverPath(), { m_display,
-auth, m_authPath, -nolisten, tcp,
QString(vt%1).arg(QString::number(display-vtNumber()), 2, '0')});
-+start_parameters m_display -auth m_authPath -nolisten
tcp QString(vt%1).arg(QString::number(display-vtNumber()), 2, '0');
-+process-start(Configuration::instance()-serverPath(),
start_parameters);
- #else
--process-start(/usr/bin/Xephyr, { m_display, -ac, -br,
-noreset, -screen, 800x600});
-+start_parameters m_display -ac -br -noreset
-screen 800x600;
-+process-start(/usr/bin/Xephyr, start_parameters);
- #endif
- // wait for display server to start
- if (!process-waitForStarted()) {
-
src/daemon/Greeter.cpp
-+++ src/daemon/Greeter.cpp
-@@ -70,12 +70,15 @@
- env.insert(XCURSOR_THEME, Configuration::instance()-cursorTheme());
- process-setProcessEnvironment(env);
-
-+QStringList start_parameters;
- #if !TEST
- // start greeter
--process-start(QString(%1/sddm-greeter).arg(BIN_INSTALL_DIR), {
--socket, m_socket, --theme, m_theme });
-+start_parameters --socket m_socket --theme m_theme;
-+process-start(QString(%1/sddm-greeter).arg(BIN_INSTALL_DIR),
start_parameters);
- #else
- // start greeter
--process-start(QString(%1/sddm-greeter).arg(.), { --socket,
m_socket, --theme, m_theme });
-+start_parameters --socket m_socket --theme m_theme;
-+process-start(QString(%1/sddm-greeter).arg(.), start_parameters);
- #endif
- // wait for greeter to start
- if (!process-waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
deleted file mode 100644
index f0e68ac..000
--- a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
+++ /dev/null
@@ -1,53 +0,0 @@
CMakeLists.txt
-+++ CMakeLists.txt
-@@ -6,7 +6,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_definitions(-Wall -march=native -std=c++11)
-+add_definitions(-Wall -std=c++11)
-
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Release)
-@@ -19,7 +19,6 @@
- else()
- message(STATUS Release build)
- add_definitions(-DNDEBUG)
--set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}
