Skip to content

A
abiword
Commit 6b49f2e8 authored by Yuri N. Sedunov's avatar Yuri N. Sedunov Committed by Girar Builder pender robot
Browse files
Options

3.0.0-alt1

- 3.0.0
parent 91597620
Expand all Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 401 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

.gear/rules
View file @ 6b49f2e8
tar.gz: abiword name=abiword-2.9.4
tar.gz: abiword name=abiword-3.0.0
abiword-3.0.spec
View file @ 6b49f2e8
%define _name abiword
%define abi_ver 3.0
%define ver_major 2.9
%define ver_major 3.0
%def_enable spell
%def_without goffice
%def_with goffice
%def_with champlain
%def_with libical
%def_without eds
Name: %_name-%abi_ver
Version: %ver_major.4
Version: %ver_major.0
Release: alt1
Summary: Lean and fast full-featured word processor
......@@ -20,11 +20,12 @@ Source: http://www.abisource.com/downloads/abiword/%version/source/%_name-%versi
Obsoletes: abisuite, abisuite-koi8, abisuite-cp1251, abisuite-iso8859-8
Conflicts: %_name %_name-light
Requires: %name-data = %version-%release
BuildRequires: gcc-c++ boost-devel
BuildRequires: libgtk+3-devel librsvg-devel libfribidi-devel
BuildRequires: libwpd-devel libwv-devel libgsf-devel bzlib-devel
BuildRequires: libjpeg-devel
BuildRequires: gcc-c++ boost-devel libreadline
BuildRequires: libgtk+3-devel librsvg-devel libfribidi-devel libredland-devel libots-devel
BuildRequires: liblink-grammar-devel libgsf-devel bzlib-devel libjpeg-devel libxslt-devel
BuildRequires: libwv-devel libwpd9-devel libwpg-devel libwmf-devel
%{?_enable_spell:BuildRequires: libenchant-devel}
%{?_with_goffice:BuildRequires: libgnomeoffice0.10-devel}
%{?_with_champlain:BuildRequires: libchamplain-gtk3-devel}
......@@ -53,12 +54,19 @@ Windows and most Unix Systems. Features include:
* Images
and much more...
%package data
Summary: Arch independent files for AbiWord
Group: Office
BuildArch: noarch
%description data
This package provides noarch data needed for AbiWord to work.
%package devel
Group: Development/C++
Summary: Headers for Abiword plugins
Requires: %name = %version-%release
%description devel
Headers and pkgconfig support for Abiword plugin building.
Conflicts: %_name-devel %_name-light-devel
......@@ -91,19 +99,22 @@ Conflicts: %_name-devel %_name-light-devel
%dir %_libdir/%_name-%ver_major
%dir %_libdir/%_name-%ver_major/plugins
%_libdir/%_name-%ver_major/plugins/*.so
%_iconsdir/hicolor/*/*/*
%_datadir/%_name-%ver_major
%_desktopdir/%_name.desktop
%_man1dir/*
%exclude %_libdir/abiword-%ver_major/plugins/*.la
%files data
%_desktopdir/%_name.desktop
%_iconsdir/hicolor/*/*/*
%_datadir/%_name-%ver_major/
%_man1dir/*
%files devel
%_includedir/*
%_pkgconfigdir/*
%changelog
* Mon Oct 14 2013 Yuri N. Sedunov <aris@altlinux.org> 3.0.0-alt1
- 3.0.0
* Thu Nov 29 2012 Yuri N. Sedunov <aris@altlinux.org> 2.9.4-alt1
- first build for Sisyphus
abiword/COPYING
View file @ 6b49f2e8
......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -309,7 +309,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
......
abiword/INSTALL
View file @ 6b49f2e8
Installation Instructions
*************************
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
......@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
an Autoconf limitation. Until the limitation is lifted, you can use
this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
......@@ -367,4 +368,3 @@ operates.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
abiword/config.h.in
View file @ 6b49f2e8
/* config.h.in. Generated from configure.in by autoheader. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* major.minor */
#undef ABIWORD_SERIES
......
abiword/config.sub
View file @ 6b49f2e8
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
# Copyright 1992-2013 Free Software Foundation, Inc.
timestamp='2012-02-10'
timestamp='2013-04-24'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
#
# This file 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 of the License, or
# This file 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 3 of the License, 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.
# 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/>.
......@@ -26,11 +20,12 @@ timestamp='2012-02-10'
# 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.
# the same distribution terms that you use for the rest of that
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted GNU ChangeLog entry.
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
......@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -123,7 +116,7 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
......@@ -156,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis | -knuth | -cray | -microblaze)
-apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
......@@ -225,6 +218,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
;;
-lynx*5)
os=-lynxos5
;;
-lynx*)
os=-lynxos
;;
......@@ -253,7 +252,9 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
| c4x | clipper \
......@@ -267,7 +268,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -285,16 +286,17 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
| nios | nios2 \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
| or32 \
| or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
......@@ -364,7 +366,7 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
......@@ -383,7 +385,8 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
......@@ -401,12 +404,13 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
......@@ -782,9 +786,13 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
microblaze)
microblaze*)
basic_machine=microblaze-xilinx
;;
mingw64)
basic_machine=x86_64-pc
os=-mingw64
;;
mingw32)
basic_machine=i386-pc
os=-mingw32
......@@ -998,7 +1006,7 @@ case $basic_machine in
;;
ppc64) basic_machine=powerpc64-unknown
;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
......@@ -1013,7 +1021,11 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
rdos)
rdos | rdos64)
basic_machine=x86_64-pc
os=-rdos
;;
rdos32)
basic_machine=i386-pc
os=-rdos
;;
......@@ -1340,21 +1352,21 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
......@@ -1486,9 +1498,6 @@ case $os in
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
......@@ -1537,6 +1546,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
hexagon-*)
os=-elf
;;
tic54x-*)
os=-coff
;;
......@@ -1577,6 +1589,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
or1k-*)
os=-elf
;;
or32-*)
os=-coff
;;
......
abiword/configure
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
abiword/configure.in → abiword/configure.ac
View file @ 6b49f2e8
m4_define([abi_version_major], [2])
m4_define([abi_version_minor], [9])
m4_define([abi_version_micro], [4])
m4_define([abi_version_major], [3])
m4_define([abi_version_minor], [0])
m4_define([abi_version_micro], [0])
m4_define([abi_series], [abi_version_major.abi_version_minor])
m4_define([abi_version], [abi_version_major.abi_version_minor.abi_version_micro])
......@@ -83,11 +83,13 @@ glib_req='glib-2.0 >= 2.6.0 gthread-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0'
gsf_req='libgsf-1 >= 1.14.18'
gsf_gio_req='libgsf-1 >= 1.14.9'
wv_req='wv-1.0 >= 1.2.0'
xslt_req='libxslt'
xp_pkgs="
${fribidi_req}
${glib_req}
${gsf_req}
${wv_req}
${xslt_req}
"
# optional deps
......@@ -1101,6 +1103,7 @@ INTROSPECTION_GENERATE=
INTROSPECTION_GIRDIR=
INTROSPECTION_TYPELIBDIR=
if test "x$found_introspection" = "xyes"; then
AM_PATH_PYTHON
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
......@@ -1183,6 +1186,7 @@ AC_OUTPUT(
src/af/xap/gtk/t/Makefile
src/af/xap/win/Makefile
src/af/xap/xp/Makefile
src/gi-overrides/Makefile
src/plugins/Makefile
src/text/Makefile
src/text/fmt/Makefile
......
abiword/install-sh
View file @ 6b49f2e8
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2011-01-19.21; # UTC
scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
......@@ -156,7 +156,7 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
......@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
# Protect names problematic for `test' and other utilities.
# Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
......@@ -202,7 +202,7 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
......@@ -240,7 +240,7 @@ fi
for src
do
# Protect names problematic for `test' and other utilities.
# Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
......@@ -354,7 +354,7 @@ do
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writeable bit of parent directory when it shouldn't.
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
......
abiword/libtool.m4
View file @ 6b49f2e8
......@@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
......@@ -2684,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
version_type=sunos
need_lib_prefix=no
......@@ -3301,7 +3293,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
netbsd* | netbsdelf*-gnu)
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
......@@ -4113,7 +4105,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
netbsd* | netbsdelf*-gnu)
netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
......@@ -4590,9 +4582,6 @@ m4_if([$1], [CXX], [
;;
esac
;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
......@@ -4655,9 +4644,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
......@@ -4879,7 +4865,7 @@ _LT_EOF
fi
;;
netbsd* | netbsdelf*-gnu)
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
......@@ -5056,7 +5042,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
_LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
......@@ -5361,7 +5346,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
netbsd* | netbsdelf*-gnu)
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
......
abiword/ltmain.sh
View file @ 6b49f2e8
......@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
......@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
VERSION=2.4.2
TIMESTAMP=""
package_revision=1.3337
......@@ -6124,10 +6124,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
link)
libs="$deplibs %DEPLIBS%"
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
......@@ -6447,6 +6444,9 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
......@@ -6457,9 +6457,6 @@ func_mode_link ()
fi
func_append tmp_libs " $deplib"
done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
continue
fi # $pass = conv
......@@ -7352,9 +7349,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
*)
func_fatal_configuration "$modename: unknown library version type \`$version_type'"
;;
esac
;;
no)
......
abiword/plugin-builtin.m4
View file @ 6b49f2e8
AM_CONDITIONAL([OPENWRITER_BUILTIN], test "$enable_openwriter_builtin" = "yes")
AM_CONDITIONAL([RSVG_BUILTIN], test "$enable_rsvg_builtin" = "yes")
AM_CONDITIONAL([S5_BUILTIN], test "$enable_s5_builtin" = "yes")
AM_CONDITIONAL([HRTEXT_BUILTIN], test "$enable_hrtext_builtin" = "yes")
AM_CONDITIONAL([PDF_BUILTIN], test "$enable_pdf_builtin" = "yes")
AM_CONDITIONAL([GOFFICE_BUILTIN], test "$enable_goffice_builtin" = "yes")
AM_CONDITIONAL([OPENXML_BUILTIN], test "$enable_openxml_builtin" = "yes")
AM_CONDITIONAL([BABELFISH_BUILTIN], test "$enable_babelfish_builtin" = "yes")
AM_CONDITIONAL([ISCII_BUILTIN], test "$enable_iscii_builtin" = "yes")
AM_CONDITIONAL([PASSEPARTOUT_BUILTIN], test "$enable_passepartout_builtin" = "yes")
AM_CONDITIONAL([PSION_BUILTIN], test "$enable_psion_builtin" = "yes")
AM_CONDITIONAL([HANCOM_BUILTIN], test "$enable_hancom_builtin" = "yes")
AM_CONDITIONAL([APPLIX_BUILTIN], test "$enable_applix_builtin" = "yes")
AM_CONDITIONAL([EML_BUILTIN], test "$enable_eml_builtin" = "yes")
AM_CONDITIONAL([T602_BUILTIN], test "$enable_t602_builtin" = "yes")
AM_CONDITIONAL([MSWRITE_BUILTIN], test "$enable_mswrite_builtin" = "yes")
AM_CONDITIONAL([PAINT_BUILTIN], test "$enable_paint_builtin" = "yes")
AM_CONDITIONAL([FREETRANSLATION_BUILTIN], test "$enable_freetranslation_builtin" = "yes")
AM_CONDITIONAL([GARBLE_BUILTIN], test "$enable_garble_builtin" = "yes")
AM_CONDITIONAL([COLLAB_BUILTIN], test "$enable_collab_builtin" = "yes")
AM_CONDITIONAL([MATHVIEW_BUILTIN], test "$enable_mathview_builtin" = "yes")
AM_CONDITIONAL([OPENDOCUMENT_BUILTIN], test "$enable_opendocument_builtin" = "yes")
AM_CONDITIONAL([PDB_BUILTIN], test "$enable_pdb_builtin" = "yes")
AM_CONDITIONAL([DOCBOOK_BUILTIN], test "$enable_docbook_builtin" = "yes")
AM_CONDITIONAL([CLARISWORKS_BUILTIN], test "$enable_clarisworks_builtin" = "yes")
AM_CONDITIONAL([GRAMMAR_BUILTIN], test "$enable_grammar_builtin" = "yes")
AM_CONDITIONAL([LOADBINDINGS_BUILTIN], test "$enable_loadbindings_builtin" = "yes")
AM_CONDITIONAL([GDA_BUILTIN], test "$enable_gda_builtin" = "yes")
AM_CONDITIONAL([OTS_BUILTIN], test "$enable_ots_builtin" = "yes")
AM_CONDITIONAL([WIKIPEDIA_BUILTIN], test "$enable_wikipedia_builtin" = "yes")
AM_CONDITIONAL([OPML_BUILTIN], test "$enable_opml_builtin" = "yes")
AM_CONDITIONAL([HRTEXT_BUILTIN], test "$enable_hrtext_builtin" = "yes")
AM_CONDITIONAL([KWORD_BUILTIN], test "$enable_kword_builtin" = "yes")
AM_CONDITIONAL([WORDPERFECT_BUILTIN], test "$enable_wordperfect_builtin" = "yes")
AM_CONDITIONAL([GARBLE_BUILTIN], test "$enable_garble_builtin" = "yes")
AM_CONDITIONAL([URLDICT_BUILTIN], test "$enable_urldict_builtin" = "yes")
AM_CONDITIONAL([WML_BUILTIN], test "$enable_wml_builtin" = "yes")
AM_CONDITIONAL([WPG_BUILTIN], test "$enable_wpg_builtin" = "yes")
AM_CONDITIONAL([S5_BUILTIN], test "$enable_s5_builtin" = "yes")
AM_CONDITIONAL([BABELFISH_BUILTIN], test "$enable_babelfish_builtin" = "yes")
AM_CONDITIONAL([MIF_BUILTIN], test "$enable_mif_builtin" = "yes")
AM_CONDITIONAL([ISCII_BUILTIN], test "$enable_iscii_builtin" = "yes")
AM_CONDITIONAL([PRESENTATION_BUILTIN], test "$enable_presentation_builtin" = "yes")
AM_CONDITIONAL([COMMAND_BUILTIN], test "$enable_command_builtin" = "yes")
AM_CONDITIONAL([OPML_BUILTIN], test "$enable_opml_builtin" = "yes")
AM_CONDITIONAL([WMF_BUILTIN], test "$enable_wmf_builtin" = "yes")
AM_CONDITIONAL([LOADBINDINGS_BUILTIN], test "$enable_loadbindings_builtin" = "yes")
AM_CONDITIONAL([EPUB_BUILTIN], test "$enable_epub_builtin" = "yes")
AM_CONDITIONAL([LATEX_BUILTIN], test "$enable_latex_builtin" = "yes")
AM_CONDITIONAL([EML_BUILTIN], test "$enable_eml_builtin" = "yes")
AM_CONDITIONAL([BMP_BUILTIN], test "$enable_bmp_builtin" = "yes")
AM_CONDITIONAL([T602_BUILTIN], test "$enable_t602_builtin" = "yes")
AM_CONDITIONAL([WPG_BUILTIN], test "$enable_wpg_builtin" = "yes")
AM_CONDITIONAL([APPLIX_BUILTIN], test "$enable_applix_builtin" = "yes")
AM_CONDITIONAL([AIKSAURUS_BUILTIN], test "$enable_aiksaurus_builtin" = "yes")
AM_CONDITIONAL([GOOGLE_BUILTIN], test "$enable_google_builtin" = "yes")
AM_CONDITIONAL([OTS_BUILTIN], test "$enable_ots_builtin" = "yes")
AM_CONDITIONAL([GIMP_BUILTIN], test "$enable_gimp_builtin" = "yes")
AM_CONDITIONAL([COMMAND_BUILTIN], test "$enable_command_builtin" = "yes")
AM_CONDITIONAL([LATEX_BUILTIN], test "$enable_latex_builtin" = "yes")
AM_CONDITIONAL([OPENDOCUMENT_BUILTIN], test "$enable_opendocument_builtin" = "yes")
AM_CONDITIONAL([MATHVIEW_BUILTIN], test "$enable_mathview_builtin" = "yes")
AM_CONDITIONAL([WORDPERFECT_BUILTIN], test "$enable_wordperfect_builtin" = "yes")
AM_CONDITIONAL([GDICT_BUILTIN], test "$enable_gdict_builtin" = "yes")
AM_CONDITIONAL([PSION_BUILTIN], test "$enable_psion_builtin" = "yes")
AM_CONDITIONAL([GOFFICE_BUILTIN], test "$enable_goffice_builtin" = "yes")
AM_CONDITIONAL([OPENXML_BUILTIN], test "$enable_openxml_builtin" = "yes")
AM_CONDITIONAL([PDF_BUILTIN], test "$enable_pdf_builtin" = "yes")
AM_CONDITIONAL([XSLFO_BUILTIN], test "$enable_xslfo_builtin" = "yes")
AM_CONDITIONAL([SDW_BUILTIN], test "$enable_sdw_builtin" = "yes")
AM_CONDITIONAL([PASSEPARTOUT_BUILTIN], test "$enable_passepartout_builtin" = "yes")
AM_CONDITIONAL([DOCBOOK_BUILTIN], test "$enable_docbook_builtin" = "yes")
AM_CONDITIONAL([RSVG_BUILTIN], test "$enable_rsvg_builtin" = "yes")
AM_CONDITIONAL([MHT_BUILTIN], test "$enable_mht_builtin" = "yes")
AM_CONDITIONAL([EPUB_BUILTIN], test "$enable_epub_builtin" = "yes")
AM_CONDITIONAL([MSWRITE_BUILTIN], test "$enable_mswrite_builtin" = "yes")
AM_CONDITIONAL([OPENWRITER_BUILTIN], test "$enable_openwriter_builtin" = "yes")
AM_CONDITIONAL([MIF_BUILTIN], test "$enable_mif_builtin" = "yes")
AM_CONDITIONAL([URLDICT_BUILTIN], test "$enable_urldict_builtin" = "yes")
AM_CONDITIONAL([PRESENTATION_BUILTIN], test "$enable_presentation_builtin" = "yes")
AM_CONDITIONAL([SDW_BUILTIN], test "$enable_sdw_builtin" = "yes")
AM_CONDITIONAL([FREETRANSLATION_BUILTIN], test "$enable_freetranslation_builtin" = "yes")
AM_CONDITIONAL([XSLFO_BUILTIN], test "$enable_xslfo_builtin" = "yes")
AM_CONDITIONAL([KWORD_BUILTIN], test "$enable_kword_builtin" = "yes")
AM_CONDITIONAL([GIMP_BUILTIN], test "$enable_gimp_builtin" = "yes")
AM_CONDITIONAL([GOOGLE_BUILTIN], test "$enable_google_builtin" = "yes")
AM_CONDITIONAL([GRAMMAR_BUILTIN], test "$enable_grammar_builtin" = "yes")
abiword/plugin-list.m4
View file @ 6b49f2e8
openwriter hancom applix eml paint freetranslation collab pdb clarisworks grammar loadbindings gda wikipedia opml hrtext kword wordperfect garble urldict wml wpg s5 babelfish mif iscii presentation wmf bmp t602 aiksaurus google ots gimp command latex opendocument mathview gdict psion goffice openxml pdf xslfo sdw passepartout docbook rsvg mht epub mswrite
rsvg s5 hrtext pdf goffice openxml babelfish iscii passepartout psion hancom t602 mswrite paint garble collab mathview opendocument pdb docbook clarisworks gda ots wikipedia wml command opml wmf loadbindings epub latex eml bmp wpg applix aiksaurus wordperfect gdict mht openwriter mif urldict presentation sdw freetranslation xslfo kword gimp google grammar
abiword/plugin-makefiles.m4
View file @ 6b49f2e8
plugins/openwriter/xp/Makefile
plugins/openwriter/Makefile
plugins/rsvg/xp/Makefile
plugins/rsvg/Makefile
plugins/s5/xp/Makefile
plugins/s5/Makefile
plugins/hrtext/xp/Makefile
plugins/hrtext/Makefile
plugins/pdf/xp/Makefile
plugins/pdf/Makefile
plugins/goffice/Makefile
plugins/goffice/unix/Makefile
plugins/openxml/exp/xp/Makefile
plugins/openxml/exp/Makefile
plugins/openxml/omml_xslt/Makefile
plugins/openxml/Makefile
plugins/openxml/imp/xp/Makefile
plugins/openxml/imp/Makefile
plugins/openxml/common/xp/Makefile
plugins/openxml/common/Makefile
plugins/babelfish/xp/Makefile
plugins/babelfish/Makefile
plugins/iscii/xp/Makefile
plugins/iscii/Makefile
plugins/passepartout/xp/Makefile
plugins/passepartout/Makefile
plugins/psion/xp/Makefile
plugins/psion/Makefile
plugins/hancom/xp/Makefile
plugins/hancom/Makefile
plugins/applix/xp/Makefile
plugins/applix/Makefile
plugins/eml/xp/Makefile
plugins/eml/Makefile
plugins/t602/xp/Makefile
plugins/t602/Makefile
plugins/mswrite/xp/Makefile
plugins/mswrite/Makefile
plugins/paint/win/Makefile
plugins/paint/xp/Makefile
plugins/paint/Makefile
plugins/paint/unix/Makefile
plugins/paint/win/Makefile
plugins/freetranslation/xp/Makefile
plugins/freetranslation/Makefile
plugins/collab/core/account/xp/Makefile
plugins/collab/core/account/Makefile
plugins/collab/core/dialogs/xp/Makefile
plugins/collab/core/dialogs/Makefile
plugins/collab/core/dialogs/unix/Makefile
plugins/collab/core/dialogs/win/Makefile
plugins/collab/core/session/xp/Makefile
plugins/collab/core/session/Makefile
plugins/collab/core/Makefile
plugins/collab/core/plugin/xp/Makefile
plugins/collab/core/plugin/Makefile
plugins/collab/core/packet/xp/Makefile
plugins/collab/core/packet/Makefile
plugins/collab/core/sync/xp/Makefile
plugins/collab/core/sync/Makefile
plugins/collab/Makefile
plugins/collab/backends/tcp/xp/Makefile
plugins/collab/backends/tcp/Makefile
plugins/collab/backends/tcp/unix/Makefile
plugins/collab/backends/tcp/win/Makefile
plugins/collab/backends/sipsimple/xp/Makefile
plugins/collab/backends/sipsimple/Makefile
plugins/collab/backends/sipsimple/unix/Makefile
plugins/garble/xp/Makefile
plugins/garble/Makefile
plugins/collab/backends/telepathy/Makefile
plugins/collab/backends/telepathy/unix/Makefile
plugins/collab/backends/service/xp/Makefile
plugins/collab/backends/service/Makefile
plugins/collab/backends/service/unix/Makefile
plugins/collab/backends/service/win/Makefile
plugins/collab/backends/fake/xp/Makefile
plugins/collab/backends/fake/Makefile
plugins/collab/backends/sugar/Makefile
plugins/collab/backends/sugar/unix/Makefile
plugins/collab/backends/sipsimple/xp/Makefile
plugins/collab/backends/sipsimple/Makefile
plugins/collab/backends/sipsimple/unix/Makefile
plugins/collab/backends/Makefile
plugins/collab/backends/xmpp/xp/Makefile
plugins/collab/backends/xmpp/Makefile
plugins/collab/backends/xmpp/unix/Makefile
plugins/collab/backends/fake/xp/Makefile
plugins/collab/backends/fake/Makefile
plugins/collab/backends/service/win/Makefile
plugins/collab/backends/service/xp/Makefile
plugins/collab/backends/service/Makefile
plugins/collab/backends/service/unix/Makefile
plugins/collab/backends/tcp/win/Makefile
plugins/collab/backends/tcp/xp/Makefile
plugins/collab/backends/tcp/Makefile
plugins/collab/backends/tcp/unix/Makefile
plugins/collab/Makefile
plugins/collab/core/packet/xp/Makefile
plugins/collab/core/packet/Makefile
plugins/collab/core/sync/xp/Makefile
plugins/collab/core/sync/Makefile
plugins/collab/core/Makefile
plugins/collab/core/account/xp/Makefile
plugins/collab/core/account/Makefile
plugins/collab/core/dialogs/win/Makefile
plugins/collab/core/dialogs/xp/Makefile
plugins/collab/core/dialogs/Makefile
plugins/collab/core/dialogs/unix/Makefile
plugins/collab/core/plugin/xp/Makefile
plugins/collab/core/plugin/Makefile
plugins/collab/core/session/xp/Makefile
plugins/collab/core/session/Makefile
plugins/mathview/xp/Makefile
plugins/mathview/Makefile
plugins/mathview/itex2mml/Makefile
plugins/mathview/data/Makefile
plugins/opendocument/exp/xp/Makefile
plugins/opendocument/exp/Makefile
plugins/opendocument/Makefile
plugins/opendocument/imp/xp/Makefile
plugins/opendocument/imp/Makefile
plugins/opendocument/common/xp/Makefile
plugins/opendocument/common/Makefile
plugins/pdb/xp/Makefile
plugins/pdb/Makefile
plugins/docbook/xp/Makefile
plugins/docbook/Makefile
plugins/clarisworks/xp/Makefile
plugins/clarisworks/Makefile
plugins/grammar/linkgrammarwrap/Makefile
plugins/grammar/xp/Makefile
plugins/grammar/Makefile
plugins/loadbindings/xp/Makefile
plugins/loadbindings/Makefile
plugins/gda/Makefile
plugins/gda/unix/Makefile
plugins/ots/xp/Makefile
plugins/ots/Makefile
plugins/Makefile
plugins/wikipedia/xp/Makefile
plugins/wikipedia/Makefile
plugins/opml/xp/Makefile
plugins/opml/Makefile
plugins/hrtext/xp/Makefile
plugins/hrtext/Makefile
plugins/kword/xp/Makefile
plugins/kword/Makefile
plugins/wordperfect/xp/Makefile
plugins/wordperfect/Makefile
plugins/garble/xp/Makefile
plugins/garble/Makefile
plugins/urldict/xp/Makefile
plugins/urldict/Makefile
plugins/wml/xp/Makefile
plugins/wml/Makefile
plugins/wpg/xp/Makefile
plugins/wpg/Makefile
plugins/s5/xp/Makefile
plugins/s5/Makefile
plugins/babelfish/xp/Makefile
plugins/babelfish/Makefile
plugins/mif/xp/Makefile
plugins/mif/Makefile
plugins/iscii/xp/Makefile
plugins/iscii/Makefile
plugins/presentation/xp/Makefile
plugins/presentation/Makefile
plugins/command/xp/Makefile
plugins/command/Makefile
plugins/opml/xp/Makefile
plugins/opml/Makefile
plugins/wmf/xp/Makefile
plugins/wmf/Makefile
plugins/loadbindings/xp/Makefile
plugins/loadbindings/Makefile
plugins/epub/exp/xp/Makefile
plugins/epub/exp/Makefile
plugins/epub/Makefile
plugins/epub/dialogs/win/Makefile
plugins/epub/dialogs/xp/Makefile
plugins/epub/dialogs/Makefile
plugins/epub/dialogs/gtk/Makefile
plugins/epub/imp/xp/Makefile
plugins/epub/imp/Makefile
plugins/epub/common/xp/Makefile
plugins/epub/common/Makefile
plugins/latex/xsltml/Makefile
plugins/latex/xp/Makefile
plugins/latex/Makefile
plugins/eml/xp/Makefile
plugins/eml/Makefile
plugins/bmp/xp/Makefile
plugins/bmp/Makefile
plugins/t602/xp/Makefile
plugins/t602/Makefile
plugins/wpg/xp/Makefile
plugins/wpg/Makefile
plugins/applix/xp/Makefile
plugins/applix/Makefile
plugins/aiksaurus/win/Makefile
plugins/aiksaurus/xp/Makefile
plugins/aiksaurus/Makefile
plugins/aiksaurus/win/Makefile
plugins/google/xp/Makefile
plugins/google/Makefile
plugins/ots/xp/Makefile
plugins/ots/Makefile
plugins/gimp/xp/Makefile
plugins/gimp/Makefile
plugins/Makefile
plugins/command/xp/Makefile
plugins/command/Makefile
plugins/latex/xp/Makefile
plugins/latex/Makefile
plugins/latex/xsltml/Makefile
plugins/opendocument/imp/xp/Makefile
plugins/opendocument/imp/Makefile
plugins/opendocument/common/xp/Makefile
plugins/opendocument/common/Makefile
plugins/opendocument/Makefile
plugins/opendocument/exp/xp/Makefile
plugins/opendocument/exp/Makefile
plugins/mathview/data/Makefile
plugins/mathview/xp/Makefile
plugins/mathview/Makefile
plugins/mathview/itex2mml/Makefile
plugins/wordperfect/xp/Makefile
plugins/wordperfect/Makefile
plugins/gdict/Makefile
plugins/gdict/unix/Makefile
plugins/psion/xp/Makefile
plugins/psion/Makefile
plugins/goffice/Makefile
plugins/goffice/unix/Makefile
plugins/openxml/imp/xp/Makefile
plugins/openxml/imp/Makefile
plugins/openxml/common/xp/Makefile
plugins/openxml/common/Makefile
plugins/openxml/Makefile
plugins/openxml/exp/xp/Makefile
plugins/openxml/exp/Makefile
plugins/pdf/xp/Makefile
plugins/pdf/Makefile
plugins/xslfo/xp/Makefile
plugins/xslfo/Makefile
plugins/sdw/xp/Makefile
plugins/sdw/Makefile
plugins/passepartout/xp/Makefile
plugins/passepartout/Makefile
plugins/docbook/xp/Makefile
plugins/docbook/Makefile
plugins/rsvg/xp/Makefile
plugins/rsvg/Makefile
plugins/mht/xp/Makefile
plugins/mht/Makefile
plugins/epub/imp/xp/Makefile
plugins/epub/imp/Makefile
plugins/epub/common/xp/Makefile
plugins/epub/common/Makefile
plugins/epub/dialogs/gtk/Makefile
plugins/epub/dialogs/xp/Makefile
plugins/epub/dialogs/Makefile
plugins/epub/dialogs/win/Makefile
plugins/epub/Makefile
plugins/epub/exp/xp/Makefile
plugins/epub/exp/Makefile
plugins/mswrite/xp/Makefile
plugins/mswrite/Makefile
plugins/openwriter/xp/Makefile
plugins/openwriter/Makefile
plugins/mif/xp/Makefile
plugins/mif/Makefile
plugins/urldict/xp/Makefile
plugins/urldict/Makefile
plugins/presentation/xp/Makefile
plugins/presentation/Makefile
plugins/sdw/xp/Makefile
plugins/sdw/Makefile
plugins/freetranslation/xp/Makefile
plugins/freetranslation/Makefile
plugins/xslfo/xp/Makefile
plugins/xslfo/Makefile
plugins/kword/xp/Makefile
plugins/kword/Makefile
plugins/gimp/xp/Makefile
plugins/gimp/Makefile
plugins/google/xp/Makefile
plugins/google/Makefile
plugins/grammar/linkgrammarwrap/Makefile
plugins/grammar/xp/Makefile
plugins/grammar/Makefile
abiword/plugins/aiksaurus/win/AiksaurusApp.cpp
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <windows.h>
......
abiword/plugins/aiksaurus/win/AiksaurusApp.h
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AIKAPP
......
abiword/plugins/aiksaurus/win/AiksaurusDlg.cpp
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "AiksaurusApp.h"
......
abiword/plugins/aiksaurus/win/AiksaurusDlg.h
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
......
abiword/plugins/aiksaurus/xp/AiksaurusABI.cpp
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifdef ABI_PLUGIN_BUILTIN
......
abiword/plugins/applix/xp/ie_exp_Applix.cpp
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <string.h>
......
abiword/plugins/applix/xp/ie_exp_Applix.h
View file @ 6b49f2e8
......@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef IE_EXP_Applix_H
......
abiword/plugins/applix/xp/ie_imp_Applix.cpp
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
......
abiword/plugins/applix/xp/ie_imp_Applix.h
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
......
abiword/plugins/applix/xp/ie_impexp_Applix.cpp
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "ie_imp_Applix.h"
......
abiword/plugins/applix/xp/ie_impexp_Applix.h
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef IE_IMPEXP_APPLIX_H
......
abiword/plugins/babelfish/xp/AbiBabelfish.cpp
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_Module.h"
......
abiword/plugins/bmp/xp/ie_impGraphic_BMP.cpp
View file @ 6b49f2e8
......@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <stdlib.h>
......
abiword/plugins/bmp/xp/ie_impGraphic_BMP.h
View file @ 6b49f2e8
......@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
......
abiword/plugins/clarisworks/xp/ie_imp_ClarisWorks.cpp
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <stdio.h>
......
abiword/plugins/clarisworks/xp/ie_imp_ClarisWorks.h
View file @ 6b49f2e8
......@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef IE_IMP_CLARISWORKS_H
......
abiword/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <string.h>
......
abiword/plugins/collab/backends/fake/xp/FakeAccountHandler.h
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __FAKEACCOUNTHANDLER__
......
abiword/plugins/collab/backends/fake/xp/FakeBuddy.h
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __FAKEBUDDY_H__
......
abiword/plugins/collab/backends/service/unix/ServiceUnixAccountHandler.cpp
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "ServiceUnixAccountHandler.h"
......
abiword/plugins/collab/backends/service/unix/ServiceUnixAccountHandler.h
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __SERVICEUNIXACCOUNTHANDLER__
......
abiword/plugins/collab/backends/service/unix/ap_UnixDialog_GenericInput.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/unix/ap_UnixDialog_GenericInput.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AP_UNIXDIALOG_GENERICINPUT_H
......
abiword/plugins/collab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/unix/ap_UnixDialog_GenericProgress.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AP_UNIXDIALOG_GENERICPROGRESS_H
......
abiword/plugins/collab/backends/service/win/ServiceWin32AccountHandler.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/win/ServiceWin32AccountHandler.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __SERVICEWIN32ACCOUNTHANDLER__
......
abiword/plugins/collab/backends/service/win/ap_Win32Dialog_GenericInput.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/win/ap_Win32Dialog_GenericInput.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AP_WIN32DIALOG_GENERICINPUT_H
......
abiword/plugins/collab/backends/service/win/ap_Win32Dialog_GenericProgress.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/win/ap_Win32Dialog_GenericProgress.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __AP_WIN32DIALOG_GENERICPROGRESS_H__
......
abiword/plugins/collab/backends/service/win/ap_Win32Res_DlgGenericInput.rc2
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
// 02110-1301 USA.
//////////////////////////////////////////////////////////////////
......
abiword/plugins/collab/backends/service/win/ap_Win32Res_DlgGenericProgress.rc2
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
// 02110-1301 USA.
//////////////////////////////////////////////////////////////////
......
abiword/plugins/collab/backends/service/win/ap_Win32Res_ServiceDialogs.rc
View file @ 6b49f2e8
......@@ -17,8 +17,8 @@
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
// 02110-1301 USA.
//////////////////////////////////////////////////////////////////
#include "ap_Win32Res_DlgGenericInput.rc2"
......
abiword/plugins/collab/backends/service/xp/AbiCollabImport.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <libxml/tree.h>
......
abiword/plugins/collab/backends/service/xp/AbiCollabImport.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __ABICOLLAB_IMPORT__
......
abiword/plugins/collab/backends/service/xp/AbiCollabSaveInterceptor.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <boost/bind.hpp>
......
abiword/plugins/collab/backends/service/xp/AbiCollabSaveInterceptor.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __ABICOLLAB_SAVE_INTERCEPTOR__
......
abiword/plugins/collab/backends/service/xp/AbiCollabService_Export.cpp
View file @ 6b49f2e8
......@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "pd_Document.h"
......
abiword/plugins/collab/backends/service/xp/AbiCollabService_Export.h
View file @ 6b49f2e8
......@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef ABICOLLABSERVICE_EXPORT_H
......
abiword/plugins/collab/backends/service/xp/AsyncWorker.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __ASYNC_WORKER__
......
abiword/plugins/collab/backends/service/xp/InterruptableAsyncWorker.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __INTERRUPTABLE_ASYNC_WORKER__
......
abiword/plugins/collab/backends/service/xp/ProgressiveSoapCall.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __PROGRESSIVE_SOAP_CALL__
......
abiword/plugins/collab/backends/service/xp/RealmBuddy.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __REALM_BUDDY__
......
abiword/plugins/collab/backends/service/xp/RealmConnection.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <boost/function.hpp>
......@@ -361,7 +361,7 @@ void RealmConnection::_message(const asio::error_code& e, std::size_t /*bytes_tr
return;
}
UT_DEBUGMSG(("Constructing packet of type: 0x%x\n", (*msg_ptr)[0]));
PacketPtr packet_ptr = realm::protocolv1::Packet::construct(static_cast<rpv1::packet_type>((*msg_ptr)[0]));
realm::protocolv1::PacketPtr packet_ptr = realm::protocolv1::Packet::construct(static_cast<rpv1::packet_type>((*msg_ptr)[0]));
if (!packet_ptr) {
UT_DEBUGMSG(("Error constructing packet for type 0x%x\n", (*msg_ptr)[0]));
return;
......@@ -369,7 +369,7 @@ void RealmConnection::_message(const asio::error_code& e, std::size_t /*bytes_tr
_complete_packet(packet_ptr);
}
void RealmConnection::_complete_packet(PacketPtr packet_ptr)
void RealmConnection::_complete_packet(realm::protocolv1::PacketPtr packet_ptr)
{
UT_DEBUGMSG(("RealmConnection::_complete_packet()\n"));
int bytes_needed = packet_ptr->complete(m_buf.data(), m_buf.size());
......@@ -398,7 +398,7 @@ void RealmConnection::_complete_packet(PacketPtr packet_ptr)
}
}
void RealmConnection::_complete(const asio::error_code& e, std::size_t bytes_transferred, PacketPtr packet_ptr)
void RealmConnection::_complete(const asio::error_code& e, std::size_t bytes_transferred, realm::protocolv1::PacketPtr packet_ptr)
{
UT_DEBUGMSG(("RealmConnection::_complete()\n"));
if (e)
......
abiword/plugins/collab/backends/service/xp/RealmConnection.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __REALM_CONNECTION__
......@@ -34,8 +34,6 @@
class AP_Dialog_GenericProgress;
using realm::protocolv1::PacketPtr;
struct PendingDocumentProperties
{
PendingDocumentProperties(AP_Dialog_GenericProgress* pDlg_,
......@@ -90,7 +88,7 @@ public:
{ return m_pDoc; }
void setDocument(PD_Document* pDoc)
{ m_pDoc = pDoc; }
SynchronizedQueue<PacketPtr>& queue()
SynchronizedQueue<realm::protocolv1::PacketPtr>& queue()
{ return m_packet_queue; }
asio::ip::tcp::socket& socket()
{ return m_socket; }
......@@ -119,9 +117,9 @@ private:
std::size_t bytes_transferred,
boost::shared_ptr<std::string> msg_ptr);
void _complete_packet(PacketPtr packet_ptr);
void _complete_packet(realm::protocolv1::PacketPtr packet_ptr);
void _complete(const asio::error_code& e, std::size_t bytes_transferred,
PacketPtr packet_ptr);
realm::protocolv1::PacketPtr packet_ptr);
asio::io_service m_io_service;
std::string m_ca_file;
......@@ -138,7 +136,7 @@ private:
std::string m_session_id;
PD_Document* m_pDoc;
realm::GrowBuffer m_buf;
SynchronizedQueue<PacketPtr> m_packet_queue;
SynchronizedQueue<realm::protocolv1::PacketPtr> m_packet_queue;
boost::function<void (boost::shared_ptr<RealmConnection>)> m_sig;
std::vector<RealmBuddyPtr> m_buddies;
......
abiword/plugins/collab/backends/service/xp/ServiceAccountHandler.cpp
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifdef _MSC_VER
......@@ -25,6 +25,7 @@
#ifndef WIN32
#include <unistd.h>
#endif
#include <string>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <libxml/parser.h>
......@@ -193,11 +194,11 @@ UT_UTF8String ServiceAccountHandler::getShareHint(PD_Document* pDoc)
// TODO: we should really have a nice web url for this, but until we do,
// we'll poke in the SOAP uri to find it.
std::string server = getProperty("uri");
string::size_type proto_pos = server.find("://", 0);
if (proto_pos != string::npos)
std::string::size_type proto_pos = server.find("://", 0);
if (proto_pos != std::string::npos)
{
string::size_type slash_pos = server.find("/", proto_pos + 3);
if (slash_pos != string::npos)
std::string::size_type slash_pos = server.find("/", proto_pos + 3);
if (slash_pos != std::string::npos)
server = server.substr(0, slash_pos + 1);
}
return UT_UTF8String_sprintf("Your document will automatically be uploaded\nto %s", server.c_str());
......
abiword/plugins/collab/backends/service/xp/ServiceAccountHandler.h
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __SERVICEACCOUNTHANDLER__
......
abiword/plugins/collab/backends/service/xp/ServiceBuddy.h
View file @ 6b49f2e8
......@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __SERVICEBUDDY__
......@@ -79,10 +79,10 @@ public:
virtual const DocTreeItem* getDocTreeItems() const
{
const vector<DocHandle*>& docHandles = getDocHandles();
const std::vector<DocHandle*>& docHandles = getDocHandles();
DocTreeItem* first = 0;
DocTreeItem* prev = 0;
for (vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
for (std::vector<DocHandle*>::const_iterator pos = docHandles.begin(); pos != docHandles.end(); pos++)
{
DocTreeItem* item = new DocTreeItem();
item->m_type = DOCTREEITEM_TYPE_DOCUMENT;
......
abiword/plugins/collab/backends/service/xp/ServiceErrorCodes.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include <boost/lexical_cast.hpp>
......
abiword/plugins/collab/backends/service/xp/ServiceErrorCodes.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __SERVICE_ERRORCODES__
......
abiword/plugins/collab/backends/service/xp/abicollab_types.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef __ABICOLLAB_TYPES__
......
abiword/plugins/collab/backends/service/xp/ap_Dialog_GenericInput.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/xp/ap_Dialog_GenericInput.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AP_DIALOG_GENERICINPUT_H
......
abiword/plugins/collab/backends/service/xp/ap_Dialog_GenericProgress.cpp
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#include "xap_App.h"
......
abiword/plugins/collab/backends/service/xp/ap_Dialog_GenericProgress.h
View file @ 6b49f2e8
......@@ -12,8 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
#ifndef AP_DIALOG_GENERICPROGRESS_H
......
abiword/plugins/mathview/itex2mml/y.tab.c
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
abiword/plugins/openxml/omml_xslt/mml2omml.xsl 0 → 100644
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
abiword/po/bg-BG.strings
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
abiword/po/br-FR.strings
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
abiword/po/ja-JP.strings
View file @ 6b49f2e8
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment