[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 349 commits - berkeleydb/makefile.mk boost/aliasing.patch boost/makefile.mk cairo/cairo cairo/pixman curl/makefile.mk curl/prj dictionaries/cs_CZ dictionaries/da_DK dictionaries/diclst dictionaries/en dictionaries/fr_FR dictionaries/it_IT dictionaries/ne_NP dictionaries/pl_PL dictionaries/ro dictionaries/ru_RU dictionaries/sk_SK dictionaries/sl_SI expat/makefile.mk graphite/makefile.mk hunspell/makefile.mk icu/createmak.cfg icu/icu-mp.patch icu/makefile.mk jpeg/makefile.mk libxml2/makefile.mk libxslt/makefile.mk moz/extractfiles.mk moz/makefile.mk moz/zipped neon/makefile.mk nss/makefile.mk python/makefile.mk python/prj python/Python-parallel-make.patch saxon/makefile.mk
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Feb 11 08:26:25 PST 2011
berkeleydb/makefile.mk | 18
boost/aliasing.patch | 4
boost/makefile.mk | 4
cairo/cairo/makefile.mk | 22
cairo/pixman/makefile.mk | 8
curl/makefile.mk | 28
curl/prj/build.lst | 2
dictionaries/cs_CZ/makefile.mk | 8
dictionaries/da_DK/desc_da_DK.txt | 1
dictionaries/da_DK/desc_en_US.txt | 1
dictionaries/da_DK/description.xml | 7
dictionaries/da_DK/makefile.mk | 1
dictionaries/diclst/makefile.mk | 6
dictionaries/en/th_en_US_v2.idx |145868 +++++++++++++++++++++++++++++++++++++
dictionaries/fr_FR/makefile.mk | 1
dictionaries/fr_FR/thes_fr.idx |36207 +++++++++
dictionaries/it_IT/makefile.mk | 3
dictionaries/it_IT/th_it_IT_v2.idx |25853 ++++++
dictionaries/ne_NP/makefile.mk | 8
dictionaries/pl_PL/makefile.mk | 2
dictionaries/pl_PL/th_pl_PL_v2.idx |33849 ++++++++
dictionaries/ro/makefile.mk | 3
dictionaries/ru_RU/makefile.mk | 8
dictionaries/sk_SK/th_sk_SK_v2.idx |12523 +++
dictionaries/sl_SI/makefile.mk | 1
dictionaries/sl_SI/th_sl_SI_v2.idx |14046 +++
expat/makefile.mk | 2
graphite/makefile.mk | 4
hunspell/makefile.mk | 4
icu/createmak.cfg | 14
icu/icu-mp.patch | 24
icu/makefile.mk | 112
jpeg/makefile.mk | 4
libxml2/makefile.mk | 10
libxslt/makefile.mk | 8
moz/extractfiles.mk | 306
moz/makefile.mk | 174
moz/zipped/makefile.mk | 36
neon/makefile.mk | 4
nss/makefile.mk | 8
python/Python-parallel-make.patch | 36
python/makefile.mk | 19
python/prj/build.lst | 2
saxon/makefile.mk | 4
44 files changed, 268856 insertions(+), 397 deletions(-)
New commits:
commit 0df8b3bfa0d9dd40b6d3f1c1c6316534c0c3e655
Merge: a9f8d61... ae6f485...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Feb 11 10:02:13 2011 +0000
Merge branch 'premerge/dev300_m98' into integration/dev300_m98
Conflicts:
dictionaries/de_AT/th_de_AT_v2.idx
dictionaries/de_CH/th_de_CH_v2.idx
dictionaries/de_DE/th_de_DE_v2.idx
dictionaries/ro/th_ro_RO_v2.idx
zlib/zlib-1.1.4.patch
diff --cc moz/makefile.mk
index e347705,c1f111b..22b00f6
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@@ -188,16 -188,20 +188,28 @@@ CXXFLAGS+=-m6
.ENDIF
.EXPORT : CXXFLAGS
.ENDIF # "$(COMNAME)"=="sunpro5"
+ .IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
+ CXXFLAGS:=-mminimal-toc
+ .EXPORT : CXXFLAGS
+ .ENDIF
+ .ENDIF
+
+ .IF "$(COM)" == "GCC"
+ CXXFLAGS+=-fpermissive
+ .IF "$(OS)$(CPUNAME)" == "LINUXPOWERPC64"
+ CXXFLAGS+=-mminimal-toc
+ .ENDIF
+ .EXPORT : CXXFLAGS
.ENDIF
+.IF "$(COM)" == "GCC"
+CXXFLAGS+=-fpermissive
+.IF "$(OS)$(CPUNAME)" == "LINUXPOWERPC64"
+CXXFLAGS+=-mminimal-toc
+.ENDIF
+.EXPORT : CXXFLAGS
+.ENDIF
+
.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
.EXPORT: PKG_CONFIG_PATH
commit ae6f48543ad011ecf39cecb1af2cdec97ce33966
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Feb 11 09:41:14 2011 +0000
first attempt at merging m98
Conflicts:
berkeleydb/makefile.mk
bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
boost/aliasing.patch
boost/makefile.mk
cairo/cairo/makefile.mk
cairo/pixman/makefile.mk
curl/makefile.mk
dictionaries/cs_CZ/makefile.mk
dictionaries/da_DK/desc_da_DK.txt
dictionaries/da_DK/desc_en_US.txt
dictionaries/da_DK/description.xml
dictionaries/da_DK/makefile.mk
dictionaries/de_AT/th_de_AT_v2.idx
dictionaries/de_CH/th_de_CH_v2.idx
dictionaries/de_DE/th_de_DE_v2.idx
dictionaries/diclst/makefile.mk
dictionaries/en/description.xml
dictionaries/en/makefile.mk
dictionaries/en_GB/delzip
dictionaries/en_GB/description.xml
dictionaries/fr_FR/makefile.mk
dictionaries/hr_HR/delzip
dictionaries/hr_HR/description.xml
dictionaries/hr_HR/dictionaries.xcu
dictionaries/hr_HR/makefile.mk
dictionaries/hr_HR/manifest.xml
dictionaries/hu_HU/description.xml
dictionaries/it_IT/makefile.mk
dictionaries/ku_TR/delzip
dictionaries/ku_TR/makefile.mk
dictionaries/ne_NP/makefile.mk
dictionaries/pl_PL/makefile.mk
dictionaries/ro/makefile.mk
dictionaries/ro/th_ro_RO_v2.idx
dictionaries/ru_RU/makefile.mk
dictionaries/sk_SK/makefile.mk
dictionaries/sl_SI/makefile.mk
dictionaries/util/th_gen_idx.pl
graphite/makefile.mk
hunspell/makefile.mk
icu/createmak.cfg
icu/makefile.mk
libxml2/makefile.mk
libxslt/makefile.mk
more_fonts/fonts/ttf_dejavu/makefile.mk
more_fonts/fonts/ttf_linlibertineg/makefile.mk
more_fonts/prj/build.lst
more_fonts/prj/d.lst
moz/extractfiles.mk
moz/makefile.mk
moz/zipped/makefile.mk
neon/makefile.mk
nss/makefile.mk
nss/nss.patch
nss/nss_macosx.patch
python/Python-2.6.1.patch
python/Python-ssl.patch
python/makefile.mk
python/prj/build.lst
stax/makefile.mk
zlib/makefile.mk
zlib/zlib-1.1.4.patch
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ad966da
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+
+/moz/zipped/*.zip
diff --git a/berkeleydb/db-aix.patch b/berkeleydb/db-aix.patch
new file mode 100644
index 0000000..3a2c21f
--- /dev/null
+++ b/berkeleydb/db-aix.patch
@@ -0,0 +1,205 @@
+--- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500
++++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500
+@@ -532,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -544,6 +544,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
+--- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500
++++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500
+@@ -3701,7 +3701,7 @@
+ # Don't override anything if it's already set from the environment.
+ optimize_debug="-O"
+ case "$host_os" in
+-aix4.3.*|aix5*)
++aix[4-9]*)
+ case "$host_os" in
+ aix4.3.*)
+ CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
+@@ -6452,7 +6452,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -9439,7 +9439,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[4-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -9649,7 +9649,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -9669,7 +9669,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -10410,7 +10410,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11826,7 +11826,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -12670,7 +12670,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -12683,7 +12683,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -13805,7 +13805,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -14201,7 +14201,7 @@
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -14334,7 +14334,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15455,7 +15455,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -15966,7 +15966,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -16176,7 +16176,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -16917,7 +16917,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -18540,7 +18540,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -18750,7 +18750,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -19511,7 +19511,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+--- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500
++++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500
+@@ -154,7 +154,7 @@
+ # Don't override anything if it's already set from the environment.
+ optimize_debug="-O"
+ case "$host_os" in
+-aix4.3.*|aix5*)
++aix[4-9]*)
+ case "$host_os" in
+ aix4.3.*)
+ CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index cbc9aaf..a866e87 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -60,7 +60,9 @@ ADDITIONAL_FILES= \
.IF "$(GUI)$(COM)"=="WNTGCC"
PATCH_FILES=db-4.7.25-mingw.patch
.ELSE
-PATCH_FILES=db-4.7.25.patch
+PATCH_FILES=\
+ db-4.7.25.patch \
+ db-aix.patch
.ENDIF
# clean compiler flags
diff --git a/boost/aliasing.patch b/boost/aliasing.patch
index 8e3dc41..3b517c2 100644
--- a/boost/aliasing.patch
+++ b/boost/aliasing.patch
@@ -22,7 +22,7 @@
// Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
#ifdef BOOST_NO_STD_TYPEINFO
// Embedded VC++ does not have type_info in namespace std
-@@ -303,15 +311,15 @@
+@@ -314,15 +322,15 @@
{
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
new file mode 100644
index 0000000..805447c
--- /dev/null
+++ b/boost/boost.4713.warnings.patch
@@ -0,0 +1,745 @@
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp
+@@ -126,8 +126,8 @@
+ typedef unary<ParserT, parser<self_t> > base_t;
+ typedef unary_parser_category parser_category_t;
+
+- assertive_parser(ParserT const& parser, ErrorDescrT descriptor)
+- : base_t(parser), descriptor(descriptor) {}
++ assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
++ : base_t(parser), descriptor(descriptor_) {}
+
+ template <typename ScannerT>
+ struct result
+@@ -222,9 +222,9 @@
+
+ error_status(
+ result_t result_ = fail,
+- std::ptrdiff_t length = -1,
++ std::ptrdiff_t length_ = -1,
+ T const& value_ = T())
+- : result(result_), length(length), value(value_) {}
++ : result(result_), length(length_), value(value_) {}
+
+ result_t result;
+ std::ptrdiff_t length;
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp
+@@ -54,13 +54,13 @@
+ typedef typename ScannerT::iterator_t iterator_t;
+
+ iterator_t const s(scan.first);
+- functor_result_t result;
+- std::ptrdiff_t len = functor(scan, result);
++ functor_result_t functor_result;
++ std::ptrdiff_t len = functor(scan, functor_result);
+
+ if (len < 0)
+ return scan.no_match();
+ else
+- return scan.create_match(std::size_t(len), result, s, scan.first);
++ return scan.create_match(std::size_t(len), functor_result, s, scan.first);
+ }
+ };
+
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp
+@@ -47,8 +47,8 @@
+ typedef fixed_loop<ParserT, ExactT> self_t;
+ typedef unary<ParserT, parser<self_t> > base_t;
+
+- fixed_loop (ParserT const & subject, ExactT const & exact)
+- : base_t(subject), m_exact(exact) {}
++ fixed_loop (ParserT const & subject_, ExactT const & exact)
++ : base_t(subject_), m_exact(exact) {}
+
+ template <typename ScannerT>
+ typename parser_result <self_t, ScannerT>::type
+@@ -112,8 +112,8 @@
+ typedef finite_loop <ParserT, MinT, MaxT> self_t;
+ typedef unary<ParserT, parser<self_t> > base_t;
+
+- finite_loop (ParserT const & subject, MinT const & min, MaxT const & max)
+- : base_t(subject), m_min(min), m_max(max) {}
++ finite_loop (ParserT const & subject_, MinT const & min, MaxT const & max)
++ : base_t(subject_), m_min(min), m_max(max) {}
+
+ template <typename ScannerT>
+ typename parser_result <self_t, ScannerT>::type
+@@ -196,11 +196,11 @@
+ typedef unary<ParserT, parser<self_t> > base_t;
+
+ infinite_loop (
+- ParserT const& subject,
++ ParserT const& subject_,
+ MinT const& min,
+ more_t const&
+ )
+- : base_t(subject), m_min(min) {}
++ : base_t(subject_), m_min(min) {}
+
+ template <typename ScannerT>
+ typename parser_result <self_t, ScannerT>::type
+@@ -253,9 +253,9 @@
+
+ template <typename ParserT>
+ fixed_loop <ParserT, ExactT>
+- operator[](parser <ParserT> const & subject) const
++ operator[](parser <ParserT> const & subject_) const
+ {
+- return fixed_loop <ParserT, ExactT> (subject.derived (), m_exact);
++ return fixed_loop <ParserT, ExactT> (subject_.derived (), m_exact);
+ }
+
+ ExactT m_exact;
+@@ -283,11 +283,11 @@
+
+ template <typename ParserT>
+ typename impl::loop_traits<ParserT, MinT, MaxT>::type
+- operator[](parser <ParserT> const & subject) const
++ operator[](parser <ParserT> const & subject_) const
+ {
+ typedef typename impl::loop_traits<ParserT, MinT, MaxT>::type ret_t;
+ return ret_t(
+- subject.derived(),
++ subject_.derived(),
+ m_min,
+ m_max);
+ }
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
+@@ -102,13 +102,13 @@
+ {
+ typedef typename ScannerT::iterator_t iterator_t;
+ iterator_t first = scan.first;
+- typename SetT::search_info result = SetT::find(scan);
++ typename SetT::search_info result_ = SetT::find(scan);
+
+- if (result.data)
++ if (result_.data)
+ return scan.
+ create_match(
+- result.length,
+- symbol_ref_t(*result.data),
++ result_.length,
++ symbol_ref_t(*result_.data),
+ first,
+ scan.first);
+ else
+
+--- misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
++++ misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
+@@ -82,8 +82,8 @@
+ //Give duration access to ticks constructor -- hide from users
+ friend class date_time::time_duration<time_duration, time_res_traits>;
+ private:
+- explicit time_duration(impl_type ticks) :
+- date_time::time_duration<time_duration, time_res_traits>(ticks)
++ explicit time_duration(impl_type _ticks) :
++ date_time::time_duration<time_duration, time_res_traits>(_ticks)
+ {}
+ };
+
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp
+@@ -49,7 +49,7 @@
+ : first(rp->first), second(rp->second)
+ { }
+
+- const ref_pair* const operator->() const
++ const ref_pair* operator->() const
+ {
+ return this;
+ }
+--- misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp
+@@ -476,19 +476,19 @@
+ public: // C-array support
+
+ void transfer( iterator before, value_type* from,
+- size_type size, bool delete_from = true ) // strong
++ size_type size_, bool delete_from = true ) // strong
+ {
+ BOOST_ASSERT( from != 0 );
+ if( delete_from )
+ {
+ BOOST_DEDUCED_TYPENAME base_type::scoped_deleter
+- deleter( from, size ); // nothrow
+- this->base().insert( before.base(), from, from + size ); // strong
++ deleter( from, size_ ); // nothrow
++ this->base().insert( before.base(), from, from + size_ ); // strong
+ deleter.release(); // nothrow
+ }
+ else
+ {
+- this->base().insert( before.base(), from, from + size ); // strong
++ this->base().insert( before.base(), from, from + size_ ); // strong
+ }
+ }
+
+@@ -510,72 +510,72 @@
+
+ public: // resize
+
+- void resize( size_type size ) // basic
++ void resize( size_type size_ ) // basic
+ {
+ size_type old_size = this->size();
+- if( old_size > size )
++ if( old_size > size_ )
+ {
+- this->erase( boost::next( this->begin(), size ), this->end() );
++ this->erase( boost::next( this->begin(), size_ ), this->end() );
+ }
+- else if( size > old_size )
++ else if( size_ > old_size )
+ {
+- for( ; old_size != size; ++old_size )
++ for( ; old_size != size_; ++old_size )
+ this->push_back( new BOOST_DEDUCED_TYPENAME
+ boost::remove_pointer<value_type>::type );
+ }
+
+- BOOST_ASSERT( this->size() == size );
++ BOOST_ASSERT( this->size() == size_ );
+ }
+
+- void resize( size_type size, value_type to_clone ) // basic
++ void resize( size_type size_, value_type to_clone ) // basic
+ {
+ size_type old_size = this->size();
+- if( old_size > size )
++ if( old_size > size_ )
+ {
+- this->erase( boost::next( this->begin(), size ), this->end() );
++ this->erase( boost::next( this->begin(), size_ ), this->end() );
+ }
+- else if( size > old_size )
++ else if( size_ > old_size )
+ {
+- for( ; old_size != size; ++old_size )
++ for( ; old_size != size_; ++old_size )
+ this->push_back( this->null_policy_allocate_clone( to_clone ) );
+ }
+
+- BOOST_ASSERT( this->size() == size );
++ BOOST_ASSERT( this->size() == size_ );
+ }
+
+- void rresize( size_type size ) // basic
++ void rresize( size_type size_ ) // basic
+ {
+ size_type old_size = this->size();
+- if( old_size > size )
++ if( old_size > size_ )
+ {
+ this->erase( this->begin(),
+- boost::next( this->begin(), old_size - size ) );
++ boost::next( this->begin(), old_size - size_ ) );
+ }
+- else if( size > old_size )
++ else if( size_ > old_size )
+ {
+- for( ; old_size != size; ++old_size )
++ for( ; old_size != size_; ++old_size )
+ this->push_front( new BOOST_DEDUCED_TYPENAME
+ boost::remove_pointer<value_type>::type );
+ }
+
+- BOOST_ASSERT( this->size() == size );
++ BOOST_ASSERT( this->size() == size_ );
+ }
+
+- void rresize( size_type size, value_type to_clone ) // basic
++ void rresize( size_type size_, value_type to_clone ) // basic
+ {
+ size_type old_size = this->size();
+- if( old_size > size )
++ if( old_size > size_ )
+ {
+ this->erase( this->begin(),
+- boost::next( this->begin(), old_size - size ) );
++ boost::next( this->begin(), old_size - size_ ) );
+ }
+- else if( size > old_size )
++ else if( size_ > old_size )
+ {
+- for( ; old_size != size; ++old_size )
++ for( ; old_size != size_; ++old_size )
+ this->push_front( this->null_policy_allocate_clone( to_clone ) );
+ }
+
+- BOOST_ASSERT( this->size() == size );
++ BOOST_ASSERT( this->size() == size_ );
+ }
+
+ public: // algorithms
+--- misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp
+@@ -477,6 +477,7 @@
+ }
+
+ ptr_map_adapter( const ptr_map_adapter& r )
++ : base_type()
+ {
+ map_basic_clone_and_insert( r.begin(), r.end() );
+ }
+--- misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp
++++ misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp
+@@ -423,17 +423,17 @@
+ void delete_buckets()
+ {
+ if(buckets_) {
+- bucket_ptr begin = cached_begin_bucket_;
+- bucket_ptr end = buckets_end();
+- while(begin != end) {
+- clear_bucket(begin);
+- ++begin;
++ bucket_ptr begin_ = cached_begin_bucket_;
++ bucket_ptr end_ = buckets_end();
++ while(begin_ != end_) {
++ clear_bucket(begin_);
++ ++begin_;
+ }
+
+ // Destroy an extra bucket for the sentinels.
+- ++end;
+- for(begin = buckets_; begin != end; ++begin)
+- allocators_.bucket_alloc_.destroy(begin);
++ ++end_;
++ for(begin_ = buckets_; begin_ != end_; ++begin_)
++ allocators_.bucket_alloc_.destroy(begin_);
+
+ allocators_.bucket_alloc_.deallocate(buckets_,
+ bucket_manager_.bucket_count() + 1);
+@@ -680,11 +680,11 @@
+ // The deleted node is at the end of the group, so the
+ // first node in the group is pointing to it.
+ // Find that to change its pointer.
+- link_ptr it = n->group_prev_;
+- while(prev_in_group(it) != *pos) {
+- it = prev_in_group(it);
++ link_ptr it2 = n->group_prev_;
++ while(prev_in_group(it2) != *pos) {
++ it2 = prev_in_group(it2);
+ }
+- prev_in_group(it) = n->group_prev_;
++ prev_in_group(it2) = n->group_prev_;
+ }
+ *pos = next;
+ --size_;
+@@ -721,25 +721,25 @@
+ size_ -= node_count(n.node_);
+ }
+
+- void unlink_nodes(iterator_base begin, iterator_base end)
++ void unlink_nodes(iterator_base begin_, iterator_base end_)
+ {
+- BOOST_ASSERT(begin.bucket_ == end.bucket_);
+- size_ -= node_count(begin.node_, end.node_);
+- link_ptr* it = get_for_erase(begin);
+- split_group(*it, end.node_);
+- *it = end.node_;
++ BOOST_ASSERT(begin_.bucket_ == end_.bucket_);
++ size_ -= node_count(begin_.node_, end_.node_);
++ link_ptr* it = get_for_erase(begin_);
++ split_group(*it, end_.node_);
++ *it = end_.node_;
+ }
+
+- void unlink_nodes(bucket_ptr base, iterator_base end)
++ void unlink_nodes(bucket_ptr base, iterator_base end_)
+ {
+- BOOST_ASSERT(base == end.bucket_);
++ BOOST_ASSERT(base == end_.bucket_);
+
+- split_group(end.node_);
++ split_group(end_.node_);
+
+ link_ptr ptr(base->next_);
+- base->next_ = end.node_;
++ base->next_ = end_.node_;
+
+- size_ -= node_count(ptr, end.node_);
++ size_ -= node_count(ptr, end_.node_);
+ }
+
+ #if BOOST_UNORDERED_EQUIVALENT_KEYS
+@@ -797,12 +797,12 @@
+ {
+ node_constructor a(allocators_);
+
+- link_ptr end = next_group(it);
++ link_ptr end_ = next_group(it);
+
+ a.construct(get_value(it)); // throws
+ link_ptr n = link_node_in_bucket(a, dst);
+
+- for(it = it->next_; it != end; it = it->next_) {
++ for(it = it->next_; it != end_; it = it->next_) {
+ a.construct(get_value(it)); // throws
+ link_node(a, n);
+ }
+@@ -824,21 +824,21 @@
+ //
+ // no throw
+
+- void delete_to_bucket_end(link_ptr begin)
++ void delete_to_bucket_end(link_ptr begin_)
+ {
+- while(begin) {
+- link_ptr node = begin;
+- begin = begin->next_;
+- allocators_.destroy(node);
++ while(begin_) {
++ link_ptr node_ = begin_;
++ begin_ = begin_->next_;
++ allocators_.destroy(node_);
+ }
+ }
+
+- void delete_nodes(link_ptr begin, link_ptr end)
++ void delete_nodes(link_ptr begin_, link_ptr end_)
+ {
+- while(begin != end) {
+- link_ptr node = begin;
+- begin = begin->next_;
+- allocators_.destroy(node);
++ while(begin_ != end_) {
++ link_ptr node_ = begin_;
++ begin_ = begin_->next_;
++ allocators_.destroy(node_);
+ }
+ }
+
+@@ -848,9 +848,9 @@
+ delete_nodes(first_node, prev_in_group(first_node)->next_);
+ }
+ #else
+- void delete_group(link_ptr node)
++ void delete_group(link_ptr node_)
+ {
+- allocators_.destroy(node);
++ allocators_.destroy(node_);
+ }
+ #endif
+
+@@ -869,15 +869,15 @@
+
+ void clear()
+ {
+- bucket_ptr begin = cached_begin_bucket_;
+- bucket_ptr end = buckets_end();
++ bucket_ptr begin_ = cached_begin_bucket_;
++ bucket_ptr end_ = buckets_end();
+
+ size_ = 0;
+- cached_begin_bucket_ = end;
++ cached_begin_bucket_ = end_;
+
+- while(begin != end) {
+- clear_bucket(begin);
+- ++begin;
++ while(begin_ != end_) {
++ clear_bucket(begin_);
++ ++begin_;
+ }
+ }
+
+@@ -974,13 +974,13 @@
+ cached_begin_bucket_ = b2;
+ }
+
+- size_type erase_group(link_ptr* it, bucket_ptr bucket)
++ size_type erase_group(link_ptr* it, bucket_ptr bucket_)
+ {
+ link_ptr pos = *it;
+ size_type count = unlink_group(it);
+ delete_group(pos);
+
+- this->recompute_begin_bucket(bucket);
++ this->recompute_begin_bucket(bucket_);
+
+ return count;
+ }
+@@ -1541,8 +1541,8 @@
+ hf(extract_key(data::get_value(src_bucket->next_))));
+
+ link_ptr n = src_bucket->next_;
+- size_type count = src.unlink_group(&src_bucket->next_);
+- dst.link_group(n, dst_bucket, count);
++ size_type count_ = src.unlink_group(&src_bucket->next_);
++ dst.link_group(n, dst_bucket, count_);
+ }
+ }
+ }
+@@ -1651,20 +1651,20 @@
+ {
+ key_type const& k = extract_key(a.get()->value());
+ size_type hash_value = hash_function()(k);
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr position = find_iterator(bucket, k);
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr position = find_iterator(bucket_, k);
+
+ // reserve has basic exception safety if the hash function
+ // throws, strong otherwise.
+ if(reserve_for_insert(size() + 1))
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+
+ // I'm relying on link_ptr not being invalidated by
+ // the rehash here.
+- return iterator_base(bucket,
++ return iterator_base(bucket_,
+ (BOOST_UNORDERED_BORLAND_BOOL(position)) ?
+ data_.link_node(a, position) :
+- data_.link_node_in_bucket(a, bucket)
++ data_.link_node_in_bucket(a, bucket_)
+ );
+ }
+
+@@ -1718,13 +1718,13 @@
+ a.construct(*i);
+
+ key_type const& k = extract_key(a.get()->value());
+- bucket_ptr bucket = get_bucket(k);
+- link_ptr position = find_iterator(bucket, k);
++ bucket_ptr bucket_ = get_bucket(k);
++ link_ptr position = find_iterator(bucket_, k);
+
+ if(BOOST_UNORDERED_BORLAND_BOOL(position))
+ data_.link_node(a, position);
+ else
+- data_.link_node_in_bucket(a, bucket);
++ data_.link_node_in_bucket(a, bucket_);
+ }
+ }
+ }
+@@ -1761,8 +1761,8 @@
+ typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type;
+
+ size_type hash_value = hash_function()(k);
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr pos = find_iterator(bucket, k);
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr pos = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(pos))
+ return data::get_value(pos);
+@@ -1778,11 +1778,11 @@
+ // reserve has basic exception safety if the hash function
+ // throws, strong otherwise.
+ if(reserve_for_insert(size() + 1))
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+
+ // Nothing after this point can throw.
+
+- return data::get_value(data_.link_node_in_bucket(a, bucket));
++ return data::get_value(data_.link_node_in_bucket(a, bucket_));
+ }
+ }
+
+@@ -1797,13 +1797,13 @@
+ // No side effects in this initial code
+ key_type const& k = extract_key(v);
+ size_type hash_value = hash_function()(k);
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr pos = find_iterator(bucket, k);
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr pos = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
+ // Found an existing key, return it (no throw).
+ return std::pair<iterator_base, bool>(
+- iterator_base(bucket, pos), false);
++ iterator_base(bucket_, pos), false);
+
+ } else {
+ // Doesn't already exist, add to bucket.
+@@ -1817,14 +1817,14 @@
+ // reserve has basic exception safety if the hash function
+ // throws, strong otherwise.
+ if(reserve_for_insert(size() + 1))
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+
+ // Nothing after this point can throw.
+
+- link_ptr n = data_.link_node_in_bucket(a, bucket);
++ link_ptr n = data_.link_node_in_bucket(a, bucket_);
+
+ return std::pair<iterator_base, bool>(
+- iterator_base(bucket, n), true);
++ iterator_base(bucket_, n), true);
+ }
+ }
+
+@@ -1864,13 +1864,13 @@
+ {
+ // No side effects in this initial code
+ size_type hash_value = hash_function()(k);
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr pos = find_iterator(bucket, k);
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr pos = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
+ // Found an existing key, return it (no throw).
+ return std::pair<iterator_base, bool>(
+- iterator_base(bucket, pos), false);
++ iterator_base(bucket_, pos), false);
+
+ } else {
+ // Doesn't already exist, add to bucket.
+@@ -1884,12 +1884,12 @@
+ // reserve has basic exception safety if the hash function
+ // throws, strong otherwise.
+ if(reserve_for_insert(size() + 1))
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+
+ // Nothing after this point can throw.
+
+- return std::pair<iterator_base, bool>(iterator_base(bucket,
+- data_.link_node_in_bucket(a, bucket)), true);
++ return std::pair<iterator_base, bool>(iterator_base(bucket_,
++ data_.link_node_in_bucket(a, bucket_)), true);
+ }
+ }
+
+@@ -1904,23 +1904,23 @@
+ // No side effects in this initial code
+ key_type const& k = extract_key(a.get()->value());
+ size_type hash_value = hash_function()(k);
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr pos = find_iterator(bucket, k);
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr pos = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
+ // Found an existing key, return it (no throw).
+ return std::pair<iterator_base, bool>(
+- iterator_base(bucket, pos), false);
++ iterator_base(bucket_, pos), false);
+ } else {
+ // reserve has basic exception safety if the hash function
+ // throws, strong otherwise.
+ if(reserve_for_insert(size() + 1))
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+
+ // Nothing after this point can throw.
+
+- return std::pair<iterator_base, bool>(iterator_base(bucket,
+- data_.link_node_in_bucket(a, bucket)), true);
++ return std::pair<iterator_base, bool>(iterator_base(bucket_,
++ data_.link_node_in_bucket(a, bucket_)), true);
+ }
+ }
+
+@@ -1969,8 +1969,8 @@
+ for (; i != j; ++i) {
+ // No side effects in this initial code
+ size_type hash_value = hash_function()(extract_key(*i));
+- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value);
+- link_ptr pos = find_iterator(bucket, extract_key(*i));
++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value);
++ link_ptr pos = find_iterator(bucket_, extract_key(*i));
+
+ if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
+ // Doesn't already exist, add to bucket.
+@@ -1984,11 +1984,11 @@
+ // throws, strong otherwise.
+ if(size() + 1 >= max_load_) {
+ reserve_for_insert(size() + insert_size(i, j));
+- bucket = data_.bucket_ptr_from_hash(hash_value);
++ bucket_ = data_.bucket_ptr_from_hash(hash_value);
+ }
+
+ // Nothing after this point can throw.
+- data_.link_node_in_bucket(a, bucket);
++ data_.link_node_in_bucket(a, bucket_);
+ }
+ }
+ }
+@@ -2001,11 +2001,11 @@
+ size_type erase_key(key_type const& k)
+ {
+ // No side effects in initial section
+- bucket_ptr bucket = get_bucket(k);
+- link_ptr* it = find_for_erase(bucket, k);
++ bucket_ptr bucket_ = get_bucket(k);
++ link_ptr* it = find_for_erase(bucket_, k);
+
+ // No throw.
+- return *it ? data_.erase_group(it, bucket) : 0;
++ return *it ? data_.erase_group(it, bucket_) : 0;
+ }
+
+ // count
+@@ -2022,19 +2022,19 @@
+ // strong exception safety, no side effects
+ iterator_base find(key_type const& k) const
+ {
+- bucket_ptr bucket = get_bucket(k);
+- link_ptr it = find_iterator(bucket, k);
++ bucket_ptr bucket_ = get_bucket(k);
++ link_ptr it = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(it))
+- return iterator_base(bucket, it);
++ return iterator_base(bucket_, it);
+ else
+ return data_.end();
+ }
+
+ value_type& at(key_type const& k) const
+ {
+- bucket_ptr bucket = get_bucket(k);
+- link_ptr it = find_iterator(bucket, k);
++ bucket_ptr bucket_ = get_bucket(k);
++ link_ptr it = find_iterator(bucket_, k);
+
+ if (BOOST_UNORDERED_BORLAND_BOOL(it))
+ return data::get_value(it);
+@@ -2047,10 +2047,10 @@
+ // strong exception safety, no side effects
+ std::pair<iterator_base, iterator_base> equal_range(key_type const& k) const
+ {
+- bucket_ptr bucket = get_bucket(k);
+- link_ptr it = find_iterator(bucket, k);
++ bucket_ptr bucket_ = get_bucket(k);
++ link_ptr it = find_iterator(bucket_, k);
+ if (BOOST_UNORDERED_BORLAND_BOOL(it)) {
+- iterator_base first(iterator_base(bucket, it));
++ iterator_base first(iterator_base(bucket_, it));
+ iterator_base second(first);
+ second.increment_group();
+ return std::pair<iterator_base, iterator_base>(first, second);
+@@ -2074,10 +2074,10 @@
+ }
+
+ // strong exception safety, no side effects
+- link_ptr find_iterator(bucket_ptr bucket,
++ link_ptr find_iterator(bucket_ptr bucket_,
+ key_type const& k) const
+ {
+- link_ptr it = data_.begin(bucket);
++ link_ptr it = data_.begin(bucket_);
+ while (BOOST_UNORDERED_BORLAND_BOOL(it) && !equal(k, data::get_value(it)))
+ it = data::next_group(it);
+
+@@ -2085,9 +2085,9 @@
+ }
+
+ // strong exception safety, no side effects
+- link_ptr* find_for_erase(bucket_ptr bucket, key_type const& k) const
++ link_ptr* find_for_erase(bucket_ptr bucket_, key_type const& k) const
+ {
+- link_ptr* it = &bucket->next_;
++ link_ptr* it = &bucket_->next_;
+ while(BOOST_UNORDERED_BORLAND_BOOL(*it) && !equal(k, data::get_value(*it)))
+ it = &data::next_group(*it);
+
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
index d837246..46395dd 100644
--- a/boost/boost_1_39_0.patch
+++ b/boost/boost_1_39_0.patch
@@ -285,3 +285,28 @@ index 5d75be2..730cf0c 100644
).second;
}
+--- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
++++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk
+@@ -1,1 +1,21 @@
+-dummy
++PRJ=..$/..$/..$/..$/..$/..$/..$/..
++
++PRJNAME=boostthread
++TARGET=boostthread
++LIBTARGET=NO
++
++.IF "$(GUI)"=="WNT"
++
++.INCLUDE : settings.mk
++
++SLOFILES= $(SLO)$/exceptions.obj \
++ $(SLO)$/thread.obj \
++ $(SLO)$/tss_dll.obj \
++ $(SLO)$/tss_pe.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE : target.mk
++.ENDIF
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 3e97046..ec699ac 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -54,6 +54,12 @@ PATCH_FILES=$(TARFILE_NAME).patch
# See https://svn.boost.org/trac/boost/ticket/3780
PATCH_FILES+=aliasing.patch
+#https://svn.boost.org/trac/boost/ticket/4713
+PATCH_FILES+=boost.4713.warnings.patch
+
+ADDITIONAL_FILES= \
+ libs/thread/src/win32/makefile.mk
+
CONFIGURE_DIR=
CONFIGURE_ACTION=
@@ -67,6 +73,7 @@ BUILD_FLAGS=
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+
# --- post-build ---------------------------------------------------
# "normalize" the output structure, in that the C++ headers are
@@ -81,11 +88,18 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME)
@@ -97,13 +111,27 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/thread $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/unordered $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME)
@$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+.IF "$(GUI)"!="WNT"
+
$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
+
+.ELSE
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib
+
+boostthreadlib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+ cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS)
+
+.ENDIF
+
.ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index 421265b..528d185 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,3 +1,3 @@
-bo boost : SO:so_prereq solenv NULL
+bo boost : solenv NULL
bo boost usr1 - all bo_mkout NULL
bo boost nmake - all bo_boost NULL
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 6b9ebca..185ac0f 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -1,18 +1,34 @@
mkdir: %_DEST%\inc%_EXT%\boost
+mkdir: %_DEST%\inc%_EXT%\boost\algorithm
+mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string
+mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\detail
+mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\std
+mkdir: %_DEST%\inc%_EXT%\boost\assign
+mkdir: %_DEST%\inc%_EXT%\boost\assign\std
mkdir: %_DEST%\inc%_EXT%\boost\bind
+mkdir: %_DEST%\inc%_EXT%\boost\concept
+mkdir: %_DEST%\inc%_EXT%\boost\concept\detail
mkdir: %_DEST%\inc%_EXT%\boost\config
+mkdir: %_DEST%\inc%_EXT%\boost\config\abi
mkdir: %_DEST%\inc%_EXT%\boost\config\compiler
mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1
mkdir: %_DEST%\inc%_EXT%\boost\config\platform
mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib
+mkdir: %_DEST%\inc%_EXT%\boost\date_time
+mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian
+mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time
+mkdir: %_DEST%\inc%_EXT%\boost\date_time\posix_time
mkdir: %_DEST%\inc%_EXT%\boost\detail
mkdir: %_DEST%\inc%_EXT%\boost\function
mkdir: %_DEST%\inc%_EXT%\boost\function\detail
+mkdir: %_DEST%\inc%_EXT%\boost\functional
+mkdir: %_DEST%\inc%_EXT%\boost\functional\hash\detail
+mkdir: %_DEST%\inc%_EXT%\boost\io
+mkdir: %_DEST%\inc%_EXT%\boost\integer
mkdir: %_DEST%\inc%_EXT%\boost\iterator
mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail
mkdir: %_DEST%\inc%_EXT%\boost\exception
mkdir: %_DEST%\inc%_EXT%\boost\exception\detail
-mkdir: %_DEST%\inc%_EXT%\boost\function
mkdir: %_DEST%\inc%_EXT%\boost\mpl
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config
@@ -110,8 +126,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
@@ -128,6 +148,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset
@@ -146,25 +170,49 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl
mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset
mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr
mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail
+mkdir: %_DEST%\inc%_EXT%\boost\thread
+mkdir: %_DEST%\inc%_EXT%\boost\thread\detail
+mkdir: %_DEST%\inc%_EXT%\boost\thread\pthread
+mkdir: %_DEST%\inc%_EXT%\boost\thread\win32
mkdir: %_DEST%\inc%_EXT%\boost\tuple
mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
mkdir: %_DEST%\inc%_EXT%\boost\type_traits
mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
+mkdir: %_DEST%\inc%_EXT%\boost\unordered
+mkdir: %_DEST%\inc%_EXT%\boost\unordered\detail
mkdir: %_DEST%\inc%_EXT%\boost\utility
mkdir: %_DEST%\inc%_EXT%\boost\utility\detail
mkdir: %_DEST%\inc%_EXT%\boost\variant
mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost
+..\%__SRC%\inc\boost\algorithm\* %_DEST%\inc%_EXT%\boost\algorithm
+..\%__SRC%\inc\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string
+..\%__SRC%\inc\boost\algorithm\string\detail\* %_DEST%\inc%_EXT%\boost\algorithm\string\detail
+..\%__SRC%\inc\boost\algorithm\string\std\* %_DEST%\inc%_EXT%\boost\algorithm\string\std
+..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign
+..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std
..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind
+..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept
+..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail
..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config
+..\%__SRC%\inc\boost\config\abi\* %_DEST%\inc%_EXT%\boost\config\abi
..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler
..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1
..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform
..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib
+..\%__SRC%\inc\boost\date_time\* %_DEST%\inc%_EXT%\boost\date_time
+..\%__SRC%\inc\boost\date_time\gregorian\* %_DEST%\inc%_EXT%\boost\date_time\gregorian
+..\%__SRC%\inc\boost\date_time\local_time\* %_DEST%\inc%_EXT%\boost\date_time\local_time
+..\%__SRC%\inc\boost\date_time\posix_time\* %_DEST%\inc%_EXT%\boost\date_time\posix_time
..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail
..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function
..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail
+..\%__SRC%\inc\boost\functional\* %_DEST%\inc%_EXT%\boost\functional
+..\%__SRC%\inc\boost\functional\hash\* %_DEST%\inc%_EXT%\boost\functional\hash
+..\%__SRC%\inc\boost\functional\hash\detail\* %_DEST%\inc%_EXT%\boost\functional\hash\detail
+..\%__SRC%\inc\boost\io\* %_DEST%\inc%_EXT%\boost\io
+..\%__SRC%\inc\boost\integer\* %_DEST%\inc%_EXT%\boost\integer
..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator
..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail
..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception
@@ -266,8 +314,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic
..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
+..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute
+..\%__SRC%\inc\boost\spirit\home\classic\attribute\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl
..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl
+..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic
+..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl
..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
@@ -284,6 +336,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
+..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix
+..\%__SRC%\inc\boost\spirit\home\classic\phoenix\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl
+..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols
+..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl
..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset
@@ -302,11 +358,18 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset
..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr
..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail
+..\%__SRC%\inc\boost\thread\* %_DEST%\inc%_EXT%\boost\thread
+..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc%_EXT%\boost\thread\detail
+..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc%_EXT%\boost\thread\pthread
+..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc%_EXT%\boost\thread\win32
..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple
..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail
..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
+..\%__SRC%\inc\boost\unordered\* %_DEST%\inc%_EXT%\boost\unordered
+..\%__SRC%\inc\boost\unordered\detail\* %_DEST%\inc%_EXT%\boost\unordered\detail
..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+..\%__SRC%\slb\boostthread.lib %_DEST%\lib%_EXT%\boostthread.lib
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index f51015f..f8a6f51 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -120,7 +120,7 @@ OUT2INC+=src$/cairo-quartz.h
.ELSE
# ----------- Unix ---------------------------------------------------------
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
.ELIF "$(OS)$(COM)"=="SOLARISC52"
cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
@@ -169,6 +169,11 @@ OUT2INC+=src$/cairo-xlib.h \
CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
.ENDIF
+.IF "$(debug)"!=""
+cairo_CFLAGS+=-g
+CONFIGURE_FLAGS+= STRIP=" "
+.ENDIF
+
CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
.ENDIF
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
index 4aa0681..c3d2145 100644
--- a/cairo/pixman-0.12.0.patch
+++ b/cairo/pixman-0.12.0.patch
@@ -23,3 +23,14 @@
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
+--- misc/pixman-0.12.0/Makefile.in 2008-09-17 19:14:38.000000000 +0200
++++ misc/build/pixman-0.12.0/Makefile.in 2010-09-28 14:27:47.000000000 +0200
+@@ -203,7 +203,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ GPGKEY = 6FF7C1A8
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 58485fd..34f0b85 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
# ----------- Unix ---------------------------------------------------------
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
@@ -120,13 +120,7 @@ pixman_CFLAGS+=-fPIC
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-.IF "$(CPUNAME)"=="X86_64"
-# static builds tend to fail on 64bit
CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
-.ELSE
-# use static lib to avoid linking problems with older system pixman libs
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
-.ENDIF
CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
@@ -149,11 +143,7 @@ OUT2LIB+=pixman$/.libs$/*.a
OUT2LIB+=pixman$/release$/*.lib
.ENDIF
.ELSE
-.IF "$(CPUNAME)"=="X86_64"
-OUT2LIB+=pixman$/.libs$/libpixman-1.so
-.ELSE
-OUT2LIB+=pixman$/.libs$/libpixman-1.a
-.ENDIF
+OUT2LIB+=pixman$/.libs$/libpixman-1.so*
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/curl/curl-aix.patch b/curl/curl-aix.patch
new file mode 100644
index 0000000..1ee1999
--- /dev/null
+++ b/curl/curl-aix.patch
@@ -0,0 +1,21 @@
+--- misc/curl-7.19.7/config.guess 2010-09-15 14:29:17.000000000 -0500
++++ misc/build/curl-7.19.7/config.guess 2010-09-15 14:32:41.000000000 -0500
+@@ -548,7 +548,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -560,6 +560,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
diff --git a/curl/makefile.mk b/curl/makefile.mk
index b880b03..84fa616 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -43,6 +43,7 @@ all:
TARFILE_NAME=curl-7.19.7
TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab
+<<<<<<< HEAD
PATCH_FILES=curl-7.19.7.patch
.IF "$(GUI)"=="WNT"
@@ -50,6 +51,17 @@ PATCH_FILES=curl-7.19.7.patch
.IF "$(COM)"=="GCC"
PATCH_FILES+=curl-7.19.7_mingw.patch
.ENDIF
+=======
+PATCH_FILES=\
+ curl-7.19.7.patch \
+ curl-aix.patch
+
+.IF "$(GUI)"=="WNT"
+ PATCH_FILES+=curl-7.19.7_win.patch
+ .IF "$(COM)"=="GCC"
+ PATCH_FILES+=curl-7.19.7_mingw.patch
+ .ENDIF
+>>>>>>> LO-BASE-INTEGRATION-DEV300_m98
.ENDIF
@@ -70,6 +82,10 @@ curl_CFLAGS+:=$(ARCH_FLAGS)
curl_LDFLAGS+:=$(ARCH_FLAGS)
.ENDIF
+.IF "$(OS)"=="AIX"
+curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
CONFIGURE_DIR=.$/
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=.$/configure
@@ -112,10 +128,17 @@ EXCFLAGS="/EHsc /YX"
.ENDIF
BUILD_DIR=.$/lib
+
+.IF "$(CPU)" == "I"
+MACHINE=X86
+.ELSE
+MACHINE=X64
+.ENDIF
+
.IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS)
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
.ELSE
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS)
+BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE)
.ENDIF
OUT2BIN=$(BUILD_DIR)$/libcurl.dll
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index e9dfc31..867b225 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -53,7 +53,6 @@ COMPONENT_FILES= \
$(EXTENSIONDIR)$/ca.dic \
$(EXTENSIONDIR)$/hyph_ca.dic \
$(EXTENSIONDIR)$/th_ca_ES_v3.dat \
- $(EXTENSIONDIR)$/th_ca_ES_v3.idx \
$(EXTENSIONDIR)$/dict_LICENSES-en.txt \
$(EXTENSIONDIR)$/dict_LLICENCIES-ca.txt \
$(EXTENSIONDIR)$/hyph_release-note_ca.txt \
@@ -77,10 +76,13 @@ CUSTOM_LICENSE=LICENSES-en.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
+COMPONENT_UNZIP_FILES= \
+ $(EXTENSIONDIR)$/th_ca_ES_v3.idx
+
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
-EXTENSION_PACKDEPS=$(COMPONENT_FILES)
+EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global settings for extension packing
.INCLUDE : extension_pre.mk
@@ -88,3 +90,6 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
+$(EXTENSIONDIR)$/th_ca_ES_v3.idx : "$(EXTENSIONDIR)$/th_ca_ES_v3.dat"
+ $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
+
diff --git a/dictionaries/ca/th_ca_ES_v3.idx b/dictionaries/ca/th_ca_ES_v3.idx
deleted file mode 100644
index 03b9e18..0000000
--- a/dictionaries/ca/th_ca_ES_v3.idx
+++ /dev/null
@@ -1,8158 +0,0 @@
-UTF-8
-8156
--|150263
--|150320
--|150335
--|374606
--|374739
--|392025
--|392124
--|392142
--|409240
--|409281
--|427841
-[gos] coniller|6
-[gos] guineuer|79
-[gos] llebrer|152
-[gos] perdiguer|225
-a baix preu|298
-a bon preu|350
-a fi que|490
-a hores d'ara|630
-a l'interior|720
-a més a més|945
-a més d'això|1074
-a peu nu|1715
-a recules|2072
-a reculons|2121
-a reveure|2170
-a tota hora|2294
-abaixar|3793
-abandonament|3908
-abandonar|3953
-abandonat|4193
-abandó|3858
-abans|4214
-abarrotar|4285
-abast|4476
-abastar|4505
-abatre|4564
-abatut|4678
-abdomen|4822
-abellir|4874
-abillar-se|4983
-abisme|5031
-ablamar|5049
-abocar|5119
-abogar|5346
-abominar|5382
-abonar|5418
-abonaré|5480
-abordar|5500
-abrandar|5914
-abraonar|5984
-abrasar|6125
-abraçadora|5647
-abraçar|5731
-abraçar|5872
-abric|6212
-abrigall|6343
-abril|6428
-abrivar|6480
-abscència|6525
-abscés|6634
-absecració|6650
-absent|6693
-absolució|6721
-absolut|6838
-absorbir|6909
-absorció|7017
-absurd|7044
-abundant|7168
-abundor|7269
-abundà ncia|7083
-abundós|7126
-abusar|7312
-abús|4268
-acabament|7347
-acabar|7431
-acabat|7685
-acabat de fer|7741
-acadèmia|7780
-acalorar|7831
-acalorat|7912
-acaramullar|7985
-accedir|8115
-accelerar|8206
-accelerat|8259
-accent|8284
-acceptació|8371
-acceptar|8409
-acceptat|8903
-accessible|8974
-accident|9222
-accidentat|9570
-acció|9052
-accés|8034
-acerb|9600
-acetós|9674
-aciençar|9763
-aclamar|9869
-aclariment|9962
-aclarir|10042
-acoblament|10117
-acoblar|10188
-acoblar-se|10490
-acollar|10546
-acolliment|10617
-acollir|10655
-acolorir|11000
-acomiadament|11020
-acomiadar|11044
-acomodar|11068
-acomodat|11151
-acompanyament|11246
-acompanyant|11287
-acompanyar|11311
-acomplir|11407
-acompte|11434
-acondicionar|11488
-aconseguir|11562
-aconsellar|11699
-acontentament|11762
-acontentar|11873
-acorar|11982
-acord|12010
-acordar|12267
-acordió|12448
-acostar|12493
-acostat|12702
-acostumar|12734
-acostumat|12841
-acotar|12875
-acre|13104
-acréixer|12988
-acréixer-se|13026
-acta|13178
-acte|13371
-actitud|13491
-actiu|13558
-activitat|13577
-actor|13619
-actuació|13667
-actual|13863
-actualitat|13937
-actualment|13973
-actuar|14063
-acudir|14133
-acudit|14157
-acuitar|14243
-acull|14284
-acumulació|14322
-acumulació nuvolada|14473
-acumular|14529
-acusació|14674
-acusar|14751
-acÃ|7332
-acÃ|9748
-adaptació|15086
-adaptar|15135
-adaptar-se|15185
-addicionar|15262
-adelitar|15298
-adequar|15371
-adequat|15400
-adherir|15551
-adhesió|15772
-adient|15823
-adinerat|15969
-adjudicar|16064
-admetre|16244
-administració|16515
-administració, commandament|16647
-administrador|16687
-administrar|16714
-admirable|16757
-admiració|16807
-admirar|16917
-admissió|16940
-adob|16975
-adobar|17040
-adobat|17107
-adoctrinar|17137
-adolescent|17392
-adolescència|17329
-adonar-se|17497
-adopció|17600
-adoptar|17625
-adoració|17664
-adorar|17809
-adorn|17858
-adornar|17879
-adquirir|17912
-adquisició|18051
-adreça|18102
-adreçat|18157
-adular|18178
-adversari|18266
-advertiment|18541
-advertir|18709
-advertència|18380
-advertència|18478
-advocat|18964
-adés|14915
-adéu|15010
-adéu-siau|15048
-aeroplà |19109
-aeroport|19137
-aeròdrom|19054
-aeròstat|19077
-afable|19207
-afaitar|19298
-afalac|19403
-afalagar|19474
-afanar|19583
-afaneta|19688
-afany|19873
-afanyar|19952
-afartar|20029
-afavorir|20187
-afeccionar-se|20471
-afeccionat|20545
-afecció|20250
-afectar|20581
-afectar-se|20663
-afectat|20737
-afecte|20782
-afegir|20981
-afeixugar|21040
-afer|21119
-afermar|21182
-aferrador|21417
-aferrar|21499
-afició|21778
-afició, gust, inclinació, preferència, tirada|21802
-afilar|21869
-afiliar|21993
-afiliar-se|22064
-afinar|22096
-afinitat|22195
-afirmació|22217
-afirmar|22272
-aflaquir|22320
-afluixar|22419
-afrontar|22561
-afuar|22609
-afÃ|19160
-afÃ|21706
-agafador|22741
-agafall|22823
-agafar|22905
-agafar un camÃ|23696
-agarrar|23780
-agenollar-se|23870
-agent|23960
-agitació|24096
-agitar|24186
-aglomeració|24379
-aglomerat|24492
-agosarat|24568
-agost|24607
-agradable|24776
-agradable, amable, afable, cordial, xamòs|24931
-agradar|24988
-agrair|25243
-agranadures|25343
-agranar|25416
-agraner|25438
-agrari|25474
-agre|25495
-agredir|25587
-agregar|25672
-agrenc|25728
-agressiu|25898
-agressió|25802
-agreujar|25921
-agrunsar|26010
-agrupació|26151
-agrupació|26293
-agrupar|26349
-agrÃcola|24681
-agrós|24702
-aguaitar|26387
-aguantar|26528
-agudell|26793
-agudesa|26924
-agulla|27005
-agullonar|27231
-agulló|27137
-agusar|27265
-agut|27364
-agència|22708
-ahir|27453
-aiguada|27514
-aiguaneix|27552
-aiguat|27630
-aigüera|27467
-aire|27709
-aital|27817
-aixafar|27925
-aixecador|28050
-aixecar|28072
-aixecar la camisa|28397
-aixeta|28575
-aixopluc|28636
-aixÃ|27846
-aixà que|27873
-això|27902
-ajagut|28698
-ajeure's|28724
-ajornalar|28776
-ajornar|28817
-ajuda|28906
-ajudant|29112
-ajudar|29210
-ajuntament|29249
-ajuntar|29442
-ajustar|29992
-ajustar-se|30066
-ajusticiar|30244
-ajut|30322
-al cap de|30573
-ala|30662
-alabar|31291
-alabarda|31383
-alarmant|31433
-alarmar|31483
-alb|31519
-alba|31599
-alberg|31709
-albergar|31766
-albergueria|31817
-albir|31874
-albirar|31940
-albÃ|31633
-alcaid|32112
-alcalde|32168
-alcaldessa|32198
-alcandora|32223
-alcohol|32273
-alcova|32299
-alcà sser|32016
-alegrament|32331
-alegrança|32442
-alegrar|32553
-alegrar-se|32693
-alegre|32742
-alegria|32812
-alegrois|33062
-alemany|33173
-alenar|33209
-alentir|33244
-alerta|33304
-aleró|33270
-aleshores|33365
-aleta|33395
-algun|33429
-aliança|33556
-aliment|33600
-alimentació|33686
-alimentar|33731
-aliè|33443
-allargar|33992
-allargassat|34107
-allargat|34211
-allerar|34315
-alletar|34406
-alleugeriment|34451
-alleujar|34529
-allevar|34584
-alliberar|34816
-alliberat|34908
-allisar|35127
-alliçonar|34673
-alliçonar|34935
-allongat|35192
-allotjament|35296
-allotjar|35357
-allunyar|35398
-allunyat|35463
-allà |33906
-allÃ|33949
-allò|35147
-almanco|35514
-almenys|35558
-almoinar|35602
-alpaca|35647
-alqueria|35692
-alt|35759
-alt, voluminós, extens, llarg, profund|35954
-alta|36009
-altament|36044
-alteració|36079
-alterar|36175
-alterat|36254
-altercar|36274
-alternar|36315
-alternativa|36359
-altiplà |36391
-altitud|36412
-altivar-se|36450
-altrament|36546
-altura|36675
-alumne|36759
-al·legació|30785
-al·legar|30834
-al·legat|30865
-al·lucinant|30914
-al·ludir|31049
-alçar|31104
-alè|30749
-amable|36799
-amagar|36900
-amagat|37020
-amagatall|37044
-amalgama|37140
-amalgamar|37196
-amanida|37245
-amanir|37276
-amant|37343
-amanuense|37387
-amanyac|37431
-amarar|37641
-amarg|37826
-amargor|37848
-amarrar|37880
-amassament|37921
-amat|38012
-amatinar-se|38083
-amb això|38160
-amb tot això|38203
-ambicionar|38355
-ambiciós|38332
-ambient|38421
-ambosta|38443
-amenaça|38484
-amenaçar|38537
-americana|38613
-americà |38570
-amesurat|38639
-ametlla|38678
-ametlló|38699
-amfiteatre|38720
-amic|38760
-amiga|38884
-amistat|38974
-amistós|38900
-amitjanar|39129
-amnistia|39166
-amnistiar|39321
-amnistÃa, indult, perdó|39283
-amo|39354
-amollar|39828
-amollir|39938
-amonar|39970
-amor|40036
-amoreta|40214
-amorrar|40285
-amotinar|40398
-amoïnar|39499
-amoïnar|39629
-ampit|40476
-amplada|40567
-ample|40603
-ampli|40761
-ampliació|40856
-ampliar|40891
-amplitud|41008
-amplà ria|40531
-ampolla|41042
-amullerar|41166
-amunt|41267
-amuntegament|41299
-anadÃpsia|41665
-analitzar|41769
-anar|41792
-anar a parar|42065
-anar cosit d'or|42121
-anar curt|42216
-anar de trompis|42280
-anar en matrimoni|42336
-anar-se'n|42437
-ancià |42478
-andana|42502
-anedó|42532
-aneguet|42570
-anell|42608
-anella|42650
-angle|42756
-anglès|42734
-angoixa|42818
-angora|42867
-angost|42927
-anhelar|42956
-anihilament|43030
-animació|43083
-animal|43176
-animalet|43279
-animar|43314
-anit|43629
-aniversari|43643
-anomalia|43681
-anomenada|43708
-anomenar|43748
-anomenat|43806
-anotació|43829
-anotar|43909
-ansietat|44009
-antagonista|44260
-antagònic|44154
-antany|44366
-antena|44420
-anterior|44461
-anteriorment|44589
-antesala|44643
-antic|44684
-anticipar|44719
-antiestètic|44792
-antigament|44857
-antiquat|44911
-antologia|44940
-antracita|45025
-antre|45072
-antènula|44050
-antÃdot|44077
-anular|45266
-anul·lar|45143
-anunci|45304
-anunciar|45438
-anvers|45565
-anyada|45593
-anyell|45655
-anà leg|41363
-anà leg|41697
-anà lisi|41388
-anònim|41486
-apa|45899
-apagar|45945
-aparador|46071
-aparcament|46103
-aparcar|46143
-aparell|46235
-aparellar|46303
-aparentar|46662
-aparença|46516
-apariament|46736
-aparició|46788
-apartament|46836
-apartar|46855
-apartat|47023
-aparèixer|45983
-apassionant|47159
-apassionar|47319
-apassionat|47384
-apel·lació|47515
-apel·lar|47549
-apercebre's|47594
-apetir|47697
-apetit|47717
-apilament|47761
-aplaudir|47874
-aplegament|48057
-aplegar|48170
-aplicació|48352
-aplicar|48404
-aplicat|48458
-apoderar-se|48478
-aporrinar|48551
-aportació|48602
-aportar|48659
-aposar|48688
-aposta|48776
-apostar|48888
-apostòlic|48794
-apreciable|48935
-apreciació|49009
-apreciar|49149
-apreciat|49314
-apregonar|49385
-aprenent|49482
-aprenentatge|49550
-apressar|49588
-apressar-se|49632
-aprimar|49709
-aprofitar|49808
-aprofitar-se|49905
-aprofundir|49938
-apropar|50082
-apropiar-se|50195
-apropiat|50268
-aprovació|50560
-aprovar|50587
-aproximació|50819
-aproximar|50856
-apte|50969
-apuntalar|51004
-apuntar|51088
-apurar|51246
-apà tic|47468
-apòstol|45923
-aquarel·la|51375
-aqueix|51438
-aquell|51479
-aquest|51518
-aquesta cosa|51559
-aqueta|51582
-aquiescència|51760
-aquÃ|51360
-aquÃ|51745
-aqüedcute|51277
-ara|51873
-ara com ara|51981
-ara mateix|52071
-ara per ara|52161
-aranya|52251
-arbitrar|52285
-arbitri|52481
-arborar|52547
-arbre de sant josep|52617
-arbreda|52652
-arbust|52713
-arc|52729
-arca|52759
-ardent|53112
-ardentor|53130
-ardor|53320
-ardència|52922
-aregar|53388
-arena|53494
-arenes|53510
-areny|53550
-aresta|53586
-argolla|53648
-argue|53732
-argument|53763
-arma|53827
-armada|53863
-armament|53905
-armar|53929
-armari|53999
-armella|54038
-armenter|54122
-aroma|54148
-arpejar|54206
-arpellejar|54283
-arpia|54360
-arquetip|54394
-arrabassar|54478
-arraconar|54593
-arramadar|54664
-arrambador|54735
-arrambar|54790
-arran|54903
-arrancar|54992
-arranjament|55038
-arranjar|55096
-arravatament|55199
-arreaments|55236
-arreglar|55287
-arrel|55432
-arrels|55565
-arremesa|55585
-arrencada|55681
-arrencar|55740
-arrencar el bull|55843
-arrendament|55925
-arrendar|55955
-arreplec|55975
-arreplega|56037
-arreplegar|56111
-arrere|56289
-arrest|56338
-arrestar|56555
-arreu|56607
-arribada|56679
-arribar|56703
-arrimar|56740
-arriscar|56853
-arriscat|56917
-arrodonit|57074
-arroentar|57133
-arrop|57214
-arrossegar|57261
-arrugar|57452
-arruïnar|57410
-art|57472
-artefacte|57693
-article|57756
-articulació|57899
-articular|57934
-artificial|57959
-artista|58004
-artritis|58067
-artèria|57533
-artÃstic|57670
-arà bic|51963
-as|58085
-ascendent|58161
-ascendir|58208
-ascendència|58106
-ascens|58359
-ascensió|58418
-ascona|58489
-ase|58539
-asfalt|58557
-asfixiar|58574
-asil|58600
-aspecte|58639
-aspergir|58858
-aspiració|58912
-aspirant|58939
-aspre|59007
-assabentar|59046
-assaig|59109
-assalt|59205
-assaltador|59315
-assaltar|59347
-assaonar|59441
-assaonat|59508
-assassinar|59588
-assassÃ|59527
-assecar|59690
-assecar-se|59803
-assedegament|59824
-asseguració|59856
-assegurament|59916
-assegurança|59976
-assegurar|60036
-assegurat|60313
-assemblea|60334
-assentiment|60486
-assenyalar|60589
-assenyat|60862
-asserenat|60902
-assessor|60947
-asseure|60970
-asseure's|61007
-assignar|61027
-assignatura|61207
-assimilació|61255
-assimilar|61282
-assistent|61557
-assistir|61655
-assistència|61326
-assistència|61374
-associació|61726
-associació|61877
-associació, agrupament, congregació, germandat|61974
-associar|62069
-associat|62224
-assoldar|62286
-assoliment|62327
-assolir|62380
-assossec|62420
-assossegat|62597
-assot|62641
-assotar|62839
-assumir|62934
-assumpció|63029
-assumpte|63050
-assutzena|63155
-asta|63187
-astre|63254
-astrugà ncia|63291
-astut|63450
-astúcia|63237
-atabalar|63582
-atac|63661
-atacar|63874
-ataconador|64140
-atansar|64171
-atapeït|64284
-atardar|64308
-ataronjat|64397
-atavellar|64428
-atemptar|64465
-atemptat|64550
-atenció|64655
-atenció|64799
-atendre|64906
-atent|64968
-atenuar|65049
-aterrar|65126
-atestat|65214
-atiar|65254
-atifells|65324
-atipar|65368
-atipar-se|65451
-atleta|65487
-atlètic|65507
-atmosfera|65556
-atonyar|65659
-atordir|65713
-atorgar|65838
-atracador|65927
-atracallar|65959
-atracar|66038
-atracció|66176
-atracció|66272
-atractiu|66313
-atrapar|66345
-atraure|66552
-atreure|66661
-atreviment|66744
-atrevir|66773
-atri|66821
-atribolar|66854
-atribució|66933
-atribuir|67004
-atronauta|67212
-atropament|67237
-atropar|67328
-atroç|67057
-atupar|67399
-aturar|67450
-aturat|67579
-atzabeja|67666
-atzagaia|67713
-atzar|67763
-atzarós|67954
-atòmic|63562
-au|68065
-audaç|68104
-audició|68258
-audiència|68189
-audà cia|68133
-augment|68302
-augmentar|68434
-aula|68871
-auto|69055
-autobús|69097
-autocar|69135
-automòbil|69212
-autonomia|69254
-autopista|69331
-autor|69468
-autoritat|69522
-autorització|69726
-autoritzar|69763
-autovia|69854
-autoòmnibus|69293
-autèntic|68887
-autòcton|68947
-autògraf|69173
-autònom|68995
-auxili|69991
-auxiliar|70087
-aval|70511
-avalar|70597
-avall|70636
-avalotar|70653
-avaluar|70731
-avant|71200
-avantatge|71233
-avantpassat|71281
-avantsala|71302
-avanzar, progressar, millorar|71343
-avanç|70788
-avançada|71095
-avançar|70842
-avançar|71149
-avançat|71062
-avar|71408
-avaria|71514
-avariciós|71700
-avenir|71887
-avenir-se|71940
-aventura|72175
-aventurar|72382
-aventurat|72508
-avenç|71812
-avergonyir|72619
-avi|72644
-aviador|72696
-aviar|72724
-aviat|72774
-avinagrat|72823
-avinença|72897
-avioneta|73000
-aviram|73028
-avisar|73084
-avió|72668
-avorrir|73284
-avorrit|73597
-avui|73655
-avés|70366
-avÃs|70213
-avÃs|73049
-aïllar|3639
-aïllat|3679
-aïllat|27668
-babau|74612
-babó|74688
-bacinet|74739
-bacó|74861
-badabadoc|74906
-badadura|74950
-badaire|75045
-badall|75089
-badia|75204
-badoc|75275
-badÃvol|75222
-baf|75319
-baga|75341
-bagatge|75373
-bagul|75496
-baix|75659
-baixa|75783
-baixada|75834
-baixador|75925
-baixar|75954
-bajoca|76022
-bala|76053
-balada|76133
-balancejar|76522
-balancÃ|76443
-balandrejar|76663
-balança|76282
-balançar|76302
-balcona|76867
-balconada|76938
-balcó|76804
-baldar|77011
-baldufa|77152
-baleja|77182
-ball|77218
-ballesta|77239
-balma|77266
-baluard|77337
-balustrada|77367
-balustre|77422
-baló|76087
-bambú|77469
-ban|77522
-banal|77804
-banasta|77885
-banastell|77963
-banc|78041
-banda|78055
-bandera|78312
-bandit|78352
-bandositat|78411
-banqueta|78455
-bany|78477
-banya|78650
-banyada|78780
-banyadura|78864
-banyar|78901
-banyat|79013
-banyera|79052
-banyot|79098
-banyó|78698
-banyó|79069
-bar|79127
-baralla|79212
-barallar|79235
-barallar-se|79278
-barana|79303
-barat|79358
-barba|79426
-barbaritat|79465
-barbejar|79520
-barber|79625
-barbollar|79646
-barca|79715
-barcarola|79743
-barman|79892
-baronÃvol|79932
-barra|79989
-barraca|80116
-barracot|80325
-barral|80361
-barreig|80435
-barreja|80491
-barrejar|80659
-barrera|80834
-barreta|80855
-barri|80977
-barriada|81034
-barril|81069
-barrilla|81143
-barroer|81218
-barruer|81298
-barrut|81420
-barró|80073
-baró|79190
-basar|81527
-basca|81601
-bascular|81630
-base|81771
-basquejar-se|81870
-bassa|81947
-bassal|82031
-bassiol|82062
-bastant|82135
-bastir|82169
-bastó|82095
-bata|82216
-batalla|82263
-batallada|82308
-batalló|82342
-bategar|82390
-batent|82441
-bateria|82458
-batibull|82525
-batlle|82570
-batllessa|82600
-batre|82625
-batuda|82676
-batxiller|82762
-batzac|82825
-baula|82919
-bava|83003
-bavalles|83047
-bavosall|83091
-be|83110
-bec|83128
-befar|83191
-beguda|83270
-bell|83325
-bellesa|83436
-bellesa, galanesa, atractiu, encant, airositat|83456
-bellugar|83564
-ben vestit|83655
-benastrugança|83696
-benefici|83767
-beneficiar|83914
-beneir|84022
-beneit|84054
-beneitó|84121
-beneplà cit|84188
-benestant|84301
-benestar|84396
-beneït|83730
-benvist|84441
-benvolgut|84512
-benzina|84583
-berena|84626
-berenada|84660
-berenar|84694
-bes|84728
-besada|84774
-besar|84820
-bescambra|84866
-bescanvi|84938
-bescanviar|84987
-bescavar|85023
-bescoll|85077
-bescompte|85120
-beset|85176
-besllaurar|85228
-besllum|85309
-bessó|85390
-bestiesa|85449
-bestiola|85504
-bestornar|85539
-bestreta|85620
-besunyar|85674
-betum|85751
-betzol|85768
-beuratge|85835
-beure|85890
-beure's|85983
-bevenda|86129
-biaix|86184
-biblioteca|86261
-bicicle|86358
-bicicleta|86392
-bicoquet|86426
-biga|86548
-binar|86779
-birra|86860
-bisbat|86878
-bisbe|86898
-biscuit, pasta|86968
-bistec|86994
-bitllet|87095
-bitlleta|87219
-bitlletera|87240
-blanc|87376
-blanca|87469
-blanor|87485
-blanquinós|87519
-blasmar|87595
-blat|87816
-blau|87839
-blaverol|87897
-blegar|87955
-blegar-se|87999
-bloc|88089
-bo|88144
-boc|88433
-boca|88492
-bocÃ|88659
-boda|88774
-bodes|88927
-boga|89101
-bogeria|89132
-boig|89151
-boira|89220
-bol|89236
-bola|89263
-bolcar|89481
-bolet|89542
-bolet de bou|89563
-bomba|89614
-bombó|89671
-bona sort|89714
-bondat|89748
-bonic|89780
-borda|89921
-bordar|90025
-bordegà s|90072
-border|90166
-borla|90211
-borralló|90243
-borrassa|90273
-borrassó|90311
-bosc|90349
-boscam|90410
-boscater|90471
-boscatge|90535
-bosquer|90596
-bosqueró|90660
-bossa|90721
-bot|90944
-botell|91046
-botella|91120
-botifarra|91244
-botifarró|91305
-botiga|91366
-botiguer|91441
-botonar|91511
-botzina|91530
-botÃ|90983
-botó|90999
-botó|91483
-bou|91555
-bram|91854
-bramar|91905
-branca|92077
-branca [p.e. d'un canelobre]|92138
-brandar|92177
-branquilló|92318
-bransolejar|92368
-brasejar|92565
-braser|92719
-brau|92736
-braç|91616
-braç|91729
-braçol|91633
-braó|91665
-braó|92509
-brec|92896
-brega|93065
-bres|93082
-bressar|93108
-bressol|93249
-bressola|93275
-breu|93301
-brida|93349
-brigada|93426
-brillant|93474
-brillar|93536
-brindar|93624
-brisa|93660
-brità nic|93699
-broc|93721
-broca|93795
-brocar|93824
-brodar|93909
-broll|93938
-brollador|94016
-brollar|94109
-broma|94291
-bromera|94419
-bronja|94444
-bronzejat|94476
-broquet|94507
-brossa|94574
-brossaire|94647
-brot|94713
-brotar|94742
-brotxa|94821
-brou|94853
-bru|94882
-brufolar|94930
-bruixa|94978
-brusa|95012
-brusc|95062
-brut|95097
-brutal|95285
-brutÃcia|95246
-brutÃcia|95520
-buanya|95539
-buc|95604
-buf|95813
-bufanda|95871
-bufar|95894
-bufar-se|95970
-bufegar|96029
-bufetada|96077
-bufetada, bufa, plantofada, morma, hòstia, bolet|96117
-bufó|95835
-bufó|96227
-bugadejar|96291
-bugader|96335
-buidar|96371
-buit|96507
-bujol|96598
-bull|96629
-bullir|96690
-bullit|96772
-bunyol|96948
-burgmestre|96975
-burgravi|97005
-burla|97061
-burlar|97077
-burlar-se|97202
-burro|97284
-burxar|97350
-bus|97391
-busca|97429
-buscall|97523
-buscar|97567
-butaca|97681
-butlla|97760
-butlla, bolla|97926
-butllofa|97951
-butxaca|98147
-bà ndol|73751
-bà rbar|73795
-bà sic|73888
-bèl·lic|74040
-bèl·lua|74062
-bèstia|74104
-bé|74281
-bÃstia|74239
-bòfeha|89080
-bòmbix|74407
-bòria|74466
-bóta|74538
-ca|98165
-cabal|100077
-cabals|100140
-cabana|100340
-cabanya|100376
-cabasset|100412
-cabdill|100534
-cabell|100695
-cabellera|100739
-caber|100783
-cabina|100823
-cable|100852
-cabra|100935
-cabre|100994
-cabreta|101034
-cabriola|101093
-cabrit|101124
-cabró|101183
-caca|101242
-cacera|101725
-cada|101811
-cada un, cada una|101866
-cadaf|101954
-cadarn|101982
-cadascun, cadascuna|102050
-cadavèric, lÃvid, desmaiat|102105
-cadell|102143
-cadena|102190
-caderner|102286
-cadira|102311
-caduc|102390
-caducifoli|102411
-cadà ver|101921
-cafeteria|102479
-cafè|102432
-cagacalces|102526
-caiguda|102572
-caiguda d'aigua|102669
-caiman|102710
-caixa|102737
-caixeta|103101
-caixmir|103126
-caixó|102938
-caixó|103186
-cal|103211
-cala|103231
-calabre|103865
-calaix|103899
-calaix [verb]|104093
-calaix [verb]|104186
-calar|104273
-calar foc|104395
-calat|104465
-calc|104504
-calcar|104567
-calcer [nom]|104650
-calcetÃ|104723
-calcigar|104743
-calcilla|104838
-calcina|104880
-calcinar|104921
-calcular|105035
-cald|105124
-caldejar|105197
-caldejat|105278
-caldera|105351
-caldo|105406
-caldre|105435
-calefactar|105549
-calefactor|105630
-calent|105652
-caler|105725
-calessa|105794
-calfar|105963
-calipà ndria|106044
-callament|106112
-callar|106157
-callat|106232
-calma|106258
-calmar|106547
-calmós|106412
-calor|106623
-calumet|106691
-calvari|106720
-calç|103249
-calç morta|103290
-calç viva|103331
-calça|103372
-calçada|103461
-calçar|103598
-calçat|103723
-calçat [hiperònim]|103760
-calçat [nom]|103792
-calçó|103433
-cama|106766
-camallarg|107315
-camallot|107369
-camarada|107433
-cambra|107504
-cambrer|107585
-cambrera|107684
-camejar|107748
-camell|107897
-camerà men|107951
-caminar|108067
-camioneta|108267
-camisa|108338
-camiseta|108666
-camisola|108689
-camió|107996
-camp|108739
-campament|108984
-campana|109003
-campanya|109179
-campenaria|109217
-camperol|109310
-campionat|109487
-campió|109330
-camÃ|106814
-camà carreter|107178
-can|109555
-can felip|109575
-canal|110155
-canalera|110259
-canana|110398
-canari|110471
-canastrell|110496
-canella|110574
-canelobre|110635
-canoca|110656
-canonada|110695
-cansament|110834
-cansar|110858
-cansar-se|111299
-cant|111341
-cantar|111801
-cantar les quaranta|111935
-cantell|112078
-cantina|112203
-cantiri|112241
-cantonada|112390
-cantussar|112460
-cantussol|112594
-cantó|111511
-cantúria|111652
-canvi|112743
-canviar|112946
-canya|113223
-canya americana|113384
-canyet|113420
-canyiula|113492
-canyoca|113531
-canyot|113596
-cançoner|109796
-cançó|109647
-canó|109931
-canós|110079
-caos|113800
-cap|113976
-cap cosa|114396
-capa|114421
-capacitat|114879
-capatà s|115002
-capaç|114721
-capcer|115102
-capcinejar|115199
-capciró|115340
-capell|115393
-capell de ferro|115419
-capella|115647
-capellina|115674
-capellà |115541
-capellà |115571
-caperull|115920
-caperulla|115988
-caperó|115852
-capficar|116056
-capgirar|116118
-capir|116140
-capissar|116179
-capital|116268
-capitonat|116431
-capitost|116502
-capità |116218
-caplleuta|116646
-capmall|116732
-capot|116854
-capritx|116939
-capsa|116959
-captaire|117122
-captar|117151
-captar-se, atreure-s, propiciar-se|117475
-captivant|117522
-captivar|117657
-capturar|117761
-caputxa|117995
-caputxó|118063
-capvespre|118131
-capçada|114551
-capçada|115052
-capçalar|114569
-capçalera|114683
-car|118199
-cara|118320
-caracteritzar|118797
-caracterÃstic|118720
-caracterÃstica|118761
-caramel|118849
-caramella|118892
-caramull|118983
-carbassa|119214
-carbassot|119281
-carbonissa|119380
-carbonitzar|119443
-carburant|119530
-carbó|119080
-carcanyol|119573
-carceller|119665
-carculla|119735
-carda|119827
-carena|119922
-carenada|119974
-cargol|120126
-cargolar|120196
-caritat|120271
-caritatiu|120392
-carn|120423
-carnassa|120658
-carner|120698
-carnet|120792
-carnisser|120916
-carnissera|121005
-carnÃvor|120627
-carpeta|121034
-carrall|121170
-carregament|121263
-carregar|121458
-carregar el mort|122130
-carregar els neulers|122160
-carrera|122194
-carreta|122250
-carretel-la|122655
-carretera|122824
-carretera comarcal|122961
-carretera comercial|123098
-carretera general|123235
-carretó|122419
-carretó pòrtic|122625
-carric|123372
-carriot|123457
-carro|123626
-carro de combat|123914
-carro de dos cavalls|123959
-carro de quatre cavalls|124019
-carro falçat|124079
-carronya|124124
-carrossa|124153
-carruatge|124371
-carta|124540
-carta al director|125128
-carta astral|125169
-carta atorgada|125192
-carta blanca|125376
-carta bomba|125399
-carta de grà cia|125421
-carta nà utica|125605
-carta oberta|125647
-carta ordre|125688
-cartell|126062
-carter|126215
-cartera|126284
-cartera d'assegurances|126594
-cartera de comandes|126629
-cartera de valors|126661
-cartereta|126691
-carterista|126726
-cartilla|126911
-cartipà s|127001
-cartolina|127044
-cartonet|127082
-cartre|127158
-cartró|127120
-cartó|125872
-cartó ondulat|126012
-cartó pedra|126038
-carura|127236
-carà cter|118460
-carència|120017
-carÃcia|118649
-cas|127304
-cas de casos|127636
-cas de força major|127800
-cas omÃs|127828
-cas perdut|127846
-casa|127865
-casa de camp|128359
-casa de canvi|128674
-casa de caritat|128759
-casa de comerç|128844
-casa de correció|128929
-casa de joc|129014
-casa de la vila|129099
-casa de pagès|129156
-casa pairal|129260
-casa senyorial|129530
-casa senyorÃvola|129434
-casada|129626
-casal|129649
-casament|129768
-casar|129989
-casar-se|130260
-casat|130334
-casc|130400
-casc blau|130653
-cascada|130672
-caserna|130713
-caseta|130757
-casori|130931
-casot|131084
-cassola|131258
-cassoleta|131331
-cassot|131392
-cassussa|131442
-castanya|131486
-castanya d'aigua|131569
-castanya de mar|131599
-castanya de terra|131628
-castanya, castanyot, clatellot, cop fava, galeta|131659
-castell|131769
-castell d'arena|131954
-castellanoparlant|132084
-castellera|132142
-castellà |131982
-castic|132198
-castigament|132396
-castigar|132594
-castrense|132857
-casualitat|132906
-casull|133065
-cataclisme|133623
-catalanesc|133832
-català |133809
-catarro|133855
-catedral|133923
-categoria|133940
-catifa|134087
-catre|134105
-catxap|134141
-catà leg|133239
-catà strofe|133322
-catòlic|133529
-cau|134168
-caució|134456
-caució|134542
-caucà sic|134380
-caure|134602
-caure-hi|134903
-causa|134993
-causant|135323
-causar|135374
-causÃdic|135233
-cavalcadura|135489
-cavall|135658
-cavaller|135880
-cavalleria|136195
-cavallet|136364
-cavallet marÃ|136391
-cavallot|136417
-cavar|136586
-caverna|136817
-cavitat|136888
-cavorca|137011
-caça|100055
-caça|101312
-caçador|101398
-caçar|101471
-cec|137082
-cedir|137199
-cel|137317
-celada|137403
-celar|137525
-celebració|137598
-celebrar|137620
-celibatari|137873
-celler|137924
-celobert|137942
-cementeri|137975
-cementiri|138047
-cenotafi|138119
-censió|138181
-censura|138221
-cent|138242
-centella|138265
-centellejar|138395
-centenar|138483
-central|138515
-centrar|138624
-centrat|138703
-centre|138723
-cenyidor|138809
-cenyir|138882
-cenyit|139056
-cerca|139091
-cercar|139199
-cercle|139313
-cerilla|139427
-cerimònia|139462
-cert|139506
-certamen|139630
-certesa|139698
-certificar|139733
-certificat|139758
-cervatell|139848
-cervell|139895
-cervellera|140060
-cervesa|140182
-cervo|140200
-cessar|140247
-cicatriu|140460
-cicerone|140525
-ciclomotor|140599
-ciclopi|140631
-cigarret|140698
-cigarreta|140729
-cigarro|140760
-cigronera|140860
-cigró|140791
-cigró|140842
-cilindre|140911
-cim|140961
-cimadal|141099
-cimal|141196
-cimall|141293
-ciment|141390
-cine|141434
-cinegètica|141480
-cinema|141578
-cingla|141624
-cint|141697
-cinta|141770
-cinturó|141920
-cintó|141847
-cinyell|141993
-circ|142066
-circuit|142106
-circulació|142177
-circular|142242
-circumdar|142607
-circumferència|142748
-circumstà ncia|142830
-cirera|143030
-cisar|143066
-cisma|143101
-cistell|143167
-cistella|143245
-cisterna|143323
-cita|143355
-citació|143373
-citar|143401
-citat|143495
-ciuronera|143597
-ciuró|143528
-ciuró|143579
-ciutadania|143693
-ciutadà |143648
-ciutat|143733
-civilització|143816
-civilitzar|143875
-civilitzat|143912
-ciència|140421
-clacar|144124
-clamar|144193
-clamor|144274
-clap|144325
-clapa|144388
-clapir|144417
-clar|144464
-claredat|144756
-clarejar|144837
-claror|144862
-classe|144943
-classificació|145153
-classificar|145186
-clatell|145291
-clau|145334
-clau d'espècia|145463
-clau de pas|145556
-clavar|145617
-clavar crits|145968
-clavat|146111
-clavecÃ|146146
-claveguera|146198
-clavell|146281
-clavell d'espècia|146374
-clavellina|146467
-clavicordi|146612
-clavicèmbal|146560
-clavilla|146664
-clemència|146694
-clenxa|146811
-clenxador|146829
-clepsa|146924
-cleptòman|146988
-clergue|147173
-cleta|147249
-cletxa|147344
-client|147439
-clientela|147482
-clivella|147507
-cloca|147602
-cloenda|147632
-clofolla|147718
-clorur de sodi|147756
-clos|147779
-closca|147820
-clot|148094
-clota|148130
-clotxa|148166
-cloure|148193
-clown|148241
-club|148266
-clà usula|143936
-clà xon|143972
-clÃnica|143997
-clòtxina|144032
-coaccionar|148734
-coadjuntor|148773
-coalició|148871
-cobejança|148903
-cobert|148946
-coberta|149027
-cobertor|149262
-cobertura|149312
-cobla|149332
-coblejar|149499
-cobrador|149633
-cobrar|149687
-cobrellit|149754
-cobretaula|149790
-cobrir|149840
-cobrir-se|150161
-coc|150209
-coc|150278
-cocaïna|150350
-cocodril|150372
-codi|150399
-codificar|150425
-codina|150467
-coentor|150499
-coet|150689
-coetani|150734
-coexistent|150792
-cofoi|150850
-cofre|150897
-cognom|151060
-coherent|151172
-coherència|151087
-coherència|151112
-cohesió|151192
-coincident|151479
-coincidir|151537
-coincidència|151217
-coit|151561
-coix|151588
-col lecció|151682
-colador|153368
-colar|153464
-colgar|153500
-coll|153529
-colla|153589
-collada|153839
-collar|153856
-collaret|153954
-collir|154003
-collita|154294
-colom|154420
-colomÃ|154438
-colonitzar|154518
-color|154540
-coloració|154621
-colorant|154670
-colorit|154710
-colosal|154777
-colossal|154844
-columna|154929
-columna vertebral|155062
-colzada|155107
-colze|155155
-col·laboració|151993
-col·laborador|152037
-col·leccionar|152279
-col·lecció|151795
-col·lecció|152158
-col·lectiu|151844
-col·lectiu|152337
-col·lectivitat|151900
-col·lector|151939
-col·lega|152383
-col·legi|152454
-col·locació|152612
-col·locar|152670
-col·loqui|153234
-col·loquial|153301
-colònia|153327
-colònia|154456
-colós|154759
-com|155217
-comanar|155283
-comanda|155324
-comandament|155408
-comando|155453
-comarca|155618
-comarcada|155703
-combat|155763
-combat, batalla, lluita, hostilitats, conflicte|155816
-combinació|155875
-combinar|155957
-combustible|156058
-comediant|156110
-comentar|156498
-comentari|156529
-començament|156155
-començant|156214
-començar|156282
-comerciant|156834
-comerç|156708
-comesa|156916
-cometre|156976
-comiat|157065
-comissionista|157254
-comissió|157153
-comitè|157300
-commandament|157468
-commemoració|157510
-commemorar|157548
-commiseració|157729
-commonitori|157794
-commoure|157978
-commutar|157999
-comoditat|158048
-compacte|158083
-compadir|158175
-compaginar-se|158197
-company|158375
-companyia|158497
-comparable|158614
-comparació|158686
-comparança|158714
-comparar|158742
-compare|158810
-compareixença|158881
-compartir|158961
-compassió|159033
-compenetrar-se|159129
-compensar|159198
-competent|159427
-competició|159553
-competidor|159636
-competència|159274
-compilació|159742
-compilar|159791
-complaent|159973
-complaure|160020
-complet|160129
-completar|160217
-complex|160335
-complexitat|160365
-complicació|160400
-complicar|160576
-complicat|160676
-compliment|160699
-complimentar|160839
-complir|160864
-complà nyer|159892
-compondre|160907
-component|161017
-comportament|161072
-comportar|161119
-composició|161210
-compost|161328
-compota|161348
-comprador|161395
-comprar|161438
-comprendre|161480
-comprensió|161623
-compressor|161658
-comprimir|161679
-comprimit|161781
-comprometre|161915
-compromissari|162023
-compromÃs|161813
-comprovant|162111
-comprovar|162153
-comptabilitat|162187
-comptar|162212
-compte|162326
-computar|162521
-comuna|162745
-comunal|162817
-comunicació|162934
-comunicació escrita|163109
-comunicar|163275
-comunista|163465
-comunitari|163484
-comunitat|163507
-comunió|162873
-comú|155497
-comú|162567
-conca|163965
-concatenar|164031
-concavitat|164125
-concebre|164161
-concedir|164191
-concentració|164493
-concentrar|164642
-concepció|164761
-concepte|164873
-concernir|164926
-concert|164957
-concertar|165066
-concertina|165125
-conciliador|165170
-concloure|165258
-conclusió|165370
-concordança|165572
-concordar|165675
-concret|165862
-concurrència|165925
-concurs|165981
-concÃs|163983
-condecoració|166133
-condemna|166156
-condemnació|166364
-condemnament|166562
-condemnar|166760
-condescendir|166886
-condició|166977
-condigne|167083
-condimentar|167195
-condol|167303
-condolença|167326
-conducció|167423
-conducta|167560
-conducte|167611
-conductor|167694
-conductora|167806
-conduir|167911
-conduïdor|167349
-conduïdor|167877
-condó|167262
-conegut|168158
-coneixement|168265
-coneixença|168376
-confabular|168470
-confecció|168627
-conferir|168788
-conferència|168678
-conferència|168756
-confessar|168919
-confiança|168982
-confiar|169041
-confident|169167
-configuració|169238
-confirmació|169277
-confirmar|169307
-confiter|169372
-confiteria|169395
-confitura|169433
-conflicte|169480
-confondre|169536
-conformar|169696
-conformar-se|169743
-conforme a|169820
-conformitat|169867
-confrare|169970
-confraria|170041
-confrontació|170101
-confusió|170154
-confusió|170295
-confús|168572
-congelar|170471
-conglomerat|170524
-congratulació|170703
-congratular|170735
-congratular-se|170761
-congregació|170810
-congrés|170600
-conill|170916
-conjetura|170943
-conjugi|171107
-conjunció|171260
-conjunt|171289
-connectar|171583
-connexió|171708
-connubi|171785
-conquerir|171938
-conquilla|172033
-conquistar|172125
-conrear|172242
-conreria|172334
-conreu|172508
-consagració|172597
-consagrar|172634
-consanguini|172672
-consciència|172719
-consegüent|172769
-consell|172821
-conseller|172945
-conselleria|173046
-consemblant|173108
-consentiment|173180
-consentir|173293
-conseqüent|173519
-conseqüència|173401
-conserge|173566
-conserva|173595
-conservador|173642
-conservar|173670
-conservar, mantenir, preservar, retenir, reservar|173842
-conservar-se|173787
-considerable|173904
-consideració|173963
-consideració|174239
-considerar|174326
-considerat|174639
-consignar|174676
-consistent|174711
-consistori|174803
-consolar|174860
-consolidació|174880
-consolidar|174910
-consomé|174935
-consonar|175067
-consonà ncia|174964
-consort|175245
-constant|175351
-constantment|175429
-constatació|175504
-constatar|175534
-constipat|175591
-constitució|175678
-construcció|175910
-construir|175961
-constà ncia|175284
-consulta|176044
-consultar|176079
-consum|176110
-consumar|176131
-consumidor|176157
-consumir|176200
-contacte|176275
-contagi|176317
-contalla|176339
-contaminar|176413
-contar|176458
-contarella|176515
-conte|176589
-contemplar|176870
-contemporani|176985
-contenir|177092
-contenir-se|177306
-content|177341
-contesa|177388
-contesta|177456
-contestació|177500
-contestar|177544
-context|177616
-contingut|177847
-contingència|177643
-continu|177889
-continuació|178073
-continuar|178180
-continuat|178253
-continuïtat|177959
-contorn|178312
-contraatac|178331
-contraatacar|178427
-contrabandista|178512
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list