[gentoo-commits] repo/gentoo:master commit in: gui-apps/gtkgreet/files/, gui-apps/gtkgreet/

[gentoo-commits] repo/gentoo:master commit in: gui-apps/gtkgreet/files/, gui-apps/gtkgreet/

[Aaron Bauman]

commit:     982f94041641d9900756f59cabafddd380e66e5a
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Oct 30 15:52:40 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:26:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982f9404

gui-apps/gtkgreet: remove Werror build flag

Closes: https://bugs.gentoo.org/750707
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18077
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch | 12 ++++++++++++
 gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild             |  7 ++++---
 gui-apps/gtkgreet/gtkgreet-9999.ebuild               |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch b/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch
new file mode 100644
index 00000000000..f47a21adc12
--- /dev/null
+++ b/gui-apps/gtkgreet/files/gtkgreet-0.6-r1-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index eb3a2b8..07bee48 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,6 @@ project(
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=2',
+-		'werror=true',
+ 	],
+ )
+ 

diff --git a/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
index a74b52eb2e4..93f8843afbf 100644
--- a/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
@@ -12,8 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -23,8 +22,8 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	x11-libs/gtk+:3
 	layershell? ( gui-libs/gtk-layer-shell )
+	x11-libs/gtk+:3
 "
 RDEPEND="
 	${DEPEND}
@@ -35,6 +34,8 @@ BDEPEND="
 	man? ( app-text/scdoc )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6-r1-werror.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature man man-pages)

diff --git a/gui-apps/gtkgreet/gtkgreet-9999.ebuild b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
index bc41aaec11f..93f8843afbf 100644
--- a/gui-apps/gtkgreet/gtkgreet-9999.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
@@ -34,6 +34,8 @@ BDEPEND="
 	man? ( app-text/scdoc )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6-r1-werror.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature man man-pages)