Merged pidgin/main into default
--- a/finch/finch.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-Description: Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.-Cflags: -I${includedir}/finch-Libs: -L${libdir} -lfinch--- a/finch/libgnt/autogen.sh Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {- echo "You must have libtool installed to compile LibGNT";-(automake --version) < /dev/null > /dev/null 2>&1 || {- echo "You must have automake installed to compile LibGNT";-(autoconf --version) < /dev/null > /dev/null 2>&1 || {- echo "You must have autoconf installed to compile LibGNT";-echo "Generating configuration files for LibGNT, please wait...."-echo "Running libtoolize, please ignore non-fatal messages...."-echo n | libtoolize --copy --force || exit;-# Add other directories to this list if people continue to experience-# brokennesses ... Obviously the real answer is for them to fix it-# themselves, but for Luke's sake we have this.-for dir in "/usr/local/share/aclocal" \- "/opt/gnome-1.4/share/aclocal"- ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"-libtoolize -c -f --automake-aclocal $ACLOCAL_FLAGS || exit;-automake --add-missing --copy;--- a/finch/libgnt/configure.ac Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.-# UPDATING VERSION NUMBERS FOR RELEASES-# gnt_micro_version += 1-# If any functions have been added to libgnt:-# gnt_minor_version += 1-# If backwards compatibility has been broken in libgnt:-# gnt_major_version += 1;-# gnt_version_suffix should be similar to one of the following:-# For beta releases: [beta2]-# For code under development: [devel]-# For production releases: []-# Make sure to update ../../configure.ac with libgnt version changes.-m4_define([gnt_lt_current], [8])-m4_define([gnt_major_version], [2])-m4_define([gnt_minor_version], [8])-m4_define([gnt_micro_version], [0])-m4_define([gnt_version_suffix], [devel])-m4_define([gnt_version],- [gnt_major_version.gnt_minor_version.gnt_micro_version])-m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))-AC_INIT([libgnt], [gnt_display_version], [devel@pidgin.im])-AM_CONFIG_HEADER(config.h)-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)-GNT_MAJOR_VERSION=gnt_major_version-GNT_MINOR_VERSION=gnt_minor_version-GNT_MICRO_VERSION=gnt_micro_version-GNT_VERSION=gnt_display_version-AC_SUBST(GNT_MAJOR_VERSION)-AC_SUBST(GNT_MINOR_VERSION)-AC_SUBST(GNT_MICRO_VERSION)-GNT_LT_VERSION_INFO="gnt_lt_current:gnt_micro_version:gnt_minor_version"-AC_SUBST(GNT_LT_VERSION_INFO)-AC_PATH_PROG(sedpath, sed)-dnl Storing configure arguments-AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])-dnl Checks for programs.-LIBTOOL="$LIBTOOL --silent"-dnl we don't use autobreak on cygwin!!-dnl Checks for header files.-AC_CHECK_HEADERS(unistd.h)-dnl Checks for typedefs, structures, and compiler characteristics.-dnl Checks for library functions.-dnl to prevent the g_stat()/g_unlink() crash,-dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac-if test "x$enable_debug" = "xyes" ; then- AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])-if test "x$enable_deprecated" = "xno"; then- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"-if test "x$GCC" = "xyes"; then- dnl We enable -Wall later.- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.- dnl This leads to warnings we don't want.- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`- dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE- dnl Future Possibilities- dnl Consider adding -Wbad-function-cast.- dnl This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call.- dnl We'd need an intermediate variable.- dnl Consider adding -Wfloat-equal.- dnl This leads to warnings with Perl.- dnl Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory.- dnl On the other hand, it's probably actually broken, so maybe the Perl folks should fix that?- dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases.- dnl This is likely non-trivial.- "-Wdeclaration-after-statement" \- "-Werror-implicit-function-declaration" \- "-Wextra -Wno-sign-compare -Wno-unused-parameter" \- "-Wmissing-declarations" \- "-Wmissing-prototypes" \- CFLAGS="$CFLAGS $newflag"- AC_MSG_CHECKING(for $newflag option to gcc)- DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"- if test "x$enable_fortify" = "xyes"; then- AC_MSG_CHECKING(for FORTIFY_SOURCE support)- AC_TRY_COMPILE([#include <features.h>], [- #if !(__GNUC_PREREQ (4, 1) \- || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \- || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \- && __GNUC_MINOR__ == 4 \- && (__GNUC_PATCHLEVEL__ > 2 \- || (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))- #error No FORTIFY_SOURCE support- DEBUG_CFLAGS="$DEBUG_CFLAGS -D_FORTIFY_SOURCE=2"- DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0],,-*** GLib 2.0 is required to build LibGNT; please make sure you have the GLib-*** development headers installed. The latest version of GLib is-*** always available at http://www.gtk.org/.])-AC_MSG_CHECKING(for me pot o' gold)-AC_CHECK_HEADERS(sys/wait.h)-#AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])])-#AC_VAR_TIMEZONE_EXTERNALS-AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],- [compile finch against the ncurses includes in DIR])],- [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])-AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no])-AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no])-# If ncursesw is not found, look for plain old ncurses-if test "x$enable_gnt" = "xno"; then- AC_CHECK_LIB(ncurses, initscr, [[GNT_LIBS="-lncurses"] [enable_gnt=yes]], [enable_gnt=no])- AC_CHECK_LIB(panel, update_panels, [[GNT_LIBS="$GNT_LIBS -lpanel"] [enable_gnt=yes]], [enable_gnt=no])- AC_DEFINE(NO_WIDECHAR, [1], [Define to 1 if you do not have ncursesw.])- dnl # Some distros put the headers in ncursesw/, some don't- for location in $ac_ncurses_includes /usr/include/ncursesw /usr/include- f="$location/ncurses.h"- orig_CPPFLAGS="$CPPFLAGS"- CFLAGS="$CFLAGS -I$location"- CPPFLAGS="$CPPFLAGS -I$location"- AC_MSG_CHECKING([if $f supports wide characters])- #define _XOPEN_SOURCE_EXTENDED- # error get_wch not found!- if test x"$dir" != x"." ; then- CPPFLAGS="$orig_CPPFLAGS"- CPPFLAGS="$orig_CPPFLAGS"- if test x"$found_ncurses_h" != "xyes"; then-if test "x$enable_gnt" = "xno"; then-*** You need ncursesw or ncurses and its header files.])-dnl Check for Python headers (currently useful only for libgnt)-AC_PATH_PROG(pythonpath, python)-if test "_$pythonpath" != _ ; then- AC_MSG_CHECKING(for Python compile flags)- PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`- PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`- PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`- PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`- if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then- AC_CHECK_LIB(pthread, pthread_create, )- AC_CHECK_LIB(util, openpty, )- AC_CHECK_LIB(db, dbopen, )- PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])- AC_MSG_RESULT([Can't find Python.h])-PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , [-if test "x$have_libxml" = "xno"; then- AC_DEFINE(NO_LIBXML, 1, [Do not have libxml2.])-AM_CONDITIONAL(PURPLE_AVAILABLE, false)--- a/finch/libgnt/gnt.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-Description: Glib Ncurses Toolkit is a collection of curses-widgets.-Cflags: -I${includedir}/gnt--- a/finch/libgnt/meson.build Fri Nov 17 14:23:40 2017 +0300
+++ b/finch/libgnt/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -76,11 +76,14 @@
dependencies : [ncurses, glib])
-configure_file(input : 'gnt.pc.in',- configuration : pkg_conf,- install_dir : get_option('libdir') + '/pkgconfig')+ description : 'Glib Ncurses Toolkit is a collection of curses-widgets.', + version : purple_display_version, + requires : ['glib-2.0']) libgnt_gir = gnome.generate_gir(libgnt,
@@ -94,5 +97,6 @@
--- a/finch/libgnt/test/Makefile Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-CFLAGS=`pkg-config --cflags gobject-2.0 gmodule-2.0` -g -I../ -DSTANDALONE -I/usr/include/ncursesw/-LDFLAGS=`pkg-config --libs gobject-2.0 gmodule-2.0 gnt` -pg-EXAMPLES=combo focus tv multiwin keys menu parse- rm -f $(EXAMPLES) *.so wm- for i in $(EXAMPLES); do gcc -shared $(CFLAGS) -USTANDALONE $(LDFLAGS) $${i}.c -o $${i}.so ; done--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/finch/libgnt/test/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -0,0 +1,13 @@
+foreach prog : ['combo', 'focus', 'tv', 'multiwin', 'keys', 'menu', 'parse'] + c_args : '-DSTANDALONE', + dependencies : [libgnt_dep, gobject, gmodule], + build_by_default : false) + dependencies : [libgnt_dep, gobject, gmodule], + build_by_default : false) --- a/finch/meson.build Fri Nov 17 14:23:40 2017 +0300
+++ b/finch/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -91,11 +91,14 @@
dependencies : [libpurple_dep, libgnt_dep, libfinch_dep],
- configure_file(input : 'finch.pc.in',- configuration : pkg_conf,- install_dir : get_option('libdir') + '/pkgconfig')+ description : 'Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.', + version : purple_display_version, + libraries : [libfinch], + requires : ['gnt', 'purple-3']) introspection_sources = libfinch_headers
--- a/libpurple/data/purple-3-uninstalled.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-abs_builddir=@abs_builddir@-abs_top_srcdir=@abs_top_srcdir@-abs_top_builddir=@abs_top_builddir@-plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@-Description: libpurple is a GLib-based instant messenger library.-Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}-Libs: ${abs_top_builddir}/libpurple/libpurple.la--- a/libpurple/data/purple-3.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-exec_prefix=@exec_prefix@-includedir=@includedir@/libpurple-datarootdir=@datarootdir@-plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@-Description: libpurple is a GLib-based instant messenger library.-Requires: glib-2.0@GPLUGIN_REQ@-Libs: -L${libdir} -lpurple--- a/libpurple/meson.build Fri Nov 17 14:23:40 2017 +0300
+++ b/libpurple/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -418,11 +418,15 @@
install_headers(purple_mediaheaders,
subdir : 'libpurple/media')
-configure_file(input : 'data/purple-3.pc.in',- output : 'purple-3.pc',- configuration : pkg_conf,- install_dir : get_option('libdir') + '/pkgconfig')+ description : 'libpurple is a GLib-based instant messenger library.', + version : purple_display_version, + libraries : [libpurple], + requires : ['glib-2.0'] + GPLUGIN_REQ, + variables : ['plugindir=${libdir}/purple-@0@'.format(purple_major_version)]) DESKTOP_FILE = 'purple-url-handler.desktop'
--- a/libpurple/tag.sh Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# Script to silence win32 and perl build by displaying a neat one-line notice-# instead of full command contents when executing compilers.-# Written by Tomek Wasilczyk <tomkiewicz@cpw.pidgin.im>, licensed under GNU GPL- if [ "$found" == 1 ]; then- if [ "$arg" == "-o" ]; then- if [ "$tag" == "auto" ] && [ "$arg" == "-shared" ]; then- if [ "${ext_1}" == ".c" ]; then- ext_2=${arg#${arg%???}}- if [ "${ext_2}" == ".xs" ]; then- ext_3=${arg#${arg%????}}- if [ "${ext_3}" == ".3pm" ]; then-if [ "$tag" == "auto" ]; then-if [ "$object" == "" ] && [ "${file_1}" != "" ]; then-if [ "$object" == "" ] && [ "${file_2}" != "" ]; then-if [ "$object" == "" ]; then- echo -e " $tag\t$object" >&2--- a/libpurple/win32/global.mak Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-# This file should be included by all Makefile.mingw files for project-# wide definitions (after correctly defining PIDGIN_TREE_TOP).-#include optional $(PIDGIN_TREE_TOP)/local.mak to allow overriding of any definitions--include $(PIDGIN_TREE_TOP)/local.mak-# TODO: we should do parsing like for PURPLE_VERSION, if we won't drop-# Makefile.mingw files before 3.0.0 release-PURPLE_MAJOR_VERSION := 3-PURPLE_MINOR_VERSION := 0-PURPLE_MICRO_VERSION := 0-PURPLE_API_VERSION := 20-# Locations of our various dependencies-WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev-ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant-1.6-GNUTLS_TOP ?= $(WIN32_DEV_TOP)/gnutls-3.1-GTK_TOP ?= $(WIN32_DEV_TOP)/gtk2-2.24-GTK_BIN ?= $(GTK_TOP)/bin-JSON_GLIB_TOP ?= $(WIN32_DEV_TOP)/json-glib-0.14-LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.2_daa1-MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.24-nspr-4.12-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.12-GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13-GCC_SSP_TOP ?= $(shell dirname $(shell which $(CC)))-CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1-WEBKITGTK_TOP ?= $(WIN32_DEV_TOP)/libwebkitgtk-1.10-LIBSOUP_TOP ?= $(WIN32_DEV_TOP)/libsoup-2.42-GETTEXT_TOP ?= $(WIN32_DEV_TOP)/gettext-0.18-INTLTOOL_TOP ?= $(WIN32_DEV_TOP)/intltool-0.50-LIBGADU_TOP ?= $(WIN32_DEV_TOP)/libgadu-1.12-# Where we installing this stuff to?-PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir-PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir-PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins-PURPLE_INSTALL_PLUGINS_DIR := $(PURPLE_INSTALL_DIR)/plugins-PURPLE_INSTALL_PO_DIR := $(PURPLE_INSTALL_DIR)/locale-# Important (enough) locations in our source code-PURPLE_TOP := $(PIDGIN_TREE_TOP)/libpurple-PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins-PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin-PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps-PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins-PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po-PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols-# Locations of important (in-tree) build targets-PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h-PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h-PIDGIN_REVISION_H := $(PIDGIN_TREE_TOP)/package_revision.h-PIDGIN_REVISION_RAW_TXT := $(PIDGIN_TREE_TOP)/package_revision_raw.txt-PURPLE_PURPLE_H := $(PURPLE_TOP)/purple.h-PURPLE_VERSION_H := $(PURPLE_TOP)/version.h-PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll-PIDGIN_DLL := $(PIDGIN_TOP)/pidgin.dll-PIDGIN_EXE := $(PIDGIN_TOP)/pidgin.exe-PIDGIN_PORTABLE_EXE := $(PIDGIN_TOP)/pidgin-portable.exe-GCCWARNINGS ?= -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef-CC_HARDENING_OPTIONS ?= -Wstack-protector -fwrapv -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security -fstack-protector-all --param ssp-buffer-size=1-LD_HARDENING_OPTIONS ?= -Wl,--dynamicbase -Wl,--nxcompat-TAG := @$(PURPLE_TOP)/tag.sh-# parse the version number from the configure.ac file if it is newer-#m4_define([purple_major_version], [2])-#m4_define([purple_minor_version], [0])-#m4_define([purple_micro_version], [0])-#m4_define([purple_version_suffix], [devel])-PIDGIN_VERSION := $(shell \- if [ ! $(PIDGIN_TREE_TOP)/VERSION -nt $(PIDGIN_TREE_TOP)/configure.ac ]; then \- awk 'BEGIN {FS="[\\(\\)\\[\\]]"} /^m4_define..purple_(major|minor)_version/ {printf("%s.",$$5);} /^m4_define..purple_micro_version/ {printf("%s",$$5);} /^m4_define..purple_version_suffix/ {printf("%s",$$5); exit}' \- $(PIDGIN_TREE_TOP)/configure.ac > $(PIDGIN_TREE_TOP)/VERSION; \- cat $(PIDGIN_TREE_TOP)/VERSION \-PURPLE_VERSION := $(PIDGIN_VERSION)-DISPLAY_VERSION := $(PIDGIN_VERSION)-$(EXTRAVERSION)-DISPLAY_VERSION := $(PIDGIN_VERSION)-DEFINES += -DHAVE_CYRUS_SASL-DEFINES += -DHAVE_CONFIG_H -DWIN32_LEAN_AND_MEAN -DWINVER=0x0501 -D_WIN32_WINNT=0x501-CFLAGS += -O2 -Wall $(GCCWARNINGS) $(CC_HARDENING_OPTIONS) -pipe -mms-bitfields -g-# If not specified, dlls are built with the default base address of 0x10000000.-# When loaded into a process address space a dll will be rebased if its base-# address colides with the base address of an existing dll. To avoid rebasing -# we do the following. Rebasing can slow down the load time of dlls and it-# also renders debug info useless.-DLL_LD_FLAGS += -Wl,--enable-auto-image-base -Wl,--enable-auto-import $(LD_HARDENING_OPTIONS) -lssp-ifeq "$(origin CC)" "default"-# comment out the next line to make output more verbose-CC := $(TAG) "auto" $(CC)-GMSGFMT ?= $(GETTEXT_TOP)/bin/msgfmt-MAKENSIS ?= makensis.exe-INTLTOOL_MERGE ?= $(INTLTOOL_TOP)/bin/intltool-merge-MONO_SIGNCODE ?= signcode-GLIB_GENMARSHAL ?= $(GTK_BIN)/glib-genmarshal-GLIB_MKENUMS ?= $(GTK_BIN)/glib-mkenums-PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak-PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak-MINGW_MAKEFILE := Makefile.mingw- -I$(GSTREAMER_TOP)/include/gstreamer-0.10 \- -I$(GSTREAMER_TOP)/include/farstream-0.1 \- -I$(LIBXML2_TOP)/include/libxml2-DEFINES += -DUSE_GSTREAMER -DUSE_VV-INSTALL_SSL_CERTIFICATES ?= 1--- a/libpurple/win32/rules.mak Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# Rules on how to make object files from various sources- $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<- @$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@-%.desktop: %.desktop.in $(wildcard $(PIDGIN_TREE_TOP)/po/*.po)- LC_ALL=C $(PERL) $(INTLTOOL_MERGE) -d -u -c $(PIDGIN_TREE_TOP)/po/.intltool-merge-cache $(PIDGIN_TREE_TOP)/po $< $@- @echo "static const char $*_html[] = {" > $@- @sed -e 's/^[ ]\+//g' -e 's/[ ]\+/ /g' $< | xxd -i | sed -e 's/\(0x[0-9a-f][0-9a-f]\)$$/\1, 0x00/' >> $@--- a/libpurple/win32/targets.mak Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# This file should be included at the end of all Makefile.mingw-# files for better handling of cross directory dependencies-$(PIDGIN_CONFIG_H): $(PIDGIN_CONFIG_H).mingw $(PIDGIN_TREE_TOP)/configure.ac- @sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@-$(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in- @sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@-$(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac- @awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \- /^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \- /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \- /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac-$(PIDGIN_REVISION_RAW_TXT):- @(hg --cwd $(PIDGIN_TREE_TOP) log -r . -T '{node}') 2>/dev/null >$@ \-$(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT)- sed 's/^\(.\{1,\}\)$$/#define REVISION "\1"/' $< > $@; \- @[ -f $@ ] || echo "#define REVISION \"unknown\"" > $@-$(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)- $(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll-$(PIDGIN_DLL) $(PIDGIN_DLL).a:- $(MAKE_at) $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll- $(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe-# Installation Directories- mkdir -p $(PIDGIN_INSTALL_DIR)-$(PIDGIN_INSTALL_PLUGINS_DIR):- mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR)-$(PURPLE_INSTALL_PO_DIR):- mkdir -p $(PURPLE_INSTALL_PO_DIR)-#$(PURPLE_INSTALL_PLUGINS_DIR):-# mkdir -p $(PURPLE_INSTALL_PLUGINS_DIR)--- a/meson.build Fri Nov 17 14:23:40 2017 +0300
+++ b/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -70,7 +70,6 @@
add_project_arguments('-DHAVE_CONFIG_H=1', language : 'c')
conf = configuration_data()
man_conf = configuration_data()
-pkg_conf = configuration_data() version_conf = configuration_data()
conf.set_quoted('PACKAGE', meson.project_name())
@@ -107,17 +106,8 @@
man_conf.set('VERSION', purple_display_version)
man_conf.set('prefix', get_option('prefix'))
-# This is used for pkg-config files. This probably can be removed and the-# builtin generator used instead once we drop the Autotools build.-pkg_conf.set('VERSION', purple_display_version)-pkg_conf.set('PURPLE_MAJOR_VERSION', purple_major_version)-pkg_conf.set('prefix', get_option('prefix'))-pkg_conf.set('exec_prefix', '${prefix}')-pkg_conf.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))-pkg_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))-pkg_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))-pkg_conf.set('datadir', '${datarootdir}')-pkg_conf.set('sysconfdir', join_paths('${prefix}', get_option('sysconfdir')))+# Used for pkg-config files. +pkgconfig = import('pkgconfig') sedpath = find_program('sed')
@@ -1119,11 +1109,12 @@
gplugin = dependency('gplugin', version : '>= 0.0.17')
# GPLUGIN_REQ sets pkg-config requirements in the .pc file
- pkg_conf.set('GPLUGIN_REQ', ', gplugin')+ GPLUGIN_REQ = ['gplugin'] enable_introspection = dependency('gobject-introspection-1.0',
version : '>= 1.30.0', required : false).found()
enable_introspection = false
--- a/pidgin/data/pidgin-3-uninstalled.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-abs_builddir=@abs_builddir@-abs_top_srcdir=@abs_top_srcdir@-abs_top_builddir=@abs_top_builddir@-plugindir=${libdir}/pidgin-Description: Pidgin is a GTK3-based instant messenger application.-Requires: gtk+-3.0 webkitgtk-3.0 purple-3-Cflags: -I${abs_top_srcdir}--- a/pidgin/data/pidgin-3.pc.in Fri Nov 17 14:23:40 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-exec_prefix=@exec_prefix@-includedir=@includedir@/pidgin-datarootdir=@datarootdir@-plugindir=${libdir}/pidgin-Description: Pidgin is a GTK3-based instant messenger application.-Requires: gtk+-3.0 webkitgtk-3.0 purple-3-Libs: -L${libdir} -lpidgin--- a/pidgin/meson.build Fri Nov 17 14:23:40 2017 +0300
+++ b/pidgin/meson.build Wed Nov 22 14:33:46 2017 +0300
@@ -185,11 +185,15 @@
# pidgin_LDFLAGS += -mwindows
- configure_file(input : 'data/pidgin-3.pc.in',- output : 'pidgin-3.pc',- configuration : pkg_conf,- install_dir : get_option('libdir') + '/pkgconfig')+ description : 'Pidgin is a GTK3-based instant messenger application.', + version : purple_display_version, + libraries : [libpidgin], + requires : ['gtk+-3.0', 'webkitgtk-3.0', 'purple-3'], + variables : ['plugindir=${libdir}/pidgin']) DESKTOP_FILE = 'im.pidgin.Pidgin.desktop'
