From f4def06406fc8431d4238b17c9c0f7776810b206 Mon Sep 17 00:00:00 2001
From: roku <roku@decade.cz>
Date: Thu, 23 Jan 2025 16:23:41 +0100
Subject: [PATCH] gui-apps/ignis: fix library install path, remove unneeded
 patch

---
 .../ignis/files/ignis-gvc-collision.patch     | 24 -------------------
 gui-apps/ignis/ignis-0.4-r1.ebuild            |  5 +++-
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 gui-apps/ignis/files/ignis-gvc-collision.patch

diff --git a/gui-apps/ignis/files/ignis-gvc-collision.patch b/gui-apps/ignis/files/ignis-gvc-collision.patch
deleted file mode 100644
index d94ed55..0000000
--- a/gui-apps/ignis/files/ignis-gvc-collision.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Rename libgvc to libgnome-volume-control to prevent
-soname collision with graphviz.
-
-diff -ur a/subprojects/gvc/meson.build b/subprojects/gvc/meson.build
---- a/subprojects/gvc/meson.build	2025-01-22 16:01:29.637007998 +0100
-+++ b/subprojects/gvc/meson.build	2025-01-22 16:03:14.217729940 +0100
-@@ -78,7 +78,7 @@
- endif
- 
- if enable_static
--  libgvc_static = static_library('gvc',
-+  libgvc_static = static_library('gnome-volume-control',
-     sources: libgvc_gir_sources + libgvc_no_gir_sources + libgvc_enums,
-     dependencies: libgvc_deps,
-     c_args: c_args
-@@ -90,7 +90,7 @@
-     error('Installing shared library, but pkglibdir is unset!')
-   endif
- 
--  libgvc_shared = shared_library('gvc',
-+  libgvc_shared = shared_library('gnome-volume-control',
-     sources: libgvc_gir_sources + libgvc_no_gir_sources + libgvc_enums,
-     dependencies: libgvc_deps,
-     c_args: c_args,
diff --git a/gui-apps/ignis/ignis-0.4-r1.ebuild b/gui-apps/ignis/ignis-0.4-r1.ebuild
index 5dd9657..f8e0e03 100644
--- a/gui-apps/ignis/ignis-0.4-r1.ebuild
+++ b/gui-apps/ignis/ignis-0.4-r1.ebuild
@@ -54,12 +54,15 @@ BDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-gvc-collision.patch
 	"${FILESDIR}"/${PN}-grass-sass.patch
 )
 
 S="${WORKDIR}/${PN}"
 
+src_configure() {
+	meson_src_configure --libdir="$(get_libdir)/ignis"
+}
+
 src_install() {
 	meson_src_install
 	python_optimize "${D}$(python_get_sitedir)/${PN}"