./packages/openofficeorg/3.2/unstable r1992: merge mythes 1.2 change from 3.2.1
------------------------------------------------------------
revno: 1992
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-05-25 17:20:35 +0200
message:
merge mythes 1.2 change from 3.2.1
added:
patches/fix-system-mythes-for-mythes-1.2.diff
modified:
changelog
control
control.in
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-05-20 17:34:30 +0000
+++ b/changelog 2010-05-25 15:20:35 +0000
@@ -12,11 +12,14 @@
locking conditionals in soffice.sh
* debian/patches/extensions-mozilla-plugin-pc-if-libxul.diff: fix plugin
build failure, somehow OOo sets the wrong $MOZ_FLAVOUR for xulrunner 1.9
+ * debian/patches/fix-system-mythes-for-mythes-1.2.diff: adapt build
+ for mythes 1.2
* debian/rules:
- re-enable extensions on armel
- make grep -v for RID_STR_EXTENSION_NOT_PRESENT stricter so that
we don't catch dbumiscres.src
+ - build with external mythes
* debian/control.lenny_squeeze_transitional.in: move packages to
localization, where they belong
* debian/control.in:
@@ -26,6 +29,8 @@
* debian/rules,
debian/openoffice.org-{filter-binfilter,evolution,kab}.bug-script.in:
fix component bug scripts and add the kab one
+ * debian/rules, debian/control.in: stop building libmythes-dev (now built
+ again by mythes)
-- Rene Engelhard <rene@debian.org> Thu, 20 May 2010 19:33:30 +0200
=== modified file 'control'
--- a/control 2010-05-17 14:01:41 +0000
+++ b/control 2010-05-25 15:20:35 +0000
@@ -3,8 +3,12 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
+<<<<<<< TREE
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s39
0x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2
-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libn
eon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
+=======
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 alpha amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 alpha amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libformula-java-openoff
ice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>=
2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-d
ev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+>>>>>>> MERGE-SOURCE
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
Standards-Version: 3.8.4
XS-Python-Version: >= 2.4
@@ -480,6 +484,7 @@
* PocketWord
* PocketExcel
+<<<<<<< TREE
Package: libmythes-dev
Section: libdevel
Suggests: perl
@@ -495,6 +500,8 @@
to develop applications using mythes and the perl script to create
the index files.
+=======
+>>>>>>> MERGE-SOURCE
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
=== modified file 'control.in'
--- a/control.in 2010-05-17 14:01:41 +0000
+++ b/control.in 2010-05-25 15:20:35 +0000
@@ -772,21 +772,6 @@
* PocketWord
* PocketExcel
-Package: libmythes-dev
-Section: libdevel
-Suggests: perl
-Architecture: %OOO_ARCHS%
-Depends: ${misc:Depends}
-Description: simple thesaurus library -- development files
- MyThes is a simple thesaurus that uses a structured
- text data file and an index file with binary search
- to lookup words and phrases and return information
- on part of speech, meanings, and synonyms
- .
- This package contains the static library and header file needed
- to develop applications using mythes and the perl script to create
- the index files.
-
Package: openoffice.orgVER-dtd-officedocument1.0
Section: text
Priority: extra
=== added file 'patches/fix-system-mythes-for-mythes-1.2.diff'
--- a/patches/fix-system-mythes-for-mythes-1.2.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-system-mythes-for-mythes-1.2.diff 2010-05-25 15:20:35 +0000
@@ -0,0 +1,124 @@
+--- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/apply-old 2010-04-26 23:44:46.000000000 +0200
++++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/apply 2010-04-26 23:45:05.000000000 +0200
+@@ -1648,6 +1648,8 @@
+ # use getopt() and readdir_r() from system glibc
+ #FIXME src680: system-libc.diff, i#69033, rengelha
+
++fix-system-mythes-for-mythes-1.2.diff
++
+ [ TangoIcons ]
+ # default to large icons in the toolbar
+ gui-toolbox-large-icons.diff, jholesov
+@@ -2343,15 +2343,11 @@ events-intptr.diff, i#59411, jholesov
+ svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
+
+ [ DebianEtchOnly ]
+-static-libs-use-_pic.diff, rengelha
+ hunspell-lib-use-_pic.diff, rengelha
+ libhnj-lib-use-_pic.diff, rengelha
+ # use -llpsolve55_pic
+ system-lpsolve-use-_pic.diff, rengelha
+
+-[ DebianSidOnly ]
+-static-libs-use-_pic.diff, rengelha
+-
+ [ UbuntuOnly ]
+ SectionOwner => ccheney
+
+@@ -2361,7 +2357,6 @@ ubuntu-lpi-help-translate.diff, i#64895, mklose
+ #ubuntu-lpi-bugs.diff, i#64895, mklose
+ ubuntu-sparc-hack.diff, mklose
+ human-icons-add.diff, mklose
+-static-libs-use-_pic.diff, rengelha
+ ubuntu-no-stack-protector.diff, doko
+ #gccXXXXX.solenv.javaregistration.diff
+ ubuntu-mstopdf.diff, ccheney
+@@ -3398,7 +3393,6 @@ sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
+ # fixes crasher in xml parser
+ unoxml-fix-empty-xmlns.diff, rodo
+ configure-fix-lpsolve-depends.diff, janneke
+-configure-fix-use-c++-for-mythes.diff, janneke
+ build-fix-xulrunner-npapi-inc.diff, janneke
+ toolkit-proper-erase-fix.diff, i#106575, thorsten
+
+diff --git a/patches/dev300/system-lpsolve-rpath.diff b/patches/dev300/system-lpsolve-rpath.diff
+index d1099de..56d80dd 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/system-lpsolve-rpath.diff
++++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/system-lpsolve-rpath.diff
+@@ -1,8 +1,8 @@
+ --- solenv/inc/libs.mk-old 2008-04-29 12:50:10.000000000 +0200
+ +++ solenv/inc/libs.mk 2008-04-29 12:51:27.000000000 +0200
+ @@ -340,7 +340,13 @@
++ MYTHESLIB=-lmythes
+ .ENDIF
+- MYTHESLIB*=-lmythes
+ PYUNOLIB=-lpyuno
+ +.IF "$(SYSTEM_LPSOLVE)" == "YES"
+ +# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+--- /dev/null 2010-04-22 23:53:48.512914234 +0200
++++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/fix-system-mythes-for-mythes-1.2.diff 2010-04-26 23:42:56.000000000 +0200
+@@ -0,0 +1,64 @@
++diff --git a/configure.in b/configure.in
++--- configure.in
+++++ configure.in
++@@ -5090,15 +5090,29 @@
++ if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
++ AC_MSG_RESULT([external])
++ SYSTEM_MYTHES=YES
++- AC_CHECK_HEADER(mythes.hxx, [],
++- [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
++- AC_CHECK_LIB(mythes, main, [],
++- [ AC_MSG_ERROR(mythes library not found.)], [])
+++ AC_LANG_PUSH([C++])
+++ PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
+++ if test "$MYTHES_PKGCONFIG" = "no"; then
+++ AC_CHECK_HEADER(mythes.hxx, [],
+++ [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
+++ AC_CHECK_LIB(mythes-1.2, main, [],
+++ [ MYTHES_FOUND=no], [])
+++ if test "$MYTHES_FOUND" = "no"; then
+++ AC_CHECK_LIB(mythes, main, [],
+++ [ MYTHES_FOUND=no], [])
+++ fi
+++ if test "$MYTHES_FOUND" = "no"; then
+++ AC_MSG_ERROR([mythes library not found!.])
+++ fi
+++ fi
+++ AC_LANG_POP([C++])
++ else
++ AC_MSG_RESULT([internal])
++ SYSTEM_MYTHES=NO
++ fi
++ AC_SUBST(SYSTEM_MYTHES)
+++AC_SUBST(MYTHES_CFLAGS)
+++AC_SUBST(MYTHES_LIBS)
++
++ dnl ===================================================================
++ dnl Checking for lpsolve
++diff --git a/set_soenv.in b/set_soenv.in
++--- set_soenv.in
+++++ set_soenv.in
++@@ -1878,6 +1878,8 @@
++ ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
++ ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
++ ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
+++ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" );
+++ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" );
++ ToFile( "PAM", "@PAM@", "e" );
++ ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" );
++ ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
++diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
++--- solenv/inc/libs.mk
+++++ solenv/inc/libs.mk
++@@ -342,7 +342,11 @@
++ .ELSE
++ HUNSPELLLIB=-lhunspell-1.2
++ .ENDIF
+++.IF "$(SYSTEM_MYTHES)" == "YES"
+++MYTHESLIB=$(MYTHES_LIBS)
+++.ELSE
++ MYTHESLIB=-lmythes
+++.ENDIF
++ PYUNOLIB=-lpyuno
++ LPSOLVELIB=-llpsolve55
++ SOFFICELIB=-lsofficeapp
=== modified file 'patches/series'
--- a/patches/series 2010-05-20 17:34:30 +0000
+++ b/patches/series 2010-05-25 15:20:35 +0000
@@ -13,3 +13,4 @@
sw-64bit-Size-mismatch.diff
file-locking-conditional-cifs.diff
extensions-mozilla-plugin-pc-if-libxul.diff
+fix-system-mythes-for-mythes-1.2.diff
=== modified file 'rules'
--- a/rules 2010-05-18 15:17:51 +0000
+++ b/rules 2010-05-25 15:20:35 +0000
@@ -153,7 +153,7 @@
LIBWPD8_MINVER= (>= 0.8.3-3)
USE_SYSTEM_SABLOT=n
USE_LIBXSLT=y
-USE_EXTERNAL_MYTHES=n
+USE_EXTERNAL_MYTHES=y
USE_SYSTEM_ICU=y
ICU_MINVER= (>= 4.0)
USE_SYSTEM_LIBWPG=y
@@ -1032,9 +1032,8 @@
CONFIGURE_FLAGS += --with-system-sablot
endif
ifeq "$(USE_EXTERNAL_MYTHES)" "y"
- BUILD_DEPS += , libmythes-dev (>= 1:1.0-3)
+ BUILD_DEPS += , libmythes-dev (>= 2:1.2)
CONFIGURE_FLAGS += --with-system-mythes
- DEBHELPER_OPTIONS+= -Nlibmythes-dev
endif
ifeq "$(USE_SYSTEM_LIBWPS)" "y"
BUILD_DEPS += , libwps-dev
@@ -2006,15 +2005,6 @@
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
- # build non-PIC version of libmythes
- cd $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes && \
- $(CXX) -O2 -Wall -ansi -pedantic -I. -I../../../inc/pch \
- -c mythes.cxx && \
- ar rc libmythes_nopic.a mythes.o && ranlib libmythes_nopic.a && \
- mv libmythes_nopic.a $(CURDIR)/$(SOURCE_TREE)
-endif
-
touch $@
test: $(STAMP_DIR)/test
@@ -2812,24 +2802,6 @@
cp $(OOO_BUILD_TREE)/doc/data-from-remote-mysql-server.txt \
$(PKGDIR)-base/usr/share/doc/openoffice.org$(VER)-base
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
- # install libmythes and th_gen_idx.pl (on archs where we build OOo)
- rm -rf debian/libmythes-dev
- mkdir -p debian/libmythes-dev/usr/lib
- mkdir -p debian/libmythes-dev/usr/include
- mkdir -p debian/libmythes-dev/usr/share/mythes
- install -m644 \
- $(SOURCE_TREE)/lingucomponent/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmythes.a \
- debian/libmythes-dev/usr/lib/libmythes_pic.a
- install -m644 \
- $(SOURCE_TREE)/libmythes_nopic.a \
- debian/libmythes-dev/usr/lib/libmythes.a
- install -m644 $(SOURCE_TREE)/lingucomponent/source/thesaurus/mythes/mythes.hxx \
- debian/libmythes-dev/usr/include
- install -m755 $(SOURCE_TREE)/dictionaries/util/th_gen_idx.pl \
- debian/libmythes-dev/usr/share/mythes/th_gen_idx.pl
-endif
-
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
@@ -3460,10 +3432,9 @@
rm -rf debian/$$pkg/DEBIAN;\
done
- dh_installdocs -s -A -Nlibmythes-dev debian/README.Debian \
+ dh_installdocs -s -A debian/README.Debian \
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
$(OOO_BUILD_TREE)/NEWS
- dh_installdocs -plibmythes-dev debian/copyright
for p in core pdfimport presenter-console mysql-connector filter-binfilter \
evolution kab sdbc-postgresql presentation-minimizer; do \
cat debian/openoffice.org-common.templates.in > debian/openoffice.org-$$p.templates; \
@@ -3481,13 +3452,10 @@
done; \
done
if [ -s $(OOO_BUILD_TREE)/ChangeLog ]; then \
- dh_installchangelogs -s -k -Nlibmythes-dev $(OOO_BUILD_TREE)/ChangeLog; \
+ dh_installchangelogs -s -k $(OOO_BUILD_TREE)/ChangeLog; \
else \
- dh_installchangelogs -s -k -Nlibmythes-dev; \
+ dh_installchangelogs -s -k; \
fi
-ifneq "$(USE_EXTERNAL_MYTHES)" "y"
- dh_installchangelogs -plibmythes-dev
-endif
dh_installmime -s
dh_installmenu -s
ifeq "$(BUILD_JARS_NATIVE)" "y"
Reply to: