Commit 1e8ec74d authored by Martin's avatar Martin

Imported upstream master from 2017-06-28

parent 1d6c2bda
syntax: glob
*.orig
*.swp
*.gmo
*.in
*.m4
*.pyc
*.pyo
*~
autom4te.cache
data/defs.py
data/org.gajim.Gajim.appdata.xml
data/org.gajim.Gajim.desktop
libtool
po/.intltool-merge-cache
po/POTFILES
po/stamp-it
stamp-h1
Makefile
__pycache__/
src/gtk/
win/_build_root
syntax: regexp
^config\.*
^config\/
^scripts\/gajim.*
CURRENT DEVELOPERS:
Yann Leboulanger (asterix AT lagaule.org)
Philipp Hörist (philipp AT hoerist.com)
PAST DEVELOPERS:
......
Gajim 0.16.8 (04 June 2017)
* Fix rejoining MUCs after connection loss
* Fix Groupchat invites
* Fix encoding problems with newer GnuPG versions
* Fix old messages randomly reappearing in the chat window
* Fix some problems with IBB filetransfer
* Make XEP-0146 Commands opt-in
* Improve sending messages to your own resources
* Improve reliability of delivery recipes
* Many minor bugfixes
Gajim 0.16.7 (30 January 2017)
* Better compatibility with XEP-0191: Blocking Command
* Windows Credential Vault is used for password storage on Windows
* Gajim now depends on python-gnupg for PGP encryption
* Add portable installer for Windows
* Remove usage of demandimport
* Many minor bugfixes
Gajim 0.16.6 (02 October 2016)
Gajim 0.16.6 ( September 2016)
* Fix using gpg2
* Improve message receipts usage
* Improve message receips usage
* Improve roster filtering
* several minor bugs
......@@ -61,14 +40,12 @@ Gajim 0.16 (04 October 2014)
* Improve File transfer support by adding Jingle file transfer
* use external python-nbxmpp library
* improve security
* Improve audio / Video calls and add screensharing feature
* Support audio under windows
* Support systemd-logind
* Support XEP-0308 Last message correction
* Support XEP-0224 Attention
* Support XEP-0191 Blocking command
* Support XEP-0249 Direct Invitation
* Better RTL languages support
* use host command to resolve SRV records if it is available
......
......@@ -10,8 +10,7 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
gajim.nsi \
setup_win32.py \
win \
scripts/gajim.in
DISTCLEANFILES = \
......@@ -50,7 +49,7 @@ MAINTAINERCLEANDIRS = \
test:
python test/runtests.py
${PYTHON} test/runtests.py
.PHONY: test
doc:
......
This diff is collapsed.
......@@ -14,27 +14,29 @@
<h2>Runtime Requirements</h2>
<ul>
<li>python2.5 or higher</li>
<li>pygtk2.22 or higher</li>
<li>python3.4 or higher</li>
<li>python3-gi</li>
<li>python3-gi-cairo</li>
<li>gir1.2-gtk-3.0</li>
<li>python-nbxmpp</li>
</ul>
<h2>Optional Runtime Requirements</h2>
<ul>
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.12) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python-pyasn1 to check SSL/TLS certificate</li>
<li>python-crypto to enable End to end encryption</li>
<li>python-gnupg to enable GPG encryption</li>
<li>For idle module, libxss library</li>
<li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python3-pyasn1 to check SSL/TLS certificate</li>
<li>python3-crypto to enable End to end encryption</li>
<li>python3-gnupg to enable GPG encryption</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li>
<li>kwalletcli (for support of KDE Wallet as password storage)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li>
<li>gir1.2-notify-0.7 to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python-dbus bindings (>=0.81)</li>
<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
<li>python3-dbus bindings (>=1.2.0)</li>
<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li>
<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li>
<li>gir1.2-networkmanager-1.0 for network lose detection</li>
</ul>
<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
......@@ -42,6 +44,8 @@
<h2>Compile-time Requirements</h2>
<ul>
<li>intltool (>= 0.40.1)</li>
<li>pkg-config</li>
<li>libtool</li>
</ul>
<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p>
......@@ -114,9 +118,9 @@ Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/
<br/>
<br/>
<br/>
(C) 2003-2012<br/>
(C) 2003-2015<br/>
The Gajim Team<br/>
http://gajim.org<br/>
https://gajim.org<br/>
<br/>
<br/>
......
# Welcome to the Gajim project Wiki
The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here.
## Links
- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home)
* FAQ, Did you know that...
* Quickstart guides
* Advanced configuration
- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home)
* Advanced use of gajim
* User groups
* Reviews
- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home)
* Guidelines and documentation
* How to contribute
* The Gajim team
- Latest release:
* [Gajim 0.16.7 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.7.tar.gz)
* [Gajim 0.16.7-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.7-1.exe)
* [Gajim 0.16.7-1 portable (.exe)](https://www.gajim.org/downloads/0.16/gajim-portable-0.16.7-1.exe)
* [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D)
- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues)
\ No newline at end of file
This diff is collapsed.
environment:
matrix:
- MSYS: "C:\\msys64\\mingw32.exe"
branches:
only:
- master
clone_depth: 1
# init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
install:
- ps: |
function bash($command) {
Write-Host $command -NoNewline
cmd /c start /wait C:\msys64\usr\bin\sh.exe --login -c $command
Write-Host " - OK" -ForegroundColor Green
}
bash 'pacman -Sy --noconfirm git'
bash 'git clone https://dev.gajim.org/gajim/gajim.git'
- cmd: '%MSYS% C:/msys64/home/appveyor/gajim/win/build.sh'
# Ugly workaround, because i found no way to tell when mingw32.exe returns
- cmd: timeout 900
# Push Installer Exe
- ps: $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
- ps: $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
- ps: Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe"
- ps: Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe"
build: off
# on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
deploy:
# FTP deployment provider settings
- provider: FTP
protocol: ftp
host: panoramix.gajim.org
username:
secure: SNcOJDhUtBjfddbKXudE2w==
password:
secure: tQkYbcUb6nChCp0cdqo4CA==
folder: win_snap
active_mode: false
beta: true # enable alternative FTP library for 'ftp' and 'ftps' modes
debug: true
#!/usr/bin/env bash
gajimversion="0.16.8"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
else
hgversion=""
fi
echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4
AM_ARGS="--add-missing --gnu --copy -Wno-portability"
CONF_ARGS=""
echo "[encoding: UTF-8]" > po/POTFILES.in \
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \
&& ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \
&& ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
po/POTFILES.in \
&& echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1
&& echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1
if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
fi
......
/* config.h.in. Generated from configure.ac by autoheader. */
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
/* Gettext package */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
if test -f "$dir/lib$lib.a"; then
found=yes
lib=$dir/lib$lib.a
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;