diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 8d5154f..484468b 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -2,5 +2,6 @@ AUX jpilot-1.8.2-fix-configure-clang16.patch 479 BLAKE2B 5b3e44bbb0a2f9374ba1ca8
 AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
 AUX jpilot-1.8.2-fno-common.patch 1094 BLAKE2B 50e039c59bd36af356c9eb53d144be622cc36af5be86464c135ff3184ad5f7bc59bfcb9d19287ba56d59e3eab33274cb8dcc220c8fc1429d4c82df0711d3feb5 SHA512 50d4f6c924fb3c5241d424ec5457f80f93a4fa5dc6dcd9f31e0a2d44bc696ea5ad9f6cd447dfae6f3a6b97a9c951977a0b98379ef3b548eba4b0d1732443bf87
 AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
+AUX jpilot-1.8.2-r2-gcc15-fixes.patch 12336 BLAKE2B dcb05f2a67941f939d0864e3a1e1f873c1b79ff4007c2fd27a959f1c757df8da466fb5587e3c8e525e73a07352051f02941a9eb278bc21768627836c539ea5de SHA512 4dab60ae9ad9a306f33d4e6d7d12fb2c7447f2b3c04a9773040db4db73e4679d70b78a55b3f92ca985619edbc18cbfb1d905231c866d148a40beb5799995db6c
 DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
