[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/wscreensaver/

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/wscreensaver/

[Pascal Jäger]

commit:     fa1923135f20cd8776184865a2daea3d52caeef1
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Wed Dec 13 21:43:56 2023 +0000
Commit:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Wed Dec 13 21:43:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa192313

gui-apps/wscreensaver: fix build for gcc

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 gui-apps/wscreensaver/wscreensaver-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gui-apps/wscreensaver/wscreensaver-9999.ebuild b/gui-apps/wscreensaver/wscreensaver-9999.ebuild
index b1631cd5df..e22c5aa670 100644
--- a/gui-apps/wscreensaver/wscreensaver-9999.ebuild
+++ b/gui-apps/wscreensaver/wscreensaver-9999.ebuild
@@ -48,7 +48,9 @@ src_configure() {
 	local S="$S"/wayland
 	# Will write a patch later and send it to upstream.
 	# For now accept it.
-	append-cflags -Wno-error=incompatible-function-pointer-types
+	if [[ $CC == clang* ]]; then
+		append-cflags -Wno-error=incompatible-function-pointer-types
+	fi
 	meson_src_configure
 }
 

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/wscreensaver/

[Pascal Jäger]

commit:     1da3a321a53625d0042e78b484fa2523825b1ce1
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Wed Dec 13 23:08:23 2023 +0000
Commit:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Wed Dec 13 23:08:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1da3a321

gui-apps/wscreensaver: use get_libdir instead of hardcode

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 gui-apps/wscreensaver/wscreensaver-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gui-apps/wscreensaver/wscreensaver-9999.ebuild b/gui-apps/wscreensaver/wscreensaver-9999.ebuild
index e22c5aa670..13c748b32f 100644
--- a/gui-apps/wscreensaver/wscreensaver-9999.ebuild
+++ b/gui-apps/wscreensaver/wscreensaver-9999.ebuild
@@ -44,7 +44,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow )
 
 src_configure() {
 	econf
-	cd wayland
 	local S="$S"/wayland
 	# Will write a patch later and send it to upstream.
 	# For now accept it.
@@ -70,7 +69,7 @@ src_install() {
 		filename=$(basename "${file}")
 		if [[ "${filename}" != *.* && "${filename}" != *meson-*  ]]; then
 			doins "${file}"
-			fperms +x /usr/lib64/misc/"${PN}"/"${filename}"
+			fperms +x /usr/$(get_libdir)/misc/"${PN}"/"${filename}"
 		fi
 	done
 }