pidgin/android/libpurple

Fix compilation on OBS mingw, don't crash on webkitgtk

2013-04-05, Tomasz Wasilczyk
af0723304ab3
Parents 9d172d15a45f
Children 08c8eeaa173d
Fix compilation on OBS mingw, don't crash on webkitgtk
3 files changed, 37 insertions(+), 3 deletions(-)
  • +24 -1
    libpurple/win32/wpurpleerror.h
  • +6 -0
    pidgin/gtkwebview.c
  • +7 -2
    pidgin/win32/nsis/generate_gtk_zip.sh
    • --- a/libpurple/win32/wpurpleerror.h Wed Apr 03 22:46:20 2013 -0700
    +++ b/libpurple/win32/wpurpleerror.h Fri Apr 05 00:08:34 2013 +0200
    @@ -27,32 +27,55 @@
    /* Here we define unix socket errors as windows socket errors */
    +#undef ENETDOWN
    #define ENETDOWN WSAENETDOWN
    +#undef EAFNOSUPPORT
    #define EAFNOSUPPORT WSAEAFNOSUPPORT
    +#undef EINPROGRESS
    #define EINPROGRESS WSAEINPROGRESS
    +#undef ENOBUFS
    #define ENOBUFS WSAENOBUFS
    +#undef EPROTONOSUPPORT
    #define EPROTONOSUPPORT WSAEPROTONOSUPPORT
    +#undef EPROTOTYPE
    #define EPROTOTYPE WSAEPROTOTYPE
    +#undef ESOCKTNOSUPPORT
    #define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
    +#undef EADDRINUSE
    #define EADDRINUSE WSAEADDRINUSE
    -#define EINPROGRESS WSAEINPROGRESS
    +#undef EALREADY
    #define EALREADY WSAEALREADY
    +#undef EADDRNOTAVAIL
    #define EADDRNOTAVAIL WSAEADDRNOTAVAIL
    +#undef ECONNREFUSED
    #define ECONNREFUSED WSAECONNREFUSED
    +#undef EISCONN
    #define EISCONN WSAEISCONN
    +#undef ENETUNREACH
    #define ENETUNREACH WSAENETUNREACH
    +#undef ENOTSOCK
    #define ENOTSOCK WSAENOTSOCK
    +#undef ETIMEDOUT
    #define ETIMEDOUT WSAETIMEDOUT
    +#undef EWOULDBLOCK
    #define EWOULDBLOCK WSAEWOULDBLOCK
    +#undef ENOTCONN
    #define ENOTCONN WSAENOTCONN
    +#undef ENETRESET
    #define ENETRESET WSAENETRESET
    +#undef EOPNOTSUPP
    #define EOPNOTSUPP WSAEOPNOTSUPP
    +#undef ESHUTDOWN
    #define ESHUTDOWN WSAESHUTDOWN
    +#undef EMSGSIZE
    #define EMSGSIZE WSAEMSGSIZE
    +#undef ECONNABORTED
    #define ECONNABORTED WSAECONNABORTED
    +#undef ECONNRESET
    #define ECONNRESET WSAECONNRESET
    +#undef EHOSTUNREACH
    #define EHOSTUNREACH WSAEHOSTUNREACH
    #endif /* end _WPURPLEERROR_H */
    --- a/pidgin/gtkwebview.c Wed Apr 03 22:46:20 2013 -0700
    +++ b/pidgin/gtkwebview.c Fri Apr 05 00:08:34 2013 +0200
    @@ -247,6 +247,7 @@
    t->image = NULL;
    }
    +#if 0
    static int
    gtk_smiley_tree_lookup(GtkSmileyTree *tree, const char *text)
    {
    @@ -304,6 +305,7 @@
    return 0;
    }
    +#endif
    static void
    gtk_webview_disassociate_smiley_foreach(gpointer key, gpointer value,
    @@ -372,6 +374,7 @@
    G_CALLBACK(gtk_webview_disconnect_smiley), smiley);
    }
    +#if 0
    static gboolean
    gtk_webview_is_smiley(GtkWebViewPriv *priv, const char *sml, const char *text,
    int *len)
    @@ -390,6 +393,7 @@
    *len = gtk_smiley_tree_lookup(tree, text);
    return (*len > 0);
    }
    +#endif
    static GtkWebViewSmiley *
    gtk_webview_smiley_get_from_tree(GtkSmileyTree *t, const char *text)
    @@ -436,6 +440,7 @@
    return gtk_webview_smiley_get_from_tree(priv->default_smilies, text);
    }
    +#if 0
    static GdkPixbufAnimation *
    gtk_smiley_get_image(GtkWebViewSmiley *smiley)
    {
    @@ -451,6 +456,7 @@
    return smiley->icon;
    }
    +#endif
    static void
    gtk_custom_smiley_allocated(GdkPixbufLoader *loader, gpointer user_data)
    --- a/pidgin/win32/nsis/generate_gtk_zip.sh Wed Apr 03 22:46:20 2013 -0700
    +++ b/pidgin/win32/nsis/generate_gtk_zip.sh Fri Apr 05 00:08:34 2013 +0200
    @@ -6,7 +6,7 @@
    GPG_SIGN=$1
    if [ ! -e $PIDGIN_BASE/ChangeLog ]; then
    - echo pidgin base dir not found
    + echo "Pidgin base directory not found"
    exit 1
    fi
    @@ -84,7 +84,12 @@
    PIXMAN="${DOWNLOAD_HOST}mingw32-pixman-0.26.0-1.4.noarch.rpm pixman 0.26.0-1.4 sha1sum:f751fe428ea83996daf7e57bff6f4f79361b0d29"
    PTHREADS="${DOWNLOAD_HOST}mingw32-pthreads-2.8.0-14.6.noarch.rpm pthreads 2.8.0-14.6 sha1sum:e948ae221f82bbcb4fbfd991638e4170c150fe9f"
    SQLITE="${DOWNLOAD_HOST}mingw32-libsqlite-3.7.6.2-1.6.noarch.rpm SQLite 3.7.6.2-1.6 sha1sum:f61529bc0c996d9af28a94648ce6102d579ed928"
    -WEBKITGTK="${DOWNLOAD_HOST}mingw32-libwebkitgtk-1.10.2-1.3.noarch.rpm WebKitGTK+ 1.10.2-1.3 sha1sum:33b558d2110fc2caf2c3c0ab24a6c18645814893"
    +
    +#webkit 1.10 crashes when calling document.createElement, so I grabbed 1.8 from openSUSE_Factory instead
    +#TODO: investigate it
    +#WEBKITGTK="${DOWNLOAD_HOST}mingw32-libwebkitgtk-1.10.2-1.3.noarch.rpm WebKitGTK+ 1.10.2-1.3 sha1sum:33b558d2110fc2caf2c3c0ab24a6c18645814893"
    +WEBKITGTK="${DOWNLOAD_HOST}mingw32-libwebkitgtk-1.8.3-1.14.noarch.rpm WebKitGTK+ 1.8.3-1.14 sha1sum:ade86455fc2da257f4fe5831367f500a61a1af9a"
    +
    ZLIB="${DOWNLOAD_HOST}mingw32-zlib-1.2.7-1.4.noarch.rpm zlib 1.2.7-1.4 sha1sum:83e91f3b4d14e47131ca33fc69e12b82aabdd589"
    ALL="ATK CAIRO2 DBUS DBUS_GLIB ENCHANT FONTCONFIG FREETYPE GDK_PIXBUF GEOCLUE GLIB GST GST_INT GTK2 LIBFFI LIBGCC LIBJASPER LIBICU LIBINTL LIBJPEG LIBJSON LIBLZMA LIBPNG LIBSOUP LIBSTDCPP LIBTIFF LIBXSLT PANGO PIXMAN PTHREADS SQLITE WEBKITGTK ZLIB"