5 files changed, 19 insertions, 72 deletions
diff --git a/media-sound/alsa-scarlett-gui/Manifest b/media-sound/alsa-scarlett-gui/Manifest
index f037ba2d4804..f430b3885902 100644
--- a/media-sound/alsa-scarlett-gui/Manifest
+++ b/media-sound/alsa-scarlett-gui/Manifest
@@ -1,5 +1,4 @@
-AUX alsa-scarlett-gui-0.3.3-cflags.patch 1071 BLAKE2B 994958c3e4395229f0b9c31eac5e9050f46d98241224fba8c09b31e2cdfda91bff762a4c72c7f5441010f7d60e48a0942c51e4430d0190f6b167d753defffc02 SHA512 a7dd3cfd4318858d733dafeeaf6ea52de91b10e7d0cc8392295b7a0020745b7ed0edad8fb8e7892ff4bc81187f627c144e08beb364f881bcdd7b91686b5e8e8c
-AUX alsa-scarlett-gui-0.3.3-fabs.patch 1165 BLAKE2B a5da1ef2709b94c4bb83cf2b097baef61176d359642c009de1927d72f0b7bd49a082801f13f1c68d8e6bfa62030195ad631f94f08a9153dc5de71ff01202a8cb SHA512 440e70e63de07def071f18db14c0be98483cb2839ab4f572c000ce4f1dd9aa8aa915aa9c13fbdca7dd94764f0edfed30248caf1629604d619794c54109f1ed68
-DIST alsa-scarlett-gui-0.3.3.tar.gz 3113190 BLAKE2B 16128c8795c4a4ebd9d711f64dad1dd0e38ba17e34a50d17cf43b8ce454409ee2a5bc817120d5b421b367d3f1e5ef0f9f7868fb1109af6edb8d820579cad7b14 SHA512 38b0e8cb0bb1d9039463d7635ee81ad1ae477628b885f5f1f3601c163369ff59c7effbba140fb761b26dca7cf9c0f6b5a3f8db0b68a8c604078fe8f08cea082f
-EBUILD alsa-scarlett-gui-0.3.3-r1.ebuild 622 BLAKE2B b27e814cdb268dd928842b6cae287e97a31d0ecf84cef1cdb071f38994e9d319665d7fdc40a5b979f0ee080e242cb49d1d50c096c4e49a75429a6fb89140ec76 SHA512 73c7db7f2827d28c8cab1906d75c42047ce074667f0782d53e63b5108b8985b1d36be15b808fe5e582b3311c328138ed4a08ba20dbf69f5d9597c087665da56d
+AUX alsa-scarlett-gui-0.4.0-no-Werror.patch 332 BLAKE2B 571f7774182bbce3cfdbcb6a00848628845990252fba243f876d4e2bc0879cf4374fed30c6338003a4403f231e1dec599a090a5a0b29db3f0162fed3223ab187 SHA512 ab27e16a46caf509d6b428262962d4df5122ebfd092f13069e66c128b98433780452fb4babd0116f1bfadb2900f451c8a1f069b4d93a9bf8979ee28cbc3c686a
+DIST alsa-scarlett-gui-0.4.0.tar.gz 3434771 BLAKE2B 5bdab633a8271e99eec06aac8b9629ad50eb9a4cf892fe962f30848fc7644036093056d0db75f60accd13757dbeb578c0cfa365aa6dcd2655985564e1039a7d9 SHA512 9cc316f153cd197823295dc57012931f75b3cb06f9ea87661853626e3d9326ce1a433adfb8af23bcdc1e76f9ab59d2175bee9e3d02da0b4a7b3365caf734e1e2
+EBUILD alsa-scarlett-gui-0.4.0.ebuild 616 BLAKE2B 87071f9f2f0244e7d246e0655bfe97d6c47c098aa0209e03d5c3116c7b2fff744b68a03ebcd585aa30c6496c4e7ff1b96346d9b5ba0fd15a6f9aae49ff62cd36 SHA512 f0dbe8a9611ad9beb57b8d873a08b92c8a6f36a2a636fbd5ba7d9ebe53d6cc2cab290a7c517d357561bcc257dbf5b32219f65bea6a9fe0e26d11ea99823ace10
 MISC metadata.xml 453 BLAKE2B 6de6fb3e0f17b2e5e760efb9a429afae2b96b2825d597a8d13232c93bcbe1f2cecf16804c66931be07fac9af3944a7293299cbdef6325cc20407b3e16a23032c SHA512 f7f52d3834a241b92a46ec49d1560dc273ece1fc86abe1dfcb492f04efa53e5af7f156d229f17f76dcccbc8566df32889b30a650d31979234b2fed52a170b92f
