From c95a859752fb3b07a8a909a873bf48ebb4235f37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Thu, 8 Jan 2015 12:04:46 +0000 Subject: [PATCH] Version bump. Fixes bug #534262 Package-Manager: portage-2.2.15/cvs/Linux x86_64 --- x11-misc/sddm/ChangeLog | 10 ++- x11-misc/sddm/Manifest | 25 ++----- .../sddm/files/sddm-0.11.0-consolekit.patch | 11 +++ x11-misc/sddm/sddm-0.11.0.ebuild | 71 +++++++++++++++++++ 4 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 x11-misc/sddm/files/sddm-0.11.0-consolekit.patch create mode 100644 x11-misc/sddm/sddm-0.11.0.ebuild diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog index cece85b2169f..8356ef042eb5 100644 --- a/x11-misc/sddm/ChangeLog +++ b/x11-misc/sddm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/sddm -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.14 2014/10/18 17:53:57 jauhien Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.15 2015/01/08 12:04:43 mrueg Exp $ + +*sddm-0.11.0 (08 Jan 2015) + + 08 Jan 2015; Manuel Rüger + +files/sddm-0.11.0-consolekit.patch, +sddm-0.11.0.ebuild: + Version bump. Fixes bug #534262 18 Oct 2014; Jauhien Piatlicki -files/sddm-0.9.0-consolekit.patch, -files/sddm-0.9.0-upower.patch, diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 051d75512580..b0b70cc80846 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,26 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX sddm-0.10.0-consolekit.patch 429 SHA256 4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5 SHA512 59959087fb31368dad6ee815f90f85d3440abb671a0a10185c1ed1bd8ead5430275ecd9ad16d89c2df55494ee1e1f1412280c0562299bd7a09c7d1af3023d121 WHIRLPOOL 709990539e053d66e2079174945b883ebc7c88a8b8d90a46a4bffa8e3bdbb24a3cc711a95f193045ef151be1993fec688050828039f7c3b54bea99b62c5f322c AUX sddm-0.10.0-upower.patch 553 SHA256 6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f SHA512 309fcea508b7ec44c15d527277dd895b0bbcb3d118d4fbd97ca02ca7b022c995f5a3434e7a37396ef1ff80574b1dcaf02719b56ad3976242ad82d92fcbfa3db9 WHIRLPOOL e26d2b5df7b6b3983ab43c6f36dbe7a0fe25653605aacc427b7e3eae9a0d2bf1473c56dc745820f897303bde9742212369b69fdfde2a7b2b834db6a14a710700 +AUX sddm-0.11.0-consolekit.patch 395 SHA256 28da5f7183d24120e65271a540f6f222ddaa4544c00e860f9c598526718adb4c SHA512 d47c0243bee6c4119ec0a3f9e7ffce8b7fdb18a46513b621d2a9752431dd5c3379ad9e12431fac107322488807cc8fd61a5ce5db3a8f8ef4d5b4ac8abd731905 WHIRLPOOL c8eb05c278468e5f8cd9acfb9d1dd50a560215c315667a282ddba23eef5d2a8b79b841eeaf2157b301cf4e8697115cff92913038164c60c251975ae5d7231dac DIST sddm-0.10.0.tar.gz 4727266 SHA256 8d2df745be2025ed3fdaa0065d410c768915e2dddf576eb92eef8ae287319d96 SHA512 c0907c2fe6b2e22f55082fab33c26e62432cb33acf153fa752c0f2bbca2f1d13707c7ca486f77fdfd9c7dd504d29b9c9f8640e59abc184c3130a059c74eb1055 WHIRLPOOL 0f9052e511b1be8bb9f2959df287b648e7d03f23416a30a938620a83cfbd471acd827984fa5e6ec99464da1028311be27ae4f6d1b824a710090537114cc38646 +DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f EBUILD sddm-0.10.0.ebuild 2020 SHA256 d36f49b7d6d07cb1e88e32dc9404c7c3e82a37734917d4070cf6858d958ebf54 SHA512 994428982943dc10dae2111236ec09073d5f333f441978d29e16405d6880682f14b3c3b05d8332a7a4e36644d372eeb6a1f4d896bc41270a057577791784d387 WHIRLPOOL 1fdf11e35eb71dc9eed87b29b732defd350de390e83447e455b8c7046d982c297803676ad3a4d17db3569fb634c308b211d7d7af9c240caa20e16d87109c6ea1 -MISC ChangeLog 2856 SHA256 ff4ad79292d8858edcaa27909486e2ae60500790b26d663f6df80681a5477384 SHA512 09f87168fde397f33de16b7ed71d9942dff499890897a40e31e67e6a9977f8001d53242a0d653507dab7bde9226dc2e5887b56e6a8b9b84f5e82f821154e5ddc WHIRLPOOL 9cea9f84121b1c724eeeb8333f2f0d5a3135f959bff1a18bfc9563fd22186da1fc2134ce623c7b5d744f28ae5e923ac32e16eeb1f739bafc1f7a535d206d3657 +EBUILD sddm-0.11.0.ebuild 2026 SHA256 745907ba32884ffe4b74c9a22934cf0304ec3b3e7f814cb4c124b320bd5a32ab SHA512 b7d453f7645af8bc9993c5d66134175698a072d2a28c99577808af12750a064eecf1c2509960d001129f052b95f700a0505a8f8379677d28d6254e4812f693be WHIRLPOOL 2627ccf3ec39a7b9011bb43f88bd5fd46b9585ad65b7ce70b06375f07019c1a8c3c11f368a25ccc2c61dd1d518c2808aaca59750d7833bef0718b9b0410e5883 +MISC ChangeLog 3025 SHA256 c1e421a4937062e43600aa1ec7cf2f2345b603c012ff21c796d0d2dcb50f3a49 SHA512 6bf729f23d05f944e3f16eb28a3a23644889e01ef3a10c7b2a39eeb8a26be98e46ec1e3f46550434d9bd6ad2d2dd2cf1829a5704b8d3afcec14f5e441b7b3898 WHIRLPOOL e65e0b667f3034fbe3a9fb8cc1bad320796e8879155d9bce45ef2e4445e20e8ba4b42a34a914b3d4fd5423935d8fde9e180ac4ff88eb7ab5b3a0a6a5db49a51f MISC metadata.xml 684 SHA256 260a9c7c0edd03a2986bee9e483994c9fb135707e9c02340a03c49cfbc2d3f2c SHA512 2cb1389468e2879bab30fcfbb21bc38cf6c35cd7927786cf4293e7775e838a660f488816f1738e6ecb1420b44b8fd1039541614dfe6d2d1d8c629d4a63b1e558 WHIRLPOOL f26b41cbea499725954de851b80f1815b62b6220fa639da5d699a0716a387c279b8a5ea9462a4ef008f407cd777be31859ad43cf77a9c48ab1a0dd6e14fbbee3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUQqk3AAoJELvuk32y76HUYekP/1CY7cmU9o99gxAgYhztollP -S5aGDCksceyRcWYtfy133fgqekQuqekFcRjnExJy95wDDAwDJYa4YgocqJ7FycTr -ht6Wvb7eN865AFv0BOoQ06gmDYB1CmxQbs+BPYPyGTt/x8WNYywsFiw6IpGAbt2C -1rEFhFA0NgnTc1L0NrNay/OgvsNVgOKuKevj8+JxJCrDPUVe/Ck3mXkAaQKxpAOB -CGoE0+4WIEdok/jBE5+L30eLoVXvadcnfGLcfDClqYgTo0wUVyORlveBTkd8ka6D -u/Gv2XLy6p9br/IM1wLLn4f29biH1ZqVJbZnIAdhRG2dyOzp1rHWMRqMHSdP5olL -djtcV/eshzUKKLFtCEwa4Gq6wu64+GE+RLCVnC9lKzISlq4JYwpPbOdjK5lYZkbm -nWeVzuv4ZDT1VcwRk9BK5rFoP8uEWWKSrU/BuLm0y2yvzKRJJt259MqxagEVccoy -Q32GSjkX89Embd3ky/Kj5ICRNixAFis5nGPw+bxyJDvuP3pqI8iYzuwvrjVNtAco -e1KQ1pF4ZfrW2KGZmIqADGcjlm7lxQkdYPgTw9oCmpMWo2zbIXDES98iJChEIYnl -766FZgwEXJJJU2Qeoag+OsqoD/pQAxPz7f9qHmYLBldQj/GKjmoHmqDaz/fec5WC -hz24q9vK1vkIITkORhHz -=Ebxs ------END PGP SIGNATURE----- diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch new file mode 100644 index 000000000000..4871bee0f06e --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch @@ -0,0 +1,11 @@ +--- data/scripts/Xsession.old 2015-01-08 12:58:24.448241484 +0100 ++++ data/scripts/Xsession 2015-01-08 13:00:07.794244087 +0100 +@@ -93,7 +93,7 @@ + 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." diff --git a/x11-misc/sddm/sddm-0.11.0.ebuild b/x11-misc/sddm/sddm-0.11.0.ebuild new file mode 100644 index 000000000000..8ce2556f0dc7 --- /dev/null +++ b/x11-misc/sddm/sddm-0.11.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0.ebuild,v 1.1 2015/01/08 12:04:43 mrueg Exp $ + +EAPI=5 +inherit cmake-utils toolchain-funcs user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" +SLOT="0" +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 + 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 ) )" +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" + use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch" + + # respect user's cflags + sed -e 's|-Wall -march=native||' \ + -e 's|-O2||' \ + -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." + 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} +} -- 2.26.2