[codeblocks] - unbundle astyle library (#1050825)
Dan Horák
sharkcz at fedoraproject.org
Fri Mar 21 21:46:25 UTC 2014
commit 080fe18c688216b0cba85d08c38090d7ebd399a3
Author: Dan Horák <dan at danny.cz>
Date: Fri Mar 21 22:46:25 2014 +0100
- unbundle astyle library (#1050825)
codeblocks-13.12-unbundle.patch | 311 ++++++++++++++++++++++++++++++---------
codeblocks.spec | 12 +-
2 files changed, 248 insertions(+), 75 deletions(-)
---
diff --git a/codeblocks-13.12-unbundle.patch b/codeblocks-13.12-unbundle.patch
index 52acfd0..dfdd650 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: Dan Horak <dan at danny.cz>
Date: Wed, 13 May 2009 10:21:19 +0200
-Subject: [PATCH 01/36] add check for tinyxml into configure
+Subject: [PATCH 01/37] 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.1.4
+1.8.5.3
From 928cfb033583dfd6cad19cb45f6de9066a3c1487 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/36] move tinywxuni.h header from tinyxml into sdk
+Subject: [PATCH 02/37] move tinywxuni.h header from tinyxml into sdk
---
src/include/Makefile.am | 1 +
@@ -266,13 +266,13 @@ index 1fd2024..e0b1f24 100644
//***********************************************************************
--
-1.8.1.4
+1.8.5.3
From 8c34c37fdd1fd5892dd879debe82cfddee85df5e 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/36] move tinywxuni.cpp implementation from tinyxml into sdk
+Subject: [PATCH 03/37] move tinywxuni.cpp implementation from tinyxml into sdk
---
src/base/tinyxml/Makefile.am | 2 +-
@@ -432,13 +432,13 @@ index 0000000..57f48e3
+}
+
--
-1.8.1.4
+1.8.5.3
From b6cf081205e8b943f161f5b75a46e675a8e64ce4 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/36] update C::B projects with new locations of tinywxuni
+Subject: [PATCH 04/37] update C::B projects with new locations of tinywxuni
---
src/CodeBlocks-unix.cbp | 4 ++--
@@ -490,13 +490,13 @@ index 0f973ab..adf972b 100644
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
--
-1.8.1.4
+1.8.5.3
From db7a8721117026ca7e1f52b8f8bcbf9e3c792f46 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/36] convert autorevision to new tinyxml handling
+Subject: [PATCH 05/37] 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.1.4
+1.8.5.3
From 2ae5531188b7d0674620e54b182c11e0c61a57c6 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/36] convert sdk to new tinyxml handling
+Subject: [PATCH 06/37] convert sdk to new tinyxml handling
---
src/include/configmanager.h | 3 +--
@@ -677,13 +677,13 @@ index accbd05..018a9bd 100644
WorkspaceLoader::WorkspaceLoader()
--
-1.8.1.4
+1.8.5.3
From 8d9c0de74f7f5dacf1e1fbe02d2b71c35a2d09ad 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/36] update codecompletion plugin
+Subject: [PATCH 07/37] 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.1.4
+1.8.5.3
From a7b7731ba3b7046c2a77f2c33a9fa14e93950c33 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/36] update codesnippets plugin
+Subject: [PATCH 08/37] 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.1.4
+1.8.5.3
From f443969492824ed84097acd031c62c4ed1cae191 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/36] update envvars plugin
+Subject: [PATCH 09/37] 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.1.4
+1.8.5.3
From 8c61ee941dbc3d845f1ab47f2d080ebdc10d86d2 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/36] update BrowseTracker plugin
+Subject: [PATCH 10/37] update BrowseTracker plugin
---
src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +-
@@ -871,13 +871,13 @@ index ebd5650..7115870 100644
pluginlib_LTLIBRARIES = libBrowseTracker.la
--
-1.8.1.4
+1.8.5.3
From b0ba74a8d284c1c54f3c0f8cad9d1110ffa73337 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/36] update Valgrind plugin
+Subject: [PATCH 11/37] 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.1.4
+1.8.5.3
From 2a11b3af7b9dc71075d9c5c2ed797ec6b806b8ff 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/36] convert AutoVersioning plugin
+Subject: [PATCH 12/37] 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.1.4
+1.8.5.3
From 321776b3c0b1d2c64f7c71480d012ef379c0cb93 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/36] convert lib_finder plugin
+Subject: [PATCH 13/37] 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.1.4
+1.8.5.3
From 3e7ad38521cc950da2d2b26b01d14d36afb66bbf 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/36] convert wxSmith plugin
+Subject: [PATCH 14/37] 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.1.4
+1.8.5.3
From 1a3450998fa22044ee0536a3ff22c9a0a972c1ee 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/36] convert cb_share_config tool
+Subject: [PATCH 15/37] 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.1.4
+1.8.5.3
From f1ba7b4854d59550af53f488e5c06d0194bdde0f 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/36] build local copy of tinyxml library only when no system
+Subject: [PATCH 16/37] 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.1.4
+1.8.5.3
From 81f96b81b2e5cecd76aac48f137c11d72d9981ed 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/36] fix include dirs for the main app when system tinyxml
+Subject: [PATCH 17/37] 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.1.4
+1.8.5.3
From 4395f32aac48dc210dfca123142055c4062d11fb 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/36] use/install local timyxml headers only when a
+Subject: [PATCH 18/37] 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.1.4
+1.8.5.3
From 1463a4bf2b556267a18e6298377785017f581fb1 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/36] fix linking with tinyxml in the codesnippets plugin
+Subject: [PATCH 19/37] 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.1.4
+1.8.5.3
From 035e1aee923d1678a9ab8afb5f3fe4bef4b5c078 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/36] fix tinyxml includes in the help plugin
+Subject: [PATCH 20/37] 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.1.4
+1.8.5.3
From 7899a4b1c0afb576a92d9f014cef7398e467fcc9 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/36] fix tinyxml includes in the wxSmithAui plugin
+Subject: [PATCH 21/37] 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.1.4
+1.8.5.3
From 8986bf6d90ad640e7ae1a628725eb5810dc6ee91 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/36] fix tinyxml includes in the MouseSap plugin
+Subject: [PATCH 22/37] 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.1.4
+1.8.5.3
From 3e821940a0c7dfec7f46c1b875f97189a1177205 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/36] fix tinyxml includes in the DoxyBlocks plugin
+Subject: [PATCH 23/37] 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.1.4
+1.8.5.3
From 5cf0e20d5b59410c5103c318fad44f6c73288c8d 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/36] fix tinyxml includes in the NassiShneiderman plugin
+Subject: [PATCH 24/37] 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.1.4
+1.8.5.3
From de25009da8e358ede39832ce564f35c846243247 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/36] fix tinyxml includes in the ReopenEditor plugin
+Subject: [PATCH 25/37] 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.1.4
+1.8.5.3
From 9ee64d3cf3b806463dba4e78f3bad12ec2eba941 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/36] fix tinyxml includes in the DoxyBlock plugin
+Subject: [PATCH 26/37] 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.1.4
+1.8.5.3
From dfe05fa173c9fc198f8f62ac1be7496eab1678ec 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/36] fix tinyxml includes in the CppCheck plugin
+Subject: [PATCH 27/37] 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.1.4
+1.8.5.3
From da633ad64298c9c4e12cd8f9a8896c4bdba40a92 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/36] fix include dirs for the main app when system tinyxml
+Subject: [PATCH 28/37] 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.1.4
+1.8.5.3
From 8ea1b6175a0ca367f59a6edea90b3ec87b14412c 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/36] fix tinyxml includes in projectimporter plugin
+Subject: [PATCH 29/37] 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.1.4
+1.8.5.3
From 19a01f30c3fa30d87531a60354d1b75624921e2b 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/36] add check for squirrel to configure.in
+Subject: [PATCH 30/37] 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.1.4
+1.8.5.3
From 83caea37982546a1cfe632c6b52b6f87a06020bb 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/36] disable unicode for squirrel
+Subject: [PATCH 31/37] 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.1.4
+1.8.5.3
From 0cd7273c88ba6ed3d3415b5ed221e2488c0e1d50 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/36] convert includes to system squirrel
+Subject: [PATCH 32/37] 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.1.4
+1.8.5.3
From 6d58c3828d7210a1e65288f027fd273b3126cf19 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/36] convert sdk to system squirrel
+Subject: [PATCH 33/37] convert sdk to system squirrel
---
src/sdk/Makefile.am | 11 ++++++++---
@@ -2178,13 +2178,13 @@ index 2cdd579..4c0cf53 100644
noinst_LTLIBRARIES = libsqplus.la
--
-1.8.1.4
+1.8.5.3
From 9c37f768fae5af4f6960b4b36e82d05034054b29 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/36] convert main to system squirrel
+Subject: [PATCH 34/37] 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.1.4
+1.8.5.3
From 9054307262f98d1220d80d45ac3cce1b6e363f00 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/36] convert plugins to system squirrel
+Subject: [PATCH 35/37] 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.1.4
+1.8.5.3
From a7d4fda515ae6f4377a7df9fbc058e703a6dfd26 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/36] switch to AM_CPPFLAGS from INCLUDES
+Subject: [PATCH 36/37] switch to AM_CPPFLAGS from INCLUDES
---
src/include/Makefile.am | 6 +++---
@@ -3124,5 +3124,172 @@ index 689861a..9f94d47 100644
cb_share_config_LDFLAGS =
--
-1.8.1.4
+1.8.5.3
+
+
+From 5b481f09585b000d80d5d8b2e9968393933803f8 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
+
+- use system provided astyle library
+- rename the plugin so it doesn't clash with the library name we need to link with
+---
+ configure.ac | 2 ++
+ src/plugins/astyle/Makefile.am | 21 ++++++++++++++-------
+ src/plugins/astyle/asstreamiterator.h | 2 +-
+ src/plugins/astyle/dlgformattersettings.cpp | 2 +-
+ src/plugins/astyle/dlgformattersettings.h | 2 +-
+ src/plugins/astyle/formattersettings.cpp | 2 +-
+ src/plugins/astyle/formattersettings.h | 2 +-
+ src/plugins/astyle/resources/Makefile.am | 6 +++---
+ 8 files changed, 24 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2617746..9c123a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,12 +68,14 @@ save_CPP=$CPP
+ CC=$CXX
+ CPP=$CXXCPP
+ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no])
++AC_CHECK_HEADER(astyle.h, [HAVE_ASTYLE=yes], [HAVE_ASTYLE=no])
+ CC=$save_CC
+ CPP=$save_CPP
+
+ AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_ZLIB" = yes])
+ AM_CONDITIONAL([HAVE_BZIP2], [test "$HAVE_BZIP2" = yes])
+ AM_CONDITIONAL([HAVE_TINYXML], [test "$HAVE_TINYXML" = yes])
++AM_CONDITIONAL([HAVE_ASTYLE], [test "$HAVE_ASTYLE" = yes])
+
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
+ PKG_PROG_PKG_CONFIG
+diff --git a/src/plugins/astyle/Makefile.am b/src/plugins/astyle/Makefile.am
+index a84e3a9..0b5c231 100644
+--- a/src/plugins/astyle/Makefile.am
++++ b/src/plugins/astyle/Makefile.am
+@@ -1,27 +1,34 @@
+ SUBDIRS = resources
+
+ AM_CPPFLAGS = $(WX_CXXFLAGS) \
+- -I$(top_srcdir)/src/plugins/astyle/astyle \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
+
++if ! HAVE_ASTYLE
++AM_CPPFLAGS += -I$(top_srcdir)/src/plugins/astyle/astyle
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+
+-pluginlib_LTLIBRARIES = libastyle.la
++pluginlib_LTLIBRARIES = libAstyle.la
+
+-libastyle_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libAstyle_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+
+-libastyle_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS)
++libAstyle_la_LIBADD = ../../sdk/libcodeblocks.la $(WX_LIBS)
+
+-libastyle_la_SOURCES = asstreamiterator.cpp \
++libAstyle_la_SOURCES = asstreamiterator.cpp \
+ astyleconfigdlg.cpp \
+ astyleplugin.cpp \
+ dlgformattersettings.cpp \
+- formattersettings.cpp \
+- astyle/ASBeautifier.cpp \
++ formattersettings.cpp
++if ! HAVE_ASTYLE
++libAstyle_la_SOURCES += astyle/ASBeautifier.cpp \
+ astyle/ASEnhancer.cpp \
+ astyle/ASFormatter.cpp \
+ astyle/ASResource.cpp
++else
++libAstyle_la_LIBADD += -lastyle
++endif
+
+ noinst_HEADERS = asstreamiterator.h \
+ astyleconfigdlg.h \
+diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h
+index d30398d..7679c7f 100644
+--- a/src/plugins/astyle/asstreamiterator.h
++++ b/src/plugins/astyle/asstreamiterator.h
+@@ -10,7 +10,7 @@
+ #include <wx/string.h>
+ #include <cbeditor.h>
+ #include <vector>
+-#include "astyle/astyle.h"
++#include <astyle.h>
+
+ class ASStreamIterator : public astyle::ASSourceIterator
+ {
+diff --git a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp
+index 30dca00..4e31963 100644
+--- a/src/plugins/astyle/dlgformattersettings.cpp
++++ b/src/plugins/astyle/dlgformattersettings.cpp
+@@ -69,7 +69,7 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setBlockIndent(XRCCTRL(*m_dlg, "chkIndentBlocks", wxCheckBox)->GetValue());
+ formatter.setNamespaceIndent(XRCCTRL(*m_dlg, "chkIndentNamespaces", wxCheckBox)->GetValue());
+ formatter.setLabelIndent(XRCCTRL(*m_dlg, "chkIndentLabels", wxCheckBox)->GetValue());
+- formatter.setPreprocessorIndent(XRCCTRL(*m_dlg, "chkIndentPreprocessor", wxCheckBox)->GetValue());
++ formatter.setPreprocDefineIndent(XRCCTRL(*m_dlg, "chkIndentPreprocessor", wxCheckBox)->GetValue());
+ formatter.setIndentCol1CommentsMode(XRCCTRL(*m_dlg, "chkIndentCol1Comments", wxCheckBox)->GetValue());
+
+ wxString pointerAlign = XRCCTRL(*m_dlg, "cmbPointerAlign", wxComboBox)->GetValue();
+diff --git a/src/plugins/astyle/dlgformattersettings.h b/src/plugins/astyle/dlgformattersettings.h
+index 61d0520..ad2a313 100644
+--- a/src/plugins/astyle/dlgformattersettings.h
++++ b/src/plugins/astyle/dlgformattersettings.h
+@@ -10,7 +10,7 @@
+ #ifndef DLGFORMATTERSETTINGS_H
+ #define DLGFORMATTERSETTINGS_H
+
+-#include "astyle/astyle.h"
++#include <astyle.h>
+
+ class wxWindow;
+
+diff --git a/src/plugins/astyle/formattersettings.cpp b/src/plugins/astyle/formattersettings.cpp
+index ff8b1bc..3ee5d09 100644
+--- a/src/plugins/astyle/formattersettings.cpp
++++ b/src/plugins/astyle/formattersettings.cpp
+@@ -98,7 +98,7 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
+ formatter.setBlockIndent(cfg->ReadBool(_T("/indent_blocks")));
+ formatter.setNamespaceIndent(cfg->ReadBool(_T("/indent_namespaces")));
+ formatter.setLabelIndent(cfg->ReadBool(_T("/indent_labels")));
+- formatter.setPreprocessorIndent(cfg->ReadBool(_T("/indent_preprocessor")));
++ formatter.setPreprocDefineIndent(cfg->ReadBool(_T("/indent_preprocessor")));
+ formatter.setIndentCol1CommentsMode(cfg->ReadBool(_T("/indent_col1_comments")));
+
+ wxString pointerAlign = cfg->Read(_T("/pointer_align"));
+diff --git a/src/plugins/astyle/formattersettings.h b/src/plugins/astyle/formattersettings.h
+index 0f88a3c..431d0fa 100644
+--- a/src/plugins/astyle/formattersettings.h
++++ b/src/plugins/astyle/formattersettings.h
+@@ -6,7 +6,7 @@
+ #ifndef FORMATTERSETTINGS_H
+ #define FORMATTERSETTINGS_H
+
+-#include "astyle/astyle.h"
++#include <astyle.h>
+
+ class FormatterSettings
+ {
+diff --git a/src/plugins/astyle/resources/Makefile.am b/src/plugins/astyle/resources/Makefile.am
+index f7ca9bb..89c337a 100644
+--- a/src/plugins/astyle/resources/Makefile.am
++++ b/src/plugins/astyle/resources/Makefile.am
+@@ -1,7 +1,7 @@
+ EXTRA_DIST = configuration.xrc manifest.xml
+
+-pkgdata_DATA = astyle.zip
++pkgdata_DATA = Astyle.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+-astyle.zip: $(EXTRA_DIST)
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip manifest.xml *.xrc > /dev/null
++Astyle.zip: $(EXTRA_DIST)
++ PWD=`pwd` cd $(srcdir) && zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null
+--
+1.8.5.3
diff --git a/codeblocks.spec b/codeblocks.spec
index d5b892e..10fc469 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
Name: codeblocks
Version: 13.12
-Release: 2%{?svnrelease}%{?dist}
+Release: 3%{?svnrelease}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv3+
@@ -34,6 +34,9 @@ BuildRequires: hunspell-devel
%if 0%{?fedora}
BuildRequires: squirrel-devel
%endif
+%if 0%{?fedora} >= 21
+BuildRequires: astyle-devel
+%endif
BuildRequires: gamin-devel
BuildRequires: zip
BuildRequires: dos2unix
@@ -217,7 +220,7 @@ update-mime-database /usr/share/mime &> /dev/null || :
%dir %{pkglibdir}
%dir %{plugindir}
-%{plugindir}/libastyle.so
+%{plugindir}/libAstyle.so
%{plugindir}/libautosave.so
%{plugindir}/libclasswizard.so
%{plugindir}/libcodecompletion.so
@@ -249,7 +252,7 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{pkgdatadir}/lexers
%{pkgdatadir}/scripts
%{pkgdatadir}/templates
-%{pkgdatadir}/astyle.zip
+%{pkgdatadir}/Astyle.zip
%{pkgdatadir}/autosave.zip
%{pkgdatadir}/classwizard.zip
%{pkgdatadir}/codecompletion.zip
@@ -385,6 +388,9 @@ update-mime-database /usr/share/mime &> /dev/null || :
%changelog
+* Thu Mar 20 2014 Dan Horák <dan[at]danny.cz> - 13.12-3
+- unbundle astyle library (#1050825)
+
* Wed Feb 26 2014 Dan Horák <dan[at]danny.cz> - 13.12-2
- move the Occurrences Highlighting plugin to the main package (#1068971)
More information about the scm-commits
mailing list