aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/pidgin
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/pidgin')
-rw-r--r--meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb5
-rw-r--r--meta-oe/recipes-support/pidgin/icyque_git.bb7
-rw-r--r--meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb5
-rw-r--r--meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch31
-rw-r--r--meta-oe/recipes-support/pidgin/libotr_4.1.1.bb3
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb2
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb8
-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/purple-OE-branding-25.patch24
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch2
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb (renamed from meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb)34
-rw-r--r--meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb4
12 files changed, 257 insertions, 45 deletions
diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
index 6c7802e18a..9337ae5966 100644
--- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
+++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
@@ -1,6 +1,6 @@
SUMMARY = "Protocol plugin for New Yahoo (2016) for Adium, Pidgin, Miranda and Telepathy IM Framework"
SECTION = "webos/services"
-LICENSE = "GPLv3.0"
+LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
DEPENDS = "pidgin json-glib glib-2.0"
@@ -10,6 +10,9 @@ inherit pkgconfig
SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https"
SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
S = "${WORKDIR}/git"
do_compile() {
diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb
index 2f415de3d9..b2f9944c16 100644
--- a/meta-oe/recipes-support/pidgin/icyque_git.bb
+++ b/meta-oe/recipes-support/pidgin/icyque_git.bb
@@ -1,17 +1,20 @@
SUMMARY = "WIM Protocol plugin for ICQ for Adium, Pidgin, Miranda and Telepathy IM Framework"
SECTION = "webos/services"
-LICENSE = "GPLv3.0"
+LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
DEPENDS = "pidgin json-glib"
-PV = "0.1+gitr${SRCPV}"
+PV = "0.1+git"
inherit pkgconfig
SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https"
SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
S = "${WORKDIR}/git"
do_compile() {
diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
index 2450d31966..f2fe4a7a93 100644
--- a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
+++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
@@ -1,7 +1,7 @@
SUMMARY = "GNT: The GLib Ncurses Toolkit"
SECTION = "libs"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e"
DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native"
@@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \
"
SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false"
FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so"
diff --git a/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch
new file mode 100644
index 0000000000..5b2e14b7b9
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch
@@ -0,0 +1,31 @@
+From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Apr 2022 20:15:03 -0700
+Subject: [PATCH] tests: Include missing sys/socket.h header
+
+Helps define
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX'
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM'
+| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX'
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/regression/client/client.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c
+index e72b661..e0b3453 100644
+--- a/tests/regression/client/client.c
++++ b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <syscall.h>
+ #include <sys/epoll.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ #include <unistd.h>
+--
+2.35.1
+
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 c701244219..115a6968eb 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
@@ -1,12 +1,13 @@
SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging"
HOMEPAGE = "http://www.cypherpunks.ca/otr/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24"
DEPENDS = "libgcrypt libgpg-error"
SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
file://fix_qa-issue_include.patch \
file://sepbuild.patch \
+ file://0001-tests-Include-missing-sys-socket.h-header.patch \
"
SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81"
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 80fb23e6a9..326c5bfc57 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
@@ -1,6 +1,6 @@
SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging"
HOMEPAGE = "https://otr.cypherpunks.ca/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24"
DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native"
REQUIRED_DISTRO_FEATURES = "x11"
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 3752c0501c..e96e118611 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
@@ -1,6 +1,6 @@
SUMMARY = "Protocol plugin for Office 365/Lync/OCS for Adium, Pidgin, Miranda and Telepathy IM Framework"
SECTION = "webos/services"
-LICENSE = "GPLv2.0"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "pidgin gmime intltool-native glib-2.0-native"
@@ -25,6 +25,8 @@ PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5"
PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib"
#PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5"
PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind"
+# disable Werror by default, useful for dev mode
+PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no,"
FILES:${PN}-dev += " \
${libdir}/purple-2/*.la \
@@ -35,3 +37,7 @@ FILES:${PN} += " \
${datadir}/appdata \
${datadir}/metainfo \
"
+
+# http://errors.yoctoproject.org/Errors/Details/766947/
+# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
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
new file mode 100644
index 0000000000..4e088ffc11
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch
@@ -0,0 +1,177 @@
+# HG changeset patch
+# User Yoann Congal <yoann.congal@smile.fr>
+# Date 1720270125 -7200
+# Sat Jul 06 14:48:45 2024 +0200
+# Branch gcc-14-incompatible-pointer-types
+# Node ID 06721b86a5a8e6fb8163d9411a7778d2a0274b26
+# Parent 21a56db5f9987efb88d76ab26ee1eadf316f3d7d
+Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14
+
+The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks
+(aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types
+(aka void (*)(void *, guint, GtkWidget *)).
+
+This is coherent with the gtk-2 documentation:
+> gtk_item_factory_create_items(..., GtkItemFactoryEntry *entries,...)
+> entries : an array of GtkItemFactoryEntrys whose callback members must by of
+> type GtkItemFactoryCallback1
+
+But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to
+GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]).
+
+An exemple of this error:
+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]
+ 3096 | { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
+ | ^~~~~~~~~~~~~~~~
+pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback')
+
+To fix this, explicitely cast to GtkItemFactoryCallback where needed.
+
+Testing Done:
+Built with gcc-14, started and clicked on some affected menus
+
+[0]: https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types
+
+Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+
+diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
+--- a/pidgin/gtkblist.c
++++ b/pidgin/gtkblist.c
+@@ -3624,11 +3624,11 @@ static GtkItemFactoryEntry blist_menu[]
+ { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
+ { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
+ { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL},
+- { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
+- { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
+- { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
+- { N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
+- { N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL },
++ { N_("/Buddies/Show/_Offline Buddies"), NULL, (GtkItemFactoryCallback)pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
++ { N_("/Buddies/Show/_Empty Groups"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
++ { N_("/Buddies/Show/Buddy _Details"), NULL, (GtkItemFactoryCallback)pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
++ { N_("/Buddies/Show/Idle _Times"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
++ { N_("/Buddies/Show/_Protocol Icons"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL },
+ { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL },
+ { "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL },
+ { N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
+@@ -3651,11 +3651,11 @@ static GtkItemFactoryEntry blist_menu[]
+ { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
+ { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL },
+ { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
+- { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
++ { N_("/Tools/_File Transfers"), "<CTL>T", (GtkItemFactoryCallback)pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
+ { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
+ { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL },
+ { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
+- { N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
++ { N_("/Tools/Mute _Sounds"), NULL, (GtkItemFactoryCallback)pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
+ /* Help */
+ { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
+ { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
+diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
+--- a/pidgin/gtkconv.c
++++ b/pidgin/gtkconv.c
+@@ -3093,76 +3093,76 @@ static GtkItemFactoryEntry menu_items[]
+ /* Conversation menu */
+ { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL },
+
+- { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb,
++ { N_("/Conversation/New Instant _Message..."), "<CTL>M", (GtkItemFactoryCallback)menu_new_conv_cb,
+ 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
+- { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb,
++ { N_("/Conversation/Join a _Chat..."), NULL, (GtkItemFactoryCallback)menu_join_chat_cb,
+ 0, "<StockItem>", PIDGIN_STOCK_CHAT },
+
+ { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL },
+
+- { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0,
++ { N_("/Conversation/_Find..."), NULL, (GtkItemFactoryCallback)menu_find_cb, 0,
+ "<StockItem>", GTK_STOCK_FIND },
+- { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<Item>", NULL },
+- { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0,
++ { N_("/Conversation/View _Log"), NULL, (GtkItemFactoryCallback)menu_view_log_cb, 0, "<Item>", NULL },
++ { N_("/Conversation/_Save As..."), NULL, (GtkItemFactoryCallback)menu_save_as_cb, 0,
+ "<StockItem>", GTK_STOCK_SAVE_AS },
+- { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR },
++ { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", (GtkItemFactoryCallback)menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR },
+
+ { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
+
+ #ifdef USE_VV
+ { N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL },
+
+- { N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0,
++ { N_("/Conversation/Media/_Audio Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL },
+- { N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1,
++ { N_("/Conversation/Media/_Video Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 1,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
+- { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2,
++ { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 2,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL },
+ #endif
+
+- { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
+- { N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION },
+- { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
++ { N_("/Conversation/Se_nd File..."), NULL, (GtkItemFactoryCallback)menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
++ { N_("/Conversation/Get _Attention"), NULL, (GtkItemFactoryCallback)menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION },
++ { N_("/Conversation/Add Buddy _Pounce..."), NULL, (GtkItemFactoryCallback)menu_add_pounce_cb,
+ 0, "<Item>", NULL },
+- { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
++ { N_("/Conversation/_Get Info"), "<CTL>O", (GtkItemFactoryCallback)menu_get_info_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
+- { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0,
++ { N_("/Conversation/In_vite..."), NULL, (GtkItemFactoryCallback)menu_invite_cb, 0,
+ "<Item>", NULL },
+ { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL },
+
+ { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL },
+
+- { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0,
++ { N_("/Conversation/Al_ias..."), NULL, (GtkItemFactoryCallback)menu_alias_cb, 0,
+ "<Item>", NULL },
+- { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0,
++ { N_("/Conversation/_Block..."), NULL, (GtkItemFactoryCallback)menu_block_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK },
+- { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0,
++ { N_("/Conversation/_Unblock..."), NULL, (GtkItemFactoryCallback)menu_unblock_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK },
+- { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0,
++ { N_("/Conversation/_Add..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0,
+ "<StockItem>", GTK_STOCK_ADD },
+- { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0,
++ { N_("/Conversation/_Remove..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0,
+ "<StockItem>", GTK_STOCK_REMOVE },
+
+ { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL },
+
+- { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0,
++ { N_("/Conversation/Insert Lin_k..."), NULL, (GtkItemFactoryCallback)menu_insert_link_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_LINK },
+- { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0,
++ { N_("/Conversation/Insert Imag_e..."), NULL, (GtkItemFactoryCallback)menu_insert_image_cb, 0,
+ "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE },
+
+ { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL },
+
+
+- { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0,
++ { N_("/Conversation/_Close"), NULL, (GtkItemFactoryCallback)menu_close_conv_cb, 0,
+ "<StockItem>", GTK_STOCK_CLOSE },
+
+ /* Options */
+ { N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL },
+- { N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL },
+- { N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL },
++ { N_("/Options/Enable _Logging"), NULL, (GtkItemFactoryCallback)menu_logging_cb, 0, "<CheckItem>", NULL },
++ { N_("/Options/Enable _Sounds"), NULL, (GtkItemFactoryCallback)menu_sounds_cb, 0, "<CheckItem>", NULL },
+ { "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL },
+- { N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL },
+- { N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL },
++ { N_("/Options/Show Formatting _Toolbars"), NULL, (GtkItemFactoryCallback)menu_toolbar_cb, 0, "<CheckItem>", NULL },
++ { N_("/Options/Show Ti_mestamps"), NULL, (GtkItemFactoryCallback)menu_timestamps_cb, 0, "<CheckItem>", NULL },
+ };
+
+ static const int menu_item_count =
diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
deleted file mode 100644
index 0a1baa9183..0000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001
-From: Herrie <github.com@herrie.org>
-Date: Mon, 24 Jul 2017 21:30:16 +0200
-
----
- libpurple/protocols/irc/irc.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
-index 596ddaf..b70f3a9 100644
---- a/libpurple/protocols/irc/irc.h
-+++ b/libpurple/protocols/irc/irc.h
-@@ -40,9 +40,9 @@
-
- #define IRC_DEFAULT_CHARSET "UTF-8"
- #define IRC_DEFAULT_AUTODETECT FALSE
--#define IRC_DEFAULT_ALIAS "purple"
-+#define IRC_DEFAULT_ALIAS "OE-user"
-
--#define IRC_DEFAULT_QUIT "Leaving."
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
-
- #define IRC_BUFSIZE_INCREMENT 1024
- #define IRC_MAX_BUFSIZE 16384
diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
index 84dbcdc276..cf6207423d 100644
--- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
+++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
@@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org>
Date: Mon, 24 Jul 2017 21:30:16 +0200
---
+Upstream-Status: Pending
+
configure.ac | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb
index b2e6d9ac10..ac62863f5c 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb
@@ -1,7 +1,7 @@
SUMMARY = "multi-protocol instant messaging client"
SECTION = "x11/network"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native"
@@ -10,15 +10,17 @@ inherit autotools gettext pkgconfig gconf perlnative python3native
SRC_URI = "\
${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch \
- file://purple-OE-branding-25.patch \
+ file://fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch \
"
-SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603"
+SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8"
+
+CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
+CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
"
-PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
# --disable-gstreamer compile without GStreamer audio support
# --disable-gstreamer-video
# compile without GStreamer 1.0 Video Overlay support
@@ -26,8 +28,7 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
# compile without GStreamer 0.10 interface support
# --with-gstreamer=<version>
# compile with GStreamer 0.10 or 1.0 interface
-PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer"
-PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer"
+PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0"
PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn"
PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+"
PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11"
@@ -48,8 +49,17 @@ EXTRA_OECONF = " \
--disable-meanwhile \
--disable-nm \
--disable-screensaver \
+ --disable-farstream \
+ --disable-vv \
"
+# CONFIG_ARGS is used to display build info. Replace full paths by reproducible
+# variables ($S, $WORKDIR)
+do_configure:append() {
+ sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h
+ sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h
+}
+
OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
OE_LT_RPATH_ALLOW[export]="1"
@@ -70,7 +80,7 @@ FILES:finch = "${bindir}/finch"
FILES:finch-dev = "${libdir}/finch/*.la"
FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
- ${datadir}/applications"
+ ${datadir}/applications ${datadir}/metainfo"
RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp"
FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata"
@@ -83,27 +93,27 @@ python populate_packages:prepend () {
purple = d.expand('${libdir}/purple-2')
finch = d.expand('${libdir}/finch')
- do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$',
+ do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$',
output_pattern='pidgin-plugin-%s',
description='Pidgin plugin %s',
prepend=True, extra_depends='')
- do_split_packages(d, purple, '^lib(.*)\.so$',
+ do_split_packages(d, purple, r'^lib(.*)\.so$',
output_pattern='libpurple-protocol-%s',
description='Libpurple protocol plugin for %s',
prepend=True, extra_depends='')
- do_split_packages(d, purple, '^(ssl-.*)\.so$',
+ do_split_packages(d, purple, r'^(ssl-.*)\.so$',
output_pattern='libpurple-plugin-%s',
description='libpurple plugin %s',
prepend=True, extra_depends='libpurple-plugin-ssl')
- do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
+ do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$',
output_pattern='libpurple-plugin-%s',
description='libpurple plugin %s',
prepend=True, extra_depends='')
- do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$',
+ do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$',
output_pattern='finch-plugin-%s',
description='Finch plugin %s',
prepend=True, extra_depends='')
diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
index a29a445c90..1981f1ee9c 100644
--- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
+++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
@@ -1,6 +1,6 @@
SUMMARY = "Skype protocol plug-in for libpurple"
SECTION = "webos/services"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://skypeweb/gpl3.txt;md5=d90260d32cef39f3c8d6c0f05d3adb8e"
DEPENDS = "pidgin json-glib glib-2.0 zlib"
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https"
SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6"
S = "${WORKDIR}/git"
-PV = "1.7+git${SRCPV}"
+PV = "1.7+git"
do_compile() {
oe_runmake -C skypeweb;
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-09-20 16:55:34 +0000