diff options
Diffstat (limited to 'meta-oe/recipes-support/pidgin')
-rw-r--r-- | meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/icyque_git.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch | 177 | ||||
-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) | 7 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb | 1 |
8 files changed, 3 insertions, 187 deletions
diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 9337ae5966..c547b0532e 100644 --- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb | |||
@@ -13,7 +13,6 @@ SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" | |||
13 | # Upstream repo does not tag | 13 | # Upstream repo does not tag |
14 | UPSTREAM_CHECK_COMMITS = "1" | 14 | UPSTREAM_CHECK_COMMITS = "1" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | ||
17 | 16 | ||
18 | do_compile() { | 17 | do_compile() { |
19 | oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}"; | 18 | oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}"; |
diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb index b2f9944c16..e8b4a3c2c3 100644 --- a/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb | |||
@@ -15,7 +15,6 @@ SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" | |||
15 | # Upstream repo does not tag | 15 | # Upstream repo does not tag |
16 | UPSTREAM_CHECK_COMMITS = "1" | 16 | UPSTREAM_CHECK_COMMITS = "1" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | ||
19 | 18 | ||
20 | do_compile() { | 19 | do_compile() { |
21 | oe_runmake; | 20 | oe_runmake; |
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index 115a6968eb..b4f462de83 100644 --- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | |||
@@ -10,7 +10,6 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ | |||
10 | file://0001-tests-Include-missing-sys-socket.h-header.patch \ | 10 | file://0001-tests-Include-missing-sys-socket.h-header.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" | ||
14 | SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" | 13 | SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" |
15 | 14 | ||
16 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 326c5bfc57..f4c9020dea 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb | |||
@@ -7,7 +7,6 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
7 | 7 | ||
8 | SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ | 8 | SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ |
9 | " | 9 | " |
10 | SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626" | ||
11 | SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" | 10 | SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" |
12 | 11 | ||
13 | FILES:${PN} = "${libdir}/pidgin/*" | 12 | FILES:${PN} = "${libdir}/pidgin/*" |
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index e96e118611..5fd927bc64 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb | |||
@@ -14,7 +14,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ | |||
14 | file://0001-Migrate-to-use-g_memdup2.patch \ | 14 | file://0001-Migrate-to-use-g_memdup2.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" | ||
18 | SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" | 17 | SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" |
19 | 18 | ||
20 | PACKAGECONFIG ??= "nss krb5" | 19 | PACKAGECONFIG ??= "nss krb5" |
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 | ||
8 | Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14 | ||
9 | |||
10 | The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks | ||
11 | (aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types | ||
12 | (aka void (*)(void *, guint, GtkWidget *)). | ||
13 | |||
14 | This 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 | |||
19 | But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to | ||
20 | GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]). | ||
21 | |||
22 | An exemple of this error: | ||
23 | pidgin/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 | | ^~~~~~~~~~~~~~~~ | ||
26 | pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback') | ||
27 | |||
28 | To fix this, explicitely cast to GtkItemFactoryCallback where needed. | ||
29 | |||
30 | Testing Done: | ||
31 | Built 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 | |||
35 | Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492] | ||
36 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
37 | |||
38 | diff --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 }, | ||
72 | diff --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 ac62863f5c..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 | |||
10 | SRC_URI = "\ | 10 | SRC_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 | ||
16 | SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8" | 15 | SRC_URI[sha256sum] = "0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356" |
17 | 16 | ||
18 | CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 17 | CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
19 | CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 18 | CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
@@ -60,8 +59,8 @@ do_configure:append() { | |||
60 | sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h | 59 | sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h |
61 | } | 60 | } |
62 | 61 | ||
63 | OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" | 62 | OE_LT_RPATH_ALLOW = ":${libdir}/purple-2:" |
64 | OE_LT_RPATH_ALLOW[export]="1" | 63 | OE_LT_RPATH_ALLOW[export] = "1" |
65 | 64 | ||
66 | PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" | 65 | PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" |
67 | 66 | ||
diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 1981f1ee9c..421b1725ba 100644 --- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb | |||
@@ -10,7 +10,6 @@ inherit pkgconfig | |||
10 | SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" | 10 | SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" |
11 | SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" | 11 | SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | ||
14 | PV = "1.7+git" | 13 | PV = "1.7+git" |
15 | 14 | ||
16 | do_compile() { | 15 | do_compile() { |