Compiling with system hunspell - texmaker

[David Tardon]

Hi,

On Wed, Aug 06, 2014 at 09:22:29PM -0500, Mukundan Ragavan wrote:
> The source tarball has a directory hunspell which is removed in %prep
> and system hunspell libraries are used instead. This works without any
> problems with version 4.2. However, in 4.3, I get
> 
> WARNING: Failure to find: hunspell/affentry.cxx
> WARNING: Failure to find: hunspell/affixmgr.cxx
> WARNING: Failure to find: hunspell/csutil.cxx
> WARNING: Failure to find: hunspell/dictmgr.cxx
> WARNING: Failure to find: hunspell/hashmgr.cxx
> 
> [ ... ] {complete list of files removed}
> 
> The compilation happens and fails with the following error -
> 
> make: *** No rule to make target 'hunspell/affentry.cxx', needed by
> '.obj/affentry.o'.  Stop.

So, the first thing I have to say is that I have absolutely no idea what
you were trying to do, as you did not attach any patch with your current
changes... That said, with the attached patch I can build 4.3 just fine
(fedpkg local on F-20).

D.
-------------- next part --------------
diff --git a/texmaker-fedora.patch b/texmaker-fedora.patch
index f0f61be..626e279 100644
--- a/texmaker-fedora.patch
+++ b/texmaker-fedora.patch
@@ -1,36 +1,5 @@
 --- texmaker.cpp	2014-04-26 11:28:43.000000000 -0400
 +++ texmaker.cpp.new	2014-05-19 21:21:35.222967218 -0400
-@@ -4267,27 +4267,9 @@
- metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
- // xdvi %.dvi  -sourceposition @:%.tex
- // kdvi "file:%.dvi#src:@ %.tex"
--switch (desktop_env)
--	{
--	case 1:
--		{
--		viewdvi_command=config->value("Tools/Dvi","evince %.dvi").toString();
--		viewps_command=config->value("Tools/Ps","evince %.ps").toString();
--		viewpdf_command=config->value("Tools/Pdf","evince %.pdf").toString();
--		}break;
--	case 2:
--		{
--		viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString();
--		viewps_command=config->value("Tools/Ps","kghostview %.ps").toString();
--		viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString();
--		}break;
--	case 3:
--		{
--		viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString();
--		viewps_command=config->value("Tools/Ps","okular %.ps").toString();
--		viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
--		}break;
--	}
-+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
-+viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
-+viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
- 
- 
- 
 @@ -4533,7 +4515,7 @@
  #ifdef DEBIAN_SPELLDIR
  QString dicDir=PREFIX"/share/myspell/dicts/";
@@ -40,13 +9,6 @@
  #endif
  #endif
  
-@@ -11405,4 +11387,4 @@
- 	    UpdateBibliography();
- 	    }
- 	}
--}
-\ No newline at end of file
-+}
 --- texmaker.pro	2014-04-24 10:15:57.000000000 -0400
 +++ texmaker.pro.new	2014-05-19 21:10:57.758514263 -0400
 @@ -19,11 +19,11 @@
@@ -150,14 +112,3 @@
  INSTALLS += utilities
  
  desktop.files = utilities/texmaker.desktop
---- spellerdialog.h	2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new	2014-05-19 21:17:38.642291054 -0400
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
diff --git a/texmaker.spec b/texmaker.spec
index 67eb016..29c9a09 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,6 +1,6 @@
 Summary:	LaTeX editor
 Name:		texmaker
-Version:	4.2
+Version:	4.3
 Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2+