/soc/2013/ankitkv/gobjectification: fba6e5400a2a: Merged default...
Ankit Vani
a at nevitus.org
Tue Feb 25 09:47:17 EST 2014
Changeset: fba6e5400a2ab5741a948612964ec9b863755489
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-25 20:08 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fba6e5400a2a
Description:
Merged default branch
diffstat:
Makefile.am | 30 ++++++++++++++--
configure.ac | 13 ++++--
doc/reference/finch/Makefile.am | 5 ++-
doc/reference/libpurple/Makefile.am | 5 ++-
doc/reference/pidgin/Makefile.am | 5 ++-
libpurple/plugins/keyrings/Makefile.am | 2 +-
libpurple/plugins/perl/Makefile.am | 1 +
libpurple/plugins/perl/Makefile.mingw | 3 +
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Makefile.mingw | 3 +
libpurple/protocols/gg/Makefile.am | 2 +
libpurple/protocols/gg/keymapper.c | 10 ++--
libpurple/protocols/gg/keymapper.h | 4 +-
libpurple/protocols/mxit/markup.c | 2 +-
libpurple/win32/global.mak | 2 +-
pidgin/Makefile.am | 4 ++
pidgin/gtkblist-theme.c | 50 +++++++++++++++++++++++++++-
pidgin/gtkblist-theme.h | 27 ++++++++++-----
pidgin/gtkblist.c | 48 ++++++++++++++++++++++++++
pidgin/gtkblist.h | 9 +++++
pidgin/libpidgin.c | 2 +-
pidgin/pidgin.c | 4 ++
pidgin/plugins/Makefile.mingw | 2 +-
pidgin/plugins/perl/Makefile.am | 1 +
pidgin/plugins/perl/Makefile.mingw | 3 +
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/perl/common/Makefile.mingw | 3 +
pidgin/win32/gtkwin32dep.c | 9 +++-
pidgin/win32/gtkwin32dep.h | 3 +-
po/POTFILES.skip | 2 +
30 files changed, 218 insertions(+), 40 deletions(-)
diffs (truncated from 673 to 300 lines):
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,31 @@ EXTRA_DIST = \
noinst_HEADERS = config.h package_revision.h
+dist-pre-hook: package_revision.h
+if !ENABLE_GTK_DOC
+ $(AM_V_at)echo "error: gtk-doc must be installed and enabled in order to make dist"
+ $(AM_V_at)echo "re-run ./configure with --enable-gtk-doc switch and try again"
+ $(AM_V_at)false
+endif
+ $(AM_V_at)if [ ! -f "$(top_builddir)libpurple/libpurple.la" ]; then \
+ $(MAKE) -C libpurple libpurple.la; \
+ fi
+if ENABLE_GNT
+ $(AM_V_at)if [ ! -f "$(top_builddir)finch/libgnt/libgnt.la" ]; then \
+ $(MAKE) -C finch/libgnt libgnt.la; \
+ fi
+ $(AM_V_at)if [ ! -f "$(top_builddir)finch/libfinch.la" ]; then \
+ $(MAKE) -C finch libfinch.la; \
+ fi
+endif
+if ENABLE_GTK
+ $(AM_V_at)if [ ! -f "$(top_builddir)pidgin/libpidgin.la" ]; then \
+ $(MAKE) -C pidgin libpidgin.la; \
+ fi
+endif
+
+dist: dist-pre-hook
+
dist-hook:
rm $(distdir)/config.h
@@ -123,10 +148,7 @@ package_revision.h: package_revision_raw
# line does is tell 'distcheck' to shut up and ignore those two files.
distcleancheck_listfiles = find . -type f -a ! -name package_revision.h
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-if PLUGINS
-DISTCHECK_CONFIGURE_FLAGS += --enable-introspection
-endif
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
SUBDIRS = . m4macros libpurple $(GNT_DIR) $(GTK_DIR) $(PO_DIR) share/ca-certs share/sounds doc
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2557,13 +2557,16 @@ AM_CONDITIONAL(ENABLE_TRAYCOMPAT, test "
m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.16],[--flavour no-tmpl])
],[
-AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ if test "x$force_deps" = "xyes" -a "x$enable_gtk_doc" = "xyes"; then
+ AC_MSG_ERROR([
+You have requested to generate documentation, but gtk-doc was not found.
+ ])
+ fi
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ enable_gtk_doc=no
])
-if test "x$enable_gtk_doc" = "x" ; then
- enable_gtk_doc=no
-fi
-
AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],
[compile with debugging support])], , enable_debug=no)
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -124,11 +124,14 @@ EXTRA_DIST += version.xml.in
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
+dist-hook: html-build.stamp
+
# Comment this out if you want 'make check' to test you doc status
# and run some sanity checks
if ENABLE_GTK_DOC
TESTS_ENVIRONMENT = \
DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
+#TODO: fix and enable
+#TESTS = $(GTKDOC_CHECK)
endif
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -170,11 +170,14 @@ EXTRA_DIST += version.xml.in
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
+dist-hook: html-build.stamp
+
# Comment this out if you want 'make check' to test you doc status
# and run some sanity checks
if ENABLE_GTK_DOC
TESTS_ENVIRONMENT = \
DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
+#TODO: fix and enable
+#TESTS = $(GTKDOC_CHECK)
endif
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -141,11 +141,14 @@ EXTRA_DIST += version.xml.in
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
+dist-hook: html-build.stamp
+
# Comment this out if you want 'make check' to test you doc status
# and run some sanity checks
if ENABLE_GTK_DOC
TESTS_ENVIRONMENT = \
DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
+#TODO: fix and enable
+#TESTS = $(GTKDOC_CHECK)
endif
diff --git a/libpurple/plugins/keyrings/Makefile.am b/libpurple/plugins/keyrings/Makefile.am
--- a/libpurple/plugins/keyrings/Makefile.am
+++ b/libpurple/plugins/keyrings/Makefile.am
@@ -39,7 +39,7 @@ kwallet_la_LIBADD = $(GLIB_LIBS) $(KWAL
kwallet.cpp: kwallet.moc
kwallet.moc:
- $(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i kwallet.cpp -o $@
+ $(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i $(srcdir)/kwallet.cpp -o $@
CLEANFILES += kwallet.moc
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -137,6 +137,7 @@ clean-generic:
$(MAKE) clean; \
cd ..; \
done
+ cd common ; rm -rf *.c *.o pm_to_blib Purple.bs MYMETA.* blib/*/.exists blib/*/auto/Purple blib/*/Purple.*pm ; cd ..
rm -f *.so
distclean-generic:
diff --git a/libpurple/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
@@ -7,6 +7,9 @@
PIDGIN_TREE_TOP := ../../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
TARGET = perl
diff --git a/libpurple/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
--- a/libpurple/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
@@ -11,7 +11,7 @@ WriteMakefile(
AUTHOR => 'Purple <https://pidgin.im/>') : ()),
'DEFINE' => '@DEBUG_CFLAGS@ -Wno-float-equal',
'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
- 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@ -DHAVE_CONFIG_H',
+ 'INC' => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_builddir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@ -DHAVE_CONFIG_H',
'OBJECT' => '$(O_FILES)', # link all the C files too
# 'OPTIMIZE' => '-g', # For debugging
'INSTALLDIRS' => 'vendor',
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -7,6 +7,9 @@
PIDGIN_TREE_TOP := ../../../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+#we cannot include win32dep.h, but we need struct sockaddr_in6 definition
+CFLAGS += -include ws2tcpip.h
+
GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -6,6 +6,8 @@ GADU_EXTRA =
pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
EXTRA_DIST = \
+ account.c \
+ account.h \
Makefile.mingw \
lib/COPYING
diff --git a/libpurple/protocols/gg/keymapper.c b/libpurple/protocols/gg/keymapper.c
--- a/libpurple/protocols/gg/keymapper.c
+++ b/libpurple/protocols/gg/keymapper.c
@@ -78,9 +78,9 @@ ggp_keymapper_free(ggp_keymapper *km)
}
gpointer
-ggp_keymapper_to_key(ggp_keymapper *km, uint64_t val)
+ggp_keymapper_to_key(ggp_keymapper *km, guint64 val)
{
- uint64_t *key;
+ guint64 *key;
g_return_val_if_fail(km != NULL, NULL);
@@ -88,7 +88,7 @@ ggp_keymapper_to_key(ggp_keymapper *km,
if (key)
return key;
- key = g_new(uint64_t, 1);
+ key = g_new(guint64, 1);
*key = val;
g_hash_table_insert(km->val_to_key, key, key);
@@ -96,11 +96,11 @@ ggp_keymapper_to_key(ggp_keymapper *km,
return key;
}
-uint64_t
+guint64
ggp_keymapper_from_key(ggp_keymapper *km, gpointer key)
{
g_return_val_if_fail(km != NULL, 0);
g_return_val_if_fail(key != NULL, 0);
- return *((uint64_t*)key);
+ return *((guint64*)key);
}
diff --git a/libpurple/protocols/gg/keymapper.h b/libpurple/protocols/gg/keymapper.h
--- a/libpurple/protocols/gg/keymapper.h
+++ b/libpurple/protocols/gg/keymapper.h
@@ -39,10 +39,10 @@ void
ggp_keymapper_free(ggp_keymapper *km);
gpointer
-ggp_keymapper_to_key(ggp_keymapper *km, uint64_t val);
+ggp_keymapper_to_key(ggp_keymapper *km, guint64 val);
/* The key have to be valid. */
-uint64_t
+guint64
ggp_keymapper_from_key(ggp_keymapper *km, gpointer key);
#endif /* _GGP_KEYMAPPER_H */
diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -214,7 +214,7 @@ static int asn_getUtf8( const gchar* dat
return -1;
}
- len = (uint8_t)data[1]; /* length field [1 byte] */
+ len = (guint8)data[1]; /* length field [1 byte] */
out_str = g_malloc(len + 1);
memcpy(out_str, &data[2], len); /* data field */
out_str[len] = '\0';
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -19,7 +19,7 @@ BONJOUR_TOP ?= $(WIN32_DEV_TOP)/bonjour-
JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-glib-0.14
LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9
MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.14
PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10
SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1
TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.5
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -154,11 +154,15 @@ libpidgin_la_builtheaders = gtkdebug.htm
BUILT_SOURCES = $(libpidgin_la_builtheaders)
+CLEANFILES = gtkdebug.html.h
+
%.html.h: %.html
$(AM_V_GEN)echo "static const char $*_html[] = {" > $@
$(AM_V_at)$(sedpath) -e 's/^[ ]\+//g' -e 's/[ ]\+/ /g' $< | $(xxdpath) -i | sed -e 's/\(0x[0-9a-f][0-9a-f]\)$$/\1, 0x00/' >> $@
$(AM_V_at)echo "};" >> $@
+gtkdebug.c: gtkdebug.html.h
+
libpidgin_la_DEPENDENCIES = @LIBOBJS@
libpidgin_la_LDFLAGS = -export-dynamic
libpidgin_la_LIBADD = \
diff --git a/pidgin/gtkblist-theme.c b/pidgin/gtkblist-theme.c
More information about the Commits
mailing list