[codeblocks] - set Fedora specific paths for spellchecker and thesaurus in the SpellChecker plugin - update for a
Dan Horák
sharkcz at fedoraproject.org
Tue Nov 25 20:36:33 UTC 2014
commit 5096ea75c7e2d76c785ab2d4ac196edac1273f81
Author: Dan Horák <dan at danny.cz>
Date: Tue Nov 25 21:36:28 2014 +0100
- set Fedora specific paths for spellchecker and thesaurus in the SpellChecker plugin
- update for astyle 2.05 (#1166377)
codeblocks-13.12-astyle-2.05.patch | 214 +++++++++++++++++++
codeblocks-13.12-spellchecker-settings.patch | 34 +++
codeblocks-13.12-unbundle.patch | 287 ++++++++++++++++----------
codeblocks.spec | 20 ++-
4 files changed, 439 insertions(+), 116 deletions(-)
---
diff --git a/codeblocks-13.12-astyle-2.05.patch b/codeblocks-13.12-astyle-2.05.patch
new file mode 100644
index 0000000..477241a
--- /dev/null
+++ b/codeblocks-13.12-astyle-2.05.patch
@@ -0,0 +1,214 @@
+diff --git a/src/plugins/astyle/asstreamiterator.cpp b/src/plugins/astyle/asstreamiterator.cpp
+index 4bd394c..a2d75f2 100644
+--- a/src/plugins/astyle/asstreamiterator.cpp
++++ b/src/plugins/astyle/asstreamiterator.cpp
+@@ -8,93 +8,98 @@
+ */
+
+ #include "asstreamiterator.h"
++
++#include <vector>
++
++#include "cbstyledtextctrl.h"
+ #include "globals.h"
+
+-ASStreamIterator::ASStreamIterator(cbEditor *cbe, const wxChar* in)
+-: m_cbe(cbe), m_In(in), m_PeekStart(0), m_curline(0), m_foundBookmark(false),
+-m_foundBreakpoint(false)
++ASStreamIterator::ASStreamIterator(cbEditor* cbe, const wxChar* in) :
++ m_Ed(cbe),
++ m_CharPtr(in),
++ m_SavedCharPtr(0),
++ m_CurChar(0),
++ m_CurLine(0),
++ m_FoundBookmark(false),
++ m_FoundBreakpoint(false)
+ {
+- //ctor
+ }
+
+ ASStreamIterator::~ASStreamIterator()
+ {
+- //dtor
+ }
+
+ bool ASStreamIterator::hasMoreLines() const
+ {
+- return (*m_In) != 0;
++ return (*m_CharPtr) != 0;
+ }
+
+-inline bool ASStreamIterator::IsEOL(wxChar ch)
++int ASStreamIterator::getStreamLength() const
+ {
+- if (ch == _T('\r') || ch == _T('\n'))
+- {
+- return true;
+- }
+-
+- return false;
++ return static_cast<int>(m_Ed->GetControl()->GetLength());
+ }
+
+ std::string ASStreamIterator::nextLine(cb_unused bool emptyLineWasDeleted)
+ {
+- // hack: m_curline = 0 is a special case we should not evaluate here
+- if (m_cbe && m_curline && m_cbe->HasBookmark(m_curline))
+- {
+- m_foundBookmark = true;
+- }
+- if (m_cbe && m_curline && m_cbe->HasBreakpoint(m_curline))
+- {
+- m_foundBreakpoint = true;
+- }
++ // hack: m_CurLine = 0 is a special case we should not evaluate here
++ if (m_Ed && m_CurLine && m_Ed->HasBookmark(m_CurLine))
++ m_FoundBookmark = true;
++
++ if (m_Ed && m_CurLine && m_Ed->HasBreakpoint(m_CurLine))
++ m_FoundBreakpoint = true;
+
+ return readLine();
+ }
+
++std::string ASStreamIterator::peekNextLine()
++{
++ if (!m_SavedCharPtr)
++ m_SavedCharPtr = m_CharPtr;
++
++ return readLine();
++}
++
++void ASStreamIterator::peekReset()
++{
++ m_CharPtr = m_SavedCharPtr;
++ m_SavedCharPtr = 0;
++}
++
++std::streamoff ASStreamIterator::tellg()
++{
++ return static_cast<std::streamoff>(m_CurChar);
++}
++
++// private
++
+ std::string ASStreamIterator::readLine()
+ {
+- m_buffer.clear();
++ static std::vector<wxChar> buf;
++ buf.clear();
+
+- while (*m_In != 0)
++ while (*m_CharPtr != 0)
+ {
+- if (!IsEOL(*m_In))
+- {
+- m_buffer.push_back(*m_In);
+- }
++ if ( !IsEOL(*m_CharPtr) )
++ buf.push_back(*m_CharPtr);
+
+- ++m_In;
++ ++m_CharPtr;
++ ++m_CurChar;
+
+- if (IsEOL(*m_In))
++ if ( IsEOL(*m_CharPtr) )
+ {
+ // if CRLF (two chars) peek next char (avoid duplicating empty-lines)
+- if (*m_In != *(m_In + 1) && IsEOL(*(m_In + 1)))
++ if (*m_CharPtr != *(m_CharPtr + 1) && IsEOL(*(m_CharPtr + 1)))
+ {
+- ++m_In;
++ ++m_CharPtr;
++ ++m_CurChar;
+ }
+
+ break;
+ }
+ }
+
+- m_buffer.push_back(0);
+- ++m_curline;
++ buf.push_back(0);
++ ++m_CurLine;
+
+- return std::string(cbU2C(&m_buffer[0]));
+-}
+-
+-std::string ASStreamIterator::peekNextLine()
+-{
+- if (!m_PeekStart)
+- {
+- m_PeekStart = m_In;
+- }
+-
+- return readLine();
+-}
+-
+-void ASStreamIterator::peekReset()
+-{
+- m_In = m_PeekStart;
+- m_PeekStart = 0;
++ return static_cast<std::string>( cbU2C(&buf[0]) );
+ }
+diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h
+index d30398d..f2061d8 100644
+--- a/src/plugins/astyle/asstreamiterator.h
++++ b/src/plugins/astyle/asstreamiterator.h
+@@ -7,35 +7,41 @@
+ #define ASSTREAMITERATOR_H
+
+ #include <iostream>
++
+ #include <wx/string.h>
++
+ #include <cbeditor.h>
+-#include <vector>
++
+ #include <astyle.h>
+
+ class ASStreamIterator : public astyle::ASSourceIterator
+ {
+ public:
+- ASStreamIterator(cbEditor *cbe, const wxChar *in);
++ ASStreamIterator(cbEditor* cbe, const wxChar* in);
+ virtual ~ASStreamIterator();
+
+ bool hasMoreLines() const;
++ int getStreamLength() const;
+ std::string nextLine(bool emptyLineWasDeleted = false);
+ std::string peekNextLine();
+ void peekReset();
+- bool FoundBookmark() const { return m_foundBookmark; }
+- void ClearFoundBookmark() { m_foundBookmark = false; }
+- bool FoundBreakpoint() const { return m_foundBreakpoint; }
+- void ClearFoundBreakpoint() { m_foundBreakpoint = false; }
++ std::streamoff tellg();
++
++ bool FoundBookmark() const { return m_FoundBookmark; }
++ void ClearFoundBookmark() { m_FoundBookmark = false; }
++ bool FoundBreakpoint() const { return m_FoundBreakpoint; }
++ void ClearFoundBreakpoint() { m_FoundBreakpoint = false; }
+
+ protected:
+- bool IsEOL(wxChar ch);
+- cbEditor *m_cbe;
+- const wxChar *m_In;
+- const wxChar *m_PeekStart;
+- std::vector<wxChar> m_buffer;
+- int m_curline;
+- bool m_foundBookmark;
+- bool m_foundBreakpoint;
++ inline bool IsEOL(wxChar ch) { return (ch == _T('\r') || ch == _T('\n')); }
++
++ cbEditor* m_Ed;
++ const wxChar* m_CharPtr;
++ const wxChar* m_SavedCharPtr;
++ int m_CurChar;
++ int m_CurLine;
++ bool m_FoundBookmark;
++ bool m_FoundBreakpoint;
+
+ private:
+ std::string readLine();
diff --git a/codeblocks-13.12-spellchecker-settings.patch b/codeblocks-13.12-spellchecker-settings.patch
new file mode 100644
index 0000000..af38480
--- /dev/null
+++ b/codeblocks-13.12-spellchecker-settings.patch
@@ -0,0 +1,34 @@
+From 536832354d7b38230bca3c3495364097d948d503 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Sat, 19 Apr 2014 22:53:00 +0200
+Subject: [PATCH] set Fedora paths for spellchecker and thesaurus
+
+---
+ src/plugins/contrib/SpellChecker/SpellCheckerConfig.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/plugins/contrib/SpellChecker/SpellCheckerConfig.cpp b/src/plugins/contrib/SpellChecker/SpellCheckerConfig.cpp
+index b8b50d6..d449b8b 100644
+--- a/src/plugins/contrib/SpellChecker/SpellCheckerConfig.cpp
++++ b/src/plugins/contrib/SpellChecker/SpellCheckerConfig.cpp
+@@ -172,8 +172,7 @@ void SpellCheckerConfig::DetectDictionaryPath()
+ }
+ else
+ {
+- dictPaths.Add(wxT("/usr/share/hunspell"));
+- dictPaths.Add(wxT("/usr/share/myspell/dicts"));
++ dictPaths.Add(wxT("/usr/share/myspell"));
+ }
+ dictPaths.Add(m_pPlugin->GetOnlineCheckerConfigPath());
+ for (size_t i = 0; i < dictPaths.GetCount(); ++i)
+@@ -209,7 +208,6 @@ void SpellCheckerConfig::DetectThesaurusPath()
+ }
+ else
+ {
+- thesPaths.Add(wxT("/usr/share/myspell/dicts"));
+ thesPaths.Add(wxT("/usr/share/mythes"));
+ }
+ thesPaths.Add(m_pPlugin->GetOnlineCheckerConfigPath());
+--
+1.9.0
+
diff --git a/codeblocks-13.12-unbundle.patch b/codeblocks-13.12-unbundle.patch
index dfdd650..826f44c 100644
--- a/codeblocks-13.12-unbundle.patch
+++ b/codeblocks-13.12-unbundle.patch
@@ -1,7 +1,7 @@
-From 893aafbe11e3642b9b6a5ad67cf9dbdc2cdd650d Mon Sep 17 00:00:00 2001
+From e0d6b2146dc6f60565099262c4295148a35c3e53 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 13 May 2009 10:21:19 +0200
-Subject: [PATCH 01/37] add check for tinyxml into configure
+Subject: [PATCH 01/38] add check for tinyxml into configure
---
configure.ac | 9 +++++++++
@@ -31,13 +31,13 @@ index dfcdc20..9997857 100644
dnl versioning info for libtool
dnl Note this is the ABI version which is not the same as our actual library version
--
-1.8.5.3
+1.9.0
-From 928cfb033583dfd6cad19cb45f6de9066a3c1487 Mon Sep 17 00:00:00 2001
+From 0e6c5bf36864b8c2f061911ddbf4708653c32e4b Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Wed, 13 May 2009 16:53:29 +0200
-Subject: [PATCH 02/37] move tinywxuni.h header from tinyxml into sdk
+Subject: [PATCH 02/38] move tinywxuni.h header from tinyxml into sdk
---
src/include/Makefile.am | 1 +
@@ -266,13 +266,13 @@ index 1fd2024..e0b1f24 100644
//***********************************************************************
--
-1.8.5.3
+1.9.0
-From 8c34c37fdd1fd5892dd879debe82cfddee85df5e Mon Sep 17 00:00:00 2001
+From 284c37e58c5c1601a481bfbc0d2b13e7e9470184 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Thu, 14 May 2009 09:42:37 +0200
-Subject: [PATCH 03/37] move tinywxuni.cpp implementation from tinyxml into sdk
+Subject: [PATCH 03/38] move tinywxuni.cpp implementation from tinyxml into sdk
---
src/base/tinyxml/Makefile.am | 2 +-
@@ -432,13 +432,13 @@ index 0000000..57f48e3
+}
+
--
-1.8.5.3
+1.9.0
-From b6cf081205e8b943f161f5b75a46e675a8e64ce4 Mon Sep 17 00:00:00 2001
+From db71d1cdb1d515bdac4fbd890ae819eedef68da5 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Thu, 14 May 2009 10:04:35 +0200
-Subject: [PATCH 04/37] update C::B projects with new locations of tinywxuni
+Subject: [PATCH 04/38] update C::B projects with new locations of tinywxuni
---
src/CodeBlocks-unix.cbp | 4 ++--
@@ -446,7 +446,7 @@ Subject: [PATCH 04/37] update C::B projects with new locations of tinywxuni
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp
-index a5673f5..bec2099 100644
+index 5080ce6..a1607d1 100644
--- a/src/CodeBlocks-unix.cbp
+++ b/src/CodeBlocks-unix.cbp
@@ -526,7 +526,7 @@
@@ -490,13 +490,13 @@ index 0f973ab..adf972b 100644
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
--
-1.8.5.3
+1.9.0
-From db7a8721117026ca7e1f52b8f8bcbf9e3c792f46 Mon Sep 17 00:00:00 2001
+From ac56257a3ce1ccc08c5f022846aea47dc4bfe054 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Thu, 14 May 2009 10:05:42 +0200
-Subject: [PATCH 05/37] convert autorevision to new tinyxml handling
+Subject: [PATCH 05/38] convert autorevision to new tinyxml handling
---
src/build_tools/autorevision/Makefile.am | 4 ++++
@@ -534,13 +534,13 @@ index 008a3ca..e0a632a 100644
using namespace std;
--
-1.8.5.3
+1.9.0
-From 2ae5531188b7d0674620e54b182c11e0c61a57c6 Mon Sep 17 00:00:00 2001
+From 4e675dae5eb95f3a5f102364ae29921aab2eaeff Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Thu, 14 May 2009 17:33:02 +0200
-Subject: [PATCH 06/37] convert sdk to new tinyxml handling
+Subject: [PATCH 06/38] convert sdk to new tinyxml handling
---
src/include/configmanager.h | 3 +--
@@ -677,13 +677,13 @@ index accbd05..018a9bd 100644
WorkspaceLoader::WorkspaceLoader()
--
-1.8.5.3
+1.9.0
-From 8d9c0de74f7f5dacf1e1fbe02d2b71c35a2d09ad Mon Sep 17 00:00:00 2001
+From f07c5057a3998fd71b411793ecd4fea6a10ffcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 12:36:33 +0200
-Subject: [PATCH 07/37] update codecompletion plugin
+Subject: [PATCH 07/38] update codecompletion plugin
---
src/plugins/codecompletion/Makefile.am | 4 ++++
@@ -718,13 +718,13 @@ index df7d2d7..7061e29 100644
#include "nativeparser.h"
#include "classbrowser.h"
--
-1.8.5.3
+1.9.0
-From a7b7731ba3b7046c2a77f2c33a9fa14e93950c33 Mon Sep 17 00:00:00 2001
+From 5df2617858efb8d7e089fc6f9b8e71dc42779a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 12:38:01 +0200
-Subject: [PATCH 08/37] update codesnippets plugin
+Subject: [PATCH 08/38] update codesnippets plugin
---
src/plugins/contrib/codesnippets/Makefile.am | 4 ++++
@@ -787,13 +787,13 @@ index c0d1db7..64c7dcb 100644
#include "snippetsimages.h"
#include "codesnippetstreectrl.h"
--
-1.8.5.3
+1.9.0
-From f443969492824ed84097acd031c62c4ed1cae191 Mon Sep 17 00:00:00 2001
+From 3314a1849eee9ef2729587d5d761067724779668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 12:39:05 +0200
-Subject: [PATCH 09/37] update envvars plugin
+Subject: [PATCH 09/38] update envvars plugin
---
src/plugins/contrib/envvars/Makefile.am | 4 ++++
@@ -829,13 +829,13 @@ index 1290b5a..bf72252 100644
#include "cbproject.h"
#include "globals.h"
--
-1.8.5.3
+1.9.0
-From 8c61ee941dbc3d845f1ab47f2d080ebdc10d86d2 Mon Sep 17 00:00:00 2001
+From 349493073cd1547e9eeb63cc1b19058a53d820e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 12:40:11 +0200
-Subject: [PATCH 10/37] update BrowseTracker plugin
+Subject: [PATCH 10/38] update BrowseTracker plugin
---
src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +-
@@ -871,13 +871,13 @@ index ebd5650..7115870 100644
pluginlib_LTLIBRARIES = libBrowseTracker.la
--
-1.8.5.3
+1.9.0
-From b0ba74a8d284c1c54f3c0f8cad9d1110ffa73337 Mon Sep 17 00:00:00 2001
+From 9822240b713fcf66a0d500f04912f9708a5ed8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 12:41:03 +0200
-Subject: [PATCH 11/37] update Valgrind plugin
+Subject: [PATCH 11/38] update Valgrind plugin
---
src/plugins/contrib/Valgrind/Makefile.am | 4 ++++
@@ -913,13 +913,13 @@ index cfd399e..cbcec86 100644
#include "Valgrind.h"
#include "ValgrindListLog.h"
--
-1.8.5.3
+1.9.0
-From 2a11b3af7b9dc71075d9c5c2ed797ec6b806b8ff Mon Sep 17 00:00:00 2001
+From dd82b3908ebd603e435c151d1db746154918cb43 Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 16 May 2009 12:04:35 +0200
-Subject: [PATCH 12/37] convert AutoVersioning plugin
+Subject: [PATCH 12/38] convert AutoVersioning plugin
---
src/plugins/contrib/AutoVersioning/AutoVersioning.cpp | 4 ++--
@@ -972,13 +972,13 @@ index f99bd02..522a86f 100644
bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date)
--
-1.8.5.3
+1.9.0
-From 321776b3c0b1d2c64f7c71480d012ef379c0cb93 Mon Sep 17 00:00:00 2001
+From dd2be314d1bddd24a340416bf007c6c364082c6c Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 16 May 2009 12:10:45 +0200
-Subject: [PATCH 13/37] convert lib_finder plugin
+Subject: [PATCH 13/38] convert lib_finder plugin
---
src/plugins/contrib/lib_finder/Makefile.am | 4 ++++
@@ -1042,13 +1042,13 @@ index e7a337b..6416f09 100644
/** \brief Configuration of one project */
--
-1.8.5.3
+1.9.0
-From 3e7ad38521cc950da2d2b26b01d14d36afb66bbf Mon Sep 17 00:00:00 2001
+From e9704fc26bb864664b6a05c5185cc01de411553b Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 16 May 2009 12:20:55 +0200
-Subject: [PATCH 14/37] convert wxSmith plugin
+Subject: [PATCH 14/38] convert wxSmith plugin
---
src/plugins/contrib/wxSmith/Makefile.am | 4 ++++
@@ -1200,13 +1200,13 @@ index de6c60d..7a6dee2 100644
#define wxsDF_WIDGET _T("wxSmith XML")
--
-1.8.5.3
+1.9.0
-From 1a3450998fa22044ee0536a3ff22c9a0a972c1ee Mon Sep 17 00:00:00 2001
+From 0f14f90dc11bc3b8ff3d1d0041a81ffe39ea760a Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 16 May 2009 12:23:54 +0200
-Subject: [PATCH 15/37] convert cb_share_config tool
+Subject: [PATCH 15/38] convert cb_share_config tool
---
src/tools/cb_share_config/Makefile.am | 7 ++++++-
@@ -1251,13 +1251,13 @@ index c49e790..b658bad 100644
class MainFrame: public wxFrame
{
--
-1.8.5.3
+1.9.0
-From f1ba7b4854d59550af53f488e5c06d0194bdde0f Mon Sep 17 00:00:00 2001
+From 6dd5f2db98ef8782491cc6cdd8c487971d838a5a Mon Sep 17 00:00:00 2001
From: Dan Horak <dan at danny.cz>
Date: Sat, 16 May 2009 12:26:31 +0200
-Subject: [PATCH 16/37] build local copy of tinyxml library only when no system
+Subject: [PATCH 16/38] build local copy of tinyxml library only when no system
tinyxml library exists
---
@@ -1275,13 +1275,13 @@ index 34e0b85..eec0652 100644
EXTRA_DIST = exchndl
--
-1.8.5.3
+1.9.0
-From 81f96b81b2e5cecd76aac48f137c11d72d9981ed Mon Sep 17 00:00:00 2001
+From 0b15212a5d1664f2574fc508c1db83cae76f79ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 13:07:12 +0200
-Subject: [PATCH 17/37] fix include dirs for the main app when system tinyxml
+Subject: [PATCH 17/38] fix include dirs for the main app when system tinyxml
is not present
---
@@ -1543,13 +1543,13 @@ index 76059eb..fa8c325 100644
GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK
endif
--
-1.8.5.3
+1.9.0
-From 4395f32aac48dc210dfca123142055c4062d11fb Mon Sep 17 00:00:00 2001
+From 363e3bd34640d9668abe7fa781171f52fc976a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 18 Aug 2009 13:21:38 +0200
-Subject: [PATCH 18/37] use/install local timyxml headers only when a
+Subject: [PATCH 18/38] use/install local timyxml headers only when a
system-wide instance doesn't exist
---
@@ -1587,13 +1587,13 @@ index f7d7382..bfe01c6 100644
# $(CXXCOMPILE) is empty.
# Create the basic one here:
--
-1.8.5.3
+1.9.0
-From 1463a4bf2b556267a18e6298377785017f581fb1 Mon Sep 17 00:00:00 2001
+From b0f470009bdf4c7cfc523b8d719942cb47826848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 18 Aug 2009 13:56:15 +0200
-Subject: [PATCH 19/37] fix linking with tinyxml in the codesnippets plugin
+Subject: [PATCH 19/38] fix linking with tinyxml in the codesnippets plugin
---
src/plugins/contrib/codesnippets/resources/Makefile.am | 11 ++++++-----
@@ -1631,13 +1631,13 @@ index 94a0273..54cd35d 100644
$(srcdir)/../Search/DirectoryParamsPanel.cpp \
$(srcdir)/../Search/InsertIndexManager.cpp \
--
-1.8.5.3
+1.9.0
-From 035e1aee923d1678a9ab8afb5f3fe4bef4b5c078 Mon Sep 17 00:00:00 2001
+From 1a1e66b5f1157dc26d62cf74b0ade7037ef98278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 15 Feb 2010 21:34:45 +0100
-Subject: [PATCH 20/37] fix tinyxml includes in the help plugin
+Subject: [PATCH 20/38] fix tinyxml includes in the help plugin
---
src/plugins/contrib/help_plugin/Makefile.am | 4 ++++
@@ -1659,13 +1659,13 @@ index d71d32e..181a54d 100644
HelpConfigDialog.cpp \
help_plugin.cpp \
--
-1.8.5.3
+1.9.0
-From 7899a4b1c0afb576a92d9f014cef7398e467fcc9 Mon Sep 17 00:00:00 2001
+From 3cc3efc434a50842971df76ecec5f6f465044a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 15 Feb 2010 21:37:48 +0100
-Subject: [PATCH 21/37] fix tinyxml includes in the wxSmithAui plugin
+Subject: [PATCH 21/38] fix tinyxml includes in the wxSmithAui plugin
---
src/plugins/contrib/wxSmithAui/Makefile.am | 4 ++++
@@ -1687,13 +1687,13 @@ index 097bae1..367d04f 100644
pluginlib_LTLIBRARIES = libwxSmithAui.la
--
-1.8.5.3
+1.9.0
-From 8986bf6d90ad640e7ae1a628725eb5810dc6ee91 Mon Sep 17 00:00:00 2001
+From 0669d1f74b6a4c87aa7c3fede59bcf00e676fa46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 15 Feb 2010 21:39:14 +0100
-Subject: [PATCH 22/37] fix tinyxml includes in the MouseSap plugin
+Subject: [PATCH 22/38] fix tinyxml includes in the MouseSap plugin
---
src/plugins/contrib/MouseSap/Makefile.am | 4 ++++
@@ -1715,13 +1715,13 @@ index c13907e..3c887ae 100644
pluginlib_LTLIBRARIES = libMouseSap.la
--
-1.8.5.3
+1.9.0
-From 3e821940a0c7dfec7f46c1b875f97189a1177205 Mon Sep 17 00:00:00 2001
+From 9442d6b29133adeddb81c3d4cbc12d83ffb46716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 24 Aug 2010 08:55:17 +0200
-Subject: [PATCH 23/37] fix tinyxml includes in the DoxyBlocks plugin
+Subject: [PATCH 23/38] fix tinyxml includes in the DoxyBlocks plugin
---
src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp | 2 +-
@@ -1757,13 +1757,13 @@ index 76a9ad5..eab64ae 100644
pluginlib_LTLIBRARIES = libDoxyBlocks.la
--
-1.8.5.3
+1.9.0
-From 5cf0e20d5b59410c5103c318fad44f6c73288c8d Mon Sep 17 00:00:00 2001
+From 4528304c4bf667380da6c65376994acfcdafce42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Tue, 24 Aug 2010 09:55:32 +0200
-Subject: [PATCH 24/37] fix tinyxml includes in the NassiShneiderman plugin
+Subject: [PATCH 24/38] fix tinyxml includes in the NassiShneiderman plugin
---
src/plugins/contrib/NassiShneiderman/Makefile.am | 4 ++++
@@ -1785,13 +1785,13 @@ index c6342a2..7ad0175 100644
pluginlib_LTLIBRARIES = libNassiShneiderman.la
--
-1.8.5.3
+1.9.0
-From de25009da8e358ede39832ce564f35c846243247 Mon Sep 17 00:00:00 2001
+From bc35b99c3501833628e79947a94470d2f50f4ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 23 Jan 2011 09:38:55 +0100
-Subject: [PATCH 25/37] fix tinyxml includes in the ReopenEditor plugin
+Subject: [PATCH 25/38] fix tinyxml includes in the ReopenEditor plugin
---
src/plugins/contrib/ReopenEditor/Makefile.am | 4 ++++
@@ -1813,13 +1813,13 @@ index 2b8a355..6d66e53 100644
pluginlib_LTLIBRARIES = libReopenEditor.la
--
-1.8.5.3
+1.9.0
-From 9ee64d3cf3b806463dba4e78f3bad12ec2eba941 Mon Sep 17 00:00:00 2001
+From bf2d93be8f2924e2fecab5cf6b65c4dd6e9a86c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:50:27 +0100
-Subject: [PATCH 26/37] fix tinyxml includes in the DoxyBlock plugin
+Subject: [PATCH 26/38] fix tinyxml includes in the DoxyBlock plugin
---
src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp | 2 +-
@@ -1853,13 +1853,13 @@ index daa0b5b..dfc7541 100644
#include "Config.h"
--
-1.8.5.3
+1.9.0
-From dfe05fa173c9fc198f8f62ac1be7496eab1678ec Mon Sep 17 00:00:00 2001
+From ea910892ca6c4217dbd6f8f980e775a8d17c755d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:51:39 +0100
-Subject: [PATCH 27/37] fix tinyxml includes in the CppCheck plugin
+Subject: [PATCH 27/38] fix tinyxml includes in the CppCheck plugin
---
src/plugins/contrib/CppCheck/CppCheck.cpp | 2 +-
@@ -1895,13 +1895,13 @@ index 0e3550f..b46e2b7 100644
pluginlib_LTLIBRARIES = libCppCheck.la
--
-1.8.5.3
+1.9.0
-From da633ad64298c9c4e12cd8f9a8896c4bdba40a92 Mon Sep 17 00:00:00 2001
+From f5d6819403cf6569f0e90fc3e599608c9391a90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 16 May 2009 13:07:12 +0200
-Subject: [PATCH 28/37] fix include dirs for the main app when system tinyxml
+Subject: [PATCH 28/38] fix include dirs for the main app when system tinyxml
is not present
---
@@ -1924,13 +1924,13 @@ index 54cd35d..5735fec 100644
##pluginlib_LTLIBRARIES = codesnippets
--
-1.8.5.3
+1.9.0
-From 8ea1b6175a0ca367f59a6edea90b3ec87b14412c Mon Sep 17 00:00:00 2001
+From 7d2fc3e09ed64e3107fe87ec81b9afcb8b9a82aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 2 Sep 2012 15:34:58 +0200
-Subject: [PATCH 29/37] fix tinyxml includes in projectimporter plugin
+Subject: [PATCH 29/38] fix tinyxml includes in projectimporter plugin
---
src/plugins/projectsimporter/msvc10loader.cpp | 2 +-
@@ -1964,13 +1964,13 @@ index 7d1aae8..3eee8d0 100644
#include "prep.h"
#include "msvc7loader.h"
--
-1.8.5.3
+1.9.0
-From 19a01f30c3fa30d87531a60354d1b75624921e2b Mon Sep 17 00:00:00 2001
+From 5a443cb50da8947d98c395c2cac661c533da1d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 17:35:30 +0100
-Subject: [PATCH 30/37] add check for squirrel to configure.in
+Subject: [PATCH 30/38] add check for squirrel to configure.in
---
configure.ac | 10 +++++++++-
@@ -2002,13 +2002,13 @@ index 9997857..2617746 100644
dnl Note this is the ABI version which is not the same as our actual library version
CODEBLOCKS_CURRENT=0
--
-1.8.5.3
+1.9.0
-From 83caea37982546a1cfe632c6b52b6f87a06020bb Mon Sep 17 00:00:00 2001
+From 983fd2cba4a37f1bed5a958f4ef6ec45b95f6023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:28:16 +0100
-Subject: [PATCH 31/37] disable unicode for squirrel
+Subject: [PATCH 31/38] disable unicode for squirrel
---
src/include/scripting/sqplus/sqplus.h | 1 +
@@ -2027,13 +2027,13 @@ index a44ad3e..123bc20 100644
// C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types (this patch applies everywhere, where threse types are used)
--
-1.8.5.3
+1.9.0
-From 0cd7273c88ba6ed3d3415b5ed221e2488c0e1d50 Mon Sep 17 00:00:00 2001
+From 307e24a88573fa32a26bb884beae517fda7c35e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:33:13 +0100
-Subject: [PATCH 32/37] convert includes to system squirrel
+Subject: [PATCH 32/38] convert includes to system squirrel
---
src/include/Makefile.am | 7 ++++++-
@@ -2076,13 +2076,13 @@ index 39ea807..36adf08 100644
+SUBDIRS += squirrel sqstdlib include
+endif
--
-1.8.5.3
+1.9.0
-From 6d58c3828d7210a1e65288f027fd273b3126cf19 Mon Sep 17 00:00:00 2001
+From 4bd4ae4d6e83bab17c2b563bc050ff0932f8534f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:34:17 +0100
-Subject: [PATCH 33/37] convert sdk to system squirrel
+Subject: [PATCH 33/38] convert sdk to system squirrel
---
src/sdk/Makefile.am | 11 ++++++++---
@@ -2178,13 +2178,13 @@ index 2cdd579..4c0cf53 100644
noinst_LTLIBRARIES = libsqplus.la
--
-1.8.5.3
+1.9.0
-From 9c37f768fae5af4f6960b4b36e82d05034054b29 Mon Sep 17 00:00:00 2001
+From c15abfc2b00692ca003e0431729a7ad02117c32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:34:53 +0100
-Subject: [PATCH 34/37] convert main to system squirrel
+Subject: [PATCH 34/38] convert main to system squirrel
---
src/src/Makefile.am | 8 +++++++-
@@ -2217,13 +2217,13 @@ index fa8c325..4176634 100644
GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK
endif
--
-1.8.5.3
+1.9.0
-From 9054307262f98d1220d80d45ac3cce1b6e363f00 Mon Sep 17 00:00:00 2001
+From c6464ac4e9500e9082305a3cb36c1561f4888cd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 14 Jan 2012 23:35:32 +0100
-Subject: [PATCH 35/37] convert plugins to system squirrel
+Subject: [PATCH 35/38] convert plugins to system squirrel
---
src/plugins/abbreviations/Makefile.am | 6 +++++-
@@ -2454,13 +2454,13 @@ index a116b98..352d5b9 100644
pluginlib_LTLIBRARIES = libscriptedwizard.la
--
-1.8.5.3
+1.9.0
-From a7d4fda515ae6f4377a7df9fbc058e703a6dfd26 Mon Sep 17 00:00:00 2001
+From a1f05b124f8b6773e5e78b3f00c51ff1867fbc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sat, 7 Dec 2013 12:51:52 +0100
-Subject: [PATCH 36/37] switch to AM_CPPFLAGS from INCLUDES
+Subject: [PATCH 36/38] switch to AM_CPPFLAGS from INCLUDES
---
src/include/Makefile.am | 6 +++---
@@ -3124,13 +3124,13 @@ index 689861a..9f94d47 100644
cb_share_config_LDFLAGS =
--
-1.8.5.3
+1.9.0
-From 5b481f09585b000d80d5d8b2e9968393933803f8 Mon Sep 17 00:00:00 2001
+From 742a53b389a51c48cb46eb3ce4ebd47b21300811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Sun, 16 Mar 2014 22:38:12 +0100
-Subject: [PATCH 37/37] unbundle astyle library
+Subject: [PATCH 37/38] unbundle astyle library
- use system provided astyle library
- rename the plugin so it doesn't clash with the library name we need to link with
@@ -3291,5 +3291,68 @@ index f7ca9bb..89c337a 100644
+Astyle.zip: $(EXTRA_DIST)
+ PWD=`pwd` cd $(srcdir) && zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null
--
-1.8.5.3
+1.9.0
+
+
+From bbffcdad51f6c6dbd39bcc47f95775f2ee8e2782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Sun, 27 Apr 2014 11:53:14 +0200
+Subject: [PATCH 38/38] move bundled astyle to the new API
+
+---
+ src/plugins/astyle/astyle/ASBeautifier.cpp | 4 ++--
+ src/plugins/astyle/astyle/astyle.h | 2 +-
+ src/plugins/astyle/astyle/astyle_main.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/plugins/astyle/astyle/ASBeautifier.cpp b/src/plugins/astyle/astyle/ASBeautifier.cpp
+index 513835c..77476f3 100644
+--- a/src/plugins/astyle/astyle/ASBeautifier.cpp
++++ b/src/plugins/astyle/astyle/ASBeautifier.cpp
+@@ -69,7 +69,7 @@ ASBeautifier::ASBeautifier()
+ setLabelIndent(false);
+ setEmptyLineFill(false);
+ setCStyle();
+- setPreprocessorIndent(false);
++ setPreprocDefineIndent(false);
+ setAlignMethodColon(false);
+
+ // initialize ASBeautifier member vectors
+@@ -604,7 +604,7 @@ void ASBeautifier::setLabelIndent(bool state)
+ *
+ * @param state state of option.
+ */
+-void ASBeautifier::setPreprocessorIndent(bool state)
++void ASBeautifier::setPreprocDefineIndent(bool state)
+ {
+ preprocessorIndent = state;
+ }
+diff --git a/src/plugins/astyle/astyle/astyle.h b/src/plugins/astyle/astyle/astyle.h
+index 4a85acd..75f2d59 100644
+--- a/src/plugins/astyle/astyle/astyle.h
++++ b/src/plugins/astyle/astyle/astyle.h
+@@ -368,7 +368,7 @@ class ASBeautifier : protected ASResource, protected ASBase
+ void setSpaceIndentation(int length = 4);
+ void setSwitchIndent(bool state);
+ void setTabIndentation(int length = 4, bool forceTabs = false);
+- void setPreprocessorIndent(bool state);
++ void setPreprocDefineIndent(bool state);
+ int getBeautifierFileType() const;
+ int getFileType() const;
+ int getIndentLength(void) const;
+diff --git a/src/plugins/astyle/astyle/astyle_main.cpp b/src/plugins/astyle/astyle/astyle_main.cpp
+index 8de6e2a..66fbf53 100644
+--- a/src/plugins/astyle/astyle/astyle_main.cpp
++++ b/src/plugins/astyle/astyle/astyle_main.cpp
+@@ -3046,7 +3046,7 @@ void ASOptions::parseOption(const string &arg, const string &errorInfo)
+ }
+ else if ( isOption(arg, "w", "indent-preprocessor") )
+ {
+- formatter.setPreprocessorIndent(true);
++ formatter.setPreprocDefineIndent(true);
+ }
+ else if ( isOption(arg, "c", "convert-tabs") )
+ {
+--
+1.9.0
diff --git a/codeblocks.spec b/codeblocks.spec
index b973df7..a190e88 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
Name: codeblocks
Version: 13.12
-Release: 10%{?svnrelease}%{?dist}
+Release: 11%{?svnrelease}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv3+
@@ -34,7 +34,7 @@ BuildRequires: libICE-devel
BuildRequires: boost-devel
BuildRequires: hunspell-devel
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: squirrel-devel
%endif
%if 0%{?fedora} >= 21
@@ -48,10 +48,14 @@ BuildRequires: libappstream-glib
Requires: %{name}-libs = %{version}-%{release}
Requires: shared-mime-info
Requires: xterm
-# use system tinyxml and squirrel libraries
+# use system tinyxml, squirrel, astyle libraries
Patch10: codeblocks-13.12-unbundle.patch
+# set Fedora specific paths for spellchecker and thesaurus
+Patch11: codeblocks-13.12-spellchecker-settings.patch
# wxTreeItemId needs to be initialized with long int
Patch13: codeblocks-wxtreeitemid.patch
+# backported change for astyle 2.05 (F >= 22)
+Patch14: codeblocks-13.12-astyle-2.05.patch
%define pkgdatadir %{_datadir}/%{name}
%define pkglibdir %{_libdir}/%{name}
@@ -128,7 +132,11 @@ Additional Code::Blocks plug-ins.
%setup -q
%endif
%patch10 -p1
+%patch11 -p1
%patch13 -p1
+%if %{?fedora} >= 22
+%patch14 -p1
+%endif
%if %{snapshot}
# generate revision.m4
@@ -393,13 +401,17 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Nov 21 2014 Dan Horák <dan[at]danny.cz> - 13.12-11
+- set Fedora specific paths for spellchecker and thesaurus in the SpellChecker plugin
+- update for astyle 2.05 (#1166377)
+
* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 13.12-10
- udate mime scriptlet
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.12-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-* Mon Aug 14 2014 Richard Hughes <richard at hughsie.com> - 13.12-8
+* Thu Aug 14 2014 Richard Hughes <richard at hughsie.com> - 13.12-8
- Make the MetaInfo file validate
* Mon Jul 07 2014 Richard Hughes <richard at hughsie.com> - 13.12-7
More information about the scm-commits
mailing list