From c829eeebb791cad2eb6e897e9f8d9da1d287ff8b Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 19 Dec 2015 11:08:08 +0100 Subject: [PATCH] Add 3rdparty to source package The new 3rdparty libraries are not added to the autotools build system, so that they appear in the source package. They cannot be compiled yet with autotools (although this would make sense for cross compilation with mingw), but adding configure support for enabling/disabling these like we do for boost is a bit more work, so I did not do it for now. Nevertheless, the three new Makefile.am are already prepared for compilation. --- 3rdparty/Makefile.am | 6 + 3rdparty/hunspell/Makefile.am | 72 +++++++++ 3rdparty/libiconv/Makefile.am | 266 ++++++++++++++++++++++++++++++++++ 3rdparty/zlib/Makefile.am | 43 ++++++ Makefile.am | 2 +- configure.ac | 4 + 6 files changed, 392 insertions(+), 1 deletion(-) create mode 100644 3rdparty/Makefile.am create mode 100644 3rdparty/hunspell/Makefile.am create mode 100644 3rdparty/libiconv/Makefile.am create mode 100644 3rdparty/zlib/Makefile.am diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am new file mode 100644 index 0000000000..8706d08100 --- /dev/null +++ b/3rdparty/Makefile.am @@ -0,0 +1,6 @@ +include $(top_srcdir)/config/common.am + +DIST_SUBDIRS = hunspell libiconv zlib + +SUBDIRS = hunspell libiconv zlib + diff --git a/3rdparty/hunspell/Makefile.am b/3rdparty/hunspell/Makefile.am new file mode 100644 index 0000000000..a4e3aeb373 --- /dev/null +++ b/3rdparty/hunspell/Makefile.am @@ -0,0 +1,72 @@ +include $(top_srcdir)/config/common.am + +# This is prepared for compilation, but currently only used for packaging, +# because configure support for compilation is still missing. + +noinst_LIBRARIES = liblyxhunspell.a + +EXTRA_DIST = \ + CMakeLists.txt \ + 1.3.3/AUTHORS \ + 1.3.3/BUGS \ + 1.3.3/COPYING \ + 1.3.3/COPYING.LGPL \ + 1.3.3/COPYING.MPL \ + 1.3.3/license.hunspell \ + 1.3.3/README \ + 1.3.3/THANKS \ + 1.3.3/src/hunspell/hunspell.dsp \ + 1.3.3/src/hunspell/hunvisapi.h.in \ + 1.3.3/src/hunspell/license.hunspell \ + 1.3.3/src/hunspell/license.myspell \ + 1.3.3/src/hunspell/makefile.mk \ + 1.3.3/src/hunspell/README + +liblyxhunspell_a_SOURCES = \ + 1.3.3/src/hunspell/affentry.cxx \ + 1.3.3/src/hunspell/affentry.hxx \ + 1.3.3/src/hunspell/affixmgr.cxx \ + 1.3.3/src/hunspell/affixmgr.hxx \ + 1.3.3/src/hunspell/atypes.hxx \ + 1.3.3/src/hunspell/baseaffix.hxx \ + 1.3.3/src/hunspell/csutil.cxx \ + 1.3.3/src/hunspell/csutil.hxx \ + 1.3.3/src/hunspell/dictmgr.cxx \ + 1.3.3/src/hunspell/dictmgr.hxx \ + 1.3.3/src/hunspell/filemgr.cxx \ + 1.3.3/src/hunspell/filemgr.hxx \ + 1.3.3/src/hunspell/hashmgr.cxx \ + 1.3.3/src/hunspell/hashmgr.hxx \ + 1.3.3/src/hunspell/htypes.hxx \ + 1.3.3/src/hunspell/hunspell.cxx \ + 1.3.3/src/hunspell/hunspell.h \ + 1.3.3/src/hunspell/hunspell.hxx \ + 1.3.3/src/hunspell/hunvisapi.h \ + 1.3.3/src/hunspell/hunzip.cxx \ + 1.3.3/src/hunspell/hunzip.hxx \ + 1.3.3/src/hunspell/langnum.hxx \ + 1.3.3/src/hunspell/phonet.cxx \ + 1.3.3/src/hunspell/phonet.hxx \ + 1.3.3/src/hunspell/replist.cxx \ + 1.3.3/src/hunspell/replist.hxx \ + 1.3.3/src/hunspell/suggestmgr.cxx \ + 1.3.3/src/hunspell/suggestmgr.hxx \ + 1.3.3/src/hunspell/utf_info.cxx \ + 1.3.3/src/hunspell/w_char.hxx \ + 1.3.3/src/parsers/firstparser.cxx \ + 1.3.3/src/parsers/firstparser.hxx \ + 1.3.3/src/parsers/htmlparser.cxx \ + 1.3.3/src/parsers/htmlparser.hxx \ + 1.3.3/src/parsers/latexparser.cxx \ + 1.3.3/src/parsers/latexparser.hxx \ + 1.3.3/src/parsers/manparser.cxx \ + 1.3.3/src/parsers/manparser.hxx \ + 1.3.3/src/parsers/odfparser.cxx \ + 1.3.3/src/parsers/odfparser.hxx \ + 1.3.3/src/parsers/testparser.cxx \ + 1.3.3/src/parsers/textparser.cxx \ + 1.3.3/src/parsers/textparser.hxx \ + 1.3.3/src/parsers/xmlparser.cxx \ + 1.3.3/src/parsers/xmlparser.hxx \ + 1.3.3/src/win_api/config.h + diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am new file mode 100644 index 0000000000..2a516a57e9 --- /dev/null +++ b/3rdparty/libiconv/Makefile.am @@ -0,0 +1,266 @@ +include $(top_srcdir)/config/common.am + +# This is prepared for compilation, but currently only used for packaging, +# because configure support for compilation is still missing. + +noinst_LIBRARIES = liblyxiconv.a + +EXTRA_DIST = \ + CMakeLists.txt \ + config.h.cmake \ + configure.cmake \ + 1.14/COPYING.LIB \ + 1.14/include/iconv.h.build.in \ + 1.14/include/iconv.h.in \ + 1.14/lib/aliases_sysaix.gperf \ + 1.14/lib/aliases.gperf \ + 1.14/lib/aliases_syshpux.gperf \ + 1.14/lib/aliases_sysosf1.gperf \ + 1.14/lib/aliases_syssolaris.gperf \ + 1.14/lib/encodings_aix.def \ + 1.14/lib/encodings.def \ + 1.14/lib/encodings_dos.def \ + 1.14/lib/encodings_extra.def \ + 1.14/lib/encodings_local.def \ + 1.14/lib/encodings_osf1.def \ + 1.14/lib/translit.def \ + 1.14/libcharset/include/libcharset.h.in \ + 1.14/libcharset/include/localcharset.h.build.in \ + 1.14/libcharset/include/localcharset.h.in \ + 1.14/libcharset/lib/ChangeLog \ + 1.14/libcharset/lib/config.charset \ + 1.14/libcharset/lib/ref-add.sin \ + 1.14/libcharset/lib/ref-del.sin + +liblyxiconv_a_SOURCES = \ + 1.14/include/export.h \ + 1.14/lib/aliases2.h \ + 1.14/lib/aliases_aix.h \ + 1.14/lib/aliases_aix_sysaix.h \ + 1.14/lib/aliases_dos.h \ + 1.14/lib/aliases_extra.h \ + 1.14/lib/aliases.h \ + 1.14/lib/aliases_osf1.h \ + 1.14/lib/aliases_osf1_sysosf1.h \ + 1.14/lib/aliases_sysaix.h \ + 1.14/lib/aliases_syshpux.h \ + 1.14/lib/aliases_sysosf1.h \ + 1.14/lib/aliases_syssolaris.h \ + 1.14/lib/armscii_8.h \ + 1.14/lib/ascii.h \ + 1.14/lib/atarist.h \ + 1.14/lib/big5_2003.h \ + 1.14/lib/big5.h \ + 1.14/lib/big5hkscs1999.h \ + 1.14/lib/big5hkscs2001.h \ + 1.14/lib/big5hkscs2004.h \ + 1.14/lib/big5hkscs2008.h \ + 1.14/lib/c99.h \ + 1.14/lib/canonical_aix.h \ + 1.14/lib/canonical_aix_sysaix.h \ + 1.14/lib/canonical_dos.h \ + 1.14/lib/canonical_extra.h \ + 1.14/lib/canonical.h \ + 1.14/lib/canonical_local.h \ + 1.14/lib/canonical_local_sysaix.h \ + 1.14/lib/canonical_local_syshpux.h \ + 1.14/lib/canonical_local_sysosf1.h \ + 1.14/lib/canonical_local_syssolaris.h \ + 1.14/lib/canonical_osf1.h \ + 1.14/lib/canonical_osf1_sysosf1.h \ + 1.14/lib/canonical_sysaix.h \ + 1.14/lib/canonical_syshpux.h \ + 1.14/lib/canonical_sysosf1.h \ + 1.14/lib/canonical_syssolaris.h \ + 1.14/lib/ces_big5.h \ + 1.14/lib/ces_gbk.h \ + 1.14/lib/cjk_variants.h \ + 1.14/lib/cns11643_15.h \ + 1.14/lib/cns11643_1.h \ + 1.14/lib/cns11643_2.h \ + 1.14/lib/cns11643_3.h \ + 1.14/lib/cns11643_4a.h \ + 1.14/lib/cns11643_4b.h \ + 1.14/lib/cns11643_4.h \ + 1.14/lib/cns11643_5.h \ + 1.14/lib/cns11643_6.h \ + 1.14/lib/cns11643_7.h \ + 1.14/lib/cns11643.h \ + 1.14/lib/cns11643_inv.h \ + 1.14/lib/converters.h \ + 1.14/lib/cp1046.h \ + 1.14/lib/cp1124.h \ + 1.14/lib/cp1125.h \ + 1.14/lib/cp1129.h \ + 1.14/lib/cp1131.h \ + 1.14/lib/cp1133.h \ + 1.14/lib/cp1161.h \ + 1.14/lib/cp1162.h \ + 1.14/lib/cp1163.h \ + 1.14/lib/cp1250.h \ + 1.14/lib/cp1251.h \ + 1.14/lib/cp1252.h \ + 1.14/lib/cp1253.h \ + 1.14/lib/cp1254.h \ + 1.14/lib/cp1255.h \ + 1.14/lib/cp1256.h \ + 1.14/lib/cp1257.h \ + 1.14/lib/cp1258.h \ + 1.14/lib/cp437.h \ + 1.14/lib/cp737.h \ + 1.14/lib/cp775.h \ + 1.14/lib/cp850.h \ + 1.14/lib/cp852.h \ + 1.14/lib/cp853.h \ + 1.14/lib/cp855.h \ + 1.14/lib/cp856.h \ + 1.14/lib/cp857.h \ + 1.14/lib/cp858.h \ + 1.14/lib/cp860.h \ + 1.14/lib/cp861.h \ + 1.14/lib/cp862.h \ + 1.14/lib/cp863.h \ + 1.14/lib/cp864.h \ + 1.14/lib/cp865.h \ + 1.14/lib/cp866.h \ + 1.14/lib/cp869.h \ + 1.14/lib/cp874.h \ + 1.14/lib/cp922.h \ + 1.14/lib/cp932ext.h \ + 1.14/lib/cp932.h \ + 1.14/lib/cp936ext.h \ + 1.14/lib/cp936.h \ + 1.14/lib/cp943.h \ + 1.14/lib/cp949.h \ + 1.14/lib/cp950ext.h \ + 1.14/lib/cp950.h \ + 1.14/lib/dec_hanyu.h \ + 1.14/lib/dec_kanji.h \ + 1.14/lib/euc_cn.h \ + 1.14/lib/euc_jisx0213.h \ + 1.14/lib/euc_jp.h \ + 1.14/lib/euc_kr.h \ + 1.14/lib/euc_tw.h \ + 1.14/lib/flags.h \ + 1.14/lib/flushwc.h \ + 1.14/lib/gb12345ext.h \ + 1.14/lib/gb12345.h \ + 1.14/lib/gb18030ext.h \ + 1.14/lib/gb18030.h \ + 1.14/lib/gb18030uni.h \ + 1.14/lib/gb2312.h \ + 1.14/lib/gbkext1.h \ + 1.14/lib/gbkext2.h \ + 1.14/lib/gbkext_inv.h \ + 1.14/lib/gbk.h \ + 1.14/lib/genaliases2.c \ + 1.14/lib/genaliases.c \ + 1.14/lib/genflags.c \ + 1.14/lib/gentranslit.c \ + 1.14/lib/georgian_academy.h \ + 1.14/lib/georgian_ps.h \ + 1.14/lib/hkscs1999.h \ + 1.14/lib/hkscs2001.h \ + 1.14/lib/hkscs2004.h \ + 1.14/lib/hkscs2008.h \ + 1.14/lib/hp_roman8.h \ + 1.14/lib/hz.h \ + 1.14/lib/iconv.c \ + 1.14/lib/iconv_open1.h \ + 1.14/lib/iconv_open2.h \ + 1.14/lib/iso2022_cnext.h \ + 1.14/lib/iso2022_cn.h \ + 1.14/lib/iso2022_jp1.h \ + 1.14/lib/iso2022_jp2.h \ + 1.14/lib/iso2022_jp3.h \ + 1.14/lib/iso2022_jp.h \ + 1.14/lib/iso2022_kr.h \ + 1.14/lib/iso646_cn.h \ + 1.14/lib/iso646_jp.h \ + 1.14/lib/iso8859_10.h \ + 1.14/lib/iso8859_11.h \ + 1.14/lib/iso8859_13.h \ + 1.14/lib/iso8859_14.h \ + 1.14/lib/iso8859_15.h \ + 1.14/lib/iso8859_16.h \ + 1.14/lib/iso8859_1.h \ + 1.14/lib/iso8859_2.h \ + 1.14/lib/iso8859_3.h \ + 1.14/lib/iso8859_4.h \ + 1.14/lib/iso8859_5.h \ + 1.14/lib/iso8859_6.h \ + 1.14/lib/iso8859_7.h \ + 1.14/lib/iso8859_8.h \ + 1.14/lib/iso8859_9.h \ + 1.14/lib/isoir165ext.h \ + 1.14/lib/isoir165.h \ + 1.14/lib/java.h \ + 1.14/lib/jisx0201.h \ + 1.14/lib/jisx0208.h \ + 1.14/lib/jisx0212.h \ + 1.14/lib/jisx0213.h \ + 1.14/lib/johab.h \ + 1.14/lib/johab_hangul.h \ + 1.14/lib/koi8_r.h \ + 1.14/lib/koi8_ru.h \ + 1.14/lib/koi8_t.h \ + 1.14/lib/koi8_u.h \ + 1.14/lib/ksc5601.h \ + 1.14/lib/loops.h \ + 1.14/lib/loop_unicode.h \ + 1.14/lib/loop_wchar.h \ + 1.14/lib/mac_arabic.h \ + 1.14/lib/mac_centraleurope.h \ + 1.14/lib/mac_croatian.h \ + 1.14/lib/mac_cyrillic.h \ + 1.14/lib/mac_greek.h \ + 1.14/lib/mac_hebrew.h \ + 1.14/lib/mac_iceland.h \ + 1.14/lib/mac_roman.h \ + 1.14/lib/mac_romania.h \ + 1.14/lib/mac_thai.h \ + 1.14/lib/mac_turkish.h \ + 1.14/lib/mac_ukraine.h \ + 1.14/lib/mulelao.h \ + 1.14/lib/nextstep.h \ + 1.14/lib/pt154.h \ + 1.14/lib/relocatable.c \ + 1.14/lib/relocatable.h \ + 1.14/lib/riscos1.h \ + 1.14/lib/rk1048.h \ + 1.14/lib/shift_jisx0213.h \ + 1.14/lib/sjis.h \ + 1.14/lib/tcvn.h \ + 1.14/lib/tds565.h \ + 1.14/lib/tis620.h \ + 1.14/lib/translit.h \ + 1.14/lib/ucs2be.h \ + 1.14/lib/ucs2.h \ + 1.14/lib/ucs2internal.h \ + 1.14/lib/ucs2le.h \ + 1.14/lib/ucs2swapped.h \ + 1.14/lib/ucs4be.h \ + 1.14/lib/ucs4.h \ + 1.14/lib/ucs4internal.h \ + 1.14/lib/ucs4le.h \ + 1.14/lib/ucs4swapped.h \ + 1.14/lib/uhc_1.h \ + 1.14/lib/uhc_2.h \ + 1.14/lib/utf16be.h \ + 1.14/lib/utf16.h \ + 1.14/lib/utf16le.h \ + 1.14/lib/utf32be.h \ + 1.14/lib/utf32.h \ + 1.14/lib/utf32le.h \ + 1.14/lib/utf7.h \ + 1.14/lib/utf8.h \ + 1.14/lib/vietcomb.h \ + 1.14/lib/viscii.h \ + 1.14/libcharset/include/export.h \ + 1.14/libcharset/lib/localcharset.c \ + 1.14/libcharset/lib/relocatable.c \ + 1.14/libcharset/lib/relocatable.h \ + 1.14/srclib/localcharset.h \ + 1.14/srclib/unitypes.in.h \ + 1.14/srclib/uniwidth.in.h + diff --git a/3rdparty/zlib/Makefile.am b/3rdparty/zlib/Makefile.am new file mode 100644 index 0000000000..6d689d2be2 --- /dev/null +++ b/3rdparty/zlib/Makefile.am @@ -0,0 +1,43 @@ +include $(top_srcdir)/config/common.am + +# This is prepared for compilation, but currently only used for packaging, +# because configure support for compilation is still missing. + +noinst_LIBRARIES = liblyxzlib.a + +EXTRA_DIST = \ + CMakeLists.txt \ + 1.2.8/README \ + 1.2.8/treebuild.xml \ + 1.2.8/zconf.h.cmakein \ + 1.2.8/zlib.3 \ + 1.2.8/zlib.map \ + 1.2.8/zlib.pc.cmakein + +liblyxzlib_a_SOURCES = \ + 1.2.8/adler32.c \ + 1.2.8/compress.c \ + 1.2.8/crc32.c \ + 1.2.8/crc32.h \ + 1.2.8/deflate.c \ + 1.2.8/deflate.h \ + 1.2.8/gzclose.c \ + 1.2.8/gzguts.h \ + 1.2.8/gzlib.c \ + 1.2.8/gzread.c \ + 1.2.8/gzwrite.c \ + 1.2.8/infback.c \ + 1.2.8/inffast.c \ + 1.2.8/inffast.h \ + 1.2.8/inffixed.h \ + 1.2.8/inflate.c \ + 1.2.8/inflate.h \ + 1.2.8/inftrees.c \ + 1.2.8/inftrees.h \ + 1.2.8/trees.c \ + 1.2.8/trees.h \ + 1.2.8/uncompr.c \ + 1.2.8/zlib.h \ + 1.2.8/zutil.c \ + 1.2.8/zutil.c + diff --git a/Makefile.am b/Makefile.am index b4b432754a..023828f99c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -I config MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \ $(srcdir)/config.h.in -DIST_SUBDIRS = autotests m4 config development po boost src sourcedoc lib +DIST_SUBDIRS = 3rdparty autotests m4 config development po boost src sourcedoc lib if BUILD_CLIENT_SUBDIR CLIENT = src/client diff --git a/configure.ac b/configure.ac index afc3de94e7..2856b0757c 100644 --- a/configure.ac +++ b/configure.ac @@ -349,6 +349,10 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) AC_CONFIG_FILES([Makefile \ lyx.1:lyx.1in \ + 3rdparty/Makefile \ + 3rdparty/hunspell/Makefile \ + 3rdparty/libiconv/Makefile \ + 3rdparty/zlib/Makefile \ autotests/Makefile \ boost/Makefile \ config/Makefile \