From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F3DF15808B for ; Fri, 1 Apr 2022 14:48:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23A01E08E5; Fri, 1 Apr 2022 14:48:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0D6FE08E5 for ; Fri, 1 Apr 2022 14:48:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7581341650 for ; Fri, 1 Apr 2022 14:48:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D5F235F for ; Fri, 1 Apr 2022 14:48:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1648824427.d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch x11-misc/sddm/sddm-0.18.1-r5.ebuild x11-misc/sddm/sddm-0.18.1-r6.ebuild X-VCS-Directories: x11-misc/sddm/ x11-misc/sddm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8 X-VCS-Branch: master Date: Fri, 1 Apr 2022 14:48:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e543304d-e2db-4cca-9898-52c3159004f5 X-Archives-Hash: 16f9fa9eb295f343379a69e9ae714747 commit: d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 12 21:44:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 1 14:47:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fe5a71 x11-misc/sddm: Rebase *respect-user-flags.patch onto 0.18.1 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ect-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 ++++----- x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 +- x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +- 3 files changed, 6 insertions(+), 7 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 fc450169792d..6801fa799ead 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.000000000 +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.000000000 +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/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild index 20b127562993..52bc18534548 100644 --- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + "${FILESDIR}/${P}-respect-user-flags.patch" "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159 diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild index ee7fbfa1a60b..3d1b2b680504 100644 --- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild @@ -45,7 +45,7 @@ DEPEND="${RDEPEND} " PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" + "${FILESDIR}/${P}-respect-user-flags.patch" "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159