qulogic/pidgin3-deps

Disable jabber prpl by default
default tip
6 months ago, Elliott Sales de Andrade
a050bc2bf966
Parents 003104a9cc52
Children
Disable jabber prpl by default

It's going to be replaced by the now in-progress xmpp prpl, and disabling it
means we don't have to patch out libidn.
3 files changed, 5 insertions(+), 165 deletions(-)
  • +0 -163
    subprojects/packagefiles/pidgin3-optional-libidn.patch
  • +0 -2
    subprojects/pidgin3.wrap
  • +5 -0
    windows.ini
    • --- a/subprojects/packagefiles/pidgin3-optional-libidn.patch Sat Nov 18 15:53:51 2023 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,163 +0,0 @@
    -diff -r 9f71e90ac72d libpurple/protocols/jabber/jutil.c
    ---- a/libpurple/protocols/jabber/jutil.c Tue Nov 14 01:09:13 2023 -0600
    -+++ b/libpurple/protocols/jabber/jutil.c Thu Nov 16 04:27:15 2023 -0500
    -@@ -29,18 +29,28 @@
    - #include "presence.h"
    - #include "jutil.h"
    -
    -+#ifdef HAVE_LIBIDN
    - #include <idna.h>
    - #include <stringprep.h>
    -+#endif
    - static char idn_buffer[1024];
    -
    - static gboolean jabber_nodeprep(char *str, size_t buflen)
    - {
    -+#ifdef HAVE_LIBIDN
    - return stringprep_xmpp_nodeprep(str, buflen) == STRINGPREP_OK;
    -+#else
    -+ return TRUE;
    -+#endif
    - }
    -
    - static gboolean jabber_resourceprep(char *str, size_t buflen)
    - {
    -+#ifdef HAVE_LIBIDN
    - return stringprep_xmpp_resourceprep(str, buflen) == STRINGPREP_OK;
    -+#else
    -+ return TRUE;
    -+#endif
    - }
    -
    - static JabberID*
    -@@ -53,7 +63,9 @@
    - int node_len = 0;
    - int domain_len = 0;
    - int resource_len = 0;
    -+#ifdef HAVE_LIBIDN
    - char *out;
    -+#endif
    - JabberID *jid;
    -
    - /* Ensure no parts are > 1023 bytes */
    -@@ -128,6 +140,7 @@
    -
    - jid->domain = g_strndup(domain, domain_len);
    - } else {
    -+#ifdef HAVE_LIBIDN
    - /* Apply nameprep */
    - if (stringprep_nameprep(idn_buffer, sizeof(idn_buffer)) != STRINGPREP_OK) {
    - jabber_id_free(jid);
    -@@ -144,6 +157,7 @@
    -
    - /* This *MUST* be freed using 'free', not 'g_free' */
    - free(out);
    -+#endif
    - jid->domain = g_strdup(idn_buffer);
    - }
    -
    -@@ -256,11 +270,13 @@
    - strncpy(idn_buffer, in, sizeof(idn_buffer) - 1);
    - idn_buffer[sizeof(idn_buffer) - 1] = '\0';
    -
    -+#ifdef HAVE_LIBIDN
    - if (STRINGPREP_OK != stringprep(idn_buffer, sizeof(idn_buffer), 0,
    - stringprep_saslprep)) {
    - memset(idn_buffer, 0, sizeof(idn_buffer));
    - return NULL;
    - }
    -+#endif
    -
    - out = g_strdup(idn_buffer);
    - memset(idn_buffer, 0, sizeof(idn_buffer));
    -diff -r 9f71e90ac72d libpurple/protocols/jabber/meson.build
    ---- a/libpurple/protocols/jabber/meson.build Tue Nov 14 01:09:13 2023 -0600
    -+++ b/libpurple/protocols/jabber/meson.build Thu Nov 16 04:27:15 2023 -0500
    -@@ -81,7 +81,7 @@
    - endif
    -
    - if DYNAMIC_JABBER
    -- idn = dependency('libidn', version : '>= 0.0.0')
    -+ idn = dependency('libidn', version : '>= 0.0.0', required: false)
    -
    - xmpp_resources = gnome.compile_resources('xmppresource',
    - 'resources/xmpp.gresource.xml',
    -@@ -89,8 +89,12 @@
    - c_name : 'xmpp')
    - JABBER_SOURCES += xmpp_resources
    -
    -+ c_args = ['-DPURPLE_XMPP_COMPILATION', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-XMPP"']
    -+ if idn.found()
    -+ c_args += ['-DHAVE_LIBIDN']
    -+ endif
    - jabber_prpl = shared_library('jabber', JABBER_SOURCES,
    -- c_args : ['-DPURPLE_XMPP_COMPILATION', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-XMPP"'],
    -+ c_args : c_args,
    - gnu_symbol_visibility : 'hidden',
    - link_args : jabber_link_args,
    - dependencies : [gstreamer, idn, libxml, libpurple_dep, libsoup, glib, gio, math, ws2_32],
    -diff -r 9f71e90ac72d libpurple/protocols/jabber/tests/test_jabber_jutil.c
    ---- a/libpurple/protocols/jabber/tests/test_jabber_jutil.c Tue Nov 14 01:09:13 2023 -0600
    -+++ b/libpurple/protocols/jabber/tests/test_jabber_jutil.c Thu Nov 16 04:27:15 2023 -0500
    -@@ -146,6 +146,7 @@
    - "/Test@12345",
    - "noone@",
    - "noone/",
    -+#ifdef HAVE_LIBIDN
    - "noone@gmail_stuff.org",
    - "noone@gmail[stuff.org",
    - "noone@gmail\\stuff.org",
    -@@ -159,6 +160,7 @@
    - * The character is U+066D (ARABIC FIVE POINTED STAR).
    - */
    - "foo@example.com/٭simplexe٭",
    -+#endif
    - NULL,
    - };
    - static void
    -@@ -187,6 +189,7 @@
    -
    - /* These case-mapping tests culled from examining RFC3454 B.2 */
    -
    -+#ifdef HAVE_LIBIDN
    - /* Cyrillic capital EF (U+0424) maps to lowercase EF (U+0444) */
    - assert_jid_parts("ф", "example.com", "Ф@example.com");
    -
    -@@ -203,6 +206,7 @@
    -
    - /* U+04E9 to U+04E9 */
    - assert_jid_parts("noone", "өexample.com", "noone@Өexample.com");
    -+#endif
    - }
    -
    - PurpleTestStringData test_jabber_util_jabber_normalize_data[] = {
    -@@ -248,6 +252,7 @@
    -
    - g_test_add_func("/jabber/util/nodeprep/validate/valid",
    - test_jabber_util_nodeprep_validate);
    -+#if HAVE_LIBIDN
    - for (i = 0; test_jabber_util_nodeprep_validate_illegal_chars_data[i]; i++) {
    - test_name = g_strdup_printf(
    - "/jabber/util/nodeprep/validate/illegal_chars/%d", i);
    -@@ -258,6 +263,7 @@
    - test_jabber_util_nodeprep_validate_illegal_chars);
    - g_free(test_name);
    - }
    -+#endif
    - g_test_add_func("/jabber/util/nodeprep/validate/too_long",
    - test_jabber_util_nodeprep_validate_too_long);
    -
    -diff -r 9f71e90ac72d libpurple/protocols/jabber/tests/test_jabber_scram.c
    ---- a/libpurple/protocols/jabber/tests/test_jabber_scram.c Tue Nov 14 01:09:13 2023 -0600
    -+++ b/libpurple/protocols/jabber/tests/test_jabber_scram.c Thu Nov 16 04:27:15 2023 -0500
    -@@ -102,8 +102,10 @@
    - test_jabber_scram_pbkdf2);
    - g_test_add_func("/jabber/scram/proofs",
    - test_jabber_scram_proofs);
    -+#ifdef HAVE_LIBIDN
    - g_test_add_func("/jabber/scram/exchange",
    - test_jabber_scram_exchange);
    -+#endif
    -
    - return g_test_run();
    - }
    --- a/subprojects/pidgin3.wrap Sat Nov 18 15:53:51 2023 -0500
    +++ b/subprojects/pidgin3.wrap Mon Dec 04 00:42:00 2023 -0500
    @@ -2,5 +2,3 @@
    directory = pidgin3
    url = https://keep.imfreedom.org/pidgin/pidgin/
    revision = default
    -
    -diff_files = pidgin3-optional-libidn.patch
    \ No newline at end of file
    --- a/windows.ini Sat Nov 18 15:53:51 2023 -0500
    +++ b/windows.ini Mon Dec 04 00:42:00 2023 -0500
    @@ -29,3 +29,8 @@
    doc = false
    introspection = false
    consoleui = false
    +dynamic-prpls = 'bonjour,demo,gg,ircv3,xmpp'
    +
    +[xeme:project options]
    +doc = false
    +introspection = false