HGKeeper

grim/pidgin

Fix a bunch of stuff with the windows build. A lot if hackish, but it's working
draft
2019-12-03, Gary Kramlich

fc7ad43f123f

Parents fc7b9e4d2d03
Children f54a260ef525

Fix a bunch of stuff with the windows build. A lot if hackish, but it's working

7 files changed, 92 insertions(+), 15 deletions(-)

+2 -2

libpurple/protocols/irc/dcc_send.c

+4 -4

libpurple/protocols/jabber/si.c

+1 -0

libpurple/win32/win32dep.c

+6 -6

libpurple/xfer.c

+2 -2

libpurple/xfer.h

+76 -0

packaging/msys2/PKGBUILD.native

+1 -1

pidgin/plugins/win32/winprefs/winprefs.c

~~--- a/libpurple/protocols/irc/dcc_send.c Tue Nov 26 00:30:54 2019 -0500~~

+++ b/libpurple/protocols/irc/dcc_send.c Tue Dec 03 06:30:48 2019 +0000

@@ -209,7 +209,7 @@

return 0;

}

~~- ret = PURPLE_XFER_CLASS(irc_xfer_parent_class)->write(xfer, buffer, s);~~

+ ret = PURPLE_XFER_CLASS(irc_xfer_parent_class)->write_file(xfer, buffer, s);

if (ret < 0 && errno == EAGAIN) {

ret = 0;

@@ -419,7 +419,7 @@

xfer_class->init = irc_dccsend_init;

xfer_class->ack = irc_dccsend_recv_ack;

~~- xfer_class->write = irc_dccsend_send_write;~~

+ xfer_class->write_file = irc_dccsend_send_write;

}

void

~~--- a/libpurple/protocols/jabber/si.c Tue Nov 26 00:30:54 2019 -0500~~

+++ b/libpurple/protocols/jabber/si.c Tue Dec 03 06:30:48 2019 +0000

@@ -1041,7 +1041,7 @@

gsize tmp;

if(jsx->stream_method & STREAM_METHOD_BYTESTREAMS) {

~~- return PURPLE_XFER_CLASS(jabber_si_xfer_parent_class)->read(xfer, out_buffer, buf_size);~~

+ return PURPLE_XFER_CLASS(jabber_si_xfer_parent_class)->read_file(xfer, out_buffer, buf_size);

}

size = purple_circular_buffer_get_used(jsx->ibb_buffer);

@@ -1113,7 +1113,7 @@

if(jsx->stream_method & STREAM_METHOD_BYTESTREAMS) {

purple_debug_error("jabber", "falling back to raw socket\n");

~~- return PURPLE_XFER_CLASS(jabber_si_xfer_parent_class)->write(xfer, buffer, len);~~

+ return PURPLE_XFER_CLASS(jabber_si_xfer_parent_class)->write_file(xfer, buffer, len);

}

packet_size = MIN(len, jabber_ibb_session_get_max_data_size(sess));

@@ -1811,8 +1811,8 @@

xfer_class->request_denied = jabber_si_xfer_request_denied;

xfer_class->cancel_send = jabber_si_xfer_cancel_send;

xfer_class->cancel_recv = jabber_si_xfer_cancel_recv;

~~- xfer_class->read = jabber_si_xfer_ibb_read;~~

~~- xfer_class->write = jabber_si_xfer_ibb_write;~~

+ xfer_class->read_file = jabber_si_xfer_ibb_read;

+ xfer_class->write_file = jabber_si_xfer_ibb_write;

}

/******************************************************************************

~~--- a/libpurple/win32/win32dep.c Tue Nov 26 00:30:54 2019 -0500~~

+++ b/libpurple/win32/win32dep.c Tue Dec 03 06:30:48 2019 +0000

@@ -24,6 +24,7 @@

#include "internal.h"

#include <winuser.h>

+#include <string.h>

#include "debug.h"

#include "glibcompat.h"

~~--- a/libpurple/xfer.c Tue Nov 26 00:30:54 2019 -0500~~

+++ b/libpurple/xfer.c Tue Dec 03 06:30:48 2019 +0000

@@ -1148,8 +1148,8 @@

}

klass = PURPLE_XFER_GET_CLASS(xfer);

~~- if(klass && klass->read) {~~

~~- r = klass->read(xfer, buffer, s);~~

+ if(klass && klass->read_file) {

+ r = klass->read_file(xfer, buffer, s);

} else {

r = do_read(xfer, buffer, s);

}

@@ -1199,8 +1199,8 @@

);

klass = PURPLE_XFER_GET_CLASS(xfer);

~~- if(klass && klass->write) {~~

~~- return klass->write(xfer, buffer, s);~~

+ if(klass && klass->write_file) {

+ return klass->write_file(xfer, buffer, s);

}

return do_write(xfer, buffer, s);

@@ -2196,8 +2196,8 @@

obj_class->get_property = purple_xfer_get_property;

obj_class->set_property = purple_xfer_set_property;

~~- klass->write = do_write;~~

~~- klass->read = do_read;~~

+ klass->write_file = do_write;

+ klass->read_file = do_read;

properties[PROP_TYPE] = g_param_spec_enum("type", "Transfer type",

"The type of file transfer.", PURPLE_TYPE_XFER_TYPE,

~~--- a/libpurple/xfer.h Tue Nov 26 00:30:54 2019 -0500~~

+++ b/libpurple/xfer.h Tue Dec 03 06:30:48 2019 +0000

@@ -179,8 +179,8 @@

void (*end)(PurpleXfer *xfer);

void (*cancel_send)(PurpleXfer *xfer);

void (*cancel_recv)(PurpleXfer *xfer);

~~- gssize (*read)(PurpleXfer *xfer, guchar **buffer, gsize size);~~

~~- gssize (*write)(PurpleXfer *xfer, const guchar *buffer, gsize size);~~

+ gssize (*read_file)(PurpleXfer *xfer, guchar **buffer, gsize size);

+ gssize (*write_file)(PurpleXfer *xfer, const guchar *buffer, gsize size);

void (*ack)(PurpleXfer *xfer, const guchar *buffer, gsize size);

/*< private >*/

