/pidgin/main: 04fa7bca5239: Merged in qulogic/pidgin (pull reque...
Gary Kramlich <[email protected]> Tue, 23 Aug 2016 19:45:08 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 04fa7bca5239f20be55506c64223a2b6bdcb2b76 Author: Gary Kramlich <[email protected]> Date: 2016-08-23 18:44 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/04fa7bca5239 Description: Merged in qulogic/pidgin (pull request #101) Cleanup some build kruft diffstat: config.h.mingw | 21 ---- configure.ac | 60 +----------- finch/libgnt/configure.ac | 8 +- libpurple/Makefile.am | 14 +- libpurple/dbus-analyze-functions.py | 171 ++++++++++++++++++++--------------- libpurple/dbus-analyze-signals.py | 27 ++++- libpurple/dbus-analyze-types.py | 54 +++++----- libpurple/internal.h | 6 - pidgin/Makefile.am | 2 +- pidgin/data/pidgin-3.pc.in | 4 +- 10 files changed, 161 insertions(+), 206 deletions(-) diffs (truncated from 769 to 300 lines): diff --git a/config.h.mingw b/config.h.mingw --- a/config.h.mingw +++ b/config.h.mingw @@ -40,9 +40,6 @@ /* Define if you have the external 'altzone' variable. */ /* #undef HAVE_ALTZONE */ -/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */ -/* #undef HAVE_ARPA_NAMESER_COMPAT_H */ - /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 @@ -261,9 +258,6 @@ /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 -/* Define to 1 if you have the `strftime' function. */ -#define HAVE_STRFTIME 1 - /* Define to 1 if you have a strftime() that supports the %z format string. */ /* #undef HAVE_STRFTIME_Z_FORMAT */ @@ -312,9 +306,6 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ /* #define HAVE_SYS_SYSCTL_H 1 */ -/* Define to 1 if you have the <sys/time.h> header file. */ -/* #undef HAVE_SYS_TIME_H */ - /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 @@ -405,9 +396,6 @@ /* Define if plugins are enabled. */ #define PURPLE_PLUGINS 1 -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - /* The size of `time_t', as computed by sizeof. */ #define SIZEOF_TIME_T 4 @@ -427,9 +415,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define to 1 if your <sys/time.h> declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - /* Use GStreamer for playing sounds */ /* It's defined in global.mak. */ /* #undef USE_GSTREAMER */ @@ -453,9 +438,6 @@ /* Use voice and video */ /* #define USE_VV 1 */ -/* 'va_lists' cannot be copied as values */ -/* #define VA_COPY_AS_ARRAY 1 */ - /* Version number of package */ #define VERSION "@VERSION@" #define DISPLAY_VERSION "@DISPLAY_VERSION@" @@ -479,9 +461,6 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - /* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef size_t */ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -166,11 +166,9 @@ AC_SUBST(FINCH_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 stdint.h) +AC_CHECK_HEADERS(fcntl.h unistd.h locale.h stdint.h) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_STRUCT_TM AC_CHECK_SIZEOF(time_t, ,[ #include <stdio.h> #include <time.h>]) @@ -253,8 +251,6 @@ FINCH_PLUGINDIR="\$(libdir)/finch-$PURPL AC_SUBST([FINCH_PLUGINDIR]) dnl Checks for library functions. -AC_TYPE_SIGNAL -AC_FUNC_STRFTIME AC_CHECK_FUNCS(strdup strstr atexit setlocale) dnl Checks for getopt in standard library AC_CHECK_FUNCS(getopt_long,, @@ -379,9 +375,6 @@ int main(int argc, char *argv[]) AC_MSG_CHECKING([for the %z format string in strftime()]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif #include <time.h> #include <stdio.h> @@ -589,18 +582,12 @@ running configure. AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - GTK_PC_MODULE="gtk+-3.0" - GTK_VERSION="3" - AC_SUBST(GTK_PC_MODULE) - AC_SUBST(GTK_VERSION) - dnl We only really need Pango >= 1.4 for decent RTL support PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0], AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) WEBKIT_VERSION=1.3.7 - WEBKIT_PC_MODULE="webkitgtk-3.0" - PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [ + PKG_CHECK_MODULES(WEBKIT, ["webkitgtk-3.0" >= $WEBKIT_VERSION], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers @@ -609,7 +596,6 @@ installed to compile Pidgin. If you wan ])]) AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_LIBS) - AC_SUBST(WEBKIT_PC_MODULE) dnl ####################################################################### dnl # Check if we should compile with enchant support @@ -968,7 +954,6 @@ AC_ARG_ENABLE(gstreamer, if test x"$enable_gst" != "xno"; then PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [ AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) - with_gstreamer="1.0" AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) ], [ @@ -2115,7 +2100,7 @@ AC_CHECK_FUNCS(gethostid lrand48 timegm) AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf) AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h) AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h) -AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h) +AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/wait.h) AC_CHECK_HEADERS(termios.h) # sys/sysctl.h on OpenBSD 4.2 requires sys/param.h @@ -2132,40 +2117,10 @@ AC_CHECK_HEADERS(sys/sysctl.h, [], [], AC_CHECK_HEADERS(sys/socket.h) AC_VAR_TIMEZONE_EXTERNALS -AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <time.h> - ]], [[ - struct tm tm; - tm.tm_gmtoff = 1; - ]])], [ac_cv_struct_tm_gmtoff=yes], [ac_cv_struct_tm_gmtoff=no])) -if test $ac_cv_struct_tm_gmtoff = yes; then - AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm]) -fi - -AC_CACHE_CHECK([whether va_lists can be copied by value], ac_cv_va_val_copy,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdarg.h> -#include <stdlib.h> - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - args2 = args1; - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); - } - int main() { - f (0, 42); - return 0; - }]])], - [ac_cv_va_val_copy=yes], - [ac_cv_va_val_copy=no], - [ac_cv_va_val_copy=yes]) -]) - -if test "x$ac_cv_va_val_copy" = "xno"; then - AC_DEFINE(VA_COPY_AS_ARRAY, 1, ['va_lists' cannot be copied as values]) -fi +AC_CHECK_MEMBER([struct tm.tm_gmtoff], + [AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm])], + [], + [[#include <time.h>]]) dnl ####################################################################### dnl # Disable pixmap installation @@ -2297,7 +2252,6 @@ echo Protocols to build dynamically : $D echo Protocols to link statically.. : $STATIC_PRPLS echo echo Build with GStreamer support.. : $enable_gst -echo Build for GStreamer version... : $with_gstreamer echo Build with D-Bus support...... : $enable_dbus echo Build with voice and video.... : $enable_vv if test "x$enable_dbus" = "xyes" ; then diff --git a/finch/libgnt/configure.ac b/finch/libgnt/configure.ac --- a/finch/libgnt/configure.ac +++ b/finch/libgnt/configure.ac @@ -69,7 +69,7 @@ dnl AC_CYGWIN 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(fcntl.h unistd.h locale.h signal.h stdint.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -86,14 +86,8 @@ dnl to prevent the g_stat()/g_unlink() c dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac AC_SYS_LARGEFILE -dnl FreeBSD doesn't have libdl, dlopen is provided by libc -AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) - AC_MSG_CHECKING(for the %z format string in strftime()) AC_TRY_RUN([ -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif #include <time.h> #include <stdio.h> diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -325,16 +325,16 @@ dbus_signals = $(addprefix $(srcdir)/, $ $(srcdir)/protocols/jabber/jabber.c dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders) - $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) -o $@ $(purple_build_coreheaders) dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders) - $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) -o $@ $(purple_build_coreheaders) dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported) - $(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@ + $(AM_V_GEN)$(PYTHON) $(srcdir)/dbus-analyze-functions.py -o $@ $(dbus_build_exported) dbus-signals.c: dbus-analyze-signals.py $(dbus_signals) - $(AM_V_GEN)cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-signals.py -o $@ $(dbus_signals) dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h @@ -349,11 +349,11 @@ libpurple_client_la_LDFLAGS = -version-i libpurple_client_la_LIBADD = $(DBUS_LIBS) purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) - $(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client -o $@ $(dbus_build_exported) purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix ciphers/, $(purple_cipherheaders)) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported) - $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@ - $(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@ + $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim -o $@ $(purple_build_coreheaders) + $(AM_V_at) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers --append -o $@ $(dbus_build_exported) $(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py --- a/libpurple/dbus-analyze-functions.py +++ b/libpurple/dbus-analyze-functions.py @@ -1,4 +1,7 @@ from __future__ import print_function + +import argparse +import fileinput import re import string import sys @@ -126,7 +129,7 @@ class Parameter: fromtokens = staticmethod(fromtokens) class Binding: - def __init__(self, functiontext, paramtexts): + def __init__(self, functiontext, paramtexts, output=None): self.function = Parameter.fromtokens(functiontext.split()) if self.function.name in excluded: @@ -138,15 +141,15 @@ class Binding: self.call = "%s(%s)" % (self.function.name, ", ".join(param.name for param in self.params)) - - + + self.output = output _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits