diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-26 00:09:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-26 00:09:36 +0100 |
| commit | b1c81de4fadbd00897700a7321f03b390d952b2e (patch) | |
| tree | e6cc812351d4f105c110cfc363ebb497e996f47a /x11-misc/sddm | |
| parent | 7c59acba5699c9c58090a7a738669669a7307023 (diff) | |
gentoo resync : 26.08.2021
Diffstat (limited to 'x11-misc/sddm')
| -rw-r--r-- | x11-misc/sddm/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch | 23 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index a1d55eef1bf4..64f5086e2c15 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -5,9 +5,10 @@ AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e1737 AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784 AUX sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch 6561 BLAKE2B 33919c3913fae2eb1e7277647a38567c70ee0fd4ca5c93de6d7597d6c216c9c1802e79a5f281821f8eac4a99d73d2fa8712471b2dff8ed50ec17004ae7d8b67a SHA512 4d2bbdb301e54aaa8673b8765ee2e63d105e8dd2199f636a523b2ef46a6123e8b5194fa778390d4ba8ac3b6970cb4fb3bafc9ee8e20335fbf9284517ea5d36c5 AUX sddm-0.18.1-only-reuse-online-sessions.patch 1201 BLAKE2B cf1947f88fa1223c78bfd5c7d37884e7b9b80349f531d4593a0d1a59f4dfe2ed068abe5f2f0fe53b3d112826230ac9c481ce1db38661ece2ee93b1d0aeadba94 SHA512 62975ad657e46a6dc0157bcf749df1e165cd9f65fefa794d674aa7c2dc84e978d1e98bd2c5dad19a30a3e258d65155c9b93e89e12d32aaf80d0ba8b1e5cc594f +AUX sddm-0.18.1-qt-5.15.2.patch 865 BLAKE2B 1198a2a7b9cd0b46648eddd3eddca444d502c01baf7fd686bd52489acefa8bb3cc53e20b1d8f154aec56f88f53b653c605f8b4905cd7bb445c37ad7bdd091369 SHA512 aae777ca15df43d7c5bfb7f15e2ede4632d598e05d565338880f644e0e8ed9f00e83c33128a85db8db01d4a22cf85ee4dd6fd2c66196c7093afcc9d5c18bade2 AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f592214160ff993e86582bf5f550be204193668f5bab7786db88ae9a1a09ee268beb3e3157c1b033e765053ba415f3d291f299b09606aa566c9c197370 SHA512 b33b26517173262194bdc98e63b84fbb1f03005abc3c079332dd9b275167d8ddc680ba5c2a9968be5c54963b64f291aab65ad9f04b9f3f69299d030753cd90f5 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 EBUILD sddm-0.15.0-r2.ebuild 1477 BLAKE2B d9117fb9826beed879b15947f1830c5731fb192651f4e8d68984af87db5008a09c6e877605b13f88e8157477e4282007311106302f1c1574968ac8859b5f0908 SHA512 2864550f8a62a281f8211d93d5ccb1765b328323db83d13223626610122f6d36407508af55f35dcd834a915278c36da2c50270236e5f18fa052b4862218ab1a7 -EBUILD sddm-0.18.1-r5.ebuild 3134 BLAKE2B 0a19f7b1e791b1b698408e5b49e6b4a3b92d0d4607c018bc29db8de2846b58c2e7cf6959421954f3eca14b4f889d73164fd1d88d6af15a8f027da902afd3dbc7 SHA512 68c68efc0d77762f0100c6d0a2f5695706bb9e5329b4286aa2f466de503b02a354f5dcc753d277228efa9c598c1be8ee4abae3a376e1aa997375e075a113dc29 +EBUILD sddm-0.18.1-r5.ebuild 3202 BLAKE2B 8cf57535cca22b139e77581ac6fddb174331414c39fee01c3efe6b9d3b935021895eafcea20aa53d9e9c87622f87aabb96a43255a61de48f0940873ae44b68a1 SHA512 a9d7a4ccb051171caf58e245bc3de0f7ee67134e107d2ad6d05e8aa06535126e6fa85143903fd72e76091689dbb6f5f2bbcf0b1a8649f4d6766ec36f94bae58d MISC metadata.xml 818 BLAKE2B 2be9c3e50193b2c6117a5447ecc9e718d74a44997f8cbeea66905115ced465ea371cf596b5b366cbc4ebb46ecb41015668b96e44e23e7b3dba583e388e78b85a SHA512 c6910844830c10a5602afa3269ffd8eeb4a1a0b2ae345fea5ca0de11f3856cbbcec86cc95930070274d8e5025b4111f1ec0c7af1721c7ed71ce5ebc428adc0d7 diff --git a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch new file mode 100644 index 000000000000..7179d14e4c1e --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch @@ -0,0 +1,23 @@ +From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001 +From: "aacid@kde.org" <aacid@kde.org> +Date: Thu, 12 Nov 2020 23:42:48 +0100 +Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed + +And also comes closes to Qt6 compatibility +--- + src/daemon/XorgDisplayServer.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp +index 5f93a1b3..d5f29a94 100644 +--- a/src/daemon/XorgDisplayServer.cpp ++++ b/src/daemon/XorgDisplayServer.cpp +@@ -65,7 +65,7 @@ namespace SDDM { + // create a random hexadecimal number + const char *digits = "0123456789abcdef"; + for (int i = 0; i < 32; ++i) +- m_cookie[i] = digits[dis(gen)]; ++ m_cookie[i] = QLatin1Char(digits[dis(gen)]); + } + + XorgDisplayServer::~XorgDisplayServer() { diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild index 8f888089fe3c..20b127562993 100644 --- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild @@ -54,6 +54,8 @@ PATCHES=( # TODO: fix properly "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 "${FILESDIR}/pam-1.4-substack.patch" + # upstream git develop branch: + "${FILESDIR}/${P}-qt-5.15.2.patch" ) src_prepare() { |