[codeblocks] - update to final 12.11 release (svn revision 8629)
Dan Horák
sharkcz at fedoraproject.org
Tue Sep 3 13:11:12 UTC 2013
commit 8248b2804aab1beb523e96025d25837fb4762562
Author: Dan Horák <dan at danny.cz>
Date: Tue Sep 3 15:10:59 2013 +0200
- update to final 12.11 release (svn revision 8629)
.gitignore | 1 +
codeblocks-10.05-D.patch | 482 ----------------------
codeblocks-autorev.patch | 43 ++
codeblocks-dso.patch | 26 --
codeblocks-gcc47.patch | 33 --
codeblocks-squirrel.patch | 498 ++++++++++++++---------
codeblocks-tinyxml-26.patch | 79 ----
codeblocks-tinyxml.patch | 914 ++++++++++++++++++++++++++---------------
codeblocks-wxtreeitemid.patch | 101 +++++
codeblocks.spec | 181 ++++++--
sources | 2 +-
11 files changed, 1166 insertions(+), 1194 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f75d588..459a53e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
codeblocks-10.05-src.tar.bz2
+/codeblocks_12.11-1.tar.gz
diff --git a/codeblocks-autorev.patch b/codeblocks-autorev.patch
new file mode 100644
index 0000000..5b1cbce
--- /dev/null
+++ b/codeblocks-autorev.patch
@@ -0,0 +1,43 @@
+From 691468b112193bd6577059a08511a529e233c386 Mon Sep 17 00:00:00 2001
+From: Dan Horak <dan at danny.cz>
+Date: Mon, 19 Jan 2009 11:40:00 +0100
+Subject: [PATCH] use pregenerated revision.m4
+
+---
+ bootstrap | 9 ---------
+ src/Makefile.am | 2 +-
+ 2 files changed, 1 insertions(+), 10 deletions(-)
+
+diff --git a/bootstrap b/bootstrap
+index 8c08bec..e8d3312 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -6,15 +6,6 @@
+ # - automake 1.7+, 1.9+ for make dist
+ # - libtool 1.4+
+
+-# Touch revision.m4
+-if [ -f ./update_revision.sh ]; then
+- ./update_revision.sh;
+-elif [ ! -f ./revision.m4 ]; then
+- echo "m4_define([SVN_REV], 0)" > ./revision.m4;
+- echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4;
+- echo "m4_define([SVN_DATE], )" >> ./revision.m4;
+-fi
+-
+ # Deal with some gentoo-specific issues
+ WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits
+ export WANT_AUTOMAKE
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 776b136..9a661f4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = include base build_tools mime sdk src plugins tools templates scripts wxsmith
++SUBDIRS = include base mime sdk src plugins tools templates scripts wxsmith
+
+ dist_pkgdata_DATA = tips.txt
+
+--
+1.7.4.4
+
diff --git a/codeblocks-squirrel.patch b/codeblocks-squirrel.patch
index faae6a0..74e9ecf 100644
--- a/codeblocks-squirrel.patch
+++ b/codeblocks-squirrel.patch
@@ -1,7 +1,17 @@
-diff -up codeblocks-10.05-release/configure.in.squirrel codeblocks-10.05-release/configure.in
---- codeblocks-10.05-release/configure.in.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/configure.in 2012-01-15 11:01:47.000000000 +0100
-@@ -62,11 +62,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML
+From 780fd5112ef72573c0075ef7ab12d63fad9cbbb9 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 1/6] add check for squirrel to configure.in
+
+---
+ configure.in | 10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 50097b2..bbe7b32 100644
+--- a/configure.in
++++ b/configure.in
+@@ -64,11 +64,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no])
CC=$save_CC
CPP=$save_CPP
@@ -22,9 +32,49 @@ diff -up codeblocks-10.05-release/configure.in.squirrel codeblocks-10.05-release
dnl versioning info for libtool
dnl Note this is the ABI version which is not the same as our actual library version
CODEBLOCKS_CURRENT=0
-diff -up codeblocks-10.05-release/src/include/Makefile.am.squirrel codeblocks-10.05-release/src/include/Makefile.am
---- codeblocks-10.05-release/src/include/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/include/Makefile.am 2012-01-15 11:01:47.000000000 +0100
+--
+1.7.7.6
+
+
+From e8f27ca532788640482fc416f34b2420bcaf7860 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 2/6] disable unicode for squirrel
+
+---
+ src/include/scripting/sqplus/sqplus.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
+index c114ccc..a0df415 100644
+--- a/src/include/scripting/sqplus/sqplus.h
++++ b/src/include/scripting/sqplus/sqplus.h
+@@ -47,6 +47,7 @@
+ #define SQ_CALL_RAISE_ERROR SQFalse
+ #endif
+
++#undef _UNICODE
+ #include "squirrel.h"
+
+ // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types
+--
+1.7.7.6
+
+
+From 5f2ad259400f0acdd9e20e246cde9a3574bacd77 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 3/6] convert includes to system squirrel
+
+---
+ src/include/Makefile.am | 7 ++++++-
+ src/include/scripting/Makefile.am | 5 ++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/Makefile.am b/src/include/Makefile.am
+index 4783386..1dd5411 100644
+--- a/src/include/Makefile.am
++++ b/src/include/Makefile.am
@@ -10,7 +10,6 @@ endif
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
@@ -46,29 +96,202 @@ diff -up codeblocks-10.05-release/src/include/Makefile.am.squirrel codeblocks-10
# Because we are not generating any programs/libraries with this makefile,
# $(CXXCOMPILE) is empty.
# Create the basic one here:
-diff -up codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/include/scripting/Makefile.am
---- codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel 2010-05-22 12:32:39.000000000 +0200
-+++ codeblocks-10.05-release/src/include/scripting/Makefile.am 2012-01-15 11:01:47.000000000 +0100
+diff --git a/src/include/scripting/Makefile.am b/src/include/scripting/Makefile.am
+index 39ea807..36adf08 100644
+--- a/src/include/scripting/Makefile.am
++++ b/src/include/scripting/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = squirrel sqstdlib sqplus bindings include
+SUBDIRS = sqplus bindings
+if ! HAVE_SQUIRREL
+SUBDIRS += squirrel sqstdlib include
+endif
-diff -up codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h
---- codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel 2010-05-22 12:32:39.000000000 +0200
-+++ codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h 2012-01-15 11:01:47.000000000 +0100
-@@ -47,6 +47,7 @@
- #define SQ_CALL_RAISE_ERROR SQFalse
- #endif
+--
+1.7.7.6
+
+
+From 4d5570557c4ba8a936b3edcb5876b63d9324b3f4 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 4/6] convert sdk to system squirrel
+
+---
+ src/sdk/Makefile.am | 11 ++++++++---
+ src/sdk/scripting/Makefile.am | 6 +++++-
+ src/sdk/scripting/bindings/Makefile.am | 8 +++++++-
+ src/sdk/scripting/sqplus/Makefile.am | 9 +++++++--
+ 4 files changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
+index eefb3d8..4bc90ec 100644
+--- a/src/sdk/Makefile.am
++++ b/src/sdk/Makefile.am
+@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ $(WXPROPGRID_INCLUDE) \
+- -I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/bindings \
+ -I$(top_srcdir)/src/include/scripting/sqplus \
+ -I$(top_srcdir)/src/include/mozilla_chardet
+@@ -16,8 +15,6 @@ libcodeblocks_la_LDFLAGS = -version-info @CODEBLOCKS_VERSION_INFO@
+ libcodeblocks_la_LIBADD = $(WX_LIBS) \
+ scripting/bindings/libsqbindings.la \
+ scripting/sqplus/libsqplus.la \
+- scripting/sqstdlib/libsqstdlib.la \
+- scripting/squirrel/libsquirrel.la \
+ wxscintilla/libwxscintilla.la \
+ $(WXPROPGRID_LIB)
-+#undef _UNICODE
- #include "squirrel.h"
+@@ -28,6 +25,14 @@ else
+ libcodeblocks_la_LIBADD += -ltinyxml
+ endif
- // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types
-diff -up codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am
---- codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am 2012-01-15 11:02:00.000000000 +0100
++if HAVE_SQUIRREL
++INCLUDES += $(SQUIRREL_CFLAGS)
++libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS)
++else
++INCLUDES += -I$(top_srcdir)/src/include/scripting/include
++libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la
++endif
++
+ libcodeblocks_la_SOURCES = annoyingdialog.cpp \
+ autodetectcompilers.cpp \
+ base64.cpp \
+diff --git a/src/sdk/scripting/Makefile.am b/src/sdk/scripting/Makefile.am
+index f2bff06..f1a5d1c 100644
+--- a/src/sdk/scripting/Makefile.am
++++ b/src/sdk/scripting/Makefile.am
+@@ -1 +1,5 @@
+-SUBDIRS = squirrel sqstdlib sqplus bindings
++SUBDIRS = sqplus bindings
++if ! HAVE_SQUIRREL
++SUBDIRS += squirrel sqstdlib
++endif
++
+diff --git a/src/sdk/scripting/bindings/Makefile.am b/src/sdk/scripting/bindings/Makefile.am
+index ecf1fc8..0e632d5 100644
+--- a/src/sdk/scripting/bindings/Makefile.am
++++ b/src/sdk/scripting/bindings/Makefile.am
+@@ -1,10 +1,16 @@
+ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+- -I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/bindings \
+ -I$(top_srcdir)/src/include/scripting/sqplus
+
++if HAVE_SQUIRREL
++INCLUDES += $(SQUIRREL_CFLAGS)
++else
++INCLUDES += -I$(top_srcdir)/src/include/scripting/include
++endif
++
++
+ noinst_LTLIBRARIES = libsqbindings.la
+
+ libsqbindings_la_SOURCES = scriptbindings.cpp \
+diff --git a/src/sdk/scripting/sqplus/Makefile.am b/src/sdk/scripting/sqplus/Makefile.am
+index deb87f3..fbf351b 100644
+--- a/src/sdk/scripting/sqplus/Makefile.am
++++ b/src/sdk/scripting/sqplus/Makefile.am
+@@ -1,5 +1,10 @@
+-INCLUDES = -I$(top_srcdir)/src/include/scripting/include \
+- -I$(top_srcdir)/src/include/scripting/sqplus
++if HAVE_SQUIRREL
++INCLUDES = $(SQUIRREL_CFLAGS)
++else
++INCLUDES = -I$(top_srcdir)/src/include/scripting/include
++endif
++
++INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus
+
+ noinst_LTLIBRARIES = libsqplus.la
+
+--
+1.7.7.6
+
+
+From 94bfad10d512a0314f28a9db5b03ab3a189daaad 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 5/6] convert main to system squirrel
+
+---
+ src/src/Makefile.am | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/src/Makefile.am b/src/src/Makefile.am
+index f1f79fb..02bcfcb 100644
+--- a/src/src/Makefile.am
++++ b/src/src/Makefile.am
+@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ $(WXPROPGRID_INCLUDE) \
+ -I$(top_srcdir)/src/include \
+- -I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/sqplus \
+ -I$(top_srcdir)/src/include/mozilla_chardet
+
+@@ -12,6 +11,13 @@ if ! HAVE_TINYXML
+ INCLUDES += -I$(top_srcdir)/src/include/tinyxml
+ endif
+
++if HAVE_SQUIRREL
++INCLUDES += $(SQUIRREL_CFLAGS)
++else
++INCLUDES += -I$(top_srcdir)/src/include/scripting/include
++endif
++
++
+ if GTK_NOTEBOOK
+ GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK
+ endif
+--
+1.7.7.6
+
+
+From 796368d5adfe62f8c96fa8bc93ddab458a692304 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 6/6] convert plugins to system squirrel
+
+---
+ src/plugins/abbreviations/Makefile.am | 6 +++++-
+ src/plugins/compilergcc/Makefile.am | 7 ++++++-
+ src/plugins/contrib/envvars/Makefile.am | 7 ++++++-
+ src/plugins/contrib/help_plugin/Makefile.am | 10 +++++++++-
+ src/plugins/contrib/lib_finder/Makefile.am | 8 ++++++--
+ src/plugins/contrib/wxSmith/Makefile.am | 8 ++++++--
+ src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 8 ++++++--
+ src/plugins/debuggergdb/Makefile.am | 7 ++++++-
+ src/plugins/scriptedwizard/Makefile.am | 7 ++++++-
+ 9 files changed, 56 insertions(+), 12 deletions(-)
+
+diff --git a/src/plugins/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am
+index 0cc25a0..dcf7605 100644
+--- a/src/plugins/abbreviations/Makefile.am
++++ b/src/plugins/abbreviations/Makefile.am
+@@ -3,10 +3,14 @@ SUBDIRS = resources
+ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+- -I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/sqplus \
+ -I$(top_srcdir)/src/include/scripting/bindings
+
++if HAVE_SQUIRREL
++INCLUDES += $(SQUIRREL_CFLAGS)
++else
++INCLUDES += -I$(top_srcdir)/src/include/scripting/include
++endif
+
+ pluginlibdir = $(pkglibdir)/plugins
+
+diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am
+index 470a04a..8c80ce9 100644
+--- a/src/plugins/compilergcc/Makefile.am
++++ b/src/plugins/compilergcc/Makefile.am
@@ -3,10 +3,15 @@ SUBDIRS = depslib resources
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
@@ -86,9 +309,34 @@ diff -up codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel c
AM_CXXFLAGS = -DDEPSLIB_UNIX
pluginlibdir = $(pkglibdir)/plugins
-diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am 2012-01-15 11:02:00.000000000 +0100
+diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am
+index 854498d..f419c87 100644
+--- a/src/plugins/contrib/envvars/Makefile.am
++++ b/src/plugins/contrib/envvars/Makefile.am
+@@ -1,6 +1,5 @@
+ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+- -I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/sqplus \
+ -I$(top_srcdir)/src/include/scripting/bindings \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
+@@ -9,6 +8,12 @@ if ! HAVE_TINYXML
+ INCLUDES += -I$(top_srcdir)/src/include/tinyxml
+ endif
+
++if HAVE_SQUIRREL
++INCLUDES += $(SQUIRREL_CFLAGS)
++else
++INCLUDES += -I$(top_srcdir)/src/include/scripting/include
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+ pkgdata_DATA = envvars.zip
+
+diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am
+index 1fbb566..96def6f 100644
+--- a/src/plugins/contrib/help_plugin/Makefile.am
++++ b/src/plugins/contrib/help_plugin/Makefile.am
@@ -10,7 +10,6 @@ endif
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
@@ -97,18 +345,7 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.sq
-I$(top_srcdir)/src/include/scripting/bindings \
-I$(top_srcdir)/src/include/scripting/sqplus
-@@ -23,9 +22,7 @@ libhelp_plugin_la_LDFLAGS = -module -ver
- libhelp_plugin_la_LIBADD = $(PLUGIN_WX_LIBS) \
- ../../../sdk/libcodeblocks.la \
- ../../../sdk/scripting/bindings/libsqbindings.la \
-- ../../../sdk/scripting/sqplus/libsqplus.la \
-- ../../../sdk/scripting/sqstdlib/libsqstdlib.la \
-- ../../../sdk/scripting/squirrel/libsquirrel.la
-+ ../../../sdk/scripting/sqplus/libsqplus.la
-
- if ! HAVE_BZIP2
- libhelp_plugin_la_LIBADD += bzip2/libbzip2.la
-@@ -44,6 +41,15 @@ if ! HAVE_TINYXML
+@@ -40,6 +39,15 @@ if ! HAVE_TINYXML
INCLUDES += -I$(top_srcdir)/src/include/tinyxml
endif
@@ -124,13 +361,14 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.sq
libhelp_plugin_la_SOURCES = help_common.cpp \
HelpConfigDialog.cpp \
help_plugin.cpp \
-diff -up codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am
---- codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am 2012-01-15 11:02:00.000000000 +0100
+diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am
+index 3422f9f..e5de339 100644
+--- a/src/plugins/contrib/lib_finder/Makefile.am
++++ b/src/plugins/contrib/lib_finder/Makefile.am
@@ -4,9 +4,7 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(srcdir)/../wxSmithContribItems/wxflatnotebook/wxFlatNotebook/include \
+ -I$(srcdir)/../wxContribItems/wxFlatNotebook/include \
- -I$(top_srcdir)/src/include/scripting/include \
-I$(top_srcdir)/src/include/scripting/sqplus \
- -I$(top_srcdir)/src/include/scripting/squirrel \
@@ -150,19 +388,20 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squ
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = liblib_finder.la
-diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am 2012-01-15 11:07:13.000000000 +0100
-@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID
- INCLUDES = $(WX_CXXFLAGS) \
+diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am
+index 2227929..dbfafc6 100644
+--- a/src/plugins/contrib/wxSmith/Makefile.am
++++ b/src/plugins/contrib/wxSmith/Makefile.am
+@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
+ $(WXPROPGRID_INCLUDE) \
- -I$(top_srcdir)/src/include/scripting/include \
- -I$(top_srcdir)/src/include/scripting/squirrel \
-I$(top_srcdir)/src/include/scripting/sqplus \
-I$(top_srcdir)/src/include/scripting/bindings \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include \
-@@ -16,6 +14,12 @@ if ! HAVE_TINYXML
+ -I$(top_srcdir)/src/include/mozilla_chardet
+@@ -14,6 +12,12 @@ if ! HAVE_TINYXML
INCLUDES += -I$(top_srcdir)/src/include/tinyxml
endif
@@ -175,19 +414,20 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirr
lib_LTLIBRARIES = libwxsmithlib.la
libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared
-diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
---- codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am 2012-01-15 11:07:28.000000000 +0100
-@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID
- INCLUDES = $(WX_CXXFLAGS) \
+diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
+index abbc6a1..331bf10 100644
+--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
++++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
+@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
+ $(WXPROPGRID_INCLUDE) \
- -I$(top_srcdir)/src/include/scripting/include \
- -I$(top_srcdir)/src/include/scripting/squirrel \
-I$(top_srcdir)/src/include/scripting/sqplus \
- -I$(top_srcdir)/src/include/scripting/bindings \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
-@@ -15,6 +13,12 @@ if ! HAVE_TINYXML
+ -I$(top_srcdir)/src/include/scripting/bindings
+
+@@ -13,6 +11,12 @@ if ! HAVE_TINYXML
INCLUDES += -I$(top_srcdir)/src/include/tinyxml
endif
@@ -200,11 +440,12 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile
noinst_LTLIBRARIES = libwxsmith_wxwidgets.la
libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-diff -up codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am
---- codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel 2010-05-22 12:30:49.000000000 +0200
-+++ codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am 2012-01-15 11:05:13.000000000 +0100
-@@ -4,9 +4,14 @@ INCLUDES = $(WX_CXXFLAGS) \
- $(WX_GTK2_CFLAGS) \
+diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am
+index e0517f2..38cf567 100644
+--- a/src/plugins/debuggergdb/Makefile.am
++++ b/src/plugins/debuggergdb/Makefile.am
+@@ -3,9 +3,14 @@ SUBDIRS = resources
+ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/include/scripting/include \
@@ -219,9 +460,10 @@ diff -up codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel c
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libdebugger.la
-diff -up codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am
---- codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am 2012-01-15 11:02:00.000000000 +0100
+diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am
+index 5ef7f7a..432ce18 100644
+--- a/src/plugins/scriptedwizard/Makefile.am
++++ b/src/plugins/scriptedwizard/Makefile.am
@@ -3,13 +3,18 @@ SUBDIRS = resources
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
@@ -242,128 +484,6 @@ diff -up codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirre
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libscriptedwizard.la
-diff -up codeblocks-10.05-release/src/sdk/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/Makefile.am
---- codeblocks-10.05-release/src/sdk/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/sdk/Makefile.am 2012-01-15 11:03:23.000000000 +0100
-@@ -3,7 +3,7 @@ SUBDIRS = scripting wxscintilla resource
- INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
-- -I$(top_srcdir)/src/include/scripting/include \
-+ -I$(top_srcdir)/src/include/scripting/bindings \
- -I$(top_srcdir)/src/include/scripting/sqplus \
- -I$(top_srcdir)/src/include/mozilla_chardet
-
-@@ -14,8 +14,6 @@ libcodeblocks_la_LDFLAGS = -version-info
- libcodeblocks_la_LIBADD = $(WX_LIBS) \
- scripting/bindings/libsqbindings.la \
- scripting/sqplus/libsqplus.la \
-- scripting/sqstdlib/libsqstdlib.la \
-- scripting/squirrel/libsquirrel.la \
- wxscintilla/libwxscintilla.la
-
- if ! HAVE_TINYXML
-@@ -25,6 +23,14 @@ else
- libcodeblocks_la_LIBADD += -ltinyxml
- endif
-
-+if HAVE_SQUIRREL
-+INCLUDES += $(SQUIRREL_CFLAGS)
-+libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS)
-+else
-+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
-+libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la
-+endif
-+
- libcodeblocks_la_SOURCES = annoyingdialog.cpp \
- autodetectcompilers.cpp \
- base64.cpp \
-diff -up codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am
---- codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel 2010-05-22 12:02:34.000000000 +0200
-+++ codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am 2012-01-15 11:01:47.000000000 +0100
-@@ -1,10 +1,16 @@
- INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
-- -I$(top_srcdir)/src/include/scripting/include \
- -I$(top_srcdir)/src/include/scripting/bindings \
- -I$(top_srcdir)/src/include/scripting/sqplus
-
-+if HAVE_SQUIRREL
-+INCLUDES += $(SQUIRREL_CFLAGS)
-+else
-+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
-+endif
-+
-+
- noinst_LTLIBRARIES = libsqbindings.la
-
- libsqbindings_la_SOURCES = scriptbindings.cpp \
-diff -up codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/Makefile.am
---- codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel 2010-05-22 12:02:34.000000000 +0200
-+++ codeblocks-10.05-release/src/sdk/scripting/Makefile.am 2012-01-15 11:01:47.000000000 +0100
-@@ -1 +1,5 @@
--SUBDIRS = squirrel sqstdlib sqplus bindings
-+SUBDIRS = sqplus bindings
-+if ! HAVE_SQUIRREL
-+SUBDIRS += squirrel sqstdlib
-+endif
-+
-diff -up codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel codeblocks-10.05-release/src/sdk/scriptingmanager.cpp
---- codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel 2010-05-22 12:10:05.000000000 +0200
-+++ codeblocks-10.05-release/src/sdk/scriptingmanager.cpp 2012-01-15 11:01:47.000000000 +0100
-@@ -29,10 +29,10 @@
- #include "crc32.h"
- #include "menuitemsmanager.h"
- #include "genericmultilinenotesdlg.h"
--#include "scripting/sqplus/sqplus.h"
--#include "scripting/bindings/scriptbindings.h"
--#include "scripting/bindings/sc_plugin.h"
--#include "scripting/include/sqstdstring.h"
-+#include "sqplus.h"
-+#include "scriptbindings.h"
-+#include "sc_plugin.h"
-+#include "sqstdstring.h"
-
- template<> ScriptingManager* Mgr<ScriptingManager>::instance = 0;
- template<> bool Mgr<ScriptingManager>::isShutdown = false;
-diff -up codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am
---- codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel 2010-05-22 12:02:20.000000000 +0200
-+++ codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am 2012-01-15 11:01:47.000000000 +0100
-@@ -1,5 +1,10 @@
--INCLUDES = -I$(top_srcdir)/src/include/scripting/include \
-- -I$(top_srcdir)/src/include/scripting/sqplus
-+if HAVE_SQUIRREL
-+INCLUDES = $(SQUIRREL_CFLAGS)
-+else
-+INCLUDES = -I$(top_srcdir)/src/include/scripting/include
-+endif
-+
-+INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus
-
- noinst_LTLIBRARIES = libsqplus.la
-
-diff -up codeblocks-10.05-release/src/src/Makefile.am.squirrel codeblocks-10.05-release/src/src/Makefile.am
---- codeblocks-10.05-release/src/src/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100
-+++ codeblocks-10.05-release/src/src/Makefile.am 2012-01-15 11:04:29.000000000 +0100
-@@ -3,7 +3,6 @@ SUBDIRS = resources
- INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/include \
-- -I$(top_srcdir)/src/include/scripting/include \
- -I$(top_srcdir)/src/include/scripting/sqplus \
- -I$(top_srcdir)/src/include/mozilla_chardet
-
-@@ -11,6 +10,12 @@ if ! HAVE_TINYXML
- INCLUDES += -I$(top_srcdir)/src/include/tinyxml
- endif
-
-+if HAVE_SQUIRREL
-+INCLUDES += $(SQUIRREL_CFLAGS)
-+else
-+INCLUDES += -I$(top_srcdir)/src/include/scripting/include
-+endif
-+
- if CODEBLOCKS_LINUX
- AM_CPPFLAGS = -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\""
- endif
+--
+1.7.7.6
+
diff --git a/codeblocks-tinyxml.patch b/codeblocks-tinyxml.patch
index 82ed0e8..1201082 100644
--- a/codeblocks-tinyxml.patch
+++ b/codeblocks-tinyxml.patch
@@ -1,17 +1,17 @@
-From 91086f2ba50998b9ec286dad6420194806868ab9 Mon Sep 17 00:00:00 2001
+From 2e4212dcfa48ec2f8102eb90e65289517e123902 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/22] add check for tinyxml into configure
+Subject: [PATCH 01/29] add check for tinyxml into configure
---
configure.in | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
-index 17362a0..91f69bc 100644
+index d87be4e..50097b2 100644
--- a/configure.in
+++ b/configure.in
-@@ -54,9 +54,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no])
+@@ -56,9 +56,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no])
LIBS=$save_LIBS
AC_SEARCH_LIBS(BZ2_bzopen, bz2, [HAVE_BZIP2=yes], [HAVE_BZIP2=no])
LIBS=$save_LIBS
@@ -31,12 +31,13 @@ index 17362a0..91f69bc 100644
dnl versioning info for libtool
dnl Note this is the ABI version which is not the same as our actual library version
--
-1.6.6.1
+1.7.7.6
-From 3816818f35986a545163228079358adefe62d8ec Mon Sep 17 00:00:00 2001
+
+From 9c0c4e8074095be021698e17edec24f8b0ee5f63 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/22] move tinywxuni.h header from tinyxml into sdk
+Subject: [PATCH 02/29] move tinywxuni.h header from tinyxml into sdk
---
src/include/Makefile.am | 1 +
@@ -59,10 +60,10 @@ Subject: [PATCH 02/22] move tinywxuni.h header from tinyxml into sdk
delete mode 100644 src/include/tinyxml/tinywxuni.h
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
-index 07658aa..9f754da 100644
+index f093bf9..d510a22 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
-@@ -121,6 +121,7 @@ ALLHEADERS = annoyingdialog.h \
+@@ -124,6 +124,7 @@ ALLHEADERS = annoyingdialog.h \
selecttargetdlg.h \
settings.h \
templatemanager.h \
@@ -72,7 +73,7 @@ index 07658aa..9f754da 100644
virtualbuildtargetsdlg.h \
diff --git a/src/include/tinywxuni.h b/src/include/tinywxuni.h
new file mode 100644
-index 0000000..9ebf3a5
+index 0000000..b9433cc
--- /dev/null
+++ b/src/include/tinywxuni.h
@@ -0,0 +1,15 @@
@@ -84,7 +85,7 @@ index 0000000..9ebf3a5
+
+namespace TinyXML
+{
-+ bool LoadDocument(const wxString& filename, TiXmlDocument *doc);
++ bool LoadDocument(const wxString& filename, TiXmlDocument *doc);
+ TiXmlDocument* LoadDocument(const wxString& filename);
+
+ bool SaveDocument(const wxString& filename, TiXmlDocument* doc);
@@ -102,7 +103,7 @@ index fdfa2c5..c22e938 100644
+sdk_HEADERS = tinystr.h tinyxml.h
diff --git a/src/include/tinyxml/tinywxuni.h b/src/include/tinyxml/tinywxuni.h
deleted file mode 100644
-index 9ebf3a5..0000000
+index b9433cc..0000000
--- a/src/include/tinyxml/tinywxuni.h
+++ /dev/null
@@ -1,15 +0,0 @@
@@ -114,7 +115,7 @@ index 9ebf3a5..0000000
-
-namespace TinyXML
-{
-- bool LoadDocument(const wxString& filename, TiXmlDocument *doc);
+- bool LoadDocument(const wxString& filename, TiXmlDocument *doc);
- TiXmlDocument* LoadDocument(const wxString& filename);
-
- bool SaveDocument(const wxString& filename, TiXmlDocument* doc);
@@ -122,20 +123,20 @@ index 9ebf3a5..0000000
-
-#endif
diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
-index 7eeb514..30f38d4 100644
+index c6358a4..271ba52 100644
--- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
+++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
@@ -47,7 +47,7 @@
-
- #include <wx/tokenzr.h>
- #include "tinyxml/tinyxml.h"
--#include "tinyxml/tinywxuni.h"
-+#include "tinywxuni.h"
-
- #include "BrowseTrackerLayout.h"
- #include "BrowseMarks.h"
+
+ #include <wx/tokenzr.h>
+ #include "tinyxml/tinyxml.h"
+-#include "tinyxml/tinywxuni.h"
++#include "tinywxuni.h"
+
+ #include "BrowseTrackerLayout.h"
+ #include "BrowseMarks.h"
diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
-index db01cf2..b61adf8 100644
+index 886bbb7..a58776f 100644
--- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
+++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
@@ -22,7 +22,7 @@
@@ -161,7 +162,7 @@ index b03ceaa..8c2ca85 100644
// TODO: This is same as in wxsproject.h, make one set instead of two
namespace
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp
-index 77b4e69..d241a5c 100644
+index bd87a9b..51a6cb1 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp
+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp
@@ -31,7 +31,7 @@
@@ -174,7 +175,7 @@ index 77b4e69..d241a5c 100644
#if defined(__WXMSW__) && defined(LoadImage)
// Fix Windows winuser.h Header define of LoadImage.
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp
-index 9517cf3..24d5479 100644
+index 065dadf..5525ec8b 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp
+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp
@@ -31,7 +31,7 @@
@@ -187,7 +188,7 @@ index 9517cf3..24d5479 100644
#include <sc_base_types.h>
diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp
-index 2fc8726..c893274 100644
+index ff5b265..77393d3 100644
--- a/src/sdk/configmanager.cpp
+++ b/src/sdk/configmanager.cpp
@@ -43,7 +43,7 @@
@@ -200,12 +201,12 @@ index 2fc8726..c893274 100644
template<> CfgMgrBldr* Mgr<CfgMgrBldr>::instance = 0;
diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp
-index 15da26b..cceb1e9 100644
+index 384d6e8..36b797d 100644
--- a/src/sdk/globals.cpp
+++ b/src/sdk/globals.cpp
-@@ -32,7 +32,7 @@
- #include <algorithm>
+@@ -38,7 +38,7 @@
#include <string>
+
#include "filefilters.h"
-#include "tinyxml/tinywxuni.h"
+#include "tinywxuni.h"
@@ -213,7 +214,7 @@ index 15da26b..cceb1e9 100644
#ifndef __WXMSW__
diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp
-index 9cb870a..472b053 100644
+index 80f06cb..74a9612 100644
--- a/src/sdk/projectlayoutloader.cpp
+++ b/src/sdk/projectlayoutloader.cpp
@@ -23,7 +23,7 @@
@@ -226,23 +227,23 @@ index 9cb870a..472b053 100644
ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project)
: m_pProject(project),
diff --git a/src/sdk/projectloader.cpp b/src/sdk/projectloader.cpp
-index bf89f25..aa4f54f 100644
+index 2b70928..162291d 100644
--- a/src/sdk/projectloader.cpp
+++ b/src/sdk/projectloader.cpp
-@@ -31,7 +31,7 @@
+@@ -35,7 +35,7 @@
#include "projectloader_hooks.h"
#include "annoyingdialog.h"
#include "configmanager.h"
-#include "tinyxml/tinywxuni.h"
+#include "tinywxuni.h"
+ #include "filegroupsandmasks.h"
ProjectLoader::ProjectLoader(cbProject* project)
- : m_pProject(project),
diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp
-index d44b0b4..f2624be 100644
+index 3423c08..9af27ff 100644
--- a/src/sdk/workspaceloader.cpp
+++ b/src/sdk/workspaceloader.cpp
-@@ -26,7 +26,7 @@
+@@ -28,7 +28,7 @@
#include "tinyxml/tinyxml.h"
@@ -252,7 +253,7 @@ index d44b0b4..f2624be 100644
WorkspaceLoader::WorkspaceLoader()
{
diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp
-index 02803b6..f43b15c 100644
+index 335edd1..748e13e 100644
--- a/src/tools/cb_share_config/mainframe.cpp
+++ b/src/tools/cb_share_config/mainframe.cpp
@@ -24,7 +24,7 @@
@@ -265,19 +266,21 @@ index 02803b6..f43b15c 100644
//***********************************************************************
--
-1.6.6.1
+1.7.7.6
+
-From bc052dd162594f68126177d523092f43937d1936 Mon Sep 17 00:00:00 2001
+From 6ae3dd683e0fe6db3da3bad3aa7af897a5a25a62 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/22] move tinywxuni.cpp implementation from tinyxml into sdk
+Subject: [PATCH 03/29] move tinywxuni.cpp implementation from tinyxml into
+ sdk
---
src/base/tinyxml/Makefile.am | 2 +-
- src/base/tinyxml/tinywxuni.cpp | 62 ----------------------------------------
+ src/base/tinyxml/tinywxuni.cpp | 56 ----------------------------------------
src/sdk/Makefile.am | 1 +
- src/sdk/tinywxuni.cpp | 62 ++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 64 insertions(+), 63 deletions(-)
+ src/sdk/tinywxuni.cpp | 56 ++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 58 insertions(+), 57 deletions(-)
delete mode 100644 src/base/tinyxml/tinywxuni.cpp
create mode 100644 src/sdk/tinywxuni.cpp
@@ -293,30 +296,34 @@ index bc3e89d..c480f0c 100644
+libtinyxml_la_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
diff --git a/src/base/tinyxml/tinywxuni.cpp b/src/base/tinyxml/tinywxuni.cpp
deleted file mode 100644
-index 5cfc5ee..0000000
+index d156154..0000000
--- a/src/base/tinyxml/tinywxuni.cpp
+++ /dev/null
-@@ -1,62 +0,0 @@
+@@ -1,56 +0,0 @@
-#include "sdk_precomp.h"
-
-#ifndef CB_PRECOMP
--#include <wx/file.h>
--#include <wx/string.h>
--#include "filemanager.h"
--#include "manager.h"
+- #include <wx/file.h>
+- #include <wx/string.h>
+- #include "filemanager.h"
+- #include "manager.h"
-#endif
+-
-#include "tinywxuni.h"
-#include "tinyxml.h"
-
-bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc)
-{
-
-- if(!doc || !wxFile::Access(filename, wxFile::read))
+- if (!doc || !wxFile::Access(filename, wxFile::read))
- return false;
-
- wxFile file(filename);
- size_t len = file.Length();
-
+- if (!len)
+- return false;
+-
- char *input = new char[len+1];
- input[len] = '\0';
- file.Read(input, len);
@@ -330,15 +337,11 @@ index 5cfc5ee..0000000
-{
- TiXmlDocument* doc = new TiXmlDocument();
-
-- if(TinyXML::LoadDocument(filename, doc))
-- {
+- if (TinyXML::LoadDocument(filename, doc))
- return doc;
-- }
-- else
-- {
-- delete doc;
-- return 0;
-- }
+-
+- delete doc;
+- return 0;
-}
-
-bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc)
@@ -351,19 +354,13 @@ index 5cfc5ee..0000000
- doc->Accept(&printer);
-
- return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size());
--
--// wxTempFile file(filename);
--// if(file.IsOpened())
--// if(file.Write(Printer.CStr(), Printer.Size()) && file.Commit())
--// return true;
--// return false;
-}
-
diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
-index 0e84492..66a2620 100644
+index ffb588e..aea1a75 100644
--- a/src/sdk/Makefile.am
+++ b/src/sdk/Makefile.am
-@@ -101,6 +101,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \
+@@ -107,6 +107,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \
searchresultslog.cpp \
selecttargetdlg.cpp \
templatemanager.cpp \
@@ -373,30 +370,34 @@ index 0e84492..66a2620 100644
virtualbuildtargetsdlg.cpp \
diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp
new file mode 100644
-index 0000000..5cfc5ee
+index 0000000..d156154
--- /dev/null
+++ b/src/sdk/tinywxuni.cpp
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,56 @@
+#include "sdk_precomp.h"
+
+#ifndef CB_PRECOMP
-+#include <wx/file.h>
-+#include <wx/string.h>
-+#include "filemanager.h"
-+#include "manager.h"
++ #include <wx/file.h>
++ #include <wx/string.h>
++ #include "filemanager.h"
++ #include "manager.h"
+#endif
++
+#include "tinywxuni.h"
+#include "tinyxml.h"
+
+bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc)
+{
+
-+ if(!doc || !wxFile::Access(filename, wxFile::read))
++ if (!doc || !wxFile::Access(filename, wxFile::read))
+ return false;
+
+ wxFile file(filename);
+ size_t len = file.Length();
+
++ if (!len)
++ return false;
++
+ char *input = new char[len+1];
+ input[len] = '\0';
+ file.Read(input, len);
@@ -410,15 +411,11 @@ index 0000000..5cfc5ee
+{
+ TiXmlDocument* doc = new TiXmlDocument();
+
-+ if(TinyXML::LoadDocument(filename, doc))
-+ {
++ if (TinyXML::LoadDocument(filename, doc))
+ return doc;
-+ }
-+ else
-+ {
-+ delete doc;
-+ return 0;
-+ }
++
++ delete doc;
++ return 0;
+}
+
+bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc)
@@ -431,21 +428,16 @@ index 0000000..5cfc5ee
+ doc->Accept(&printer);
+
+ return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size());
-+
-+// wxTempFile file(filename);
-+// if(file.IsOpened())
-+// if(file.Write(Printer.CStr(), Printer.Size()) && file.Commit())
-+// return true;
-+// return false;
+}
+
--
-1.6.6.1
+1.7.7.6
+
-From 7362315ce2418e4fd00513f966b661463141bb55 Mon Sep 17 00:00:00 2001
+From 79b6d9eddde59cde7b78087afec5a8b9a6e570b6 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/22] update C::B projects with new locations of tinywxuni
+Subject: [PATCH 04/29] update C::B projects with new locations of tinywxuni
---
src/CodeBlocks-unix.cbp | 4 ++--
@@ -453,10 +445,10 @@ Subject: [PATCH 04/22] 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 eb2d9da..11ee731 100644
+index 739c24a..ef6ddd1 100644
--- a/src/CodeBlocks-unix.cbp
+++ b/src/CodeBlocks-unix.cbp
-@@ -400,7 +400,7 @@
+@@ -473,7 +473,7 @@
<Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
@@ -465,9 +457,9 @@ index eb2d9da..11ee731 100644
<Option target="sdk" />
</Unit>
<Unit filename="base/tinyxml/tinyxml.cpp">
-@@ -896,7 +896,7 @@
+@@ -981,7 +981,7 @@
<Unit filename="include/tinyxml/tinystr.h">
- <Option target="sdk" />
+ <Option target="tinyXML" />
</Unit>
- <Unit filename="include/tinyxml/tinywxuni.h">
+ <Unit filename="include/tinywxuni.h">
@@ -475,34 +467,35 @@ index eb2d9da..11ee731 100644
</Unit>
<Unit filename="include/tinyxml/tinyxml.h">
diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp
-index 47a2196..c35e699 100644
+index 9d8bdf5..f4d9a67 100644
--- a/src/CodeBlocks.cbp
+++ b/src/CodeBlocks.cbp
-@@ -505,7 +505,7 @@
- <Unit filename="base\tinyxml\tinystr.cpp">
+@@ -714,7 +714,7 @@
+ <Unit filename="base/tinyxml/tinystr.cpp">
<Option target="tinyXML" />
</Unit>
-- <Unit filename="base\tinyxml\tinywxuni.cpp">
-+ <Unit filename="sdk\tinywxuni.cpp">
+- <Unit filename="base/tinyxml/tinywxuni.cpp">
++ <Unit filename="sdk/tinywxuni.cpp">
<Option target="sdk" />
</Unit>
- <Unit filename="base\tinyxml\tinyxml.cpp">
-@@ -998,7 +998,7 @@
- <Unit filename="include\tinyxml\tinystr.h">
+ <Unit filename="base/tinyxml/tinyxml.cpp">
+@@ -1222,7 +1222,7 @@
+ <Unit filename="include/tinyxml/tinystr.h">
<Option target="tinyXML" />
</Unit>
-- <Unit filename="include\tinyxml\tinywxuni.h">
-+ <Unit filename="include\tinywxuni.h">
+- <Unit filename="include/tinyxml/tinywxuni.h">
++ <Unit filename="include/tinywxuni.h">
<Option target="sdk" />
</Unit>
- <Unit filename="include\tinyxml\tinyxml.h">
+ <Unit filename="include/tinyxml/tinyxml.h">
--
-1.6.6.1
+1.7.7.6
-From a2ee4412e4dbb135841fe9cf16e1272e3318bd3f Mon Sep 17 00:00:00 2001
+
+From 13646797c40e9c66f7b1c31a5f2f79815a3671e5 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/22] convert autorevision to new tinyxml handling
+Subject: [PATCH 05/29] convert autorevision to new tinyxml handling
---
src/build_tools/autorevision/Makefile.am | 5 ++++-
@@ -510,7 +503,7 @@ Subject: [PATCH 05/22] convert autorevision to new tinyxml handling
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/build_tools/autorevision/Makefile.am b/src/build_tools/autorevision/Makefile.am
-index f0b09b7..7de8ca4 100644
+index db54806..62e6054 100644
--- a/src/build_tools/autorevision/Makefile.am
+++ b/src/build_tools/autorevision/Makefile.am
@@ -1,9 +1,12 @@
@@ -526,9 +519,9 @@ index f0b09b7..7de8ca4 100644
+endif
all-local: auto_revision
- ./auto_revision +int +wx +t $(top_srcdir) $(top_srcdir)/src/include/autorevision.h
+ ./auto_revision +int +wx +t $(top_srcdir) $(top_builddir)/src/include/autorevision.h
diff --git a/src/build_tools/autorevision/autorevision.cpp b/src/build_tools/autorevision/autorevision.cpp
-index bdc0c88..ea6388b 100644
+index 8378eb1..8810e59 100644
--- a/src/build_tools/autorevision/autorevision.cpp
+++ b/src/build_tools/autorevision/autorevision.cpp
@@ -11,8 +11,7 @@
@@ -542,16 +535,16 @@ index bdc0c88..ea6388b 100644
using namespace std;
--
-1.6.6.1
+1.7.7.6
+
-From b370d63c271cb1ef8eac45a561ce21b7a7733268 Mon Sep 17 00:00:00 2001
+From 4690bce7dc7472372a4023b5fc736aa9f9e7f08f 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/22] convert sdk to new tinyxml handling
+Subject: [PATCH 06/29] convert sdk to new tinyxml handling
---
src/include/configmanager.h | 3 +--
- src/include/ibaseloader.h | 2 +-
src/include/projecttemplateloader.h | 2 +-
src/sdk/Makefile.am | 9 +++++++--
src/sdk/globals.cpp | 2 +-
@@ -559,10 +552,10 @@ Subject: [PATCH 06/22] convert sdk to new tinyxml handling
src/sdk/projectlayoutloader.cpp | 2 +-
src/sdk/tinywxuni.cpp | 2 +-
src/sdk/workspaceloader.cpp | 2 +-
- 9 files changed, 15 insertions(+), 11 deletions(-)
+ 8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/include/configmanager.h b/src/include/configmanager.h
-index 951dd5d..9d9de79 100644
+index f6a5297..b2849ba 100644
--- a/src/include/configmanager.h
+++ b/src/include/configmanager.h
@@ -12,8 +12,7 @@
@@ -575,19 +568,6 @@ index 951dd5d..9d9de79 100644
#include "manager.h"
#include "base64.h"
-diff --git a/src/include/ibaseloader.h b/src/include/ibaseloader.h
-index 95b3892..c0b98fb 100644
---- a/src/include/ibaseloader.h
-+++ b/src/include/ibaseloader.h
-@@ -8,7 +8,7 @@
-
- #include <wx/string.h>
- #include "settings.h"
--#include "tinyxml/tinyxml.h"
-+#include <tinyxml.h>
-
- /** Base interface for project loaders. */
- class DLLIMPORT IBaseLoader
diff --git a/src/include/projecttemplateloader.h b/src/include/projecttemplateloader.h
index 82b5c68..9add87c 100644
--- a/src/include/projecttemplateloader.h
@@ -602,23 +582,24 @@ index 82b5c68..9add87c 100644
struct FileSetFile
diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am
-index 66a2620..29f99d6 100644
+index aea1a75..eefb3d8 100644
--- a/src/sdk/Makefile.am
+++ b/src/sdk/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS = scripting wxscintilla resources
- INCLUDES = $(WX_CXXFLAGS) \
+@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
+ $(WXPROPGRID_INCLUDE) \
- -I$(top_srcdir)/src/include/tinyxml \
-I$(top_srcdir)/src/include/scripting/include \
+ -I$(top_srcdir)/src/include/scripting/bindings \
-I$(top_srcdir)/src/include/scripting/sqplus \
- -I$(top_srcdir)/src/include/mozilla_chardet
-@@ -17,9 +16,15 @@ libcodeblocks_la_LIBADD = $(WX_LIBS) \
+@@ -19,10 +18,16 @@ libcodeblocks_la_LIBADD = $(WX_LIBS) \
scripting/sqplus/libsqplus.la \
scripting/sqstdlib/libsqstdlib.la \
scripting/squirrel/libsquirrel.la \
- ../base/tinyxml/libtinyxml.la \
- wxscintilla/libwxscintilla.la
+ wxscintilla/libwxscintilla.la \
+ $(WXPROPGRID_LIB)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -631,20 +612,20 @@ index 66a2620..29f99d6 100644
autodetectcompilers.cpp \
base64.cpp \
diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp
-index cceb1e9..bb66a59 100644
+index 36b797d..7905163 100644
--- a/src/sdk/globals.cpp
+++ b/src/sdk/globals.cpp
-@@ -23,7 +23,7 @@
+@@ -26,7 +26,7 @@
#include "projectmanager.h"
#endif
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
- #include <wx/filefn.h>
- #include <wx/tokenzr.h>
+
#include <wx/dirdlg.h>
+ #include <wx/filefn.h>
diff --git a/src/sdk/pluginmanager.cpp b/src/sdk/pluginmanager.cpp
-index d6c9344..90cc953 100644
+index 2fa3262..d4192ff 100644
--- a/src/sdk/pluginmanager.cpp
+++ b/src/sdk/pluginmanager.cpp
@@ -42,7 +42,7 @@
@@ -657,7 +638,7 @@ index d6c9344..90cc953 100644
#include "annoyingdialog.h"
#include "pluginsconfigurationdlg.h"
diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp
-index 472b053..07cd159 100644
+index 74a9612..ef76036 100644
--- a/src/sdk/projectlayoutloader.cpp
+++ b/src/sdk/projectlayoutloader.cpp
@@ -22,7 +22,7 @@
@@ -670,12 +651,12 @@ index 472b053..07cd159 100644
ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project)
diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp
-index 5cfc5ee..1e33cd6 100644
+index d156154..09f897d 100644
--- a/src/sdk/tinywxuni.cpp
+++ b/src/sdk/tinywxuni.cpp
-@@ -7,7 +7,7 @@
- #include "manager.h"
+@@ -8,7 +8,7 @@
#endif
+
#include "tinywxuni.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
@@ -683,10 +664,10 @@ index 5cfc5ee..1e33cd6 100644
bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc)
{
diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp
-index f2624be..f502519 100644
+index 9af27ff..e298991 100644
--- a/src/sdk/workspaceloader.cpp
+++ b/src/sdk/workspaceloader.cpp
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
@@ -696,25 +677,26 @@ index f2624be..f502519 100644
WorkspaceLoader::WorkspaceLoader()
--
-1.6.6.1
+1.7.7.6
-From 99f0de7b8d7ff02020ab019df365ca2681c27f2e Mon Sep 17 00:00:00 2001
+
+From fe08dd5f933cd87e31cb746f6f3b9c0151e50eee 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/22] update codecompletion plugin
+Subject: [PATCH 07/29] update codecompletion plugin
---
src/plugins/codecompletion/Makefile.am | 4 ++++
- src/plugins/codecompletion/nativeparser.cpp | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ src/plugins/codecompletion/nativeparser.cpp | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am
-index 842148d..02dbbd8 100644
+index 4f8152e..3825380 100644
--- a/src/plugins/codecompletion/Makefile.am
+++ b/src/plugins/codecompletion/Makefile.am
-@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
+@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ -I$(top_srcdir)/src/include/mozilla_chardet
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -724,25 +706,25 @@ index 842148d..02dbbd8 100644
pluginlib_LTLIBRARIES = libcodecompletion.la
diff --git a/src/plugins/codecompletion/nativeparser.cpp b/src/plugins/codecompletion/nativeparser.cpp
-index a1c5ecc..174898e 100644
+index f2588d9..85545ff 100644
--- a/src/plugins/codecompletion/nativeparser.cpp
+++ b/src/plugins/codecompletion/nativeparser.cpp
-@@ -26,7 +26,7 @@
+@@ -39,6 +39,7 @@
#include <cbstyledtextctrl.h>
- #include <compilerfactory.h>
+ #include <compilercommandgenerator.h>
#include <projectloader_hooks.h>
--#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
- #include "cbauibook.h"
- #include <wx/log.h> // for wxSafeShowMessage()
+ #include "nativeparser.h"
+ #include "classbrowser.h"
--
-1.6.6.1
+1.7.7.6
-From a944d02321b7ad449580947e8257fb5fc1fcafc2 Mon Sep 17 00:00:00 2001
+
+From a2964067f8092b21726e8c47488eb73b61897150 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/22] update codesnippets plugin
+Subject: [PATCH 08/29] update codesnippets plugin
---
src/plugins/contrib/codesnippets/Makefile.am | 4 ++++
@@ -752,10 +734,10 @@ Subject: [PATCH 08/22] update codesnippets plugin
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/plugins/contrib/codesnippets/Makefile.am b/src/plugins/contrib/codesnippets/Makefile.am
-index 220912a..b44850c 100644
+index a7cbaa5..6e86044 100644
--- a/src/plugins/contrib/codesnippets/Makefile.am
+++ b/src/plugins/contrib/codesnippets/Makefile.am
-@@ -9,6 +9,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \
-I$(top_srcdir)/src/include/mozilla_chardet
@@ -767,7 +749,7 @@ index 220912a..b44850c 100644
pluginlib_LTLIBRARIES = libcodesnippets.la
diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
-index c6f8c14..191a4ca 100644
+index 65e6af5..ffbdc01 100644
--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
@@ -41,7 +41,6 @@
@@ -779,38 +761,39 @@ index c6f8c14..191a4ca 100644
#include "codesnippetstreectrl.h"
#include "codesnippetswindow.h"
diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h
-index 00c3084..9e17819 100644
+index e5778ae..8bcccd7 100644
--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.h
+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.h
@@ -30,7 +30,7 @@ class TiXmlElement;
- #include "wx/mimetype.h"
-
- #include "snippetitemdata.h"
--#include <tinyxml/tinyxml.h>
-+#include <tinyxml.h>
- #include "snippetproperty.h"
- #include "codesnippetsevent.h"
- #include "snippetsconfig.h"
+ #include "wx/mimetype.h"
+
+ #include "snippetitemdata.h"
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+ #include "snippetproperty.h"
+ #include "codesnippetsevent.h"
+ #include "snippetsconfig.h"
diff --git a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp
-index 634c7d0..5efeeab 100644
+index c0d1db7..64c7dcb 100644
--- a/src/plugins/contrib/codesnippets/codesnippetswindow.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippetswindow.cpp
@@ -63,7 +63,7 @@
- #include "version.h"
- #include "codesnippetswindow.h"
- #include "snippetitemdata.h"
--#include <tinyxml/tinyxml.h>
-+#include <tinyxml.h>
- #include "snippetsconfig.h"
- #include "snippetsimages.h"
- #include "codesnippetstreectrl.h"
+ #include "version.h"
+ #include "codesnippetswindow.h"
+ #include "snippetitemdata.h"
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+ #include "snippetsconfig.h"
+ #include "snippetsimages.h"
+ #include "codesnippetstreectrl.h"
--
-1.6.6.1
+1.7.7.6
+
-From e40d8c9f7f166adc2fca6706dac330ad232db260 Mon Sep 17 00:00:00 2001
+From 5ac8f37b931a300a4e30df64d085e3d9beaab49e 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/22] update envvars plugin
+Subject: [PATCH 09/29] update envvars plugin
---
src/plugins/contrib/envvars/Makefile.am | 4 ++++
@@ -818,11 +801,11 @@ Subject: [PATCH 09/22] update envvars plugin
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am
-index 8d38e27..f782f9b 100644
+index dc87160..854498d 100644
--- a/src/plugins/contrib/envvars/Makefile.am
+++ b/src/plugins/contrib/envvars/Makefile.am
-@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
+@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include/scripting/bindings \
-I$(top_srcdir)/src/sdk/wxscintilla/include
+if ! HAVE_TINYXML
@@ -833,7 +816,7 @@ index 8d38e27..f782f9b 100644
pkgdata_DATA = envvars.zip
diff --git a/src/plugins/contrib/envvars/envvars.cpp b/src/plugins/contrib/envvars/envvars.cpp
-index 5a9e0ba..8c3e920 100644
+index 1290b5a..bf72252 100644
--- a/src/plugins/contrib/envvars/envvars.cpp
+++ b/src/plugins/contrib/envvars/envvars.cpp
@@ -15,7 +15,7 @@
@@ -846,12 +829,13 @@ index 5a9e0ba..8c3e920 100644
#include "cbproject.h"
#include "globals.h"
--
-1.6.6.1
+1.7.7.6
+
-From 3a1f5a276af4999c028f2daeec6fe2661c3d4326 Mon Sep 17 00:00:00 2001
+From a2b68638b3dec7b626be622466dfae686794093f 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/22] update BrowseTracker plugin
+Subject: [PATCH 10/29] update BrowseTracker plugin
---
.../contrib/BrowseTracker/BrowseTrackerLayout.cpp | 2 +-
@@ -859,20 +843,20 @@ Subject: [PATCH 10/22] update BrowseTracker plugin
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
-index 30f38d4..189eaf7 100644
+index 271ba52..6dc3917 100644
--- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
+++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
@@ -46,7 +46,7 @@
- #endif
-
- #include <wx/tokenzr.h>
--#include "tinyxml/tinyxml.h"
-+#include <tinyxml.h>
- #include "tinywxuni.h"
-
- #include "BrowseTrackerLayout.h"
+ #endif
+
+ #include <wx/tokenzr.h>
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ #include "tinywxuni.h"
+
+ #include "BrowseTrackerLayout.h"
diff --git a/src/plugins/contrib/BrowseTracker/Makefile.am b/src/plugins/contrib/BrowseTracker/Makefile.am
-index a6a98c9..e8a941e 100644
+index eba1b90..3c598dc 100644
--- a/src/plugins/contrib/BrowseTracker/Makefile.am
+++ b/src/plugins/contrib/BrowseTracker/Makefile.am
@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \
@@ -887,20 +871,21 @@ index a6a98c9..e8a941e 100644
pluginlib_LTLIBRARIES = libBrowseTracker.la
--
-1.6.6.1
+1.7.7.6
-From cd4ad531af8b685cf2ad3bafc42eeb2810f40de1 Mon Sep 17 00:00:00 2001
+
+From bc4e15e830cb8ca69446d72c32cf4fe9d95d6b09 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/22] update Valgrind plugin
+Subject: [PATCH 11/29] update Valgrind plugin
---
- src/plugins/contrib/Valgrind/Makefile.am | 4 ++++
+ src/plugins/contrib/Valgrind/Makefile.am | 6 +++++-
src/plugins/contrib/Valgrind/Valgrind.cpp | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
+ 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/contrib/Valgrind/Makefile.am b/src/plugins/contrib/Valgrind/Makefile.am
-index 69c7e33..db897f5 100644
+index df34a62..b5a97f9 100644
--- a/src/plugins/contrib/Valgrind/Makefile.am
+++ b/src/plugins/contrib/Valgrind/Makefile.am
@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \
@@ -914,12 +899,19 @@ index 69c7e33..db897f5 100644
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libValgrind.la
+@@ -21,4 +25,4 @@ noinst_HEADERS = Valgrind.h \
+ valgrind_config.h
+
+ EXTRA_DIST = $(srcdir)/*.cbp \
+- wxsmith/valgrind_config_panel.wxs
+\ No newline at end of file
++ wxsmith/valgrind_config_panel.wxs
diff --git a/src/plugins/contrib/Valgrind/Valgrind.cpp b/src/plugins/contrib/Valgrind/Valgrind.cpp
-index 4f13b77..f2a5ec3 100644
+index 7cbdf9b..d1ca5d5 100644
--- a/src/plugins/contrib/Valgrind/Valgrind.cpp
+++ b/src/plugins/contrib/Valgrind/Valgrind.cpp
-@@ -21,7 +21,7 @@
- #include "projectmanager.h"
+@@ -25,7 +25,7 @@
+ #include "macrosmanager.h"
#endif
#include <wx/filefn.h>
-#include "tinyxml/tinyxml.h"
@@ -928,32 +920,36 @@ index 4f13b77..f2a5ec3 100644
#include "Valgrind.h"
#include "ValgrindListLog.h"
--
-1.6.6.1
+1.7.7.6
+
-From b2736c42db392d3fd2b2259bfa5b8644bcd8b93f Mon Sep 17 00:00:00 2001
+From 021c7efe33b989a6180d7d6641d4a9ac7d102278 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/22] convert AutoVersioning plugin
+Subject: [PATCH 12/29] convert AutoVersioning plugin
---
- .../contrib/AutoVersioning/AutoVersioning.cpp | 2 +-
+ .../contrib/AutoVersioning/AutoVersioning.cpp | 4 ++--
src/plugins/contrib/AutoVersioning/Makefile.am | 4 ++++
.../contrib/AutoVersioning/avSvnRevision.cpp | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
+ 3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp
-index 09db296..2a18834 100644
+index 9a1b647..ac0968c 100644
--- a/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp
+++ b/src/plugins/contrib/AutoVersioning/AutoVersioning.cpp
-@@ -17,7 +17,7 @@
- #include <manager.h>
- #include <projectbuildtarget.h>
- #include <projectmanager.h>
--#include <tinyxml/tinyxml.h>
-+#include <tinyxml.h>
- #endif
-
- #include "projectloader_hooks.h"
+@@ -17,9 +17,9 @@
+ #include <manager.h>
+ #include <projectbuildtarget.h>
+ #include <projectmanager.h>
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+ #endif
+-#include <tinyxml/tinywxuni.h>
++#include <tinywxuni.h>
+ #include <wx/textfile.h>
+
+ #include "projectloader_hooks.h"
diff --git a/src/plugins/contrib/AutoVersioning/Makefile.am b/src/plugins/contrib/AutoVersioning/Makefile.am
index 36a8072..eb85fd6 100644
--- a/src/plugins/contrib/AutoVersioning/Makefile.am
@@ -970,25 +966,26 @@ index 36a8072..eb85fd6 100644
pluginlib_LTLIBRARIES = libAutoVersioning.la
diff --git a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp
-index 17335ad..f549150 100644
+index f99bd02..522a86f 100644
--- a/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp
+++ b/src/plugins/contrib/AutoVersioning/avSvnRevision.cpp
@@ -3,7 +3,7 @@
- #include <wx/utils.h>
- #include <wx/string.h>
- #include <wx/arrstr.h>
--#include <tinyxml/tinyxml.h>
-+#include <tinyxml.h>
- #include <globals.h>
-
- bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date)
+ #include <wx/utils.h>
+ #include <wx/string.h>
+ #include <wx/arrstr.h>
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+ #include <globals.h>
+
+ bool QuerySvn(const wxString& workingDir, wxString& revision, wxString& date)
--
-1.6.6.1
+1.7.7.6
-From 1fcda0ed358cf7e25cd0f0bc9668fb1fabec8d52 Mon Sep 17 00:00:00 2001
+
+From da0bea08a92bcfa1b6a5320834959543bf01c142 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/22] convert lib_finder plugin
+Subject: [PATCH 13/29] convert lib_finder plugin
---
src/plugins/contrib/lib_finder/Makefile.am | 4 ++++
@@ -998,7 +995,7 @@ Subject: [PATCH 13/22] convert lib_finder plugin
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am
-index 2448840..2a30765 100644
+index ace8531..3422f9f 100644
--- a/src/plugins/contrib/lib_finder/Makefile.am
+++ b/src/plugins/contrib/lib_finder/Makefile.am
@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \
@@ -1013,7 +1010,7 @@ index 2448840..2a30765 100644
pluginlib_LTLIBRARIES = liblib_finder.la
diff --git a/src/plugins/contrib/lib_finder/lib_finder.h b/src/plugins/contrib/lib_finder/lib_finder.h
-index 4ee49e8..8aaa51a 100644
+index 0b03a40..9e0aa3a 100644
--- a/src/plugins/contrib/lib_finder/lib_finder.h
+++ b/src/plugins/contrib/lib_finder/lib_finder.h
@@ -27,7 +27,7 @@
@@ -1026,11 +1023,11 @@ index 4ee49e8..8aaa51a 100644
#include "librarydetectionmanager.h"
#include "resultmap.h"
diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
-index b61adf8..594d960 100644
+index a58776f..1c6985d 100644
--- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
+++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp
@@ -21,7 +21,7 @@
- * $HeadURL: svn+ssh://byo@svn.berlios.de/svnroot/repos/codeblocks/trunk/src/plugins/contrib/wxSmith/plugin/wxsmithpluginregistrants.cpp $
+ * $HeadURL$
*/
-#include <tinyxml/tinyxml.h>
@@ -1039,7 +1036,7 @@ index b61adf8..594d960 100644
#include <wx/arrstr.h>
diff --git a/src/plugins/contrib/lib_finder/projectconfiguration.h b/src/plugins/contrib/lib_finder/projectconfiguration.h
-index 3172492..2eaf313 100644
+index e7a337b..6416f09 100644
--- a/src/plugins/contrib/lib_finder/projectconfiguration.h
+++ b/src/plugins/contrib/lib_finder/projectconfiguration.h
@@ -27,7 +27,7 @@
@@ -1052,12 +1049,13 @@ index 3172492..2eaf313 100644
/** \brief Configuration of one project */
--
-1.6.6.1
+1.7.7.6
+
-From ca8c55a67091aaa83c761077f746505c2b6ec1b1 Mon Sep 17 00:00:00 2001
+From d7027aed78a37414648a023af1bcf5add08d089c 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/22] convert wxSmith plugin
+Subject: [PATCH 14/29] convert wxSmith plugin
---
src/plugins/contrib/wxSmith/Makefile.am | 4 ++++
@@ -1073,11 +1071,11 @@ Subject: [PATCH 14/22] convert wxSmith plugin
10 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am
-index e1abc9f..c4634c3 100644
+index 4562b2e..2227929 100644
--- a/src/plugins/contrib/wxSmith/Makefile.am
+++ b/src/plugins/contrib/wxSmith/Makefile.am
-@@ -12,6 +12,10 @@ INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include \
+@@ -10,6 +10,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include/scripting/bindings \
-I$(top_srcdir)/src/include/mozilla_chardet
+if ! HAVE_TINYXML
@@ -1088,12 +1086,12 @@ index e1abc9f..c4634c3 100644
libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared
diff --git a/src/plugins/contrib/wxSmith/properties/Makefile.am b/src/plugins/contrib/wxSmith/properties/Makefile.am
-index b7fc223..6ef1ed2 100644
+index 9d0a744..ade7e5a 100644
--- a/src/plugins/contrib/wxSmith/properties/Makefile.am
+++ b/src/plugins/contrib/wxSmith/properties/Makefile.am
-@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
+ $(WXPROPGRID_INCLUDE)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1103,7 +1101,7 @@ index b7fc223..6ef1ed2 100644
libwxsmith_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
diff --git a/src/plugins/contrib/wxSmith/properties/wxsproperty.h b/src/plugins/contrib/wxSmith/properties/wxsproperty.h
-index 1e2d321..de36cee 100644
+index 6dcd7d6..5dcb866 100644
--- a/src/plugins/contrib/wxSmith/properties/wxsproperty.h
+++ b/src/plugins/contrib/wxSmith/properties/wxsproperty.h
@@ -34,7 +34,7 @@
@@ -1129,7 +1127,7 @@ index 7694750..48a06e3 100644
#include "wxsproject.h"
diff --git a/src/plugins/contrib/wxSmith/wxsmith.h b/src/plugins/contrib/wxSmith/wxsmith.h
-index ff311c9..2a442b5 100644
+index bf7e712..00efe02 100644
--- a/src/plugins/contrib/wxSmith/wxsmith.h
+++ b/src/plugins/contrib/wxSmith/wxsmith.h
@@ -29,7 +29,7 @@
@@ -1142,7 +1140,7 @@ index ff311c9..2a442b5 100644
#include "wxsstoringsplitterwindow.h"
#include "wxsresourcetree.h"
diff --git a/src/plugins/contrib/wxSmith/wxsproject.h b/src/plugins/contrib/wxSmith/wxsproject.h
-index 4ffcab1..de0336a 100644
+index 7809091..dde9f20 100644
--- a/src/plugins/contrib/wxSmith/wxsproject.h
+++ b/src/plugins/contrib/wxSmith/wxsproject.h
@@ -24,7 +24,7 @@
@@ -1155,7 +1153,7 @@ index 4ffcab1..de0336a 100644
class wxSmith;
diff --git a/src/plugins/contrib/wxSmith/wxsversionconverter.h b/src/plugins/contrib/wxSmith/wxsversionconverter.h
-index ac2b79c..0673bb5 100644
+index 3502492..b4b5eb2 100644
--- a/src/plugins/contrib/wxSmith/wxsversionconverter.h
+++ b/src/plugins/contrib/wxSmith/wxsversionconverter.h
@@ -23,7 +23,7 @@
@@ -1168,12 +1166,12 @@ index ac2b79c..0673bb5 100644
class wxsProject;
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
-index 7238394..7a37296 100644
+index ef95776..abbc6a1 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
+++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am
-@@ -11,6 +11,10 @@ INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include/scripting/bindings \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
+@@ -9,6 +9,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include/scripting/sqplus \
+ -I$(top_srcdir)/src/include/scripting/bindings
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1183,7 +1181,7 @@ index 7238394..7a37296 100644
libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h
-index 4e5d044..18571a4 100644
+index 3d0e599..80bffc0 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h
+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h
@@ -24,7 +24,7 @@
@@ -1196,7 +1194,7 @@ index 4e5d044..18571a4 100644
#include "wxscodercontext.h"
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h
-index 142d6dd..e17f529 100644
+index de6c60d..7a6dee2 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h
+++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdataobject.h
@@ -24,7 +24,7 @@
@@ -1209,12 +1207,13 @@ index 142d6dd..e17f529 100644
#define wxsDF_WIDGET _T("wxSmith XML")
--
-1.6.6.1
+1.7.7.6
+
-From 3bcf565a2da2c0133612c4865d48cbad4b92d5cc Mon Sep 17 00:00:00 2001
+From 169df0b47666bba548ae29a24709c879bdbf8b50 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/22] convert cb_share_config tool
+Subject: [PATCH 15/29] convert cb_share_config tool
---
src/tools/cb_share_config/Makefile.am | 9 +++++++--
@@ -1261,32 +1260,38 @@ index c49e790..b658bad 100644
class MainFrame: public wxFrame
{
--
-1.6.6.1
+1.7.7.6
-From 3557cbc3393d2cce972ce7fdc29d960cc018641b Mon Sep 17 00:00:00 2001
+
+From d6747c19d76a46a712528c43fa1ee9d2f42e07a3 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/22] build local copy of tinyxml library only when no system tinyxml library exists
+Subject: [PATCH 16/29] build local copy of tinyxml library only when no
+ system tinyxml library exists
---
src/base/Makefile.am | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
-index 62a6da1..8f8347f 100644
+index 34e0b85..eec0652 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
-@@ -1 +1,3 @@
+@@ -1,3 +1,5 @@
+if ! HAVE_TINYXML
SUBDIRS = tinyxml
+endif
+
+ EXTRA_DIST = exchndl
--
-1.6.6.1
+1.7.7.6
-From 969c42a03f0c76807098785c919617850bbc0667 Mon Sep 17 00:00:00 2001
+
+From 4e2e7d930917fd5480ae816b621a3202a21350f3 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/22] fix include dirs for the main app when system tinyxml is not present
+Subject: [PATCH 17/29] fix include dirs for the main app when system tinyxml
+ is not present
---
src/plugins/autosave/Makefile.am | 4 ++++
@@ -1338,12 +1343,12 @@ index 1d30d9b..a2e2ccc 100644
pluginlib_LTLIBRARIES = libHexEditor.la
diff --git a/src/plugins/contrib/ThreadSearch/Makefile.am b/src/plugins/contrib/ThreadSearch/Makefile.am
-index 68b9a25..843a6a6 100644
+index d06f8ff..ea164af 100644
--- a/src/plugins/contrib/ThreadSearch/Makefile.am
+++ b/src/plugins/contrib/ThreadSearch/Makefile.am
@@ -6,6 +6,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include/mozilla_chardet \
- -I$(top_srcdir)/src/plugins/contrib/wxSmithContribItems/wxthings/wxthings/include
+ -I$(srcdir)/../wxContribItems/wxthings/include
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1368,10 +1373,10 @@ index d66aa15..e329f54 100644
pluginlib_LTLIBRARIES = libbyogames.la
diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am
-index a83a6bb..dbbb4b3 100644
+index c41575d..7e17e7a 100644
--- a/src/plugins/contrib/codesnippets/resources/Makefile.am
+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am
-@@ -7,6 +7,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \
-I$(top_srcdir)/src/include/mozilla_chardet
@@ -1398,7 +1403,7 @@ index a6520fb..c4aa031 100644
pluginlib_LTLIBRARIES = libdragscroll.la
diff --git a/src/plugins/contrib/headerfixup/Makefile.am b/src/plugins/contrib/headerfixup/Makefile.am
-index 2983fcd..503c3d7 100644
+index a4e9aab..c56abc2 100644
--- a/src/plugins/contrib/headerfixup/Makefile.am
+++ b/src/plugins/contrib/headerfixup/Makefile.am
@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \
@@ -1428,12 +1433,12 @@ index d9116af..5da5553 100644
pluginlib_LTLIBRARIES = libkeybinder.la
diff --git a/src/plugins/contrib/wxSmith/plugin/Makefile.am b/src/plugins/contrib/wxSmith/plugin/Makefile.am
-index cf27c1a..ec395b7 100644
+index 72ea186..21c7121 100644
--- a/src/plugins/contrib/wxSmith/plugin/Makefile.am
+++ b/src/plugins/contrib/wxSmith/plugin/Makefile.am
-@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/plugins/contrib/propgrid/include
+ $(WXPROPGRID_INCLUDE)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1443,12 +1448,12 @@ index cf27c1a..ec395b7 100644
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am
-index d340b90..4289516 100644
+index 5577946..4413537 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am
+++ b/src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile.am
-@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
+ $(WXPROPGRID_INCLUDE)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1458,12 +1463,12 @@ index d340b90..4289516 100644
libwxsmith_wxwidgets_defitems_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
diff --git a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am
-index 3b157f0..7950a67 100644
+index 1e0a57f..f3c3f43 100644
--- a/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am
+++ b/src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile.am
-@@ -5,6 +5,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -3,6 +3,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include
+ $(WXPROPGRID_INCLUDE)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1473,12 +1478,12 @@ index 3b157f0..7950a67 100644
libwxsmith_wxwidgets_properties_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
diff --git a/src/plugins/contrib/wxSmithContribItems/Makefile.am b/src/plugins/contrib/wxSmithContribItems/Makefile.am
-index 3d71f45..04c8b26 100644
+index 9d83bff..5f5e8f6 100644
--- a/src/plugins/contrib/wxSmithContribItems/Makefile.am
+++ b/src/plugins/contrib/wxSmithContribItems/Makefile.am
-@@ -11,6 +11,10 @@ INCLUDES = $(WX_CXXFLAGS) \
- -I$(srcdir)/wxflatnotebook/wxFlatNotebook/include \
- -I$(srcdir)/wxthings/wxthings/include
+@@ -19,6 +19,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(srcdir)/../wxContribItems/wxled/ledpanel/include
+
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1503,7 +1508,7 @@ index 1b9f299..f9a737a 100644
pluginlib_LTLIBRARIES = libopenfileslist.la
diff --git a/src/plugins/projectsimporter/Makefile.am b/src/plugins/projectsimporter/Makefile.am
-index 318c823..ee3ead4 100644
+index 7fec77e..ac4c8b1 100644
--- a/src/plugins/projectsimporter/Makefile.am
+++ b/src/plugins/projectsimporter/Makefile.am
@@ -5,6 +5,9 @@ INCLUDES = $(WX_CXXFLAGS) \
@@ -1532,10 +1537,10 @@ index eabbcd9..5ef7f7a 100644
pluginlib_LTLIBRARIES = libscriptedwizard.la
diff --git a/src/src/Makefile.am b/src/src/Makefile.am
-index 74f03f3..5a838ec 100644
+index c994de6..f1f79fb 100644
--- a/src/src/Makefile.am
+++ b/src/src/Makefile.am
-@@ -7,6 +7,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include/scripting/sqplus \
-I$(top_srcdir)/src/include/mozilla_chardet
@@ -1543,23 +1548,25 @@ index 74f03f3..5a838ec 100644
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
+endif
+
- if CODEBLOCKS_LINUX
- AM_CPPFLAGS = -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\""
+ if GTK_NOTEBOOK
+ GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK
endif
--
-1.6.6.1
+1.7.7.6
+
-From 5f83ee6539b9dbd67742da5e92362d37afbb099c Mon Sep 17 00:00:00 2001
+From c3061d6056e632f62bfe204b592d230ea44474c7 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/22] use/install local timyxml headers only when a system-wide instance doesn't exist
+Subject: [PATCH 18/29] use/install local timyxml headers only when a
+ system-wide instance doesn't exist
---
src/include/Makefile.am | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
-index 9f754da..63add9a 100644
+index d510a22..4783386 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,4 +1,4 @@
@@ -1567,7 +1574,7 @@ index 9f754da..63add9a 100644
+SUBDIRS = scripting
if PRECOMPILE_HEADERS
- BUILT_SOURCES = $(top_srcdir)/src/include/sdk.h.gch \
+ BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
@@ -10,11 +10,15 @@ endif
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
@@ -1586,22 +1593,23 @@ index 9f754da..63add9a 100644
# $(CXXCOMPILE) is empty.
# Create the basic one here:
--
-1.6.6.1
+1.7.7.6
-From c231728469c34e3de91ad98555cc4ad88546983b Mon Sep 17 00:00:00 2001
+
+From 8f9b98e9d5560f821a4df1f484c614c006a22770 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/22] fix linking with tinyxml in the codesnippets plugin
+Subject: [PATCH 19/29] fix linking with tinyxml in the codesnippets plugin
---
.../contrib/codesnippets/resources/Makefile.am | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am
-index dbbb4b3..0fded23 100644
+index 7e17e7a..8a56df5 100644
--- a/src/plugins/contrib/codesnippets/resources/Makefile.am
+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am
-@@ -7,10 +7,6 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -8,10 +8,6 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \
-I$(top_srcdir)/src/include/mozilla_chardet
@@ -1612,14 +1620,14 @@ index dbbb4b3..0fded23 100644
pluginlibdir = $(pkglibdir)/plugins
##pluginlib_LTLIBRARIES = codesnippets
-@@ -20,10 +16,15 @@ codesnippets_LDFLAGS = $(WX_GTK2_LIBS)
+@@ -19,10 +15,15 @@ bin_PROGRAMS = codesnippets
##codesnippets_LIBADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la
##codesnippets_LDADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la
-codesnippets_LDADD = -L../../../../base/tinyxml -ltinyxml \
+codesnippets_LDADD = -ltinyxml \
-L../../../../sdk ../../../../sdk/libcodeblocks.la \
- $(PLUGIN_WX_LIBS) $(WX_LIBS)
+ $(PLUGIN_WX_LIBS) $(WX_LIBS) $(WX_GTK2_LIBS) $(WX_X11_LIBS)
+if ! HAVE_TINYXML
+INCLUDES += -I$(top_srcdir)/src/include/tinyxml
@@ -1630,22 +1638,23 @@ index dbbb4b3..0fded23 100644
$(srcdir)/../Search/DirectoryParamsPanel.cpp \
$(srcdir)/../Search/InsertIndexManager.cpp \
--
-1.6.6.1
+1.7.7.6
+
-From 6b92be5a3a50f7b3182b18d319c7e83f45cddb8d Mon Sep 17 00:00:00 2001
+From 2aaee5d5761e9ca44ab843d51567bdfb85368da2 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/22] fix tinyxml includes in the help plugin
+Subject: [PATCH 20/29] fix tinyxml includes in the help plugin
---
src/plugins/contrib/help_plugin/Makefile.am | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am
-index 7b3dd26..219437b 100644
+index f38d145..1fbb566 100644
--- a/src/plugins/contrib/help_plugin/Makefile.am
+++ b/src/plugins/contrib/help_plugin/Makefile.am
-@@ -40,6 +40,10 @@ else
+@@ -36,6 +36,10 @@ else
libhelp_plugin_la_LIBADD += -lz
endif
@@ -1657,22 +1666,23 @@ index 7b3dd26..219437b 100644
HelpConfigDialog.cpp \
help_plugin.cpp \
--
-1.6.6.1
+1.7.7.6
-From 59462f3d197a498cee9dc3d153a9211f78d19197 Mon Sep 17 00:00:00 2001
+
+From d1cfe63e71a448a77d12f912cc85c498e0756220 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/22] fix tinyxml includes in the wxSmithAui plugin
+Subject: [PATCH 21/29] fix tinyxml includes in the wxSmithAui plugin
---
src/plugins/contrib/wxSmithAui/Makefile.am | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/plugins/contrib/wxSmithAui/Makefile.am b/src/plugins/contrib/wxSmithAui/Makefile.am
-index d56f2d7..808ec2e 100644
+index 74b08d7..b96a33e 100644
--- a/src/plugins/contrib/wxSmithAui/Makefile.am
+++ b/src/plugins/contrib/wxSmithAui/Makefile.am
-@@ -9,6 +9,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+@@ -7,6 +7,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(srcdir)/wxAuiNotebook \
-I$(srcdir)/wxAuiToolBar
@@ -1684,12 +1694,13 @@ index d56f2d7..808ec2e 100644
pluginlib_LTLIBRARIES = libwxSmithAui.la
--
-1.6.6.1
+1.7.7.6
+
-From d715e995644be51817787048f6deb7dec50e7bcb Mon Sep 17 00:00:00 2001
+From 869a363727d997dcd07af0e64ad7e31a33d9b3bd 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/22] fix tinyxml includes in the MouseSap plugin
+Subject: [PATCH 22/29] fix tinyxml includes in the MouseSap plugin
---
src/plugins/contrib/MouseSap/Makefile.am | 4 ++++
@@ -1711,23 +1722,174 @@ index 2c38f84..b185834 100644
pluginlib_LTLIBRARIES = libMouseSap.la
--
-1.6.6.1
+1.7.7.6
-diff -up codeblocks-10.05-release/src/plugins/contrib/CppCheck/CppCheck.cpp.tinyxml codeblocks-10.05-release/src/plugins/contrib/CppCheck/CppCheck.cpp
---- codeblocks-10.05-release/src/plugins/contrib/CppCheck/CppCheck.cpp.tinyxml 2012-05-22 08:54:06.842805404 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/CppCheck/CppCheck.cpp 2012-05-22 08:54:15.418677907 +0200
-@@ -27,7 +27,7 @@
- #include <wx/filedlg.h>
- #include <wx/filefn.h>
- #include <wx/utils.h>
--#include "tinyxml/tinyxml.h"
-+#include <tinyxml.h>
- #include "loggers.h"
- #include "CppCheck.h"
- #include "CppCheckListLog.h"
-diff -up codeblocks-10.05-release/src/plugins/contrib/CppCheck/Makefile.am.tinyxml codeblocks-10.05-release/src/plugins/contrib/CppCheck/Makefile.am
---- codeblocks-10.05-release/src/plugins/contrib/CppCheck/Makefile.am.tinyxml 2012-05-22 09:20:12.311188170 +0200
-+++ codeblocks-10.05-release/src/plugins/contrib/CppCheck/Makefile.am 2012-05-22 09:20:34.454826828 +0200
+
+From d8d0a239a9b7d50aee1b7cc0434866b3c58126cc 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/29] fix tinyxml includes in the DoxyBlocks plugin
+
+---
+ src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp | 2 +-
+ src/plugins/contrib/DoxyBlocks/Makefile.am | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
+index 4a31439..cb6b1b7 100644
+--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
++++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.cpp
+@@ -40,7 +40,7 @@
+ #include <cbstyledtextctrl.h>
+ #include <configurationpanel.h>
+ #include <projectloader_hooks.h>
+-#include <tinyxml/tinywxuni.h>
++#include <tinywxuni.h>
+
+ #include <wx/tokenzr.h>
+ #include <wx/textfile.h>
+diff --git a/src/plugins/contrib/DoxyBlocks/Makefile.am b/src/plugins/contrib/DoxyBlocks/Makefile.am
+index f6f024b..f49c82d 100644
+--- a/src/plugins/contrib/DoxyBlocks/Makefile.am
++++ b/src/plugins/contrib/DoxyBlocks/Makefile.am
+@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
+
++if ! HAVE_TINYXML
++INCLUDES += -I$(top_srcdir)/src/include/tinyxml
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+
+ pluginlib_LTLIBRARIES = libDoxyBlocks.la
+--
+1.7.7.6
+
+
+From 1b9953ae90c7301d0af17b1d1b1eae43d4d51886 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/29] fix tinyxml includes in the NassiShneiderman plugin
+
+---
+ src/plugins/contrib/NassiShneiderman/Makefile.am | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/contrib/NassiShneiderman/Makefile.am b/src/plugins/contrib/NassiShneiderman/Makefile.am
+index afa6395..49ebdc4 100644
+--- a/src/plugins/contrib/NassiShneiderman/Makefile.am
++++ b/src/plugins/contrib/NassiShneiderman/Makefile.am
+@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
+
++if ! HAVE_TINYXML
++INCLUDES += -I$(top_srcdir)/src/include/tinyxml
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+
+ pluginlib_LTLIBRARIES = libNassiShneiderman.la
+--
+1.7.7.6
+
+
+From 166eaa8fce9dafdd3c7c7417d46a1c819339759c 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/29] fix tinyxml includes in the ReopenEditor plugin
+
+---
+ src/plugins/contrib/ReopenEditor/Makefile.am | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/contrib/ReopenEditor/Makefile.am b/src/plugins/contrib/ReopenEditor/Makefile.am
+index 665dafa..dd80fc1 100644
+--- a/src/plugins/contrib/ReopenEditor/Makefile.am
++++ b/src/plugins/contrib/ReopenEditor/Makefile.am
+@@ -2,6 +2,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include
+
++if ! HAVE_TINYXML
++INCLUDES += -I$(top_srcdir)/src/include/tinyxml
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+
+ pluginlib_LTLIBRARIES = libReopenEditor.la
+--
+1.7.7.6
+
+
+From 7524c119824604c96486e3ac24d6a63036da4809 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/29] fix tinyxml includes in the DoxyBlock plugin
+
+---
+ src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp | 2 +-
+ src/plugins/contrib/DoxyBlocks/DoxyBlocks.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
+index 3a62a02..79499a5 100644
+--- a/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
++++ b/src/plugins/contrib/DoxyBlocks/ConfigPanel.cpp
+@@ -33,7 +33,7 @@
+ #include <configmanager.h>
+ #include <editorcolourset.h>
+ #include <editormanager.h>
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+
+ #include "version.h"
+
+diff --git a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h
+index b827fe9..917d54a 100644
+--- a/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h
++++ b/src/plugins/contrib/DoxyBlocks/DoxyBlocks.h
+@@ -25,7 +25,7 @@
+
+ #include <cbplugin.h>
+ #include <cbstyledtextctrl.h>
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+
+ #include "Config.h"
+
+--
+1.7.7.6
+
+
+From d8770eb881cdf8743ec42101fc9d7274c4cb23f7 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/29] fix tinyxml includes in the CppCheck plugin
+
+---
+ src/plugins/contrib/CppCheck/CppCheck.cpp | 2 +-
+ src/plugins/contrib/CppCheck/Makefile.am | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/contrib/CppCheck/CppCheck.cpp b/src/plugins/contrib/CppCheck/CppCheck.cpp
+index 19445fa..953d395 100644
+--- a/src/plugins/contrib/CppCheck/CppCheck.cpp
++++ b/src/plugins/contrib/CppCheck/CppCheck.cpp
+@@ -32,7 +32,7 @@
+ #include <wx/filefn.h>
+ #include <wx/utils.h>
+
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ #include "filefilters.h"
+ #include "loggers.h"
+
+diff --git a/src/plugins/contrib/CppCheck/Makefile.am b/src/plugins/contrib/CppCheck/Makefile.am
+index 7ffdea8..c5dce20 100644
+--- a/src/plugins/contrib/CppCheck/Makefile.am
++++ b/src/plugins/contrib/CppCheck/Makefile.am
@@ -4,6 +4,10 @@ INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/include \
-I$(top_srcdir)/src/sdk/wxscintilla/include
@@ -1739,3 +1901,75 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/CppCheck/Makefile.am.tinyx
pluginlibdir = $(pkglibdir)/plugins
pluginlib_LTLIBRARIES = libCppCheck.la
+--
+1.7.7.6
+
+
+From a7b7a8014abfeb65405dfb552415d3fe464eae76 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/29] fix include dirs for the main app when system tinyxml
+ is not present
+
+---
+ .../contrib/codesnippets/resources/Makefile.am | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am
+index 8a56df5..e345e70 100644
+--- a/src/plugins/contrib/codesnippets/resources/Makefile.am
++++ b/src/plugins/contrib/codesnippets/resources/Makefile.am
+@@ -8,6 +8,10 @@ INCLUDES = $(WX_CXXFLAGS) \
+ -I$(top_srcdir)/src/plugins/contrib/codesnippets/editor \
+ -I$(top_srcdir)/src/include/mozilla_chardet
+
++if ! HAVE_TINYXML
++INCLUDES += -I$(top_srcdir)/src/include/tinyxml
++endif
++
+ pluginlibdir = $(pkglibdir)/plugins
+
+ ##pluginlib_LTLIBRARIES = codesnippets
+--
+1.7.7.6
+
+
+From d0536beca6aa526e79a24559bcc0eebfd584732f 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/29] fix tinyxml includes in projectimporter plugin
+
+---
+ src/plugins/projectsimporter/msvc10loader.cpp | 2 +-
+ src/plugins/projectsimporter/msvc7loader.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/projectsimporter/msvc10loader.cpp b/src/plugins/projectsimporter/msvc10loader.cpp
+index e6c6856..f071c43 100644
+--- a/src/plugins/projectsimporter/msvc10loader.cpp
++++ b/src/plugins/projectsimporter/msvc10loader.cpp
+@@ -23,7 +23,7 @@
+
+ #include <wx/choicdlg.h>
+
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+
+ #include "prep.h"
+ #include "msvc10loader.h"
+diff --git a/src/plugins/projectsimporter/msvc7loader.cpp b/src/plugins/projectsimporter/msvc7loader.cpp
+index 06e1624..1aead20 100644
+--- a/src/plugins/projectsimporter/msvc7loader.cpp
++++ b/src/plugins/projectsimporter/msvc7loader.cpp
+@@ -23,7 +23,7 @@
+
+ #include <wx/choicdlg.h>
+
+-#include <tinyxml/tinyxml.h>
++#include <tinyxml.h>
+
+ #include "prep.h"
+ #include "msvc7loader.h"
+--
+1.7.7.6
+
diff --git a/codeblocks-wxtreeitemid.patch b/codeblocks-wxtreeitemid.patch
new file mode 100644
index 0000000..8ac566d
--- /dev/null
+++ b/codeblocks-wxtreeitemid.patch
@@ -0,0 +1,101 @@
+From 52ed888d2a47a3fc19ec691ddfa4cf6e72fa0632 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Mon, 11 Apr 2011 15:07:08 +0200
+Subject: [PATCH] wxTreeItemId needs to be initialized with long int
+
+---
+ src/plugins/contrib/codesnippets/codesnippets.cpp | 12 ++++++------
+ .../contrib/codesnippets/codesnippetstreectrl.cpp | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/plugins/contrib/codesnippets/codesnippets.cpp b/src/plugins/contrib/codesnippets/codesnippets.cpp
+index 0b138db..43ddb95 100644
+--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
+@@ -96,7 +96,7 @@ CodeSnippets::CodeSnippets()
+ m_MouseDownX = m_MouseDownY = 0;
+ m_MouseUpX = m_MouseUpY = 0;
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_prjTreeItemAtKeyUp = m_prjTreeItemAtKeyDown= 0;
++ m_prjTreeItemAtKeyUp = m_prjTreeItemAtKeyDown= 0L;
+ #endif
+ m_bMouseExitedWindow = false;
+ m_bBeginInternalDrag = false;
+@@ -1232,8 +1232,8 @@ void CodeSnippets::OnPrjTreeMouseLeftDownEvent(wxMouseEvent& event)
+ m_MouseDownY = event.GetY();
+
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_prjTreeItemAtKeyDown = 0;
+- m_prjTreeItemAtKeyUp = 0;
++ m_prjTreeItemAtKeyDown = 0L;
++ m_prjTreeItemAtKeyUp = 0L;
+ #endif
+ int hitFlags = 0;
+
+@@ -1264,7 +1264,7 @@ void CodeSnippets::OnPrjTreeMouseLeftUpEvent(wxMouseEvent& event)
+ m_MouseUpY = event.GetY();
+
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_prjTreeItemAtKeyUp = 0;
++ m_prjTreeItemAtKeyUp = 0L;
+ #endif
+ int hitFlags = 0;
+
+@@ -1442,8 +1442,8 @@ void CodeSnippets::DoPrjTreeExternalDrag(wxTreeCtrl* pTree)
+ delete fileData; //wxFileDataObject
+ m_TreeText = wxEmptyString;
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_prjTreeItemAtKeyDown = 0;
+- m_prjTreeItemAtKeyUp = 0;
++ m_prjTreeItemAtKeyDown = 0L;
++ m_prjTreeItemAtKeyUp = 0L;
+ #endif
+
+ // correct for treeCtrl bug
+diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+index 65e6af5..b24dce1 100644
+--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+@@ -95,7 +95,7 @@ CodeSnippetsTreeCtrl::CodeSnippetsTreeCtrl(wxWindow *parent, const wxWindowID id
+ m_bBeginInternalDrag = false;
+ m_LastXmlModifiedTime = time_t(0); //2009/03/15
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_itemAtKeyUp = m_itemAtKeyDown = 0;
++ m_itemAtKeyUp = m_itemAtKeyDown = 0L;
+ #endif
+
+
+@@ -1073,8 +1073,8 @@ void CodeSnippetsTreeCtrl::EndInternalTreeItemDrag()
+
+ delete pDoc; pDoc = 0;
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_itemAtKeyDown = 0;
+- m_itemAtKeyUp = 0;
++ m_itemAtKeyDown = 0L;
++ m_itemAtKeyUp = 0L;
+ #endif
+
+ return;
+@@ -1296,8 +1296,8 @@ void CodeSnippetsTreeCtrl::FinishExternalDrag()
+ delete fileData; //wxFileDataObject
+ m_TreeText = wxEmptyString;
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_itemAtKeyDown = 0;
+- m_itemAtKeyUp = 0;
++ m_itemAtKeyDown = 0L;
++ m_itemAtKeyUp = 0L;
+ #endif
+
+ }
+@@ -1410,7 +1410,7 @@ void CodeSnippetsTreeCtrl::OnEndTreeItemDrag(wxTreeEvent& event)
+ m_MouseUpY = event.GetPoint().y;
+
+ #if !wxCHECK_VERSION(2, 8, 12)
+- m_itemAtKeyUp = 0;
++ m_itemAtKeyUp = 0L;
+ #endif
+ int hitFlags = 0;
+ wxTreeItemId id = HitTest(wxPoint(m_MouseUpX, m_MouseUpY), hitFlags);
+--
+1.7.7.6
+
diff --git a/codeblocks.spec b/codeblocks.spec
index 71cca3b..4fb26e2 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -1,49 +1,68 @@
+#define svndate 20121021
+%define svnrev 8629
+%define snapshot 0%{?svndate}
+%if %{snapshot}
+%define svnrelease .%{svndate}svn%{svnrev}
+%endif
+
Name: codeblocks
-Version: 10.05
-Release: 13%{?dist}
+Version: 12.11
+Release: 1%{?svnrelease}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv3+
URL: http://www.codeblocks.org/
-Source0: http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.bz2
+%if %{snapshot}
+# fedora-getsvn codeblocks svn://svn.code.sf.net/p/codeblocks/code/trunk %%{svnrev}
+Source0: %{name}-svn%{svnrev}.tar.bz2
+Patch0: codeblocks-autorev.patch
+%else
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}-1.tar.gz
+%endif
BuildRequires: libtool
-BuildRequires: wxGTK-devel >= 2.8.0
+BuildRequires: wxGTK-devel
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: tinyxml-devel
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires: libICE-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildRequires: boost-devel
+BuildRequires: hunspell-devel
+%endif
+%if 0%{?fedora}
BuildRequires: squirrel-devel
+%endif
+BuildRequires: gamin-devel
BuildRequires: zip
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
Requires: %{name}-libs = %{version}-%{release}
Requires: shared-mime-info
Requires: xterm
-# use system tinyxml lib
-Patch1: %{name}-tinyxml.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=565198 (fully fixed in svn rev 6330)
-Patch2: %{name}-dso.patch
-# update for tinyxml 2.6
-Patch3: %{name}-tinyxml-26.patch
-# D support - svn revisions 6553-6556
-Patch4: %{name}-10.05-D.patch
+# use system tinyxml library
+Patch10: codeblocks-tinyxml.patch
# use system squirrel library
-Patch5: %{name}-squirrel.patch
-# fix build with gcc 4.7
-Patch6: %{name}-gcc47.patch
+Patch11: codeblocks-squirrel.patch
+# wxTreeItemId needs to be initialized with long int
+Patch13: codeblocks-wxtreeitemid.patch
%define pkgdatadir %{_datadir}/%{name}
%define pkglibdir %{_libdir}/%{name}
%define plugindir %{pkglibdir}/plugins
+%if 0%{?fedora} || 0%{?rhel} >= 6
%filter_provides_in %{plugindir}
%filter_setup
+%endif
%description
Code::Blocks is a free C++ IDE built specifically to meet the most demanding
needs of its users. It was designed, right from the start, to be extensible
and configurable. Built around a plug-in framework, Code::Blocks can be
-extended with plug-in DLLs. It includes a plug-in wizard, so you can compile
+extended with plug-in DLLs. It includes a plugin wizard, so you can compile
your own plug-ins.
%package libs
@@ -57,6 +76,7 @@ Libraries needed to run Code::Blocks and its plug-ins.
Summary: Files needed to build Code::Blocks plug-ins
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+Requires: pkgconfig
%description devel
Development files needed to build Code::Blocks plug-ins.
@@ -81,67 +101,100 @@ Summary: Additional Code::Blocks plug-ins
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
Requires: %{name}-contrib-libs = %{version}-%{release}
+Requires: cccc
Requires: cppcheck
+Requires: cscope
+%ifarch %{ix86} x86_64 ppc ppc64 s390x
Requires: valgrind
+%endif
%description contrib
Additional Code::Blocks plug-ins.
+
%prep
-%setup -q -n %{name}-%{version}-release
-%patch1 -p1 -b .tinyxml
-%patch2 -p1 -b .dso
-%patch3 -p1 -b .tinyxml-26
-%patch4 -p1 -b .D
-%patch5 -p1 -b .squirrel
-%patch6 -p1 -b .gcc47
+%if %{snapshot}
+%setup -q -n %{name}
+%patch0 -p1
+%else
+%setup -q -n %{name}-%{version}release%{svnrev}
+%endif
+%patch10 -p1
+%patch11 -p1
+%patch13 -p1
+
+%if %{snapshot}
+# generate revision.m4
+echo "m4_define([SVN_REV], %{svnrev})" > revision.m4
+echo "m4_define([SVN_REVISION], svn%{svnrev})" >> revision.m4
+echo "m4_define([SVN_DATE], %{svndate})" >> revision.m4
+
+./bootstrap
+%else
+# fix version inside the configure script
+sed -i 's/%{version}release%{svnrev}/%{version}/g' revision.m4
+autoreconf -f -i
+%endif
+
# convert EOLs
-find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
+find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" -exec dos2unix -q --keepdate {} \;
# remove execute bits from source files
find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';'
-find src/plugins/contrib/IncrementalSearch -type f -exec chmod a-x {} ';'
find src/plugins/compilergcc -type f -exec chmod a-x {} ';'
+find src/plugins/contrib/IncrementalSearch -type f -exec chmod a-x {} ';'
-# fix version string
-sed -i 's/-release//g' revision.m4
-
-# remove resource archives, they are corrupted
-rm -f src/src/resources/*.zip
-
-autoreconf -f -i
%build
# workaround C++ in the sqplus templates (g++ >= 4.7), disable aliasing
%global optflags %{optflags} -fpermissive -fno-strict-aliasing
-%configure --with-contrib-plugins=all
+# NassiShneiderman - boost is too old or missing on EL < 6
+# spellchecker - hunspell is missing
+%configure \
+%if 0%{?fedora} || 0%{?rhel} >= 6
+ --with-contrib-plugins=all
+%else
+ --with-contrib-plugins=all,-NassiShneiderman,-spellchecker
+%endif
# remove unbundled stuff
rm -rf src/include/tinyxml src/base/tinyxml
+%if 0%{?fedora}
rm -rf src/include/scripting/{include,squirrel,sqstdlib}
rm -rf src/sdk/scripting/{squirrel,sqstdlib}
+%endif
+
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
-%install
+%install
make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
-
+
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/wxSmithContribItems/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/wxContribItems/*.la
rm -f $RPM_BUILD_ROOT%{plugindir}/*.la
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install \
+%if 0%{?rhel} < 7 || 0%{?fedora} < 19
+ --vendor fedora \
+%endif
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/codeblocks.desktop
# set a fixed timestamp (source archive creation) to generated resource archives
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkgdatadir}/*.zip
-# generate linker config file for wxSmithContribItems libraries
+# generate linker config file for wxContribItems libraries
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/wxSmithContribItems" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-contrib-%{_arch}.conf
+echo "%{_libdir}/%{name}/wxContribItems" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-contrib-%{_arch}.conf
+
%post
update-mime-database /usr/share/mime &> /dev/null || :
@@ -157,8 +210,9 @@ update-mime-database /usr/share/mime &> /dev/null || :
%postun contrib-libs -p /sbin/ldconfig
+
%files
-%doc README AUTHORS BUGS COMPILERS NEWS ChangeLog
+%doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog
%{_bindir}/*
%{_mandir}/man1/*.gz
@@ -177,7 +231,11 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{plugindir}/libscriptedwizard.so
%{plugindir}/libtodo.so
+%if 0%{?rhel} < 7 || 0%{?fedora} < 19
+%{_datadir}/applications/fedora-%{name}.desktop
+%else
%{_datadir}/applications/%{name}.desktop
+%endif
%{_datadir}/icons/hicolor/48x48/mimetypes/*.png
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/pixmaps/%{name}.png
@@ -213,34 +271,45 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{_libdir}/lib%{name}.so.*
%files devel
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
+%exclude %{_includedir}/%{name}/wxContribItems/
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%files contrib-libs
%{_sysconfdir}/ld.so.conf.d/%{name}-contrib-%{_arch}.conf
%{_libdir}/libwxsmithlib.so.*
-%{_libdir}/wxSmithContribItems/*.so.*
+%{_libdir}/%{name}/wxContribItems/*.so.*
%exclude %{_libdir}/libwxsmithlib.so
%files contrib-devel
%{_includedir}/wxsmith
-%{_includedir}/wxSmithContribItems
-%{_libdir}/wxSmithContribItems/*.so
+%{_includedir}/%{name}/wxContribItems/
+%{_libdir}/%{name}/wxContribItems/*.so
+%{_libdir}/pkgconfig/cb_wx*.pc
%{_libdir}/pkgconfig/wxsmith.pc
%{_libdir}/pkgconfig/wxsmithaui.pc
%{_libdir}/pkgconfig/wxsmith-contrib.pc
%files contrib
+%{pkgdatadir}/images/DoxyBlocks
+
%{pkgdatadir}/AutoVersioning.zip
%{pkgdatadir}/BrowseTracker.zip
%{pkgdatadir}/Cccc.zip
%{pkgdatadir}/CppCheck.zip
+%{pkgdatadir}/Cscope.zip
+%{pkgdatadir}/DoxyBlocks.zip
+%{pkgdatadir}/EditorConfig.zip
+%{pkgdatadir}/EditorTweaks.zip
+%{pkgdatadir}/FileManager.zip
%{pkgdatadir}/HexEditor.zip
%{pkgdatadir}/IncrementalSearch.zip
%{pkgdatadir}/MouseSap.zip
%{pkgdatadir}/ThreadSearch.zip
+%{pkgdatadir}/ToolsPlus.zip
%{pkgdatadir}/Valgrind.zip
+%{pkgdatadir}/abbreviations.zip
%{pkgdatadir}/byogames.zip
%{pkgdatadir}/cb_koders.zip
%{pkgdatadir}/codesnippets.zip
@@ -255,6 +324,7 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{pkgdatadir}/lib_finder.zip
%{pkgdatadir}/Profiler.zip
%{pkgdatadir}/RegExTestbed.zip
+%{pkgdatadir}/ReopenEditor.zip
%{pkgdatadir}/SymTab.zip
%{pkgdatadir}/wxsmith.zip
%{pkgdatadir}/wxSmithAui.zip
@@ -263,16 +333,29 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{pkgdatadir}/images/codesnippets
%{pkgdatadir}/images/wxsmith
%{pkgdatadir}/lib_finder
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%{pkgdatadir}/NassiShneiderman.zip
+%{pkgdatadir}/SpellChecker.zip
+%{pkgdatadir}/SpellChecker
+%endif
+%{pkgdatadir}/SmartIndent*.zip
%{plugindir}/libAutoVersioning.so
%{plugindir}/libBrowseTracker.so
%{plugindir}/libCccc.so
%{plugindir}/libCppCheck.so
+%{plugindir}/libCscope.so
+%{plugindir}/libDoxyBlocks.so
+%{plugindir}/libEditorConfig.so
+%{plugindir}/libEditorTweaks.so
+%{plugindir}/libFileManager.so
%{plugindir}/libHexEditor.so
%{plugindir}/libIncrementalSearch.so
%{plugindir}/libMouseSap.so
%{plugindir}/libThreadSearch.so
+%{plugindir}/libToolsPlus.so
%{plugindir}/libValgrind.so
+%{plugindir}/libabbreviations.so
%{plugindir}/libbyogames.so
%{plugindir}/libcb_koders.so
%{plugindir}/libcodesnippets.so
@@ -287,12 +370,22 @@ update-mime-database /usr/share/mime &> /dev/null || :
%{plugindir}/liblib_finder.so
%{plugindir}/libProfiler.so
%{plugindir}/libRegExTestbed.so
+%{plugindir}/libReopenEditor.so
%{plugindir}/libSymTab.so
%{plugindir}/libwxsmith.so
%{plugindir}/libwxSmithAui.so
%{plugindir}/libwxsmithcontribitems.so
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%{plugindir}/libNassiShneiderman.so
+%{plugindir}/libSpellChecker.so
+%endif
+%{plugindir}/libSmartIndent*.so
+
%changelog
+* Sun Sep 01 2013 Dan Horák <dan[at]danny.cz> - 12.11-1
+- update to final 12.11 release (svn revision 8629)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.05-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 75b4133..8e9d29e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab077d562e98b0586f2f86c14cb773ba codeblocks-10.05-src.tar.bz2
+4fa8980a8c578b8b5589fceb9b0890d6 codeblocks_12.11-1.tar.gz
More information about the scm-commits
mailing list