diff --git a/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
index 12d2cdda8de62..f6d2d01209acc 100644
--- a/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
+++ b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
@@ -1,11 +1,33 @@
+# https://bugs.gentoo.org/955791
+# https://bugs.gentoo.org/717422
+# From: Bill Prendergast <dek.devel@baisenvar.info>
+
 --- a/src/purple-libnotify+-common.h
 +++ b/src/purple-libnotify+-common.h
-@@ -27,7 +27,7 @@
+@@ -27,13 +27,14 @@
  
  extern PurplePlugin *notify_plus;
  
 -struct
-+extern struct
++struct notify_plus_data_
  {
  	gboolean modify_notification;
  	gboolean use_svg;
+ 	gboolean overlay_icon;
+ 	gboolean set_transcient;
+ 	gboolean actions;
+-} notify_plus_data;
++};
++extern struct notify_plus_data_ notify_plus_data;
+ 
+ #endif /* __PURPLE_LIBNOTIFY_PLUS_COMMON_H__ */
+--- a/src/purple-libnotify+.c
++++ b/src/purple-libnotify+.c
+@@ -30,6 +30,7 @@
+ #include "purple-libnotify+-frames.h"
+ 
+ PurplePlugin *notify_plus = NULL;
++struct notify_plus_data_ notify_plus_data;
+ 
+ static void
+ _purple_notify_plus_signed_on(PurpleBuddy *buddy, PurplePlugin *plugin)
diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1-r1.ebuild
similarity index 94%
rename from x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
rename to x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1-r1.ebuild
index 04b255be574f0..e1494e1a6b3e4 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7