~~--- /dev/null Thu Jan 01 00:00:00 1970 +0000~~

+++ b/packaging/msys2/PKGBUILD.native Tue Dec 03 06:30:48 2019 +0000

@@ -0,0 +1,76 @@

+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>

+# Contributor: Renato Silva <br.renatosilva@gmail.com>

+_realname=pidgin3

+pkgbase=mingw-w64-${_realname}-hg

+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-hg"

+provides=(${MINGW_PACKAGE_PREFIX}-${_realname}

+ ${MINGW_PACKAGE_PREFIX}-libpurple

+ ${MINGW_PACKAGE_PREFIX}-finch)

+conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}

+ ${MINGW_PACKAGE_PREFIX}-libpurple

+ ${MINGW_PACKAGE_PREFIX}-finch)

+pkgver=r40324+.fc7b9e4d2d03+

+pkgrel=1

+pkgdesc="Multi-protocol instant messaging client (mingw-w64)"

+arch=('any')

+url="https://pidgin.im/"

+license=(GPL2 partial:'GPL2+') # GPL2+, but Novell and SILC are GPL2-only

+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"

+ "${MINGW_PACKAGE_PREFIX}-gcc"

+ "${MINGW_PACKAGE_PREFIX}-pkg-config"

+ "${MINGW_PACKAGE_PREFIX}-meson"

+ "${MINGW_PACKAGE_PREFIX}-ninja"

+ "${MINGW_PACKAGE_PREFIX}-gobject-introspection"

+ "gtk-doc"

+ "mercurial")

+depends=("${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"

+ "${MINGW_PACKAGE_PREFIX}-cmark"

+ "${MINGW_PACKAGE_PREFIX}-farstream"

+ "${MINGW_PACKAGE_PREFIX}-freetype"

+ "${MINGW_PACKAGE_PREFIX}-fontconfig"

+ "${MINGW_PACKAGE_PREFIX}-gettext"

+ "${MINGW_PACKAGE_PREFIX}-gspell"

+ "${MINGW_PACKAGE_PREFIX}-gumbo-parser"

+ "${MINGW_PACKAGE_PREFIX}-gtk3"

+ "${MINGW_PACKAGE_PREFIX}-libgadu"

+ "${MINGW_PACKAGE_PREFIX}-libidn"

+ "${MINGW_PACKAGE_PREFIX}-libsoup"

+ "${MINGW_PACKAGE_PREFIX}-lua51"

+ "${MINGW_PACKAGE_PREFIX}-lua51-lgi"

+ "${MINGW_PACKAGE_PREFIX}-python3"

+ "${MINGW_PACKAGE_PREFIX}-python3-gobject"

+ "${MINGW_PACKAGE_PREFIX}-meanwhile"

+ "${MINGW_PACKAGE_PREFIX}-ncurses")

+options=(!libtool strip staticlibs)

+pkgver() {

+ printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"

+build() {

+ # TODO: Add -Dcyrus-sasl=true when that works

+ meson \

+ --buildtype plain \

+ -Dconsoleui=false \

+ -Dtests=false \

+ -Dtalkatu:help2man=false \

+ -Dtalkatu:tests=false \

+ -Dgplugin:help2man=false \

+ -Dgplugin:lua=false \

+ -Dgplugin:python=false \

+ -Dgplugin:vapi=false \

+ ..

+ ninja

+package() {

+ DESTDIR="${pkgdir}${MINGW_PREFIX}" ninja install

+ install -Dm644 "../COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"

+ for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do

+ sed -s "s|$(cygpath -m ${MINGW_PREFIX})|${MINGW_PREFIX}|g" -i "${pcfile}"

+ done

~~--- a/pidgin/plugins/win32/winprefs/winprefs.c Tue Nov 26 00:30:54 2019 -0500~~

+++ b/pidgin/plugins/win32/winprefs/winprefs.c Tue Dec 03 06:30:48 2019 +0000

@@ -33,9 +33,9 @@

#include "gtkappbar.h"

#include "gtkblist.h"

#include "gtkconv.h"

~~-#include "gtkplugin.h"~~

#include "gtkprefs.h"

#include "gtkutils.h"

+#include "pidginplugininfo.h"

* MACROS & DEFINES