-EBUILD jpilot-1.8.2-r2.ebuild 1091 BLAKE2B 7f0bcb0ca20c0f892964dc6922e4d6129fd8c612383e80e7061cc0ea39798474339f046106765607ea1edf840538ebf6fef7504b21ed4349e9b77dacaf8e43c4 SHA512 31d3dc2502d39c9d20b49093e4d803f17685619fabad7829f894b7361083b0b319f964edeee4ed272db05135c252ad9e97cafddfaabffb9ce1b3897c126ed8d2
+EBUILD jpilot-1.8.2-r2.ebuild 1133 BLAKE2B e5e37b9e40ec55f592d0626d96f7f288018514b1f17b6a5e5a8143b800a31dca561ca8550acb4cf975478ab90137be9f7e6ebb0de62d99da694a61161143fbb7 SHA512 3ee175352111238b7d66dc42acb94cd4070ed53d34470533748b8f6da903e6bb77e789ee703a2ed16fd0090aa53ec4ad021072d78f359d940c62ebe4b0fcd77e
diff --git a/app-pda/jpilot/files/jpilot-1.8.2-r2-gcc15-fixes.patch b/app-pda/jpilot/files/jpilot-1.8.2-r2-gcc15-fixes.patch
new file mode 100644
index 0000000..3d0b33d
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-r2-gcc15-fixes.patch
@@ -0,0 +1,132 @@
+--- jpilot-1.8.2_orig/jpilot.c	2026-04-01 11:12:55.442616025 +0200
++++ jpilot-1.8.2/jpilot.c	2026-04-01 12:42:00.000000000 +0200
+@@ -1103,65 +1103,66 @@
+ {
+ #define ICON(icon) "<StockItem>", icon
+ #define ICON_XPM(icon, size) "<ImageItem>", get_inline_pixbuf_data(icon, size)
++#define CB(func) ((GtkItemFactoryCallback)(func))
+ 
+    GtkItemFactoryEntry menu_items1[]={
+    { _("/_File"),                           NULL,         NULL,           0,                  "<Branch>", NULL },
+    { _("/File/tear"),                       NULL,         NULL,           0,                  "<Tearoff>", NULL },
+-   { _("/File/_Find"),                      "<control>F", cb_search_gui,  0,                  ICON(GTK_STOCK_FIND) },
++   { _("/File/_Find"),                      "<control>F", CB(cb_search_gui),  0,                  ICON(GTK_STOCK_FIND) },
+    { _("/File/sep1"),                       NULL,         NULL,           0,                  "<Separator>", NULL },
+-   { _("/File/_Install"),                   "<control>I", cb_install_gui, 0,                  ICON(GTK_STOCK_OPEN) },
+-   { _("/File/Import"),                     NULL,         cb_import,      0,                  ICON(GTK_STOCK_GO_FORWARD) },
+-   { _("/File/Export"),                     NULL,         cb_export,      0,                  ICON(GTK_STOCK_GO_BACK) },
+-   { _("/File/Preferences"),                "<control>S", cb_prefs_gui,   0,                  ICON(GTK_STOCK_PREFERENCES) },
+-   { _("/File/_Print"),                     "<control>P", cb_print,       0,                  ICON(GTK_STOCK_PRINT) },
++   { _("/File/_Install"),                   "<control>I", CB(cb_install_gui), 0,                  ICON(GTK_STOCK_OPEN) },
++   { _("/File/Import"),                     NULL,         CB(cb_import),      0,                  ICON(GTK_STOCK_GO_FORWARD) },
++   { _("/File/Export"),                     NULL,         CB(cb_export),      0,                  ICON(GTK_STOCK_GO_BACK) },
++   { _("/File/Preferences"),                "<control>S", CB(cb_prefs_gui),   0,                  ICON(GTK_STOCK_PREFERENCES) },
++   { _("/File/_Print"),                     "<control>P", CB(cb_print),       0,                  ICON(GTK_STOCK_PRINT) },
+    { _("/File/sep1"),                       NULL,         NULL,           0,                  "<Separator>", NULL },
+-   { _("/File/Install User"),               NULL,         cb_install_user,0,                  ICON_XPM(user_icon, 16) },
+-   { _("/File/Restore Handheld"),           NULL,         cb_restore,     0,                  ICON(GTK_STOCK_REDO) },
++   { _("/File/Install User"),               NULL,         CB(cb_install_user),0,                  ICON_XPM(user_icon, 16) },
++   { _("/File/Restore Handheld"),           NULL,         CB(cb_restore),     0,                  ICON(GTK_STOCK_REDO) },
+    { _("/File/sep1"),                       NULL,         NULL,           0,                  "<Separator>", NULL },
+-   { _("/File/_Quit"),                      "<control>Q", cb_delete_event,0,                  ICON(GTK_STOCK_QUIT) },
++   { _("/File/_Quit"),                      "<control>Q", CB(cb_delete_event),0,                  ICON(GTK_STOCK_QUIT) },
+    { _("/_View"),                           NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { _("/View/Hide Private Records"),       NULL,         cb_private,     HIDE_PRIVATES,      "<RadioItem>", NULL },
+-   { _("/View/Show Private Records"),       NULL,         cb_private,     SHOW_PRIVATES,      _("/View/Hide Private Records"), NULL },
+-   { _("/View/Mask Private Records"),       NULL,         cb_private,     MASK_PRIVATES,      _("/View/Hide Private Records"), NULL },
++   { _("/View/Hide Private Records"),       NULL,         CB(cb_private),     HIDE_PRIVATES,      "<RadioItem>", NULL },
++   { _("/View/Show Private Records"),       NULL,         CB(cb_private),     SHOW_PRIVATES,      _("/View/Hide Private Records"), NULL },
++   { _("/View/Mask Private Records"),       NULL,         CB(cb_private),     MASK_PRIVATES,      _("/View/Hide Private Records"), NULL },
+    { _("/View/sep1"),                       NULL,         NULL,           0,                  "<Separator>", NULL },
+-   { _("/View/Datebook"),                   "F1",         cb_app_button,  DATEBOOK,           ICON_XPM(date_menu_icon, 16) },
+-   { _("/View/Addresses"),                  "F2",         cb_app_button,  ADDRESS,            ICON_XPM(addr_menu_icon, 16) },
+-   { _("/View/Todos"),                      "F3",         cb_app_button,  TODO,               ICON_XPM(todo_menu_icon, 14) },
+-   { _("/View/Memos"),                      "F4",         cb_app_button,  MEMO,               ICON(GTK_STOCK_JUSTIFY_LEFT) },
++   { _("/View/Datebook"),                   "F1",         CB(cb_app_button),  DATEBOOK,           ICON_XPM(date_menu_icon, 16) },
++   { _("/View/Addresses"),                  "F2",         CB(cb_app_button),  ADDRESS,            ICON_XPM(addr_menu_icon, 16) },
++   { _("/View/Todos"),                      "F3",         CB(cb_app_button),  TODO,               ICON_XPM(todo_menu_icon, 14) },
++   { _("/View/Memos"),                      "F4",         CB(cb_app_button),  MEMO,               ICON(GTK_STOCK_JUSTIFY_LEFT) },
+    { _("/_Plugins"),                        NULL,         NULL,           0,                  "<Branch>", NULL },
+ #ifdef WEBMENU
+    { _("/_Web"),                            NULL,         NULL,           0,                  "<Branch>", NULL },/* web */
+    { _("/Web/Netscape"),                    NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[NETSCAPE_EXISTING].desc,  NULL,         cb_web,         NETSCAPE_EXISTING,  NULL, NULL },
+-   { url_commands[NETSCAPE_NEW_WINDOW].desc,NULL,         cb_web,         NETSCAPE_NEW_WINDOW,NULL, NULL },
+-   { url_commands[NETSCAPE_NEW].desc,       NULL,         cb_web,         NETSCAPE_NEW,       NULL, NULL },
++   { url_commands[NETSCAPE_EXISTING].desc,  NULL,         CB(cb_web),         NETSCAPE_EXISTING,  NULL, NULL },
++   { url_commands[NETSCAPE_NEW_WINDOW].desc,NULL,         CB(cb_web),         NETSCAPE_NEW_WINDOW,NULL, NULL },
++   { url_commands[NETSCAPE_NEW].desc,       NULL,         CB(cb_web),         NETSCAPE_NEW,       NULL, NULL },
+    { _("/Web/Mozilla"),                     NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[MOZILLA_EXISTING].desc,   NULL,         cb_web,         MOZILLA_EXISTING,   NULL, NULL },
+-   { url_commands[MOZILLA_NEW_WINDOW].desc, NULL,         cb_web,         MOZILLA_NEW_WINDOW, NULL, NULL },
+-   { url_commands[MOZILLA_NEW_TAB].desc,    NULL,         cb_web,         MOZILLA_NEW_TAB,    NULL, NULL },
+-   { url_commands[MOZILLA_NEW].desc,        NULL,         cb_web,         MOZILLA_NEW,        NULL, NULL },
++   { url_commands[MOZILLA_EXISTING].desc,   NULL,         CB(cb_web),         MOZILLA_EXISTING,   NULL, NULL },
++   { url_commands[MOZILLA_NEW_WINDOW].desc, NULL,         CB(cb_web),         MOZILLA_NEW_WINDOW, NULL, NULL },
++   { url_commands[MOZILLA_NEW_TAB].desc,    NULL,         CB(cb_web),         MOZILLA_NEW_TAB,    NULL, NULL },
++   { url_commands[MOZILLA_NEW].desc,        NULL,         CB(cb_web),         MOZILLA_NEW,        NULL, NULL },
+    { _("/Web/Galeon"),                      NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[GALEON_EXISTING].desc,    NULL,         cb_web,         GALEON_EXISTING,    NULL, NULL },
+-   { url_commands[GALEON_NEW_WINDOW].desc,  NULL,         cb_web,         GALEON_NEW_WINDOW,  NULL, NULL },
+-   { url_commands[GALEON_NEW_TAB].desc,     NULL,         cb_web,         GALEON_NEW_TAB,     NULL, NULL },
+-   { url_commands[GALEON_NEW].desc,         NULL,         cb_web,         GALEON_NEW,         NULL, NULL },
++   { url_commands[GALEON_EXISTING].desc,    NULL,         CB(cb_web),         GALEON_EXISTING,    NULL, NULL },
++   { url_commands[GALEON_NEW_WINDOW].desc,  NULL,         CB(cb_web),         GALEON_NEW_WINDOW,  NULL, NULL },
++   { url_commands[GALEON_NEW_TAB].desc,     NULL,         CB(cb_web),         GALEON_NEW_TAB,     NULL, NULL },
++   { url_commands[GALEON_NEW].desc,         NULL,         CB(cb_web),         GALEON_NEW,         NULL, NULL },
+    { _("/Web/Opera"),                       NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[OPERA_EXISTING].desc,     NULL,         cb_web,         OPERA_EXISTING,     NULL, NULL },
+-   { url_commands[OPERA_NEW_WINDOW].desc,   NULL,         cb_web,         OPERA_NEW_WINDOW,   NULL, NULL },
+-   { url_commands[OPERA_NEW].desc,          NULL,         cb_web,         OPERA_NEW,          NULL, NULL },
++   { url_commands[OPERA_EXISTING].desc,     NULL,         CB(cb_web),         OPERA_EXISTING,     NULL, NULL },
++   { url_commands[OPERA_NEW_WINDOW].desc,   NULL,         CB(cb_web),         OPERA_NEW_WINDOW,   NULL, NULL },
++   { url_commands[OPERA_NEW].desc,          NULL,         CB(cb_web),         OPERA_NEW,          NULL, NULL },
+    { _("/Web/GnomeUrl"),                    NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[GNOME_URL].desc,          NULL,         cb_web,         GNOME_URL,          NULL, NULL },
++   { url_commands[GNOME_URL].desc,          NULL,         CB(cb_web),         GNOME_URL,          NULL, NULL },
+    { _("/Web/Lynx"),                        NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[LYNX_NEW].desc,           NULL,         cb_web,         LYNX_NEW,           NULL, NULL },
++   { url_commands[LYNX_NEW].desc,           NULL,         CB(cb_web),         LYNX_NEW,           NULL, NULL },
+    { _("/Web/Links"),                       NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[LINKS_NEW].desc,          NULL,         cb_web,         LINKS_NEW,          NULL, NULL },
++   { url_commands[LINKS_NEW].desc,          NULL,         CB(cb_web),         LINKS_NEW,          NULL, NULL },
+    { _("/Web/W3M"),                         NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[W3M_NEW].desc,            NULL,         cb_web,         W3M_NEW,            NULL, NULL },
++   { url_commands[W3M_NEW].desc,            NULL,         CB(cb_web),         W3M_NEW,            NULL, NULL },
+    { _("/Web/Konqueror"),                   NULL,         NULL,           0,                  "<Branch>", NULL },
+-   { url_commands[KONQUEROR_NEW].desc,      NULL,         cb_web,         KONQUEROR_NEW,      NULL, NULL },
++   { url_commands[KONQUEROR_NEW].desc,      NULL,         CB(cb_web),         KONQUEROR_NEW,      NULL, NULL },
+ #endif
+    { _("/_Help"),                           NULL,         NULL,           0,                  "<LastBranch>", NULL },
+-   { _("/Help/About J-Pilot"),              NULL,         cb_about,       0,                  ICON(GTK_STOCK_DIALOG_INFO) },
++   { _("/Help/About J-Pilot"),              NULL,         CB(cb_about),       0,                  ICON(GTK_STOCK_DIALOG_INFO) },
+    { "END",                                 NULL,         NULL,           0,                  NULL, NULL }
+    };
+ 
+@@ -1187,7 +1188,7 @@
+    /* Irix doesn't like non-constant expressions in a static initializer */
+    /* So we have to do this to keep the compiler happy */
+    for (i=0; i<sizeof(menu_items1)/sizeof(menu_items1[0]); i++) {
+-      if (menu_items1[i].callback==cb_prefs_gui) {
++      if (menu_items1[i].callback==CB(cb_prefs_gui)) {
+          menu_items1[i].callback_action = GPOINTER_TO_INT(my_window);
+          break;
+       }
+@@ -1285,7 +1286,7 @@
+          } else {
+             menu_items2[i2].accelerator=NULL;
+          }
+-         menu_items2[i2].callback=cb_plugin_gui;
++         menu_items2[i2].callback=CB(cb_plugin_gui);
+          menu_items2[i2].callback_action=p->number;
+          menu_items2[i2].item_type=0;
+          str_i++;
+@@ -1316,7 +1317,7 @@
+          }
+          menu_items2[i2].path=plugin_help_strings[str_i];
+          menu_items2[i2].accelerator=NULL;
+-         menu_items2[i2].callback=cb_plugin_help;
++         menu_items2[i2].callback=CB(cb_plugin_help);
+          menu_items2[i2].callback_action=p->number;
+          menu_items2[i2].item_type=0;
+          str_i++;
diff --git a/app-pda/jpilot/jpilot-1.8.2-r2.ebuild b/app-pda/jpilot/jpilot-1.8.2-r2.ebuild
index 1d3a44b..17800e1 100644
--- a/app-pda/jpilot/jpilot-1.8.2-r2.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-paths.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-fix-configure-clang16.patch
+	"${FILESDIR}"/${P}-r2-gcc15-fixes.patch 
 )
 
 src_prepare() {