[Pkg-lyx-devel] Bug#612327: Bug#612327: should use system mythes (dicts)

[Sven Hoexter]

tags 612327 upstream
thanks

On Mon, Feb 07, 2011 at 08:03:55PM +0100, Rene Engelhard wrote:

Hi,

> I think we should fix lyx to use libmythes-1.2-0 directly.

If we take only the essential parts I think we can break it down to something
that might not end as merging nightmare until we've some final solution
upstream. I hope I didn't miss anything important.


> I also created a link to /usr/share/mythes where the dicts are.

Added, thanks.

Sven
-- 
And I don't know much, but I do know this:
With a golden heart comes a rebel fist.
     [ Streetlight Manifesto - Here's To Life ]
-------------- next part --------------
Build with the system wide libmythes instead of using the one included
in LyX.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612327
http://www.lyx.org/trac/ticket/7288
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -23,7 +23,7 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 
-#include "support/mythes/mythes.hxx"
+#include <mythes.hxx>
 
 #include "frontends/alert.h"
 
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -102,10 +102,7 @@ liblyxsupport_a_SOURCES = \
 	userinfo.h \
 	unicode.cpp \
 	unicode.h \
-	weighted_btree.h \
-	mythes/mythes.cxx \
-	mythes/mythes.hxx \
-	mythes/license.readme
+	weighted_btree.h
 
 #if INSTALL_MACOSX
 #liblyxsupport_a_SOURCES += \
--- a/src/support/Makefile.in
+++ b/src/support/Makefile.in
@@ -107,7 +107,6 @@ am__liblyxsupport_a_SOURCES_DIST = FileM
 	Systemcall.cpp Systemcall.h SystemcallPrivate.h shared_ptr.h \
 	textutils.h Translator.h Timeout.cpp Timeout.h types.h \
 	userinfo.cpp userinfo.h unicode.cpp unicode.h weighted_btree.h \
-	mythes/mythes.cxx mythes/mythes.hxx mythes/license.readme \
 	AppleSpeller.h AppleSpeller.m linkback/LinkBack.h \
 	linkback/LinkBack.m linkback/LinkBackProxy.h \
 	linkback/LinkBackProxy.m linkback/LinkBackServer.h \
@@ -125,7 +124,7 @@ am_liblyxsupport_a_OBJECTS = FileMonitor
 	os.$(OBJEXT) Path.$(OBJEXT) Package.$(OBJEXT) \
 	qstring_helpers.$(OBJEXT) socktools.$(OBJEXT) \
 	Systemcall.$(OBJEXT) Timeout.$(OBJEXT) userinfo.$(OBJEXT) \
-	unicode.$(OBJEXT) mythes.$(OBJEXT) $(am__objects_1)
+	unicode.$(OBJEXT) $(am__objects_1)
 liblyxsupport_a_OBJECTS = $(am_liblyxsupport_a_OBJECTS)
 am_check_convert_OBJECTS = check_convert.$(OBJEXT) boost.$(OBJEXT)
 check_convert_OBJECTS = $(am_check_convert_OBJECTS)
@@ -465,7 +464,6 @@ liblyxsupport_a_SOURCES = FileMonitor.h
 	Systemcall.cpp Systemcall.h SystemcallPrivate.h shared_ptr.h \
 	textutils.h Translator.h Timeout.cpp Timeout.h types.h \
 	userinfo.cpp userinfo.h unicode.cpp unicode.h weighted_btree.h \
-	mythes/mythes.cxx mythes/mythes.hxx mythes/license.readme \
 	$(am__append_1)
 TESTS = \
 	tests/test_convert \
@@ -494,7 +492,7 @@ all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .gch .cpp .cxx .m .o .obj
+.SUFFIXES: .gch .cpp .m .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/common.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -580,7 +578,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lstrings.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lyxtime.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mutex.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mythes.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/os.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qstring_helpers.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/socktools.Po at am__quote@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@ SUBDIRS = support frontends . $(CLIENT)
 
 EXTRA_DIST = pch.h
 
+MYTHES_LIBS := `pkg-config --libs mythes`
+
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
 		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -732,7 +732,8 @@ lyx_LDADD = \
 	support/liblyxsupport.a \
 	$(OTHERLIBS) \
 	$(QT4_LDFLAGS) \
-	$(QT4_LIB)
+	$(QT4_LIB) \
+	-lmythes-1.2
 
 
 #lyx_LDFLAGS=-Wl,-O1