summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2025-03-25 13:26:07 +0100
committerKhem Raj <raj.khem@gmail.com>2025-03-25 18:30:53 -0700
commit04dafcf6637e0a11ab64d5ff4de68386c2beae12 (patch)
treecf6325045b893929abb2c82f3b810ecb372e8b7e
parent7211d1fec1d44edb5e4123c8c617c8a08c6f9e3b (diff)
downloadmeta-openembedded-04dafcf6637e0a11ab64d5ff4de68386c2beae12.tar.gz
pidgin: upgrade to 2.14.14 to fix build with gcc-15
* http://errors.yoctoproject.org/Errors/Details/848756/ * fixed in: https://keep.imfreedom.org/pidgin/pidgin/rev/10ae9c0f0cbf * drop backported patch Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch177
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb (renamed from meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb)3
2 files changed, 1 insertions, 179 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch
deleted file mode 100644
index 4e088ffc11..0000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch
+++ /dev/null
@@ -1,177 +0,0 @@
1# HG changeset patch
2# User Yoann Congal <yoann.congal@smile.fr>
3# Date 1720270125 -7200
4# Sat Jul 06 14:48:45 2024 +0200
5# Branch gcc-14-incompatible-pointer-types
6# Node ID 06721b86a5a8e6fb8163d9411a7778d2a0274b26
7# Parent 21a56db5f9987efb88d76ab26ee1eadf316f3d7d
8Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14
9
10The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks
11(aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types
12(aka void (*)(void *, guint, GtkWidget *)).
13
14This is coherent with the gtk-2 documentation:
15> gtk_item_factory_create_items(..., GtkItemFactoryEntry *entries,...)
16> entries : an array of GtkItemFactoryEntrys whose callback members must by of
17> type GtkItemFactoryCallback1
18
19But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to
20GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]).
21
22An exemple of this error:
23pidgin/gtkconv.c:3096:66: error: initialization of 'void (*)(void)' from incompatible pointer type 'void (*)(void *, guint, GtkWidget *)' {aka 'void (*)(void *, unsigned int, struct _GtkWidget *)'} [-Wincompatible-pointer-types]
24 3096 | { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
25 | ^~~~~~~~~~~~~~~~
26pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback')
27
28To fix this, explicitely cast to GtkItemFactoryCallback where needed.
29
30Testing Done:
31Built with gcc-14, started and clicked on some affected menus
32
33[0]: https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types
34
35Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492]
36Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
37
38diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
39--- a/pidgin/gtkblist.c
40+++ b/pidgin/gtkblist.c
41@@ -3624,11 +3624,11 @@ static GtkItemFactoryEntry blist_menu[]
42 { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
43 { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
44 { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL},
45- { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
46- { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
47- { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
48- { N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
49- { N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL },
50+ { N_("/Buddies/Show/_Offline Buddies"), NULL, (GtkItemFactoryCallback)pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
51+ { N_("/Buddies/Show/_Empty Groups"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
52+ { N_("/Buddies/Show/Buddy _Details"), NULL, (GtkItemFactoryCallback)pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
53+ { N_("/Buddies/Show/Idle _Times"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
54+ { N_("/Buddies/Show/_Protocol Icons"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL },
55 { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL },
56 { "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL },
57 { N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
58@@ -3651,11 +3651,11 @@ static GtkItemFactoryEntry blist_menu[]
59 { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
60 { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL },
61 { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
62- { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
63+ { N_("/Tools/_File Transfers"), "<CTL>T", (GtkItemFactoryCallback)pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
64 { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
65 { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL },
66 { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
67- { N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
68+ { N_("/Tools/Mute _Sounds"), NULL, (GtkItemFactoryCallback)pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
69 /* Help */
70 { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
71 { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
72diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
73--- a/pidgin/gtkconv.c
74+++ b/pidgin/gtkconv.c
75@@ -3093,76 +3093,76 @@ static GtkItemFactoryEntry menu_items[]
76 /* Conversation menu */
77 { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL },
78
79- { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
80+ { N_("/Conversation/New Instant _Message..."), "<CTL>M", (GtkItemFactoryCallback)menu_new_conv_cb,
81 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
82- { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb,
83+ { N_("/Conversation/Join a _Chat..."), NULL, (GtkItemFactoryCallback)menu_join_chat_cb,
84 0, "<StockItem>", PIDGIN_STOCK_CHAT },
85
86 { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },
87
88- { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0,
89+ { N_("/Conversation/_Find..."), NULL, (GtkItemFactoryCallback)menu_find_cb, 0,
90 "<StockItem>", GTK_STOCK_FIND },
91- { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<Item>", NULL },
92- { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0,
93+ { N_("/Conversation/View _Log"), NULL, (GtkItemFactoryCallback)menu_view_log_cb, 0, "<Item>", NULL },
94+ { N_("/Conversation/_Save As..."), NULL, (GtkItemFactoryCallback)menu_save_as_cb, 0,
95 "<StockItem>", GTK_STOCK_SAVE_AS },
96- { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR },
97+ { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", (GtkItemFactoryCallback)menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR },
98
99 { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
100
101 #ifdef USE_VV
102 { N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL },
103
104- { N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0,
105+ { N_("/Conversation/Media/_Audio Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 0,
106 "<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL },
107- { N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1,
108+ { N_("/Conversation/Media/_Video Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 1,
109 "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
110- { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2,
111+ { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 2,
112 "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
113 #endif
114
115- { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
116- { N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION },
117- { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
118+ { N_("/Conversation/Se_nd File..."), NULL, (GtkItemFactoryCallback)menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
119+ { N_("/Conversation/Get _Attention"), NULL, (GtkItemFactoryCallback)menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION },
120+ { N_("/Conversation/Add Buddy _Pounce..."), NULL, (GtkItemFactoryCallback)menu_add_pounce_cb,
121 0, "<Item>", NULL },
122- { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
123+ { N_("/Conversation/_Get Info"), "<CTL>O", (GtkItemFactoryCallback)menu_get_info_cb, 0,
124 "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
125- { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0,
126+ { N_("/Conversation/In_vite..."), NULL, (GtkItemFactoryCallback)menu_invite_cb, 0,
127 "<Item>", NULL },
128 { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL },
129
130 { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL },
131
132- { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0,
133+ { N_("/Conversation/Al_ias..."), NULL, (GtkItemFactoryCallback)menu_alias_cb, 0,
134 "<Item>", NULL },
135- { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0,
136+ { N_("/Conversation/_Block..."), NULL, (GtkItemFactoryCallback)menu_block_cb, 0,
137 "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK },
138- { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0,
139+ { N_("/Conversation/_Unblock..."), NULL, (GtkItemFactoryCallback)menu_unblock_cb, 0,
140 "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK },
141- { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0,
142+ { N_("/Conversation/_Add..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0,
143 "<StockItem>", GTK_STOCK_ADD },
144- { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0,
145+ { N_("/Conversation/_Remove..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0,
146 "<StockItem>", GTK_STOCK_REMOVE },
147
148 { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL },
149
150- { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0,
151+ { N_("/Conversation/Insert Lin_k..."), NULL, (GtkItemFactoryCallback)menu_insert_link_cb, 0,
152 "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_LINK },
153- { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0,
154+ { N_("/Conversation/Insert Imag_e..."), NULL, (GtkItemFactoryCallback)menu_insert_image_cb, 0,
155 "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE },
156
157 { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL },
158
159
160- { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0,
161+ { N_("/Conversation/_Close"), NULL, (GtkItemFactoryCallback)menu_close_conv_cb, 0,
162 "<StockItem>", GTK_STOCK_CLOSE },
163
164 /* Options */
165 { N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL },
166- { N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL },
167- { N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL },
168+ { N_("/Options/Enable _Logging"), NULL, (GtkItemFactoryCallback)menu_logging_cb, 0, "<CheckItem>", NULL },
169+ { N_("/Options/Enable _Sounds"), NULL, (GtkItemFactoryCallback)menu_sounds_cb, 0, "<CheckItem>", NULL },
170 { "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL },
171- { N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL },
172- { N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL },
173+ { N_("/Options/Show Formatting _Toolbars"), NULL, (GtkItemFactoryCallback)menu_toolbar_cb, 0, "<CheckItem>", NULL },
174+ { N_("/Options/Show Ti_mestamps"), NULL, (GtkItemFactoryCallback)menu_timestamps_cb, 0, "<CheckItem>", NULL },
175 };
176
177 static const int menu_item_count =
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
index ba7bbc52ff..13a22f6e59 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
@@ -10,10 +10,9 @@ inherit autotools gettext pkgconfig gconf perlnative python3native
10SRC_URI = "\ 10SRC_URI = "\
11 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ 11 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
12 file://sanitize-configure.ac.patch \ 12 file://sanitize-configure.ac.patch \
13 file://fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch \
14" 13"
15 14
16SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8" 15SRC_URI[sha256sum] = "0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356"
17 16
18CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 17CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
19CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 18CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-12 17:41:06 +0000