diff --git a/codeblocks-13.12-unbundle.patch b/codeblocks-13.12-unbundle.patch index 826f44c..2b1dc9c 100644 --- a/codeblocks-13.12-unbundle.patch +++ b/codeblocks-13.12-unbundle.patch @@ -3223,6 +3223,21 @@ index d30398d..7679c7f 100644 class ASStreamIterator : public astyle::ASSourceIterator { +diff --git a/src/plugins/astyle/astyleplugin.cpp b/src/plugins/astyle/astyleplugin.cpp +index b3f3320..86aeac6 100644 +--- a/src/plugins/astyle/astyleplugin.cpp ++++ b/src/plugins/astyle/astyleplugin.cpp +@@ -56,8 +56,8 @@ AStylePlugin::AStylePlugin() + { + //ctor + +- if (!Manager::LoadResource(_T("astyle.zip"))) +- NotifyMissingFile(_T("astyle.zip")); ++ if (!Manager::LoadResource(_T("Astyle.zip"))) ++ NotifyMissingFile(_T("Astyle.zip")); + } + + AStylePlugin::~AStylePlugin() diff --git a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp index 30dca00..4e31963 100644 --- a/src/plugins/astyle/dlgformattersettings.cpp diff --git a/codeblocks.spec b/codeblocks.spec index cf293cb..a260a0f 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -7,7 +7,7 @@ Name: codeblocks Version: 13.12 -Release: 12%{?svnrelease}%{?dist} +Release: 13%{?svnrelease}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPLv3+ @@ -397,6 +397,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Dec 12 2014 Dan Horák - 13.12-13 +- fix resource archive loading for astyle plugin (#1172984, #1173243) + * Wed Dec 03 2014 Dan Horák - 13.12-12 - drop support for RHEL < 6 - include appdata only for Fedora