diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/pidgin')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch | 192 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch | 229 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch | 49 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb (renamed from meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb) | 6 |
5 files changed, 195 insertions, 282 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch new file mode 100644 index 0000000000..ceb48d21fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch @@ -0,0 +1,192 @@ +From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 5 Apr 2021 11:36:50 -0700 +Subject: [PATCH] Migrate to use g_memdup2 + +g_memdup has been deprecated for long and latest glib-2.0 2.68+ has +turned it int an error to use old function. + +The fall-back to g_memdup isn't needed because pidgin provides g_memdup2 +in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h +based on glib-2.0 version: + /* Backport the static inline version of g_memdup2 if we don't have g_memdup2. + * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html + * for more information. + */ + #if !GLIB_CHECK_VERSION(2, 67, 3) + static inline gpointer + g_memdup2(gconstpointer mem, gsize byte_size) { + gpointer new_mem = NULL; + + if(mem && byte_size != 0) { + new_mem = g_malloc (byte_size); + memcpy (new_mem, mem, byte_size); + } + + return new_mem; + } + #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-common.h | 3 +++ + src/core/sip-sec-gssapi.c | 4 ++-- + src/core/sip-sec-ntlm.c | 12 ++++++------ + src/core/sip-sec-tls-dsk.c | 4 ++-- + src/core/sipe-media.c | 2 +- + src/core/sipe-tls-tester.c | 2 +- + src/core/sipe-tls.c | 4 ++-- + src/telepathy/telepathy-protocol.c | 2 +- + 8 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h +index c964f15..cab81e0 100644 +--- a/src/api/sipe-common.h ++++ b/src/api/sipe-common.h +@@ -51,3 +51,6 @@ + #ifdef _MSC_VER + typedef long ssize_t; + #endif ++ ++// for g_memdup2 ++#include <libpurple/glibcompat.h> +diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c +index 873080f..4c63868 100644 +--- a/src/core/sip-sec-gssapi.c ++++ b/src/core/sip-sec-gssapi.c +@@ -602,7 +602,7 @@ sip_sec_init_sec_context__gssapi(SipSecContext context, + + out_buff->length = output_token.length; + if (out_buff->length) +- out_buff->value = g_memdup(output_token.value, output_token.length); ++ out_buff->value = g_memdup2(output_token.value, output_token.length); + else + /* Special case: empty token */ + out_buff->value = (guint8 *) g_strdup(""); +@@ -653,7 +653,7 @@ sip_sec_make_signature__gssapi(SipSecContext context, + return FALSE; + } else { + signature->length = output_token.length; +- signature->value = g_memdup(output_token.value, ++ signature->value = g_memdup2(output_token.value, + output_token.length); + gss_release_buffer(&minor, &output_token); + return TRUE; +diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c +index 2e2354f..1fa4daa 100644 +--- a/src/core/sip-sec-ntlm.c ++++ b/src/core/sip-sec-ntlm.c +@@ -951,7 +951,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + + /* server challenge (nonce) */ + if (server_challenge) { +- *server_challenge = g_memdup(cmsg->nonce, 8); ++ *server_challenge = g_memdup2(cmsg->nonce, 8); + } + + /* flags */ +@@ -984,7 +984,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + *target_info_len = len; + } + if (target_info) { +- *target_info = g_memdup(content, len); ++ *target_info = g_memdup2(content, len); + } + } + } +@@ -1117,13 +1117,13 @@ sip_sec_ntlm_gen_authenticate(guchar **client_sign_key, + Set ServerSigningKey to SIGNKEY(ExportedSessionKey, "Server") + */ + SIGNKEY(exported_session_key, TRUE, key); +- *client_sign_key = g_memdup(key, 16); ++ *client_sign_key = g_memdup2(key, 16); + SIGNKEY(exported_session_key, FALSE, key); +- *server_sign_key = g_memdup(key, 16); ++ *server_sign_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, TRUE, key); +- *client_seal_key = g_memdup(key, 16); ++ *client_seal_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, FALSE, key); +- *server_seal_key = g_memdup(key, 16); ++ *server_seal_key = g_memdup2(key, 16); + } + + /* @TODO: */ +diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c +index 70433ea..2d3f2db 100644 +--- a/src/core/sip-sec-tls-dsk.c ++++ b/src/core/sip-sec-tls-dsk.c +@@ -88,9 +88,9 @@ sip_sec_init_sec_context__tls_dsk(SipSecContext context, + /* copy key pair */ + ctx->algorithm = state->algorithm; + ctx->key_length = state->key_length; +- ctx->client_key = g_memdup(state->client_key, ++ ctx->client_key = g_memdup2(state->client_key, + state->key_length); +- ctx->server_key = g_memdup(state->server_key, ++ ctx->server_key = g_memdup2(state->server_key, + state->key_length); + + /* extract certicate expiration time */ +diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c +index e9c4b8a..936e31c 100644 +--- a/src/core/sipe-media.c ++++ b/src/core/sipe-media.c +@@ -578,7 +578,7 @@ media_stream_to_sdpmedia(struct sipe_media_call_private *call_private, + // Set our key if encryption is enabled. + if (stream_private->encryption_key && + encryption_policy != SIPE_ENCRYPTION_POLICY_REJECTED) { +- sdpmedia->encryption_key = g_memdup(stream_private->encryption_key, ++ sdpmedia->encryption_key = g_memdup2(stream_private->encryption_key, + SIPE_SRTP_KEY_LEN); + sdpmedia->encryption_key_id = stream_private->encryption_key_id; + } +diff --git a/src/core/sipe-tls-tester.c b/src/core/sipe-tls-tester.c +index e80d715..5fbb5f8 100644 +--- a/src/core/sipe-tls-tester.c ++++ b/src/core/sipe-tls-tester.c +@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd, + printf("received %d bytes from server\n", result); + record = g_new0(struct record, 1); + record->length = result; +- record->msg = g_memdup(buffer, result); ++ record->msg = g_memdup2(buffer, result); + length += result; + fragments = g_slist_append(fragments, record); + } +diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c +index b0235d5..020aedb 100644 +--- a/src/core/sipe-tls.c ++++ b/src/core/sipe-tls.c +@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_PARAMETER struct tls_internal_state *sta + gsize half = (secret_length + 1) / 2; + gsize newseed_length = label_length + seed_length; + /* secret: used as S1; secret2: last half of original secret (S2) */ +- guchar *secret2 = g_memdup(secret + secret_length - half, half); ++ guchar *secret2 = g_memdup2(secret + secret_length - half, half); + guchar *newseed = g_malloc(newseed_length); + guchar *md5, *dest; + guchar *sha1, *src; +@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_client_key_exchange(struct tls_internal_ + + /* found all the required fields */ + state->server_random.length = server_random->length; +- state->server_random.buffer = g_memdup(server_random->data, ++ state->server_random.buffer = g_memdup2(server_random->data, + server_random->length); + tls_calculate_secrets(state); + +diff --git a/src/telepathy/telepathy-protocol.c b/src/telepathy/telepathy-protocol.c +index f6e5337..1dde579 100644 +--- a/src/telepathy/telepathy-protocol.c ++++ b/src/telepathy/telepathy-protocol.c +@@ -237,7 +237,7 @@ static void get_connection_details(SIPE_UNUSED_PARAMETER TpBaseProtocol *self, + SIPE_TYPE_SEARCH_MANAGER, + G_TYPE_INVALID + }; +- *channel_managers = g_memdup(types, sizeof(types)); ++ *channel_managers = g_memdup2(types, sizeof(types)); + } + if (icon_name) + *icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN); diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index f6b4c7cee1..5a96bec90a 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -11,6 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ file://0001-sipe-consider-64bit-time_t-when-printing.patch \ file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ + file://0001-Migrate-to-use-g_memdup2.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch deleted file mode 100644 index cfb0290f9b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch +++ /dev/null @@ -1,229 +0,0 @@ -From e03d3ef5aadd582ebf7102b7d5785fed177a0cb1 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 7 Feb 2021 13:25:29 +0100 -Subject: [PATCH] configure.ac: fix build with autoconf-2.71 - -* fixes: - | autoreconf: running: intltoolize --copy --force - | ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work. - | autoreconf: error: intltoolize failed with exit status: 1 - -* replace AM_GLIB_GNU_GETTEXT with AM_GNU_GETTEXT as suggested in: - https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration - https://blogs.gnome.org/jjardon/2010/10/08/use-upstream-gettext-instead-the-glib-one/ - because the former is causing issues with autoconf-2.71: - - -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. - -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from... - -../autoconf-2.71/lib/m4sugar/m4sh.m4:699: AS_IF is expanded from... - -../autoconf-2.71/lib/autoconf/headers.m4:89: _AC_CHECK_HEADER_COMPILE is expanded from... - -../autoconf-2.71/lib/autoconf/headers.m4:56: AC_CHECK_HEADER is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... - -configure.ac:266: the top level]) - -m4trace:configure.ac:266: -1- m4_pattern_allow([^ENABLE_NLS$]) - -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. - -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/status.m4:1025: AC_OUTPUT_COMMANDS is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from... - -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from... - -configure.ac:266: the top level]) - - and then configure fails with: - - configure.ac:2621: error: `po/stamp-it' is already registered with AC_CONFIG_COMMANDS. - autoconf-2.71/lib/autoconf/status.m4:1008: AC_CONFIG_COMMANDS is expanded from... - configure.ac:2621: the top level - -* add AM_GNU_GETTEXT_VERSION as well to resolve warning with autoconf-2.71 - configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - ABOUT-NLS | 1 + - Makefile.am | 6 +--- - configure.ac | 6 ++-- - pidgin/Makefile.am | 7 ++-- - po/Makevars | 82 ++++++++++++++++++++++++++++++++++++++++++++++ - po/POTFILES.in | 1 - - 6 files changed, 92 insertions(+), 11 deletions(-) - create mode 100644 ABOUT-NLS - create mode 100644 po/Makevars - -diff --git a/ABOUT-NLS b/ABOUT-NLS -new file mode 100644 -index 0000000..0a9d56d ---- /dev/null -+++ b/ABOUT-NLS -@@ -0,0 +1 @@ -+<https://www.gnu.org/software/gettext/manual/html_node/Users.html> -diff --git a/Makefile.am b/Makefile.am -index f8e2bc9..a74145f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,9 +13,6 @@ EXTRA_DIST = \ - fix-casts.sh \ - gaim.pc.in \ - gaim-uninstalled.pc.in \ -- intltool-extract.in \ -- intltool-merge.in \ -- intltool-update.in \ - package_revision.h \ - pidgin.apspec.in \ - pidgin.spec.in \ -@@ -139,5 +136,4 @@ endif - distuninstallcheck_listfiles = \ - find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm - --DISTCLEANFILES= intltool-extract intltool-merge intltool-update \ -- package_revision_raw.txt -+DISTCLEANFILES=package_revision_raw.txt -diff --git a/configure.ac b/configure.ac -index 81d8592..e2280cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,7 +43,7 @@ fi - - AC_CANONICAL_HOST - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2]) -+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 foreign]) - dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11 - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -@@ -257,12 +257,12 @@ dnl ####################################################################### - AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes) - - if test x$enable_i18n = xyes; then -- AC_PROG_INTLTOOL - GETTEXT_PACKAGE=pidgin - AC_SUBST(GETTEXT_PACKAGE) - - ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" -- AM_GLIB_GNU_GETTEXT -+ AM_GNU_GETTEXT([external]) -+ AM_GNU_GETTEXT_VERSION([0.21]) - - dnl If we don't have msgfmt, then po/ is going to fail -- ensure that - dnl AM_GLIB_GNU_GETTEXT found it. -diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am -index 2278b88..4d32c53 100644 ---- a/pidgin/Makefile.am -+++ b/pidgin/Makefile.am -@@ -192,13 +192,16 @@ DESKTOP_FILE=data/pidgin.desktop - appsdir = $(datadir)/applications - apps_in_files = data/pidgin.desktop.in - apps_DATA = $(apps_in_files:.desktop.in=.desktop) --@INTLTOOL_DESKTOP_RULE@ -+ -+data/pidgin.desktop: data/pidgin.desktop.in -+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ - - appdatadir = $(datarootdir)/appdata - appdata_DATA = $(appdata_in_files:.xml.in=.xml) - appdata_in_files = data/pidgin.appdata.xml.in - --@INTLTOOL_XML_RULE@ -+data/pidgin.appdata.xml: data/pidgin.appdata.xml.in -+ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@ - - endif # INSTALL_I18N - -diff --git a/po/Makevars b/po/Makevars -new file mode 100644 -index 0000000..970237a ---- /dev/null -+++ b/po/Makevars -@@ -0,0 +1,82 @@ -+# Makefile variables for PO directory in any package using GNU gettext. -+# -+# Copyright (C) 2003-2019 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to use, copy, distribute, and modify it. -+ -+# Usually the message domain is the same as the package name. -+DOMAIN = $(PACKAGE) -+ -+# These two variables depend on the location of this directory. -+subdir = po -+top_builddir = .. -+ -+# These options get passed to xgettext. -+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 -+ -+# This is the copyright holder that gets inserted into the header of the -+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -+# package. (Note that the msgstr strings, extracted from the package's -+# sources, belong to the copyright holder of the package.) Translators are -+# expected to transfer the copyright for their translations to this person -+# or entity, or to disclaim their copyright. The empty string stands for -+# the public domain; in this case the translators are expected to disclaim -+# their copyright. -+COPYRIGHT_HOLDER = Free Software Foundation, Inc. -+ -+# This tells whether or not to prepend "GNU " prefix to the package -+# name that gets inserted into the header of the $(DOMAIN).pot file. -+# Possible values are "yes", "no", or empty. If it is empty, try to -+# detect it automatically by scanning the files in $(top_srcdir) for -+# "GNU packagename" string. -+PACKAGE_GNU = -+ -+# This is the email address or URL to which the translators shall report -+# bugs in the untranslated strings: -+# - Strings which are not entire sentences, see the maintainer guidelines -+# in the GNU gettext documentation, section 'Preparing Strings'. -+# - Strings which use unclear terms or require additional context to be -+# understood. -+# - Strings which make invalid assumptions about notation of date, time or -+# money. -+# - Pluralisation problems. -+# - Incorrect English spelling. -+# - Incorrect formatting. -+# It can be your email address, or a mailing list address where translators -+# can write to without being subscribed, or the URL of a web page through -+# which the translators can contact you. -+MSGID_BUGS_ADDRESS = -+ -+# This is the list of locale categories, beyond LC_MESSAGES, for which the -+# message catalogs shall be used. It is usually empty. -+EXTRA_LOCALE_CATEGORIES = -+ -+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -+# context. Possible values are "yes" and "no". Set this to yes if the -+# package uses functions taking also a message context, like pgettext(), or -+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -+USE_MSGCTXT = no -+ -+# These options get passed to msgmerge. -+# Useful options are in particular: -+# --previous to keep previous msgids of translated messages, -+# --quiet to reduce the verbosity. -+MSGMERGE_OPTIONS = -+ -+# These options get passed to msginit. -+# If you want to disable line wrapping when writing PO files, add -+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and -+# MSGINIT_OPTIONS. -+MSGINIT_OPTIONS = -+ -+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot -+# has changed. Possible values are "yes" and "no". Set this to no if -+# the POT file is checked in the repository and the version control -+# program ignores timestamps. -+PO_DEPENDS_ON_POT = no -+ -+# This tells whether or not to forcibly update $(DOMAIN).pot and -+# regenerate PO files on "make dist". Possible values are "yes" and -+# "no". Set this to no if the POT file and PO files are maintained -+# externally. -+DIST_DEPENDS_ON_UPDATE_PO = no -diff --git a/po/POTFILES.in b/po/POTFILES.in -index a5691a1..b494bf3 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,4 +1,3 @@ --[encoding: UTF-8] - finch/finch.c - finch/gntaccount.c - finch/gntblist.c diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch deleted file mode 100644 index 99c523d5d9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 861c8a63c36f9ee7d46238c9bc13a2c1f14372c3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 7 Feb 2021 14:35:14 +0000 -Subject: [PATCH] configure.ac: disable few languages not compatible with - modern gettext - -* as pidgin-3 development is moving to meson and probably - most of these changes won't be applicable there, lets just - disable them until someone interested steps-up to maintain it - -* these 3 fail with: -cd ../../pidgin-2.14.1/po && rm -f brx.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o brx.1po brx.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o brx.gmo brx.1po && rm -f brx.1po -cd ../../pidgin-2.14.1/po && rm -f zh_HK.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_HK.1po zh_HK.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_HK.gmo zh_HK.1po && rm -f zh_HK.1po -cd ../../pidgin-2.14.1/po && rm -f zh_TW.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_TW.1po zh_TW.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_TW.gmo zh_TW.1po && rm -f zh_TW.1po -zh_HK.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. -pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error -zh_TW.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications. -pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error -zh_HK.1po: 3234 translated messages. -make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_HK.gmo] Error 1 -make[3]: *** Waiting for unfinished jobs.... -zh_TW.1po: 3234 translated messages. -make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_TW.gmo] Error 1 -brx.1po:778: number of format specifications in 'msgid' and 'msgstr' does not match -brx.1po:3179: number of format specifications in 'msgid' and 'msgstr' does not match -brx.1po:5175: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same -brx.1po:5184: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same -brx.1po:7754: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same -pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 8 fatal errors -brx.1po: 3246 translated messages. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e2280cd..9332932 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -260,7 +260,7 @@ if test x$enable_i18n = xyes; then - GETTEXT_PACKAGE=pidgin - AC_SUBST(GETTEXT_PACKAGE) - -- ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW" -+ ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN" - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.21]) - diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index d22380eb0d..ba0dca233b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -11,11 +11,9 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ - file://0001-configure.ac-fix-build-with-autoconf-2.71.patch \ - file://0002-configure.ac-disable-few-languages-not-compatible-wi.patch \ " -SRC_URI[sha256sum] = "f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780" +SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ @@ -39,9 +37,9 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" +PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl" EXTRA_OECONF = " \ - --with-python=python3 \ --disable-perl \ --disable-tcl \ --disable-gevolution \ |