diff --git a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.3-r1.ebuild b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild
index 8f4c27ffd11c..0961a09d3b1e 100644
--- a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.3-r1.ebuild
+++ b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit xdg
+
 DESCRIPTION="A UI for Focusrite Scarlett and Clarett audio interfaces"
 HOMEPAGE="https://github.com/geoffreybennett/alsa-scarlett-gui"
 SRC_URI="https://github.com/geoffreybennett/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,9 +22,9 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/"${P}"-cflags.patch
-	"${FILESDIR}"/"${P}"-fabs.patch
+	"${FILESDIR}/${PN}-0.4.0-no-Werror.patch"
 )
+
 MAKEOPTS="${MAKEOPTS} -C src"
 
 export PREFIX="/usr"
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch
deleted file mode 100644
index 696df40d6269..000000000000
--- a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 00c84902e508c20c61b003a64f772cfe82f18d43 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Fri, 1 Dec 2023 04:39:56 +0100
-Subject: [PATCH] Makefile: prefer distro cflags if specified
-
-The compilation flags that are necessary for building and part of the
-developer's intentions belong in the `+=` section, but the base flags
-that distros like to override belong in a `?=` section, so that build
-systems using their own are respected.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- src/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 2c9d51b..bba8d42 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -12,7 +12,8 @@ VERSION := $(shell \
- DEPDIR := .deps
- DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
- 
--CFLAGS += -Wall -Werror -ggdb -fno-omit-frame-pointer -O2 -D_FORTIFY_SOURCE=2
-+CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
-+CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
- CFLAGS += -DVERSION=\"$(VERSION)\"
- CFLAGS += -Wno-error=deprecated-declarations
- 
--- 
-2.42.0
-
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-fabs.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-fabs.patch
deleted file mode 100644
index 31f21bed199a..000000000000
--- a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-fabs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 883541a1073e5bd2f8a8f759db56e48d90a2f448 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 5 Dec 2023 00:00:34 +0100
-Subject: [PATCH] gtkdial: use fabs() for double
-
-Passing a double to abs() truncates it to an integer, which is probably
-not intended, and also causes fatal errors on clang.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- src/gtkdial.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gtkdial.c b/src/gtkdial.c
-index ce06515..931b06b 100644
---- a/src/gtkdial.c
-+++ b/src/gtkdial.c
-@@ -832,9 +832,9 @@ gtk_dial_scroll_controller_scroll (GtkEventControllerScroll *scroll,
-                                     double                    dy,
-                                     GtkDial                  *dial)
- {
--    double delta = dx ? dx : dy;
--    if (abs(delta) > 1)
--      delta *= abs(delta);
-+    double delta = dx ? dx : dy, absolute_delta = fabs(delta);
-+    if (absolute_delta > 1)
-+      delta *= absolute_delta;
-     double step = -gtk_adjustment_get_step_increment(dial->adj)*delta;
- 
-     set_value(dial, gtk_adjustment_get_value(dial->adj) + step);
--- 
-2.42.0
-
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
new file mode 100644
index 000000000000..e6c98f5c4889
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,7 +13,7 @@ DEPDIR := .deps
+ DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
+ 
+ CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
+-CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
++CFLAGS += -Wall -D_FORTIFY_SOURCE=2
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -Wno-error=deprecated-declarations
+