File pidgin-2.10.12-autotools.patch of Package mingw32-pidgin
--- pidgin-2.10.12/configure.ac 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/configure.ac 2016-02-11 13:11:24.101385320 +0100
@@ -120,10 +120,44 @@
dnl Check for Sun compiler
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+dnl ******************************
+dnl Win32
+dnl ******************************
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+*-mingw*)
+ os_win32=yes
+ not_os_win32=no
+ NO_UNDEFINED='-no-undefined'
+ AVOID_VERSION='-avoid-version'
+ AC_CHECK_TOOL(WINDRES, windres)
+ PURPLE_LIBS='$(top_builddir)/libpurple/libpurple.la'
+ PIDGIN_LIBS='$(top_builddir)/pidgin/libpidgin.la'
+ ;;
+*)
+ os_win32=no
+ not_os_win32=yes
+ NO_UNDEFINED=
+ AVOID_VERSION=
+ PURPLE_LIBS=
+ PIDGIN_LIBS=
+ ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+AC_SUBST(NO_UNDEFINED)
+AC_SUBST(AVOID_VERSION)
+AC_SUBST(PURPLE_LIBS)
+AC_SUBST(PIDGIN_LIBS)
+
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h regex.h)
+AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h stdint.h)
+dnl signal.h is not good in mingw
+if test "$os_win32" != yes; then
+ AC_CHECK_HEADERS(signal.h regex.h)
+fi
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -145,6 +179,7 @@
AC_LIBOBJ(getopt1)
])
+if test "$os_win32" != yes; then
dnl Check for inet_aton
AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
[AC_MSG_ERROR([inet_aton not found])])])
@@ -152,6 +187,8 @@
AC_CHECK_LIB(nsl, gethostent)
AC_CHECK_FUNC(socket, ,
[AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
+fi
+
dnl If all goes well, by this point the previous two checks will have
dnl pulled in -lsocket and -lnsl if we need them.
AC_CHECK_FUNC(getaddrinfo,
@@ -161,6 +198,8 @@
[AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
AC_CHECK_FUNCS(inet_ntop)
AC_CHECK_FUNCS(getifaddrs)
+
+if test "$os_win32" != yes; then
dnl Check for socklen_t (in Unix98)
AC_MSG_CHECKING(for socklen_t)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -182,6 +221,7 @@
AC_DEFINE(socklen_t, int, [socklen_t size])
])
])
+fi
dnl Some systems do not have sa_len field for struct sockaddr.
AC_CHECK_MEMBER([struct sockaddr.sa_len],
@@ -332,6 +372,18 @@
AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
dnl #######################################################################
+dnl # Check for Zlib
+dnl #######################################################################
+PKG_CHECK_MODULES([ZLIB],[zlib],[],[
+ AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
+ [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
+ AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
+ [AC_MSG_ERROR(zlib not found or functional)], [])
+])
+AC_SUBST(ZLIB_CFLAGS)
+AC_SUBST(ZLIB_LIBS)
+
+dnl #######################################################################
dnl # Check for GLib 2.16 (required)
dnl #######################################################################
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
@@ -1267,7 +1319,7 @@
AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
-AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes" -a "x$enable_zephyr" = "xyes")
AC_SUBST(STATIC_LINK_LIBS)
AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
[Loads static protocol plugin module initialization functions.])
@@ -1288,6 +1340,10 @@
if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc10//'`
fi
+if test "x$enable_zephyr" != "xyes"; then
+ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/zephyr//'`
+fi
+
AC_SUBST(DYNAMIC_PRPLS)
for i in $DYNAMIC_PRPLS ; do
case $i in
@@ -2641,6 +2697,11 @@
pidgin/plugins/perl/Makefile
pidgin/plugins/perl/common/Makefile.PL
pidgin/plugins/ticker/Makefile
+ pidgin/plugins/win32/Makefile
+ pidgin/plugins/win32/transparency/Makefile
+ pidgin/plugins/win32/winprefs/Makefile
+ pidgin/win32/pidgin_dll_rc.rc
+ pidgin/win32/pidgin_exe_rc.rc
libpurple/data/gconf/Makefile
libpurple/data/purple.pc
libpurple/data/purple-uninstalled.pc
@@ -2677,6 +2738,7 @@
libpurple/tests/Makefile
libpurple/purple.h
libpurple/version.h
+ libpurple/win32/libpurplerc.rc
share/sounds/Makefile
share/ca-certs/Makefile
finch/finch.pc
--- pidgin-2.10.12/finch/finch.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/finch/finch.c 2016-02-11 13:11:24.101385320 +0100
@@ -383,7 +383,7 @@
purple_plugins_add_search_path(path);
g_free(path);
- purple_plugins_add_search_path(LIBDIR);
+ purple_plugins_add_search_path(FINCH_LIBDIR);
if (!purple_core_init(FINCH_UI))
{
--- pidgin-2.10.12/finch/gntsound.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/finch/gntsound.c 2016-02-11 13:11:24.101385320 +0100
@@ -616,7 +616,7 @@
if (!filename || !strlen(filename)) {
g_free(filename);
/* XXX Consider creating a constant for "sounds/purple" to be shared with Pidgin */
- filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "sounds", "purple", sounds[event].def, NULL);
}
purple_sound_play_file(filename, NULL);
--- pidgin-2.10.12/finch/libgnt/wms/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/finch/libgnt/wms/Makefile.am 2016-02-11 13:11:24.101385320 +0100
@@ -29,7 +29,7 @@
EXTRA_DIST =
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\"
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/finch \
-I$(top_srcdir)/finch/libgnt \
--- pidgin-2.10.12/finch/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/finch/Makefile.am 2016-02-11 13:11:24.101385320 +0100
@@ -78,11 +78,11 @@
$(top_builddir)/libpurple/libpurple.la
AM_CPPFLAGS = \
- -DSTANDALONE \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/finch/\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DFINCH_LIBDIR=\"$(libdir)/finch/\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DSTANDALONE \
-I$(top_srcdir)/libpurple/ \
-I$(top_srcdir) \
-I$(srcdir)/libgnt/ \
--- pidgin-2.10.12/finch/plugins/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/finch/plugins/Makefile.am 2016-02-11 13:11:24.101385320 +0100
@@ -39,7 +39,7 @@
EXTRA_DIST = pietray.py
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir) \
--- pidgin-2.10.12/libpurple/certificate.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/certificate.c 2016-02-11 13:11:24.101385320 +0100
@@ -856,15 +856,15 @@
{
/* Attempt to point at the appropriate system path */
if (NULL == x509_ca_paths) {
-#ifdef _WIN32
- x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR,
+#if defined(_WIN32) && !defined(USE_FHS)
+ x509_ca_paths = g_list_append(NULL, g_build_filename(PURPLE_DATADIR,
"ca-certs", NULL));
#else
# ifdef SSL_CERTIFICATES_DIR
x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR));
# endif
x509_ca_paths = g_list_append(x509_ca_paths,
- g_build_filename(DATADIR, "purple", "ca-certs", NULL));
+ g_build_filename(PURPLE_DATADIR, "purple", "ca-certs", NULL));
#endif
}
--- pidgin-2.10.12/libpurple/data/purple.pc.in 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/data/purple.pc.in 2016-02-11 13:11:24.101385320 +0100
@@ -13,5 +13,5 @@
Description: libpurple is a GLib-based instant messenger library.
Version: @VERSION@
Requires: glib-2.0
-Cflags: -I${includedir}/libpurple
+Cflags: -I${includedir}/libpurple -I${includedir}/libpurple/win32
Libs: -L${libdir} -lpurple
--- pidgin-2.10.12/libpurple/dnsquery.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/dnsquery.c 2016-02-11 13:11:24.105385231 +0100
@@ -744,7 +744,8 @@
query_data = data;
-#ifdef USE_IDN
+
+#if defined(USE_IDN) && defined(HAVE_GETADDRINFO)
if (!dns_str_is_ascii(query_data->hostname)) {
rc = purple_network_convert_idn_to_ascii(query_data->hostname, &hostname);
if (rc != 0) {
--- pidgin-2.10.12/libpurple/example/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/example/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -12,11 +12,9 @@
$(top_builddir)/libpurple/libpurple.la
AM_CPPFLAGS = \
- -DSTANDALONE \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DSTANDALONE \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir) \
--- pidgin-2.10.12/libpurple/example/nullclient.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/example/nullclient.c 2016-02-11 13:11:24.105385231 +0100
@@ -308,7 +308,11 @@
account = purple_account_new(name, prpl);
/* Get the password for the account */
+#ifndef _WIN32
password = getpass("Password: ");
+#else
+ password = "password";
+#endif
purple_account_set_password(account, password);
/* It's necessary to enable the account first. */
--- pidgin-2.10.12/libpurple/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -15,21 +15,25 @@
data/purple-uninstalled.pc.in \
win32/global.mak \
win32/libc_interface.c \
- win32/libc_interface.h \
- win32/libc_internal.h \
win32/libpurplerc.rc.in \
win32/rules.mak \
win32/targets.mak \
- win32/wpurpleerror.h \
win32/win32dep.c \
- win32/giowin32.c \
+ win32/giowin32.c
+
+if !OS_WIN32
+EXTRA_DIST += \
+ win32/libc_interface.h \
+ win32/libc_internal.h \
+ win32/wpurpleerror.h \
win32/win32dep.h
+endif
if USE_GCONFTOOL
GCONF_DIR=data/gconf
endif
-SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
+SUBDIRS = $(GCONF_DIR) ciphers . plugins protocols tests example
purple_coresources = \
account.c \
@@ -94,6 +98,20 @@
xmlnode.c \
whiteboard.c
+if OS_WIN32
+purple_coresources += \
+ win32/giowin32.c \
+ win32/libc_interface.c \
+ win32/win32dep.c
+
+libpurple_win32_res = libpurple-win32-res.o
+libpurple_win32_res_ldflag = -Wl,$(libpurple_win32_res)
+
+libpurple-win32-res.o: win32/libpurplerc.rc
+ $(WINDRES) -I$(top_srcdir)/libpurple -i $< -o $@
+
+endif
+
purple_builtsources = \
marshallers.c
@@ -163,6 +181,14 @@
codec.h \
enum-types.h
+if OS_WIN32
+purple_win32headers = \
+ libc_interface.h \
+ libc_internal.h \
+ wpurpleerror.h \
+ win32dep.h
+endif
+
purple_builtheaders = purple.h version.h marshallers.h
marshallers.h: marshallers.list
@@ -297,8 +323,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = data/purple.pc
-libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
-libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
+if OS_WIN32
+win32includedir=$(includedir)/libpurple/win32
+win32include_HEADERS = \
+ $(addprefix $(srcdir)/win32/, $(purple_win32headers))
+endif
+
+libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS) $(libpurple_win32_res)
+libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) $(AVOID_VERSION) \
+ $(NO_UNDEFINED) $(libpurple_win32_res_ldflag)
libpurple_la_LIBADD = \
$(STATIC_LINK_LIBS) \
$(DBUS_LIBS) \
@@ -315,9 +348,14 @@
ciphers/libpurple-ciphers.la \
-lm
+if OS_WIN32
+libpurple_la_LIBADD += \
+ -lws2_32 -ldnsapi
+endif
+
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DPURPLE_LIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
$(GLIB_CFLAGS) \
@@ -332,6 +370,12 @@
$(IDN_CFLAGS) \
$(NETWORKMANAGER_CFLAGS)
+if OS_WIN32
+AM_CPPFLAGS += \
+ -DUSE_FHS \
+ -I$(top_srcdir)/libpurple/win32
+endif
+
# INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
# We want to use SSL_CERTIFICATES_DIR when it's not empty.
if ! INSTALL_SSL_CERTIFICATES
--- pidgin-2.10.12/libpurple/plugin.c 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/plugin.c 2016-02-11 13:11:24.105385231 +0100
@@ -1179,7 +1179,7 @@
purple_plugins_init(void) {
void *handle = purple_plugins_get_handle();
- purple_plugins_add_search_path(LIBDIR);
+ purple_plugins_add_search_path(PURPLE_LIBDIR);
purple_signal_register(handle, "plugin-load",
purple_marshal_VOID__POINTER,
--- pidgin-2.10.12/libpurple/plugins/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/plugins/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -24,27 +24,27 @@
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-autoaccept_la_LDFLAGS = -module -avoid-version
-buddynote_la_LDFLAGS = -module -avoid-version
-ciphertest_la_LDFLAGS = -module -avoid-version
-codeinline_la_LDFLAGS = -module -avoid-version
-debug_example_la_LDFLAGS = -module -avoid-version
-helloworld_la_LDFLAGS = -module -avoid-version
-idle_la_LDFLAGS = -module -avoid-version
-joinpart_la_LDFLAGS = -module -avoid-version
-log_reader_la_LDFLAGS = -module -avoid-version
-newline_la_LDFLAGS = -module -avoid-version
-notify_example_la_LDFLAGS = -module -avoid-version
-offlinemsg_la_LDFLAGS = -module -avoid-version
-one_time_password_la_LDFLAGS = -module -avoid-version
-pluginpref_example_la_LDFLAGS = -module -avoid-version
-psychic_la_LDFLAGS = -module -avoid-version
-signals_test_la_LDFLAGS = -module -avoid-version
-simple_la_LDFLAGS = -module -avoid-version
-statenotify_la_LDFLAGS = -module -avoid-version
+autoaccept_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+buddynote_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ciphertest_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+codeinline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+debug_example_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+helloworld_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+idle_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+joinpart_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+log_reader_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+newline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+notify_example_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+offlinemsg_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+one_time_password_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+pluginpref_example_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+psychic_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+signals_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+simple_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+statenotify_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
# this can't be in a conditional otherwise automake 1.4 yells
-dbus_example_la_LDFLAGS = -module -avoid-version
+dbus_example_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -90,29 +90,30 @@
simple_la_SOURCES = simple.c
statenotify_la_SOURCES = statenotify.c
-autoaccept_la_LIBADD = $(GLIB_LIBS)
-buddynote_la_LIBADD = $(GLIB_LIBS)
-ciphertest_la_LIBADD = $(GLIB_LIBS)
-codeinline_la_LIBADD = $(GLIB_LIBS)
-idle_la_LIBADD = $(GLIB_LIBS)
-joinpart_la_LIBADD = $(GLIB_LIBS)
-log_reader_la_LIBADD = $(GLIB_LIBS)
-newline_la_LIBADD = $(GLIB_LIBS)
-notify_example_la_LIBADD = $(GLIB_LIBS)
-offlinemsg_la_LIBADD = $(GLIB_LIBS)
-one_time_password_la_LIBADD = $(GLIB_LIBS)
-pluginpref_example_la_LIBADD = $(GLIB_LIBS)
-psychic_la_LIBADD = $(GLIB_LIBS)
-signals_test_la_LIBADD = $(GLIB_LIBS)
-simple_la_LIBADD = $(GLIB_LIBS)
-statenotify_la_LIBADD = $(GLIB_LIBS)
+
+autoaccept_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+buddynote_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+ciphertest_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+codeinline_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+idle_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+joinpart_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+log_reader_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+newline_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+notify_example_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+offlinemsg_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+one_time_password_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+pluginpref_example_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+psychic_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+signals_test_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+simple_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+statenotify_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
if ENABLE_DBUS
CLEANFILES = dbus-example-bindings.c
dbus_example_la_SOURCES = dbus-example.c
-dbus_example_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+dbus_example_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(PURPLE_LIBS)
.PHONY: always
@@ -140,7 +141,7 @@
startup.py
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(DEBUG_CFLAGS) \
@@ -148,6 +149,11 @@
$(PLUGIN_CFLAGS) \
$(DBUS_CFLAGS)
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
+
#
# This part allows people to build their own plugins in here.
# Yes, it's a mess.
--- pidgin-2.10.12/libpurple/plugins/perl/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/plugins/perl/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -165,7 +165,6 @@
-I$(top_srcdir) \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
- -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)\" \
$(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS) \
--- pidgin-2.10.12/libpurple/plugins/ssl/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/plugins/ssl/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -3,10 +3,10 @@
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-ssl_la_LDFLAGS = -module -avoid-version
-ssl_gnutls_la_LDFLAGS = -module -avoid-version
-ssl_nss_la_LDFLAGS = -module -avoid-version
-nss_prefs_la_LDFLAGS = -module -avoid-version
+ssl_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ssl_gnutls_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ssl_nss_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+nss_prefs_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -43,15 +43,15 @@
ssl_nss_la_SOURCES = ssl-nss.c
nss_prefs_la_SOURCES = nss-prefs.c
-ssl_la_LIBADD = $(GLIB_LIBS)
-ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
-ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
-nss_prefs_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
+ssl_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
+ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) $(PURPLE_LIBS)
+ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) $(PURPLE_LIBS)
+nss_prefs_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) $(PURPLE_LIBS)
endif # PLUGINS
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)/libpurple\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
@@ -59,6 +59,12 @@
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
+if OS_WIN32
+AM_CPPFLAGS += \
+ -DWIN32_LEAN_AND_MEAN \
+ -I$(top_srcdir)/libpurple/win32
+endif
+
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
nss_prefs_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
--- pidgin-2.10.12/libpurple/plugins/tcl/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/plugins/tcl/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -1,13 +1,13 @@
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-tcl_la_LDFLAGS = -module -avoid-version
+tcl_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
plugin_LTLIBRARIES = tcl.la
tcl_la_SOURCES = tcl.c tcl_glib.c tcl_glib.h tcl_cmds.c tcl_signals.c tcl_purple.h \
tcl_ref.c tcl_cmd.c
-tcl_la_LIBADD = $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS)
+tcl_la_LIBADD = $(GLIB_LIBS) $(TCL_LIBS) $(TK_LIBS) $(PURPLE_LIBS)
EXTRA_DIST = signal-test.tcl Makefile.mingw
@@ -20,3 +20,8 @@
$(PLUGIN_CFLAGS) \
$(TK_CFLAGS) \
$(TCL_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
\ No newline at end of file
--- pidgin-2.10.12/libpurple/protocols/bonjour/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/bonjour/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -40,7 +40,7 @@
st =
pkg_LTLIBRARIES = libbonjour.la
libbonjour_la_SOURCES = $(BONJOURSOURCES)
-libbonjour_la_LIBADD = $(GLIB_LIBS) $(LIBXML_LIBS) $(AVAHI_LIBS)
+libbonjour_la_LIBADD = $(GLIB_LIBS) $(LIBXML_LIBS) $(AVAHI_LIBS) $(PURPLE_LIBS)
endif
--- pidgin-2.10.12/libpurple/protocols/gg/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/gg/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -96,6 +96,10 @@
$(GNUTLS_CFLAGS) \
-DGG_IGNORE_DEPRECATED
+if OS_WIN32
+INTGG_CFLAGS += -include win32dep.h
+endif
+
endif
GGSOURCES = \
@@ -113,7 +117,7 @@
AM_CFLAGS = $(st)
-libgg_la_LDFLAGS = -module -avoid-version
+libgg_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_GG
@@ -121,14 +125,14 @@
noinst_LTLIBRARIES = libgg.la
libgg_la_SOURCES = $(GGSOURCES)
libgg_la_CFLAGS = $(AM_CFLAGS)
-libgg_la_LIBADD = $(LIBGADU_LIBS) $(INTGG_LIBS)
+libgg_la_LIBADD = $(LIBGADU_LIBS) $(INTGG_LIBS) $(PURPLE_LIBS)
else
st =
pkg_LTLIBRARIES = libgg.la
libgg_la_SOURCES = $(GGSOURCES)
-libgg_la_LIBADD = $(GLIB_LIBS) $(LIBGADU_LIBS) $(INTGG_LIBS)
+libgg_la_LIBADD = $(GLIB_LIBS) $(LIBGADU_LIBS) $(INTGG_LIBS) $(PURPLE_LIBS)
endif
@@ -139,3 +143,7 @@
$(INTGG_CFLAGS) \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/irc/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/irc/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -13,7 +13,7 @@
AM_CFLAGS = $(st)
-libirc_la_LDFLAGS = -module -avoid-version
+libirc_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_IRC
@@ -27,7 +27,7 @@
st =
pkg_LTLIBRARIES = libirc.la
libirc_la_SOURCES = $(IRCSOURCES)
-libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
+libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(PURPLE_LIBS)
endif
@@ -36,3 +36,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/jabber/Makefile.am 2016-01-01 00:19:40.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/jabber/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -95,7 +95,8 @@
AM_CFLAGS = $(st)
-libxmpp_la_LDFLAGS = -module -avoid-version
+libxmpp_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libjabber_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED)
if USE_CYRUS_SASL
JABBERSOURCES += auth_cyrus.c
@@ -111,12 +112,20 @@
else
st =
-pkg_LTLIBRARIES = libjabber.la libxmpp.la
+pkg_LTLIBRARIES = libxmpp.la
+
+if OS_WIN32
+lib_LTLIBRARIES = libjabber.la
+else
+pkg_LTLIBRARIES += libjabber.la
+endif
+
libjabber_la_SOURCES = $(JABBERSOURCES)
libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
$(FARSIGHT_LIBS) \
$(GSTREAMER_LIBS) \
- $(GSTINTERFACES_LIBS)
+ $(GSTINTERFACES_LIBS) \
+ $(PURPLE_LIBS)
libxmpp_la_SOURCES = libxmpp.c
libxmpp_la_LIBADD = libjabber.la
@@ -133,3 +142,10 @@
$(FARSIGHT_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GSTINTERFACES_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/libpurple/protocols/jabber/win32
+endif
+
--- pidgin-2.10.12/libpurple/protocols/msn/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/msn/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -77,7 +77,7 @@
AM_CFLAGS = $(st)
-libmsn_la_LDFLAGS = -module -avoid-version
+libmsn_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_MSN
@@ -91,7 +91,7 @@
st =
pkg_LTLIBRARIES = libmsn.la
libmsn_la_SOURCES = $(MSNSOURCES)
-libmsn_la_LIBADD = $(GLIB_LIBS)
+libmsn_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
endif
@@ -100,3 +100,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/mxit/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/mxit/Makefile.am 2016-02-11 13:11:24.105385231 +0100
@@ -40,7 +40,7 @@
AM_CFLAGS = $(st)
-libmxit_la_LDFLAGS = -module -avoid-version
+libmxit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_MXIT
@@ -54,7 +54,7 @@
st =
pkg_LTLIBRARIES = libmxit.la
libmxit_la_SOURCES = $(MXITSOURCES)
-libmxit_la_LIBADD = $(GLIB_LIBS)
+libmxit_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
endif
@@ -63,3 +63,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/mxit/markup.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/mxit/markup.c 2016-02-11 13:11:24.105385231 +0100
@@ -230,7 +230,7 @@
return -1;
}
- len = (guint8)data[1]; /* length field [1 byte] */
+ len = data[1]; /* length field [1 byte] */
if ( data_len - 2 < len ) {
/* not enough bytes left in data! */
return -1;
--- pidgin-2.10.12/libpurple/protocols/myspace/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/myspace/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -19,7 +19,7 @@
AM_CFLAGS = $(st)
-libmyspace_la_LDFLAGS = -module -avoid-version
+libmyspace_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_MYSPACE
@@ -33,7 +33,7 @@
st =
pkg_LTLIBRARIES = libmyspace.la
libmyspace_la_SOURCES = $(MSIMSOURCES)
-libmyspace_la_LIBADD = $(GLIB_LIBS)
+libmyspace_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
endif
@@ -42,3 +42,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/novell/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/novell/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -28,7 +28,7 @@
AM_CFLAGS = $(st)
-libnovell_la_LDFLAGS = -module -avoid-version
+libnovell_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_NOVELL
@@ -42,7 +42,7 @@
st =
pkg_LTLIBRARIES = libnovell.la
libnovell_la_SOURCES = $(NOVELLSOURCES)
-libnovell_la_LIBADD = $(GLIB_LIBS)
+libnovell_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
endif
@@ -51,3 +51,8 @@
-I$(top_builddir)/libpurple \
$(DEBUG_CFLAGS) \
$(GLIB_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/null/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/null/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -14,10 +14,15 @@
st =
pkg_LTLIBRARIES = libnull.la
libnull_la_SOURCES = $(NULLSOURCES)
-libnull_la_LIBADD = $(GLIB_LIBS)
+libnull_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/oscar/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/oscar/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -50,8 +50,9 @@
AM_CFLAGS = $(st)
-libaim_la_LDFLAGS = -module -avoid-version
-libicq_la_LDFLAGS = -module -avoid-version
+libaim_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libicq_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liboscar_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED)
if STATIC_OSCAR
st = -DPURPLE_STATIC_PRPL
@@ -62,9 +63,16 @@
else
st =
-pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la
+pkg_LTLIBRARIES = libaim.la libicq.la
+
+if OS_WIN32
+lib_LTLIBRARIES = liboscar.la
+else
+pkg_LTLIBRARIES += liboscar.la
+endif
+
liboscar_la_SOURCES = $(OSCARSOURCES)
-liboscar_la_LIBADD = $(GLIB_LIBS)
+liboscar_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
libaim_la_SOURCES = libaim.c
libaim_la_LIBADD = liboscar.la
@@ -79,3 +87,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/sametime/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/sametime/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -24,8 +24,8 @@
endif
libsametime_la_SOURCES = $(SAMETIMESOURCES)
-libsametime_la_LDFLAGS = -module -avoid-version
-libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
+libsametime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS) $(PURPLE_LIBS)
AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
@@ -35,3 +35,7 @@
$(MEANWHILE_CFLAGS) \
-DG_LOG_DOMAIN=\"sametime\"
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/silc/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/silc/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -19,7 +19,7 @@
AM_CFLAGS = $(st)
-libsilcpurple_la_LDFLAGS = -module -avoid-version
+libsilcpurple_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_SILC
@@ -34,7 +34,7 @@
st = $(SILC_CFLAGS)
pkg_LTLIBRARIES = libsilcpurple.la
libsilcpurple_la_SOURCES = $(SILCSOURCES)
-libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS)
+libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) $(PURPLE_LIBS)
endif
@@ -44,3 +44,8 @@
$(DEBUG_CFLAGS) \
$(GLIB_CFLAGS) \
$(SILC_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/simple/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/simple/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -11,7 +11,7 @@
AM_CFLAGS = $(st)
-libsimple_la_LDFLAGS = -module -avoid-version
+libsimple_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if STATIC_SIMPLE
@@ -25,7 +25,7 @@
st =
pkg_LTLIBRARIES = libsimple.la
libsimple_la_SOURCES = $(SIMPLESOURCES)
-libsimple_la_LIBADD = $(GLIB_LIBS)
+libsimple_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
endif
@@ -34,3 +34,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/protocols/yahoo/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/protocols/yahoo/Makefile.am 2016-02-11 13:11:24.109385142 +0100
@@ -27,8 +27,9 @@
AM_CFLAGS = $(st)
-libyahoo_la_LDFLAGS = -module -avoid-version
-libyahoojp_la_LDFLAGS = -module -avoid-version
+libyahoo_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libyahoojp_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libymsg_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED)
if STATIC_YAHOO
@@ -40,10 +41,16 @@
else
st =
-pkg_LTLIBRARIES = libymsg.la libyahoo.la libyahoojp.la
+pkg_LTLIBRARIES = libyahoo.la libyahoojp.la
+
+if OS_WIN32
+lib_LTLIBRARIES = libymsg.la
+else
+pkg_LTLIBRARIES += libymsg.la
+endif
libymsg_la_SOURCES = $(YAHOOSOURCES)
-libymsg_la_LIBADD = $(GLIB_LIBS)
+libymsg_la_LIBADD = $(GLIB_LIBS) $(PURPLE_LIBS)
libyahoo_la_SOURCES = libyahoo.c
libyahoo_la_LIBADD = libymsg.la
@@ -58,3 +65,8 @@
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32
+endif
--- pidgin-2.10.12/libpurple/win32/libc_interface.h 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/win32/libc_interface.h 2016-02-11 13:11:24.109385142 +0100
@@ -23,6 +23,7 @@
#ifndef _LIBC_INTERFACE_H_
#define _LIBC_INTERFACE_H_
#include <winsock2.h>
+#undef socklen_t
#include <ws2tcpip.h>
#include <io.h>
#include <errno.h>
--- pidgin-2.10.12/libpurple/win32/libpurplerc.rc.in 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/win32/libpurplerc.rc.in 2016-02-11 13:11:24.109385142 +0100
@@ -2,8 +2,8 @@
#include "version.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
- PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+ FILEVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
+ PRODUCTVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
--- pidgin-2.10.12/libpurple/win32/win32dep.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/win32/win32dep.c 2016-02-11 13:11:24.109385142 +0100
@@ -28,12 +28,18 @@
#include "debug.h"
#include "notify.h"
+#ifdef USE_FHS
+#include "version.h"
+#endif
/*
* LOCALS
*/
static char *app_data_dir = NULL, *install_dir = NULL,
*lib_dir = NULL, *locale_dir = NULL;
+#ifdef USE_FHS
+static char *share_dir = NULL;
+#endif
static HINSTANCE libpurpledll_hInstance = NULL;
@@ -153,13 +159,39 @@
return install_dir;
}
+#ifdef USE_FHS
+const char *wpurple_share_dir(void) {
+ static gboolean initialized = FALSE;
+
+ if (!initialized) {
+ const char *inst_dir = wpurple_install_dir();
+ if (inst_dir != NULL) {
+ share_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "share", inst_dir);
+ initialized = TRUE;
+ } else {
+ return NULL;
+ }
+ }
+
+ return share_dir;
+}
+#else
+const char *wpurple_share_dir(void) {
+ return wpurple_install_dir();
+}
+#endif
+
const char *wpurple_lib_dir(void) {
static gboolean initialized = FALSE;
if (!initialized) {
const char *inst_dir = wpurple_install_dir();
if (inst_dir != NULL) {
+#ifdef USE_FHS
+ lib_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "lib" G_DIR_SEPARATOR_S "purple-%i" , inst_dir, PURPLE_MAJOR_VERSION);
+#else
lib_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "plugins", inst_dir);
+#endif
initialized = TRUE;
} else {
return NULL;
@@ -175,7 +207,11 @@
if (!initialized) {
const char *inst_dir = wpurple_install_dir();
if (inst_dir != NULL) {
+#ifdef USE_FHS
+ locale_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S ".." G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S "locale", inst_dir);
+#else
locale_dir = g_strdup_printf("%s" G_DIR_SEPARATOR_S "locale", inst_dir);
+#endif
initialized = TRUE;
} else {
return NULL;
@@ -375,6 +411,11 @@
lib_dir = NULL;
locale_dir = NULL;
+#ifdef USE_FHS
+ g_free(share_dir);
+ share_dir = NULL;
+#endif
+
libpurpledll_hInstance = NULL;
}
--- pidgin-2.10.12/libpurple/win32/win32dep.h 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/libpurple/win32/win32dep.h 2016-02-11 13:11:24.109385142 +0100
@@ -65,6 +65,7 @@
const char *wpurple_install_dir(void);
const char *wpurple_lib_dir(void);
const char *wpurple_locale_dir(void);
+const char *wpurple_share_dir(void);
const char *wpurple_data_dir(void);
/* init / cleanup */
@@ -80,9 +81,14 @@
/*
* Purple specific
*/
-#define DATADIR wpurple_install_dir()
-#define LIBDIR wpurple_lib_dir()
+#undef PURPLE_DATADIR
+#define PURPLE_DATADIR wpurple_share_dir()
+#undef PURPLE_LIBDIR
+#define PURPLE_LIBDIR wpurple_lib_dir()
+#undef LOCALEDIR
#define LOCALEDIR wpurple_locale_dir()
+/* TODO: SYSCONFDIR should be the allusers AppData? */
+#undef SYSCONFDIR
#ifdef __cplusplus
}
--- pidgin-2.10.12/pidgin/data/pidgin-2.pc.in 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/data/pidgin-2.pc.in 2016-02-11 13:11:24.109385142 +0100
@@ -13,3 +13,4 @@
Version: @VERSION@
Requires: gtk+-2.0 purple
Cflags: -I${includedir}
+Libs: -L${libdir} -lpidgin
--- pidgin-2.10.12/pidgin/data/pidgin.pc.in 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/data/pidgin.pc.in 2016-02-11 13:11:24.109385142 +0100
@@ -12,5 +12,6 @@
Description: Pidgin is a GTK2-based instant messenger application.
Version: @VERSION@
Requires: gtk+-2.0 purple
-Cflags: -I${includedir}/pidgin
+Cflags: -I${includedir}/pidgin -I${includedir}/pidgin/win32
+Libs: -L${libdir} -lpidgin
--- pidgin-2.10.12/pidgin/gtkblist.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkblist.c 2016-02-11 13:11:24.113385054 +0100
@@ -3332,14 +3332,14 @@
char *path;
if (!strcmp(mood, "busy")) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"status", "16", "busy.png", NULL);
} else if (!strcmp(mood, "hiptop")) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"emblems", "16", "hiptop.png", NULL);
} else {
char *filename = g_strdup_printf("%s.png", mood);
- path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
"emotes", "small", filename, NULL);
g_free(filename);
}
@@ -3986,7 +3986,7 @@
if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
/* This emblem comes from the small emoticon set now,
* to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes",
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes",
"small", "mobile.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4003,7 +4003,7 @@
g_return_val_if_fail(buddy != NULL, NULL);
if (!purple_privacy_check(buddy->account, purple_buddy_get_name(buddy))) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4014,7 +4014,7 @@
if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
/* This emblem comes from the small emoticon set now, to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "mobile.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", "small", "mobile.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4023,18 +4023,18 @@
/* Only in MSN.
* TODO: Replace "Tune" with generalized "Media" in 3.0. */
if (purple_status_get_attr_string(tune, "game") != NULL) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "game.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "game.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
/* Only in MSN.
* TODO: Replace "Tune" with generalized "Media" in 3.0. */
if (purple_status_get_attr_string(tune, "office") != NULL) {
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "office.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", "office.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
/* Regular old "tune" is the only one in all protocols. */
/* This emblem comes from the small emoticon set now, to reduce duplication. */
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "music.png", NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", "small", "music.png", NULL);
return _pidgin_blist_get_cached_emblem(path);
}
@@ -4061,7 +4061,7 @@
path = get_mood_icon_path(name);
} else {
filename = g_strdup_printf("%s.png", name);
- path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
+ path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
g_free(filename);
}
--- pidgin-2.10.12/pidgin/gtkdialogs.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkdialogs.c 2016-02-11 13:11:24.113385054 +0100
@@ -466,7 +466,7 @@
gtk_window_set_default_size(GTK_WINDOW(win), 450, 450);
/* Generate a logo with a version number */
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
pixbuf = pidgin_pixbuf_new_from_file(filename);
g_free(filename);
--- pidgin-2.10.12/pidgin/gtkdnd-hints.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkdnd-hints.c 2016-02-11 13:11:24.113385054 +0100
@@ -121,7 +121,7 @@
for (i = 0; hint_windows[i].filename != NULL; i++) {
gchar *fname;
- fname = g_build_filename(DATADIR, "pixmaps", "pidgin",
+ fname = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
hint_windows[i].filename, NULL);
hint_windows[i].widget = dnd_hints_init_window(fname);
--- pidgin-2.10.12/pidgin/gtkdocklet-gtk.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkdocklet-gtk.c 2016-02-11 13:11:24.113385054 +0100
@@ -291,6 +291,6 @@
}
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
- DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
+ PURPLE_DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
}
--- pidgin-2.10.12/pidgin/gtkmain.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkmain.c 2016-02-11 13:11:24.113385054 +0100
@@ -269,7 +269,7 @@
#ifndef _WIN32
/* use the nice PNG icon for all the windows */
for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
- icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
+ icon_path = g_build_filename(PURPLE_DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
icon = pidgin_pixbuf_new_from_file(icon_path);
g_free(icon_path);
if (icon) {
@@ -811,7 +811,7 @@
fprintf(stderr, "Couldn't create plugins dir\n");
purple_plugins_add_search_path(search_path);
g_free(search_path);
- purple_plugins_add_search_path(LIBDIR);
+ purple_plugins_add_search_path(PIDGIN_LIBDIR);
if (!purple_core_init(PIDGIN_UI)) {
fprintf(stderr,
--- pidgin-2.10.12/pidgin/gtkprefs.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkprefs.c 2016-02-11 13:11:24.113385054 +0100
@@ -528,7 +528,7 @@
/* refresh the list of themes in the manager */
purple_theme_manager_refresh();
- tmp = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
+ tmp = g_build_filename(PURPLE_DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
pixbuf = pidgin_pixbuf_new_from_file_at_scale(tmp, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE);
g_free(tmp);
--- pidgin-2.10.12/pidgin/gtksound.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtksound.c 2016-02-11 13:11:24.113385054 +0100
@@ -614,7 +614,7 @@
g_free(filename);
/* XXX Consider creating a constant for "sounds/purple" to be shared with Finch */
- filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "sounds", "purple", sounds[event].def, NULL);
}
purple_sound_play_file(filename, NULL);
--- pidgin-2.10.12/pidgin/gtkthemes.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkthemes.c 2016-02-11 13:11:24.113385054 +0100
@@ -389,7 +389,7 @@
pidgin_smiley_themes_remove_non_existing();
- probedirs[0] = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", NULL);
+ probedirs[0] = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "emotes", NULL);
probedirs[1] = g_build_filename(purple_user_dir(), "smileys", NULL);
probedirs[2] = 0;
for (l=0; probedirs[l]; l++) {
--- pidgin-2.10.12/pidgin/gtkutils.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/gtkutils.c 2016-02-11 13:11:24.113385054 +0100
@@ -607,7 +607,7 @@
*/
tmp = g_strconcat(protoname, ".png", NULL);
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols",
size == PIDGIN_PRPL_ICON_SMALL ? "16" :
size == PIDGIN_PRPL_ICON_MEDIUM ? "22" : "48",
tmp, NULL);
@@ -698,7 +698,7 @@
plugin = (PurplePlugin *)p->data;
if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+ char *filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols",
"16", "google-talk.png", NULL);
GtkWidget *item;
@@ -721,7 +721,7 @@
}
if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+ char *filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols",
"16", "facebook.png", NULL);
GtkWidget *item;
--- pidgin-2.10.12/pidgin/Makefile.am 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/Makefile.am 2016-02-11 13:11:24.113385054 +0100
@@ -7,19 +7,8 @@
data/pidgin.desktop.in \
data/pidgin.pc.in \
data/pidgin-uninstalled.pc.in \
- win32/MinimizeToTray.h \
- win32/MinimizeToTray.c \
win32/pidgin_dll_rc.rc.in \
win32/pidgin_exe_rc.rc.in \
- win32/gtkdocklet-win32.c \
- win32/gtkwin32dep.c \
- win32/gtkwin32dep.h \
- win32/resource.h \
- win32/untar.c \
- win32/untar.h \
- win32/winpidgin.c \
- win32/wspell.c \
- win32/wspell.h \
win32/nsis/generate_gtk_zip.sh \
win32/nsis/rpm2zip.sh \
win32/nsis/pixmaps/pidgin-header.bmp \
@@ -31,13 +20,28 @@
win32/nsis/create_nsis_translations.pl \
win32/nsis/nsis_translations.desktop.in
+if !OS_WIN32
+EXTRA_DIST += \
+ win32/MinimizeToTray.c \
+ win32/MinimizeToTray.h \
+ win32/gtkdocklet-win32.c \
+ win32/gtkwin32dep.c \
+ win32/gtkwin32dep.h \
+ win32/resource.h \
+ win32/untar.c \
+ win32/untar.h \
+ win32/winpidgin.c \
+ win32/wspell.c \
+ win32/wspell.h
+endif
+
if ENABLE_GTK
-SUBDIRS = pixmaps plugins
+SUBDIRS = . pixmaps plugins
bin_PROGRAMS = pidgin
-pidgin_SOURCES = \
+common_SOURCES = \
pidginstock.c \
gtkaccount.c \
gtkblist.c \
@@ -51,7 +55,6 @@
gtkdialogs.c \
gtkdnd-hints.c \
gtkdocklet.c \
- gtkdocklet-gtk.c \
gtkeventloop.c \
gtkft.c \
gtkicon-theme.c \
@@ -139,14 +142,30 @@
pidgintooltip.h \
pidgin.h
+if OS_WIN32
+pidgin_win32headers = \
+ gtkwin32dep.h
+pidgin_win32noinstheaders = \
+ MinimizeToTray.h \
+ resource.h \
+ untar.h \
+ wspell.h
+endif
+
pidginincludedir=$(includedir)/pidgin
pidgininclude_HEADERS = \
$(pidgin_headers)
+if OS_WIN32
+win32includedir=$(includedir)/pidgin/win32
+win32include_HEADERS = \
+ $(addprefix $(srcdir)/win32/, $(pidgin_win32headers))
+noinst_HEADERS = \
+ $(addprefix $(srcdir)/win32/, $(pidgin_win32noinstheaders))
+endif
pidgin_DEPENDENCIES = @LIBOBJS@
-pidgin_LDFLAGS = -export-dynamic
-pidgin_LDADD = \
+common_LDADD = \
@LIBOBJS@ \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
@@ -160,9 +179,47 @@
$(GTK_LIBS) \
$(top_builddir)/libpurple/libpurple.la
+if OS_WIN32
+lib_LTLIBRARIES = libpidgin.la
+
+pidgin_SOURCES = \
+ win32/pidgin_exe_rc.rc \
+ win32/winpidgin.c
+
+libpidgin_la_SOURCES = \
+ $(common_SOURCES) \
+ win32/MinimizeToTray.c \
+ win32/gtkdocklet-win32.c \
+ win32/gtkwin32dep.c \
+ win32/untar.c \
+ win32/wspell.c \
+ win32/pidgin_dll_rc.rc
+
+libpidgin_la_LDFLAGS = $(AVOID_VERSION) $(NO_UNDEFINED)
+libpidgin_la_LIBADD = $(common_LDADD) -lz -lwinmm -lgdi32
+
+pidgin_LDFLAGS = -mwindows
+pidgin_LDADD =
+
+.rc.o:
+ $(WINDRES) $^ -o $@
+%.o : %.rc
+ $(WINDRES) -I$(top_srcdir)/pidgin -I$(top_srcdir)/pidgin/win32 -I$(top_srcdir)/libpurple -i $< -o $@
+
+else
+pidgin_SOURCES = \
+ $(common_SOURCES) \
+ gtkdocklet-gtk.c
+
+pidgin_CFLAGS = $(AM_CFLAGS)
+pidgin_LDFLAGS = -export-dynamic
+
+pidgin_LDADD = $(common_LDADD)
+endif
+
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)/pidgin/\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -DPIDGIN_LIBDIR=\"$(libdir)/pidgin/\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-I$(top_builddir)/libpurple \
@@ -178,6 +235,14 @@
$(LIBXML_CFLAGS) \
$(INTGG_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -DUSE_FHS \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = data/pidgin.pc
--- pidgin-2.10.12/pidgin/pidginstock.c 2016-01-01 00:19:41.000000000 +0100
+++ pidgin-2.10.12/pidgin/pidginstock.c 2016-02-11 13:11:24.113385054 +0100
@@ -241,7 +241,7 @@
return filename;
g_free(filename);
}
- filename = g_build_filename(DATADIR, name, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, name, NULL);
if (g_file_test(filename, G_FILE_TEST_EXISTS))
return filename;
g_free(filename);
--- pidgin-2.10.12/pidgin/plugins/cap/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/cap/Makefile.am 2016-02-11 13:11:24.113385054 +0100
@@ -18,7 +18,7 @@
cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS)
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
--- pidgin-2.10.12/pidgin/plugins/disco/gtkdisco.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/disco/gtkdisco.c 2016-02-11 13:11:24.113385054 +0100
@@ -119,14 +119,14 @@
if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) {
char *tmp = g_strconcat(service->gateway_type, ".png", NULL);
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "protocols", size, tmp, NULL);
g_free(tmp);
#if 0
} else if (service->type == XMPP_DISCO_SERVICE_TYPE_USER) {
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "status", size, "person.png", NULL);
#endif
} else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT)
- filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL);
+ filename = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", "status", size, "chat.png", NULL);
if (filename) {
pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
--- pidgin-2.10.12/pidgin/plugins/disco/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/disco/Makefile.am 2016-02-11 13:11:24.113385054 +0100
@@ -1,6 +1,10 @@
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-xmppdisco_la_LDFLAGS = -module -avoid-version
+xmppdisco_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
EXTRA_DIST = \
Makefile.mingw
@@ -15,14 +19,21 @@
xmppdisco.c \
xmppdisco.h
-xmppdisco_la_LIBADD = $(GTK_LIBS)
+xmppdisco_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
+
--- pidgin-2.10.12/pidgin/plugins/gestures/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/gestures/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -1,6 +1,10 @@
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-gestures_la_LDFLAGS = -module -avoid-version
+gestures_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -13,14 +17,20 @@
stroke.c \
stroke-draw.c
-gestures_la_LIBADD = $(GTK_LIBS)
+gestures_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS) $(GLIB_LIBS)
endif
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
\ No newline at end of file
--- pidgin-2.10.12/pidgin/plugins/gevolution/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/gevolution/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -1,6 +1,10 @@
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-gevolution_la_LDFLAGS = -module -avoid-version
+gevolution_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -15,15 +19,22 @@
new_person_dialog.c \
eds-utils.c
-gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS)
+gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS) $(GLIB_LIBS)
endif
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
--- pidgin-2.10.12/pidgin/plugins/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = cap disco gestures gevolution musicmessaging perl ticker win32
if BUILD_GEVOLUTION
GEVOLUTION_DIR = gevolution
@@ -27,29 +27,34 @@
$(MUSICMESSAGING_DIR) \
$(PERL_DIR) \
disco \
- ticker
+ ticker \
+ win32
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-convcolors_la_LDFLAGS = -module -avoid-version
-contact_priority_la_LDFLAGS = -module -avoid-version
-extplacement_la_LDFLAGS = -module -avoid-version
-gtk_signals_test_la_LDFLAGS = -module -avoid-version
-gtkbuddynote_la_LDFLAGS = -module -avoid-version
-history_la_LDFLAGS = -module -avoid-version
-iconaway_la_LDFLAGS = -module -avoid-version
-markerline_la_LDFLAGS = -module -avoid-version
-notify_la_LDFLAGS = -module -avoid-version
-pidginrc_la_LDFLAGS = -module -avoid-version
-relnot_la_LDFLAGS = -module -avoid-version
-sendbutton_la_LDFLAGS = -module -avoid-version
-spellchk_la_LDFLAGS = -module -avoid-version
-themeedit_la_LDFLAGS = -module -avoid-version
-timestamp_la_LDFLAGS = -module -avoid-version
-timestamp_format_la_LDFLAGS = -module -avoid-version
-unity_la_LDFLAGS = -module -avoid-version
-vvconfig_la_LDFLAGS = -module -avoid-version
-xmppconsole_la_LDFLAGS = -module -avoid-version
+convcolors_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+contact_priority_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+extplacement_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+gtk_signals_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+gtkbuddynote_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+history_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+iconaway_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+markerline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+notify_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+pidginrc_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+relnot_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+sendbutton_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+spellchk_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+themeedit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+timestamp_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+timestamp_format_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+unity_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+vvconfig_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+xmppconsole_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -102,42 +107,35 @@
vvconfig_la_SOURCES = vvconfig.c
xmppconsole_la_SOURCES = xmppconsole.c
-convcolors_la_LIBADD = $(GTK_LIBS)
-contact_priority_la_LIBADD = $(GTK_LIBS)
-extplacement_la_LIBADD = $(GTK_LIBS)
-gtk_signals_test_la_LIBADD = $(GTK_LIBS)
-gtkbuddynote_la_LIBADD = $(GTK_LIBS)
-history_la_LIBADD = $(GTK_LIBS)
-iconaway_la_LIBADD = $(GTK_LIBS)
-markerline_la_LIBADD = $(GTK_LIBS)
-notify_la_LIBADD = $(GTK_LIBS)
-pidginrc_la_LIBADD = $(GTK_LIBS)
-relnot_la_LIBADD = $(GLIB_LIBS)
-sendbutton_la_LIBADD = $(GTK_LIBS)
-spellchk_la_LIBADD = $(GTK_LIBS)
-themeedit_la_LIBADD = $(GTK_LIBS)
-timestamp_la_LIBADD = $(GTK_LIBS)
-timestamp_format_la_LIBADD = $(GTK_LIBS)
-unity_la_LIBADD = $(GTK_LIBS) $(UNITY_LIBS)
-vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS)
-xmppconsole_la_LIBADD = $(GTK_LIBS)
+convcolors_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+contact_priority_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+extplacement_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+gtk_signals_test_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+gtkbuddynote_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+history_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+iconaway_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+markerline_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+notify_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+pidginrc_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+relnot_la_LIBADD = $(GLIB_LIBS) $(PIDGIN_LIBS)
+sendbutton_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+spellchk_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+themeedit_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+timestamp_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+timestamp_format_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
+unity_la_LIBADD = $(GTK_LIBS) $(UNITY_LIBS) $(PIDGIN_LIBS)
+vvconfig_la_LIBADD = $(GTK_LIBS) $(GSTREAMER_LIBS) $(PIDGIN_LIBS)
+xmppconsole_la_LIBADD = $(GTK_LIBS) $(PIDGIN_LIBS)
endif # PLUGINS
EXTRA_DIST = \
- Makefile.mingw \
mailchk.c \
pidgininc.c \
- raw.c \
- win32/transparency/Makefile.mingw \
- win32/transparency/win2ktrans.c \
- win32/winprefs/gtkappbar.c \
- win32/winprefs/gtkappbar.h \
- win32/winprefs/Makefile.mingw \
- win32/winprefs/winprefs.c
+ raw.c
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
@@ -147,6 +145,12 @@
$(GSTREAMER_CFLAGS) \
$(PLUGIN_CFLAGS)
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
+
#
# This part allows people to build their own plugins in here.
# Yes, it's a mess.
@@ -154,7 +158,7 @@
SUFFIXES = .c .so
.c.so:
$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(NO_UNDEFINED) $(PLUGIN_LIBS)
@rm -f tmp$@.lo tmp$@.o libtmp$@.la
@cp .libs/libtmp$@*.so $@
@rm -rf .libs/libtmp$@.*
--- pidgin-2.10.12/pidgin/plugins/musicmessaging/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/musicmessaging/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -1,7 +1,11 @@
EXTRA_DIST = \
music.png
+if OS_WIN32
+musicmessagingdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
musicmessagingdir = $(libdir)/pidgin
+endif
musicmessaging_la_LDFLAGS = -module -avoid-version
@@ -16,7 +20,7 @@
musicmessaging_la_SOURCES = \
musicmessaging.c
-musicmessaging_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS)
+musicmessaging_la_LIBADD = $(GTK_LIBS) $(DBUS_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
CLEANFILES = music-messaging-bindings.c
@@ -35,10 +39,16 @@
endif
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(DBUS_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
--- pidgin-2.10.12/pidgin/plugins/musicmessaging/musicmessaging.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/musicmessaging/musicmessaging.c 2016-02-11 13:11:24.117384965 +0100
@@ -548,11 +548,13 @@
static void kill_editor (MMConversation *mmconv)
{
+#ifndef _WIN32
if (mmconv->pid)
{
kill(mmconv->pid, SIGINT);
mmconv->pid = 0;
}
+#endif
}
static void init_conversation (PurpleConversation *conv)
@@ -595,7 +597,7 @@
g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(music_button_toggled), mmconv);
- file_path = g_build_filename(DATADIR, "pixmaps", "purple", "buttons",
+ file_path = g_build_filename(PURPLE_DATADIR, "pixmaps", "purple", "buttons",
"music.png", NULL);
image = gtk_image_new_from_file(file_path);
g_free(file_path);
--- pidgin-2.10.12/pidgin/plugins/ticker/Makefile.am 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/ticker/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -1,9 +1,13 @@
EXTRA_DIST = \
Makefile.mingw
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+else
plugindir = $(libdir)/pidgin
+endif
-ticker_la_LDFLAGS = -module -avoid-version
+ticker_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
if PLUGINS
@@ -14,14 +18,20 @@
gtkticker.h \
ticker.c
-ticker_la_LIBADD = $(GTK_LIBS)
+ticker_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
endif
AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
-I$(top_srcdir)/pidgin \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32
+endif
--- pidgin-2.10.12/pidgin/plugins/win32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/win32/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -0,0 +1,9 @@
+DIST_SUBDIRS = transparency winprefs
+
+if OS_WIN32
+SUBDIRS = $(DIST_SUBDIRS)
+endif
+
+EXTRA_DIST = \
+ Makefile.mingw
+
--- pidgin-2.10.12/pidgin/plugins/win32/transparency/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/win32/transparency/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -0,0 +1,31 @@
+EXTRA_DIST = \
+ Makefile.mingw \
+ win2ktrans.c
+
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+
+win2ktrans_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+if PLUGINS
+
+plugin_LTLIBRARIES = win2ktrans.la
+
+win2ktrans_la_SOURCES = \
+ win2ktrans.c
+
+win2ktrans_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
+
+endif
+
+AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -I$(top_srcdir)/libpurple \
+ -I$(top_builddir)/libpurple \
+ -I$(top_srcdir)/pidgin \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32 \
+ $(DEBUG_CFLAGS) \
+ $(GTK_CFLAGS)
+
+endif
--- pidgin-2.10.12/pidgin/plugins/win32/winprefs/gtkappbar.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/win32/winprefs/gtkappbar.c 2016-02-11 13:11:24.117384965 +0100
@@ -27,6 +27,7 @@
* - Move 'App on top' feature from Trans plugin to here
* - Bug: Multiple Show/Hide Desktop calls causes client area to disappear
*/
+#define WINVER 0x500
#include <windows.h>
#include <winver.h>
#include <stdio.h>
--- pidgin-2.10.12/pidgin/plugins/win32/winprefs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ pidgin-2.10.12/pidgin/plugins/win32/winprefs/Makefile.am 2016-02-11 13:11:24.117384965 +0100
@@ -0,0 +1,35 @@
+EXTRA_DIST = \
+ gtkappbar.c \
+ gtkappbar.h \
+ winprefs.c \
+ Makefile.mingw
+
+if OS_WIN32
+plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
+
+winprefs_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+if PLUGINS
+
+plugin_LTLIBRARIES = winprefs.la
+
+winprefs_la_SOURCES = \
+ gtkappbar.c \
+ gtkappbar.h \
+ winprefs.c
+
+winprefs_la_LIBADD = $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
+
+endif
+
+AM_CPPFLAGS = \
+ -DPURPLE_DATADIR=\"$(datadir)\" \
+ -I$(top_srcdir)/libpurple \
+ -I$(top_builddir)/libpurple \
+ -I$(top_srcdir)/pidgin \
+ -I$(top_srcdir)/libpurple/win32 \
+ -I$(top_srcdir)/pidgin/win32 \
+ $(DEBUG_CFLAGS) \
+ $(GTK_CFLAGS)
+
+endif
--- pidgin-2.10.12/pidgin/win32/gtkdocklet-win32.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/win32/gtkdocklet-win32.c 2016-02-11 13:11:24.117384965 +0100
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02111-1301, USA.
*/
-#define _WIN32_IE 0x0500
+#define _WIN32_IE 0x0501
#include <windows.h>
#include <gdk/gdkwin32.h>
#include <gdk/gdk.h>
--- pidgin-2.10.12/pidgin/win32/gtkwin32dep.h 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/win32/gtkwin32dep.h 2016-02-11 13:11:24.117384965 +0100
@@ -25,6 +25,10 @@
#include <windows.h>
#include <gtk/gtk.h>
#include "conversation.h"
+#include "win32dep.h"
+
+#undef PIDGIN_LIBDIR
+#define PIDGIN_LIBDIR PURPLE_LIBDIR
HINSTANCE winpidgin_dll_hinstance(void);
HINSTANCE winpidgin_exe_hinstance(void);
--- pidgin-2.10.12/pidgin/win32/MinimizeToTray.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/win32/MinimizeToTray.c 2016-02-11 13:11:24.117384965 +0100
@@ -14,7 +14,7 @@
*
* Copyright 2000 Matthew Ellis <m.t.ellis@bigfoot.com>
*/
-#define _WIN32_WINNT 0x0500
+#define _WIN32_WINNT 0x0501
#include <windows.h>
#include "MinimizeToTray.h"
--- pidgin-2.10.12/pidgin/win32/pidgin_exe_rc.rc.in 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/win32/pidgin_exe_rc.rc.in 2016-02-11 13:11:24.117384965 +0100
@@ -3,8 +3,8 @@
#include "version.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
- PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
+ FILEVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
+ PRODUCTVERSION @PURPLE_MAJOR_VERSION@,@PURPLE_MINOR_VERSION@,@PURPLE_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -20,7 +20,7 @@
VALUE "FileVersion", "@PIDGIN_VERSION@"
VALUE "InternalName", "pidgin"
VALUE "LegalCopyright", "Copyright (C) 1998-2010 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
- VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+ VALUE "OriginalFilename", "pidgin.exe"
VALUE "ProductName", "Pidgin"
VALUE "ProductVersion", "@PIDGIN_VERSION@"
END
--- pidgin-2.10.12/pidgin/win32/winpidgin.c 2016-01-01 00:19:42.000000000 +0100
+++ pidgin-2.10.12/pidgin/win32/winpidgin.c 2016-02-11 13:11:24.117384965 +0100
@@ -320,11 +320,19 @@
posix = L"sr@Latn"; break;
case SUBLANG_SERBIAN_CYRILLIC:
posix = L"sr"; break;
+/* for some reason mingw-w64 doesn't have these definitions yet */
+#ifdef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC
case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC:
+ posix = L"bs"; break;
+#endif
+#ifdef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN
case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN:
posix = L"bs"; break;
+#endif
+#ifdef SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN
case SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN:
posix = L"hr"; break;
+#endif
}
break;
case LANG_SWEDISH: posix = L"sv"; break;
@@ -703,7 +711,7 @@
return 0;
/* Now we are ready for Pidgin .. */
- wcscat(pidgin_dir, L"\\pidgin.dll");
+ wcscat(pidgin_dir, L"\\libpidgin.dll");
if ((hmod = LoadLibraryW(pidgin_dir)))
pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main");
@@ -716,7 +724,7 @@
BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
const wchar_t *err_msg = get_win32_error_message(dw);
- _snwprintf(errbuf, 512, L"Error loading pidgin.dll.\nError: (%u) %s%s%s",
+ _snwprintf(errbuf, 512, L"Error loading libpidgin.dll.\nError: (%u) %s%s%s",
(UINT) dw, err_msg,
mod_not_found ? L"\n" : L"",
mod_not_found ? L"This probably means that GTK+ can't be found." : L"");
