From 6e957b811d283bc1176c263d32f4af66098a80ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 27 Sep 2023 09:01:34 +0200 Subject: [PATCH] - updated to latest SVN snapshot The 20.03 release does not build and this is soon going to be new version, see https://forums.codeblocks.org/index.php/topic,25371.0.html --- codeblocks-astyle-3.1.patch | 367 ------------------------ codeblocks-pwd.patch | 544 ------------------------------------ codeblocks.spec | 24 +- no-parallel.patch | 11 + 4 files changed, 23 insertions(+), 923 deletions(-) delete mode 100644 codeblocks-astyle-3.1.patch delete mode 100644 codeblocks-pwd.patch create mode 100644 no-parallel.patch diff --git a/codeblocks-astyle-3.1.patch b/codeblocks-astyle-3.1.patch deleted file mode 100644 index 86fc26f..0000000 --- a/codeblocks-astyle-3.1.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff --git a/src/plugins/astyle/asstreamiterator.cpp b/src/plugins/astyle/asstreamiterator.cpp -index a2d75f2c9..cc6244109 100644 ---- a/src/plugins/astyle/asstreamiterator.cpp -+++ b/src/plugins/astyle/asstreamiterator.cpp -@@ -53,8 +53,10 @@ std::string ASStreamIterator::nextLine(cb_unused bool emptyLineWasDeleted) - - std::string ASStreamIterator::peekNextLine() - { -- if (!m_SavedCharPtr) -+ if (!m_SavedCharPtr){ - m_SavedCharPtr = m_CharPtr; -+ m_SavedCurChar = m_CurChar; -+ } - - return readLine(); - } -@@ -62,6 +64,7 @@ std::string ASStreamIterator::peekNextLine() - void ASStreamIterator::peekReset() - { - m_CharPtr = m_SavedCharPtr; -+ m_CurChar = m_SavedCurChar; - m_SavedCharPtr = 0; - } - -diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h -index 105ca9956..d1a6c8fcd 100644 ---- a/src/plugins/astyle/asstreamiterator.h -+++ b/src/plugins/astyle/asstreamiterator.h -@@ -22,6 +22,7 @@ class ASStreamIterator : public astyle::ASSourceIterator - - bool hasMoreLines() const; - int getStreamLength() const; -+ std::streamoff getPeekStart() const { return 0; } - std::string nextLine(bool emptyLineWasDeleted = false); - std::string peekNextLine(); - void peekReset(); -@@ -39,6 +40,7 @@ class ASStreamIterator : public astyle::ASSourceIterator - const wxChar* m_CharPtr; - const wxChar* m_SavedCharPtr; - int m_CurChar; -+ int m_SavedCurChar; - int m_CurLine; - bool m_FoundBookmark; - bool m_FoundBreakpoint; -diff --git a/src/plugins/astyle/astyleconfigdlg.cpp b/src/plugins/astyle/astyleconfigdlg.cpp -index a6372b6fe..7464b74f8 100644 ---- a/src/plugins/astyle/astyleconfigdlg.cpp -+++ b/src/plugins/astyle/astyleconfigdlg.cpp -@@ -34,12 +34,13 @@ BEGIN_EVENT_TABLE(AstyleConfigDlg, wxPanel) - EVT_RADIOBUTTON(XRCID("rbStroustrup"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbWhitesmith"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbVTK"), AstyleConfigDlg::OnStyleChange) -- EVT_RADIOBUTTON(XRCID("rbBanner"), AstyleConfigDlg::OnStyleChange) -+ EVT_RADIOBUTTON(XRCID("rbRatliff"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbGNU"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbLinux"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbHorstmann"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rb1TBS"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbGoogle"), AstyleConfigDlg::OnStyleChange) -+ EVT_RADIOBUTTON(XRCID("rbMozilla"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbPico"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbLisp"), AstyleConfigDlg::OnStyleChange) - EVT_RADIOBUTTON(XRCID("rbCustom"), AstyleConfigDlg::OnStyleChange) -@@ -158,7 +159,7 @@ int Foo(bool isBar)\n\ - XRCCTRL(*this, "rbVTK", wxRadioButton)->SetValue(true); - break; - #undef AS_VTK --#define AS_BANNER "\ -+#define AS_RATLIFF "\ - int Foo(bool isBar) {\n\ - if (isBar) {\n\ - bar();\n\ -@@ -167,11 +168,11 @@ int Foo(bool isBar) {\n\ - else\n\ - return 0;\n\ - }" -- case aspsBanner: -- sample = _T(AS_BANNER); -- XRCCTRL(*this, "rbBanner", wxRadioButton)->SetValue(true); -+ case aspsRatliff: -+ sample = _T(AS_RATLIFF); -+ XRCCTRL(*this, "rbRatliff", wxRadioButton)->SetValue(true); - break; --#undef AS_BANNER -+#undef AS_RATLIFF - #define AS_GNU "\ - int Foo(bool isBar)\n\ - {\n\ -@@ -307,8 +308,8 @@ void AstyleConfigDlg::OnStyleChange(wxCommandEvent& event) - SetStyle(aspsWhitesmith); - else if (event.GetId() == XRCID("rbVTK")) - SetStyle(aspsVTK); -- else if (event.GetId() == XRCID("rbBanner")) -- SetStyle(aspsBanner); -+ else if (event.GetId() == XRCID("rbRatliff")) -+ SetStyle(aspsRatliff); - else if (event.GetId() == XRCID("rbGNU")) - SetStyle(aspsGnu); - else if (event.GetId() == XRCID("rbLinux")) -@@ -376,6 +377,7 @@ void AstyleConfigDlg::LoadSettings() - XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_extern_c"), false)); - XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_namespaces"), false)); - XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_inlines"), false)); -+ XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_closing_whiles"), false)); - - XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/indentation"), 4)); - XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/continuation"), 0)); -@@ -386,6 +388,7 @@ void AstyleConfigDlg::LoadSettings() - XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_labels"), false)); - XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_modifiers"), false)); - XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_namespaces"), false)); -+ XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_after_parens"), false)); - XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_switches"), false)); - XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_block"), false)); - XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_define"), false)); -@@ -399,6 +402,10 @@ void AstyleConfigDlg::LoadSettings() - XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_brackets"), false)); - XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_one_line_brackets"), false)); - XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/remove_brackets"), false)); -+ XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type"), false)); -+ XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type_decl"),false)); -+ XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type"), false)); -+ XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type_decl"),false)); - XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_blocks"), false)); - XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_headers"), false)); - XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_statements"), false)); -@@ -455,8 +462,8 @@ void AstyleConfigDlg::SaveSettings() - style = aspsWhitesmith; - else if (XRCCTRL(*this, "rbVTK", wxRadioButton)->GetValue()) - style = aspsVTK; -- else if (XRCCTRL(*this, "rbBanner", wxRadioButton)->GetValue()) -- style = aspsBanner; -+ else if (XRCCTRL(*this, "rbRatliff", wxRadioButton)->GetValue()) -+ style = aspsRatliff; - else if (XRCCTRL(*this, "rbGNU", wxRadioButton)->GetValue()) - style = aspsGnu; - else if (XRCCTRL(*this, "rbLinux", wxRadioButton)->GetValue()) -@@ -467,6 +474,8 @@ void AstyleConfigDlg::SaveSettings() - style = asps1TBS; - else if (XRCCTRL(*this, "rbGoogle", wxRadioButton)->GetValue()) - style = aspsGoogle; -+ else if (XRCCTRL(*this, "rbMozilla", wxRadioButton)->GetValue()) -+ style = aspsMozilla; - else if (XRCCTRL(*this, "rbPico", wxRadioButton)->GetValue()) - style = aspsPico; - else if (XRCCTRL(*this, "rbLisp", wxRadioButton)->GetValue()) -@@ -480,6 +489,7 @@ void AstyleConfigDlg::SaveSettings() - cfg->Write(_T("/attach_extern_c"), XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->GetValue()); - cfg->Write(_T("/attach_namespaces"), XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->GetValue()); - cfg->Write(_T("/attach_inlines"), XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/attach_closing_whiles"), XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->GetValue()); - - cfg->Write(_T("/indentation"), XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->GetValue()); - cfg->Write(_T("/continuation"), XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->GetValue()); -@@ -490,6 +500,7 @@ void AstyleConfigDlg::SaveSettings() - cfg->Write(_T("/indent_labels"), XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->GetValue()); - cfg->Write(_T("/indent_modifiers"), XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->GetValue()); - cfg->Write(_T("/indent_namespaces"), XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/indent_after_parens"), XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->GetValue()); - cfg->Write(_T("/indent_switches"), XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->GetValue()); - cfg->Write(_T("/indent_preproc_block"), XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->GetValue()); - cfg->Write(_T("/indent_preproc_define"), XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->GetValue()); -@@ -503,6 +514,10 @@ void AstyleConfigDlg::SaveSettings() - cfg->Write(_T("/add_brackets"), XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->GetValue()); - cfg->Write(_T("/add_one_line_brackets"), XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->GetValue()); - cfg->Write(_T("/remove_brackets"), XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/break_return_type_decl"), XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/break_return_type"), XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/attach_return_type"), XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->GetValue()); -+ cfg->Write(_T("/attach_return_type_decl"), XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->GetValue()); - cfg->Write(_T("/keep_blocks"), XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->GetValue()); - cfg->Write(_T("/keep_headers"), XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->GetValue()); - cfg->Write(_T("/keep_statements"), XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->GetValue()); -diff --git a/src/plugins/astyle/astylepredefinedstyles.h b/src/plugins/astyle/astylepredefinedstyles.h -index e00ae4907..1bf72f0ea 100644 ---- a/src/plugins/astyle/astylepredefinedstyles.h -+++ b/src/plugins/astyle/astylepredefinedstyles.h -@@ -14,7 +14,7 @@ enum AStylePredefinedStyle - aspsStroustrup, - aspsWhitesmith, - aspsVTK, -- aspsBanner, -+ aspsRatliff, - aspsGnu, - aspsLinux, - aspsHorstmann, -diff --git a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp -index 6e2d264ab..683693038 100644 ---- a/src/plugins/astyle/dlgformattersettings.cpp -+++ b/src/plugins/astyle/dlgformattersettings.cpp -@@ -39,8 +39,8 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - formatter.setFormattingStyle(astyle::STYLE_WHITESMITH); - else if (XRCCTRL(*m_dlg, "rbVTK", wxRadioButton)->GetValue()) - formatter.setFormattingStyle(astyle::STYLE_VTK); -- else if (XRCCTRL(*m_dlg, "rbBanner", wxRadioButton)->GetValue()) -- formatter.setFormattingStyle(astyle::STYLE_BANNER); -+ else if (XRCCTRL(*m_dlg, "rbRatliff", wxRadioButton)->GetValue()) -+ formatter.setFormattingStyle(astyle::STYLE_RATLIFF); - else if (XRCCTRL(*m_dlg, "rbGNU", wxRadioButton)->GetValue()) - formatter.setFormattingStyle(astyle::STYLE_GNU); - else if (XRCCTRL(*m_dlg, "rbLinux", wxRadioButton)->GetValue()) -@@ -58,10 +58,11 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - else if (XRCCTRL(*m_dlg, "rbLisp", wxRadioButton)->GetValue()) - formatter.setFormattingStyle(astyle::STYLE_LISP); - -- formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue()); -- formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue()); -- formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue()); -- formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue()); -+ formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue()); -+ formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue()); -+ formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue()); -+ formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue()); -+ formatter.setAttachClosingWhile(XRCCTRL(*m_dlg, "chkAttachClosingWhiles", wxCheckBox)->GetValue()); - - bool value = XRCCTRL(*m_dlg, "chkForceUseTabs", wxCheckBox)->GetValue(); - int spaceNum = XRCCTRL(*m_dlg, "spnIndentation", wxSpinCtrl)->GetValue(); -@@ -79,6 +80,7 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - formatter.setLabelIndent(XRCCTRL(*m_dlg, "chkIndentLabels", wxCheckBox)->GetValue()); - formatter.setModifierIndent(XRCCTRL(*m_dlg, "chkIndentModifiers", wxCheckBox)->GetValue()); - formatter.setNamespaceIndent(XRCCTRL(*m_dlg, "chkIndentNamespaces", wxCheckBox)->GetValue()); -+ formatter.setAfterParenIndent(XRCCTRL(*m_dlg, "chkIndentAfterParens", wxCheckBox)->GetValue()); - formatter.setSwitchIndent(XRCCTRL(*m_dlg, "chkIndentSwitches", wxCheckBox)->GetValue()); - formatter.setPreprocBlockIndent(XRCCTRL(*m_dlg, "chkIndentPreprocBlock", wxCheckBox)->GetValue()); - formatter.setPreprocDefineIndent(XRCCTRL(*m_dlg, "chkIndentPreprocDefine", wxCheckBox)->GetValue()); -@@ -88,11 +90,15 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - formatter.setMinConditionalIndentOption(minConditionalEvent); - formatter.setMaxInStatementIndentLength( wxAtoi(XRCCTRL(*m_dlg, "txtMaxInStatementIndent", wxTextCtrl)->GetValue()) ); - -- formatter.setBreakClosingHeaderBracketsMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue()); -+ formatter.setBreakClosingHeaderBracesMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue()); - formatter.setBreakElseIfsMode(XRCCTRL(*m_dlg, "chkBreakElseIfs", wxCheckBox)->GetValue()); -- formatter.setAddBracketsMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue()); -- formatter.setAddOneLineBracketsMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue()); -- formatter.setRemoveBracketsMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue()); -+ formatter.setAddBracesMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue()); -+ formatter.setAddOneLineBracesMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue()); -+ formatter.setRemoveBracesMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue()); -+ formatter.setBreakReturnType(XRCCTRL(*m_dlg, "chkBreakReturnType", wxCheckBox)->GetValue()); -+ formatter.setBreakReturnTypeDecl(XRCCTRL(*m_dlg, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue()); -+ formatter.setAttachReturnType(XRCCTRL(*m_dlg, "chkAttachReturnType", wxCheckBox)->GetValue()); -+ formatter.setAttachReturnTypeDecl(XRCCTRL(*m_dlg, "chkAttachReturnTypeDecl", wxCheckBox)->GetValue()); - formatter.setBreakOneLineBlocksMode(!XRCCTRL(*m_dlg, "chkKeepBlocks", wxCheckBox)->GetValue()); - formatter.setBreakOneLineHeadersMode(!XRCCTRL(*m_dlg, "chkKeepHeaders", wxCheckBox)->GetValue()); - formatter.setBreakOneLineStatementsMode(!XRCCTRL(*m_dlg, "chkKeepStatements", wxCheckBox)->GetValue()); -diff --git a/src/plugins/astyle/formattersettings.cpp b/src/plugins/astyle/formattersettings.cpp -index 8f60ddde2..b875ddcba 100644 ---- a/src/plugins/astyle/formattersettings.cpp -+++ b/src/plugins/astyle/formattersettings.cpp -@@ -54,8 +54,8 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - formatter.setFormattingStyle(astyle::STYLE_VTK); - break; - -- case aspsBanner: // Banner -- formatter.setFormattingStyle(astyle::STYLE_BANNER); -+ case aspsRatliff: // Ratliff -+ formatter.setFormattingStyle(astyle::STYLE_RATLIFF); - break; - - case aspsGnu: // GNU -@@ -123,7 +123,7 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter) - formatter.setMinConditionalIndentOption(cfg->ReadInt(_T("/min_conditional_indent"), 2)); - formatter.setMaxInStatementIndentLength(cfg->ReadInt(_T("/max_instatement_indent"), 40)); - -- formatter.setBreakClosingHeaderBracketsMode(cfg->ReadBool(_T("/break_closing"))); -+ formatter.setBreakClosingHeaderBracesMode(cfg->ReadBool(_T("/break_closing"))); - formatter.setBreakElseIfsMode(cfg->ReadBool(_T("/break_elseifs"))); - formatter.setAddBracketsMode(cfg->ReadBool(_T("/add_brackets"))); - formatter.setAddOneLineBracketsMode(cfg->ReadBool(_T("/add_one_line_brackets"))); -diff --git a/src/plugins/astyle/resources/configuration.xrc b/src/plugins/astyle/resources/configuration.xrc -index 86e0b0df9..50d8cfad0 100644 ---- a/src/plugins/astyle/resources/configuration.xrc -+++ b/src/plugins/astyle/resources/configuration.xrc -@@ -61,9 +61,9 @@ - 5 - - -- -- -- Banner style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a 'hanging indent' with following case statements and C++ class modifiers (public, private, protected). -+ -+ -+ Ratliff style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a 'hanging indent' with following case statements and C++ class modifiers (public, private, protected). - - wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT - 5 -@@ -212,6 +212,13 @@ - wxTOP|wxALIGN_LEFT - 5 - -+ -+ -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ - - wxEXPAND - 5 -@@ -319,6 +326,13 @@ - wxTOP|wxALIGN_LEFT - 5 - -+ -+ -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ - - - -@@ -427,21 +441,49 @@ - - - -- -+ - - wxTOP|wxALIGN_LEFT - 5 - - - -- -+ - - wxTOP|wxALIGN_LEFT - 5 - - - -- -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ -+ -+ -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ -+ -+ -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ -+ -+ -+ -+ -+ wxTOP|wxALIGN_LEFT -+ 5 -+ -+ -+ -+ - - wxTOP|wxALIGN_LEFT - 5 diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch deleted file mode 100644 index 72657e6..0000000 --- a/codeblocks-pwd.patch +++ /dev/null @@ -1,544 +0,0 @@ -diff -ur codeblocks-13.12/src/plugins/abbreviations/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/abbreviations/resources/Makefile.am ---- codeblocks-13.12/src/plugins/abbreviations/resources/Makefile.am 2013-11-17 20:33:51.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/abbreviations/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,5 +4,5 @@ - EXTRA_DIST = manifest.xml $(srcdir)/*.xrc - - abbreviations.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/abbreviations.zip manifest.xml *.xrc > /dev/null - ---- codeblocks-17.12/src/plugins/astyle/resources/Makefile.am.orig 2019-04-19 18:33:51.130049573 +0200 -+++ codeblocks-17.12/src/plugins/astyle/resources/Makefile.am 2019-04-19 18:35:38.729466657 +0200 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - Astyle.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/Astyle.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/autosave/Makefile.am codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am ---- codeblocks-13.12/src/plugins/autosave/Makefile.am 2013-11-17 20:33:50.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/autosave/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -17,4 +17,4 @@ - CLEANFILES = $(pkgdata_DATA) - - autosave.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/autosave.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/autosave.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/classwizard/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/classwizard/resources/Makefile.am ---- codeblocks-13.12/src/plugins/classwizard/resources/Makefile.am 2013-11-17 20:33:50.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/classwizard/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - classwizard.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/classwizard.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/classwizard.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/codecompletion/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/codecompletion/resources/Makefile.am ---- codeblocks-13.12/src/plugins/codecompletion/resources/Makefile.am 2013-11-17 20:34:13.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/codecompletion/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -56,7 +56,7 @@ - images/vars_folder.png - - codecompletion.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/codecompletion.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/codecompletion.zip manifest.xml *.xrc > /dev/null - - install-exec-local: - mkdir -p $(DESTDIR)$(pkgdatadir)/images/codecompletion -diff -ur codeblocks-13.12/src/plugins/compilergcc/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/compilergcc/resources/Makefile.am ---- codeblocks-13.12/src/plugins/compilergcc/resources/Makefile.am 2013-11-17 20:33:51.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/compilergcc/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -20,7 +20,7 @@ - images/16x16/stop.png - - compiler.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/compiler.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null -+ zip $(PWD)/compiler.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null - - compilers_xmldir = $(datadir)/@PACKAGE@/compilers - -diff -ur codeblocks-13.12/src/plugins/contrib/AutoVersioning/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/AutoVersioning/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/AutoVersioning/Makefile.am 2013-11-17 20:34:10.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/AutoVersioning/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -33,4 +33,4 @@ - CLEANFILES = $(pkgdata_DATA) - - AutoVersioning.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/AutoVersioning.zip manifest.xml > /dev/null -+ zip $(PWD)/AutoVersioning.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/BrowseTracker/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/BrowseTracker/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/BrowseTracker/Makefile.am 2013-11-17 20:34:10.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/BrowseTracker/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -42,4 +42,4 @@ - CLEANFILES = $(pkgdata_DATA) - - BrowseTracker.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/BrowseTracker.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null -+ zip -R $(PWD)/BrowseTracker.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am 2013-11-17 20:34:09.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -35,4 +35,4 @@ - CLEANFILES = $(pkgdata_DATA) - - byogames.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/byogames.zip manifest.xml > /dev/null -+ zip $(PWD)/byogames.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/cb_koders/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/cb_koders/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/cb_koders/Makefile.am 2013-11-17 20:33:55.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/cb_koders/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -24,4 +24,4 @@ - CLEANFILES = $(pkgdata_DATA) - - cb_koders.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/cb_koders.zip manifest.xml > /dev/null -+ zip $(PWD)/cb_koders.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/Cccc/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Cccc/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/Cccc/resources/Makefile.am 2013-11-17 20:34:04.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/Cccc/resources/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - Cccc.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cccc.zip manifest.xml > /dev/null -+ zip $(PWD)/Cccc.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/codesnippets/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/codesnippets/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/codesnippets/resources/Makefile.am 2013-11-17 20:34:08.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/codesnippets/resources/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -140,5 +140,5 @@ - EXTRA_DIST = manifest.xml - - codesnippets.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/codesnippets.zip manifest.xml > /dev/null -+ zip $(PWD)/codesnippets.zip manifest.xml > /dev/null - -diff -ur codeblocks-13.12/src/plugins/contrib/codestat/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/codestat/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/codestat/resources/Makefile.am 2013-11-17 20:34:09.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/codestat/resources/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - codestat.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/codestat.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/codestat.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/copystrings/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/copystrings/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/copystrings/Makefile.am 2013-11-17 20:33:55.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/copystrings/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -22,4 +22,4 @@ - CLEANFILES = $(pkgdata_DATA) - - copystrings.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/copystrings.zip manifest.xml > /dev/null -+ zip $(PWD)/copystrings.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/CppCheck/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/CppCheck/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/CppCheck/resources/Makefile.am 2013-11-17 20:33:54.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/CppCheck/resources/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - CppCheck.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/CppCheck.zip manifest.xml > /dev/null -+ zip $(PWD)/CppCheck.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/Cscope/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Cscope/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/Cscope/Makefile.am 2013-11-17 20:34:00.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/Cscope/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -36,4 +36,4 @@ - CLEANFILES = $(pkgdata_DATA) - - Cscope.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cscope.zip manifest.xml > /dev/null -+ zip $(PWD)/Cscope.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/DoxyBlocks/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/DoxyBlocks/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/DoxyBlocks/Makefile.am 2013-11-17 20:33:54.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/DoxyBlocks/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -41,7 +41,7 @@ - CLEANFILES = $(pkgdata_DATA) - - DoxyBlocks.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/DoxyBlocks.zip manifest.xml images/*.png images/16x16/*.png > /dev/null -+ zip -R $(PWD)/DoxyBlocks.zip manifest.xml images/*.png images/16x16/*.png > /dev/null - - confimagesdir = $(datadir)/@PACKAGE@/images/settings - -diff -ur codeblocks-13.12/src/plugins/contrib/dragscroll/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/dragscroll/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/dragscroll/Makefile.am 2013-11-17 20:34:05.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/dragscroll/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -26,4 +26,4 @@ - CLEANFILES = $(pkgdata_DATA) - - dragscroll.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/dragscroll.zip manifest.xml > /dev/null -+ zip $(PWD)/dragscroll.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/EditorConfig/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/EditorConfig/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/EditorConfig/Makefile.am 2013-11-17 20:34:00.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/EditorConfig/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -26,4 +26,4 @@ - CLEANFILES = $(pkgdata_DATA) - - EditorConfig.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/EditorConfig.zip manifest.xml > /dev/null -+ zip $(PWD)/EditorConfig.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/EditorTweaks/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/EditorTweaks/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/EditorTweaks/Makefile.am 2013-11-17 20:34:09.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/EditorTweaks/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -26,4 +26,4 @@ - CLEANFILES = $(pkgdata_DATA) - - EditorTweaks.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/EditorTweaks.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/EditorTweaks.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/envvars/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/envvars/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/envvars/Makefile.am 2013-11-17 20:33:54.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/envvars/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -32,4 +32,4 @@ - CLEANFILES = $(pkgdata_DATA) - - envvars.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/envvars.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/envvars.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/FileManager/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/FileManager/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/FileManager/Makefile.am 2013-11-17 20:33:59.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/FileManager/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -41,4 +41,4 @@ - CLEANFILES = $(pkgdata_DATA) - - FileManager.zip: manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc -- PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc > /dev/null -+ zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am 2013-11-17 20:34:08.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -40,4 +40,4 @@ - CLEANFILES = $(pkgdata_DATA) - - headerfixup.zip: -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/headerfixup.zip manifest.xml > /dev/null -+ zip $(PWD)/headerfixup.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/help_plugin/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/help_plugin/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/help_plugin/Makefile.am 2013-11-17 20:34:09.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/help_plugin/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -61,4 +61,4 @@ - CLEANFILES = $(pkgdata_DATA) - - help_plugin.zip: manifest.xml help_plugin.xrc -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/help_plugin.zip manifest.xml *.xrc *.png > /dev/null -+ zip $(PWD)/help_plugin.zip manifest.xml *.xrc *.png > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/HexEditor/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/HexEditor/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/HexEditor/Makefile.am 2013-11-17 20:33:55.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/HexEditor/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -66,4 +66,4 @@ - CLEANFILES = $(pkgdata_DATA) - - HexEditor.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/HexEditor.zip manifest.xml > /dev/null -+ zip $(PWD)/HexEditor.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/IncrementalSearch/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/IncrementalSearch/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/IncrementalSearch/Makefile.am 2013-11-17 20:34:02.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/IncrementalSearch/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -29,7 +29,7 @@ - CLEANFILES = $(pkgdata_DATA) - - IncrementalSearch.zip: manifest.xml IncrementalSearchToolbar.xrc IncrementalSearchConfDlg.xrc -- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null -+ zip -R $(PWD)/IncrementalSearch.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null - - confimagesdir = $(datadir)/@PACKAGE@/images/settings - -diff -ur codeblocks-13.12/src/plugins/contrib/keybinder/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/keybinder/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/keybinder/Makefile.am 2013-11-17 20:34:10.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/keybinder/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -26,4 +26,4 @@ - CLEANFILES = $(pkgdata_DATA) - - keybinder.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/keybinder.zip manifest.xml > /dev/null -+ zip $(PWD)/keybinder.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/lib_finder/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/lib_finder/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/lib_finder/Makefile.am 2013-11-17 20:34:06.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/lib_finder/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -71,4 +71,4 @@ - CLEANFILES = $(pkgdata_DATA) - - lib_finder.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/lib_finder.zip manifest.xml > /dev/null -+ zip $(PWD)/lib_finder.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/MouseSap/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/MouseSap/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/MouseSap/Makefile.am 2013-11-17 20:34:04.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/MouseSap/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -23,4 +23,4 @@ - CLEANFILES = $(pkgdata_DATA) - - MouseSap.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/MouseSap.zip manifest.xml > /dev/null -+ zip $(PWD)/MouseSap.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/NassiShneiderman/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/NassiShneiderman/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/NassiShneiderman/Makefile.am 2013-11-17 20:34:04.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/NassiShneiderman/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -81,4 +81,4 @@ - CLEANFILES = $(pkgdata_DATA) - - NassiShneiderman.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/NassiShneiderman.zip manifest.xml > /dev/null -+ zip $(PWD)/NassiShneiderman.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/profiler/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/profiler/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/profiler/resources/Makefile.am 2013-11-17 20:33:54.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/profiler/resources/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - Profiler.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Profiler.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/Profiler.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/regex_testbed/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/regex_testbed/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/regex_testbed/Makefile.am 2013-11-17 20:33:55.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/regex_testbed/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -23,4 +23,4 @@ - CLEANFILES = $(pkgdata_DATA) - - RegExTestbed.zip: manifest.xml regexdlg.xrc -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/RegExTestbed.zip manifest.xml regexdlg.xrc > /dev/null -+ zip $(PWD)/RegExTestbed.zip manifest.xml regexdlg.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/ReopenEditor/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ReopenEditor/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/ReopenEditor/Makefile.am 2013-11-17 20:34:06.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/ReopenEditor/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -28,4 +28,4 @@ - CLEANFILES = $(pkgdata_DATA) - - ReopenEditor.zip: manifest.xml ReopenEditorConfDLg.xrc -- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/ReopenEditor.zip manifest.xml *.xrc > /dev/null -+ zip -R $(PWD)/ReopenEditor.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/SmartIndent/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/SmartIndent/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/SmartIndent/Makefile.am 2013-11-17 20:34:04.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/SmartIndent/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -102,37 +102,30 @@ - .NOTPARALLEL: $(pkgdata_DATA) - - SmartIndentHDL.zip: manifest_hdl.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_hdl.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentHDL.zip manifest.xml - - SmartIndentPascal.zip: manifest_pascal.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_pascal.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentPascal.zip manifest.xml - - SmartIndentCpp.zip: manifest_cpp.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_cpp.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentCpp.zip manifest.xml - - SmartIndentPython.zip: manifest_python.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_python.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentPython.zip manifest.xml - - SmartIndentLua.zip: manifest_lua.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_lua.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentLua.zip manifest.xml - - SmartIndentFortran.zip: manifest_fortran.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_fortran.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentFortran.zip manifest.xml - - SmartIndentXML.zip: manifest_xml.xml -- PWD=`pwd` cd $(srcdir) && \ - cp manifest_xml.xml ./manifest.xml && \ - zip -R $(PWD)/SmartIndentXML.zip manifest.xml - -diff -ur codeblocks-13.12/src/plugins/contrib/source_exporter/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/source_exporter/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/source_exporter/Makefile.am 2013-11-17 20:34:03.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/source_exporter/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -38,4 +38,4 @@ - CLEANFILES = $(pkgdata_DATA) - - exporter.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/exporter.zip manifest.xml > /dev/null -+ zip $(PWD)/exporter.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/SpellChecker/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/SpellChecker/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/SpellChecker/Makefile.am 2013-11-17 20:34:09.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/SpellChecker/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -57,7 +57,7 @@ - CLEANFILES = $(pkgdata_DATA) - - SpellChecker.zip: manifest.xml SpellCheckSettingsPanel.xrc -- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/SpellChecker.zip manifest.xml SpellCheckSettingsPanel.xrc > /dev/null -+ zip -R $(PWD)/SpellChecker.zip manifest.xml SpellCheckSettingsPanel.xrc > /dev/null - - confimagesdir = $(datadir)/@PACKAGE@/images/settings - -diff -ur codeblocks-13.12/src/plugins/contrib/symtab/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/symtab/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/symtab/resources/Makefile.am 2013-11-17 20:34:06.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/symtab/resources/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -4,4 +4,4 @@ - CLEANFILES = $(pkgdata_DATA) - - SymTab.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/SymTab.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/SymTab.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/ThreadSearch/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ThreadSearch/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/ThreadSearch/Makefile.am 2013-11-17 20:34:05.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/ThreadSearch/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -71,5 +71,5 @@ - CLEANFILES = $(pkgdata_DATA) - - ThreadSearch.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/ThreadSearch.zip manifest.xml > /dev/null -+ zip $(PWD)/ThreadSearch.zip manifest.xml > /dev/null - -diff -ur codeblocks-13.12/src/plugins/contrib/ToolsPlus/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/ToolsPlus/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/ToolsPlus/Makefile.am 2013-11-17 20:34:08.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/ToolsPlus/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -42,5 +42,5 @@ - CLEANFILES = $(pkgdata_DATA) - - ToolsPlus.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/ToolsPlus.zip manifest.xml > /dev/null -+ zip -j9 $(PWD)/ToolsPlus.zip manifest.xml > /dev/null - -diff -ur codeblocks-13.12/src/plugins/contrib/Valgrind/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/Valgrind/resources/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/Valgrind/resources/Makefile.am 2013-11-17 20:34:10.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/Valgrind/resources/Makefile.am 2014-01-18 19:35:30.552044534 +0100 -@@ -5,7 +5,7 @@ - CLEANFILES = $(pkgdata_DATA) - - Valgrind.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Valgrind.zip manifest.xml > /dev/null -+ zip $(PWD)/Valgrind.zip manifest.xml > /dev/null - - confimagesdir = $(datadir)/@PACKAGE@/images/settings - -diff -ur codeblocks-13.12/src/plugins/contrib/wxSmith/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmith/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/wxSmith/Makefile.am 2013-11-17 20:33:59.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmith/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -85,4 +85,4 @@ - CLEANFILES = $(pkgdata_DATA) - - wxsmith.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxsmith.zip manifest.xml > /dev/null -+ zip $(PWD)/wxsmith.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/plugins/contrib/wxSmithAui/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmithAui/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/wxSmithAui/Makefile.am 2013-11-17 20:33:55.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmithAui/Makefile.am 2014-01-18 19:35:30.548711201 +0100 -@@ -28,7 +28,7 @@ - CLEANFILES = $(pkgdata_DATA) - - wxSmithAui.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxSmithAui.zip manifest.xml > /dev/null -+ zip $(PWD)/wxSmithAui.zip manifest.xml > /dev/null - - libwxSmithAui_la_SOURCES = \ - ./wxAuiManager/wxsAuiManager.cpp \ -diff -ur codeblocks-13.12/src/plugins/contrib/wxSmithContribItems/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/wxSmithContribItems/Makefile.am ---- codeblocks-13.12/src/plugins/contrib/wxSmithContribItems/Makefile.am 2013-11-17 20:34:01.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/contrib/wxSmithContribItems/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -57,7 +57,7 @@ - CLEANFILES = $(pkgdata_DATA) - - wxsmithcontribitems.zip: manifest.xml -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxsmithcontribitems.zip manifest.xml > /dev/null -+ zip $(PWD)/wxsmithcontribitems.zip manifest.xml > /dev/null - - libwxsmithcontribitems_la_SOURCES = \ - ./wxflatnotebook/wxsFlatNotebook.cpp \ -diff -ur codeblocks-13.12/src/plugins/debuggergdb/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/debuggergdb/resources/Makefile.am ---- codeblocks-13.12/src/plugins/debuggergdb/resources/Makefile.am 2013-11-17 20:34:12.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/debuggergdb/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -10,4 +10,4 @@ - EXTRA_DIST = $(DEBUG_RESOURCES) - - debugger.zip: $(DEBUG_RESOURCES) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/debugger.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/debugger.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/defaultmimehandler/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/defaultmimehandler/resources/Makefile.am ---- codeblocks-13.12/src/plugins/defaultmimehandler/resources/Makefile.am 2013-11-17 20:33:51.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/defaultmimehandler/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,5 +4,5 @@ - EXTRA_DIST = edit_files_handling.xrc manifest.xml - - defaultmimehandler.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/defaultmimehandler.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/defaultmimehandler.zip manifest.xml *.xrc > /dev/null - -diff -ur codeblocks-13.12/src/plugins/occurrenceshighlighting/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/occurrenceshighlighting/resources/Makefile.am ---- codeblocks-13.12/src/plugins/occurrenceshighlighting/resources/Makefile.am 2013-11-17 20:34:12.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/occurrenceshighlighting/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,4 +4,4 @@ - EXTRA_DIST = manifest.xml $(srcdir)/*.xrc - - occurrenceshighlighting.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/occurrenceshighlighting.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/occurrenceshighlighting.zip manifest.xml *.xrc > /dev/null -diff -ur codeblocks-13.12/src/plugins/openfileslist/Makefile.am codeblocks-13.12.pwd/src/plugins/openfileslist/Makefile.am ---- codeblocks-13.12/src/plugins/openfileslist/Makefile.am 2013-11-17 20:33:50.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/openfileslist/Makefile.am 2014-01-18 19:35:30.542044534 +0100 -@@ -19,5 +19,5 @@ - EXTRA_DIST = manifest.xml - - openfileslist.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/openfileslist.zip manifest.xml > /dev/null -+ zip $(PWD)/openfileslist.zip manifest.xml > /dev/null - -diff -ur codeblocks-13.12/src/plugins/projectsimporter/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/projectsimporter/resources/Makefile.am ---- codeblocks-13.12/src/plugins/projectsimporter/resources/Makefile.am 2013-11-17 20:34:14.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/projectsimporter/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,5 +4,5 @@ - EXTRA_DIST = project_import_menu.xrc manifest.xml - - projectsimporter.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/projectsimporter.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/projectsimporter.zip manifest.xml *.xrc > /dev/null - -diff -ur codeblocks-13.12/src/plugins/scriptedwizard/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/scriptedwizard/resources/Makefile.am ---- codeblocks-13.12/src/plugins/scriptedwizard/resources/Makefile.am 2013-11-17 20:33:54.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/scriptedwizard/resources/Makefile.am 2014-01-18 19:35:30.542044534 +0100 -@@ -11,5 +11,5 @@ - EXTRA_DIST = manifest.xml - - scriptedwizard.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/scriptedwizard.zip manifest.xml > /dev/null -+ zip $(PWD)/scriptedwizard.zip manifest.xml > /dev/null - -diff -ur codeblocks-13.12/src/plugins/todo/resources/Makefile.am codeblocks-13.12.pwd/src/plugins/todo/resources/Makefile.am ---- codeblocks-13.12/src/plugins/todo/resources/Makefile.am 2013-11-17 20:34:13.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/todo/resources/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -4,5 +4,5 @@ - EXTRA_DIST = manifest.xml $(srcdir)/*.xrc - - todo.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/todo.zip manifest.xml *.xrc > /dev/null -+ zip $(PWD)/todo.zip manifest.xml *.xrc > /dev/null - -diff -ur codeblocks-13.12/src/plugins/xpmanifest/Makefile.am codeblocks-13.12.pwd/src/plugins/xpmanifest/Makefile.am ---- codeblocks-13.12/src/plugins/xpmanifest/Makefile.am 2013-11-17 20:34:14.000000000 +0100 -+++ codeblocks-13.12.pwd/src/plugins/xpmanifest/Makefile.am 2014-01-18 19:35:30.545377868 +0100 -@@ -18,4 +18,4 @@ - CLEANFILES = $(pkgdata_DATA) - - xpmanifest.zip: $(EXTRA_DIST) -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/xpmanifest.zip manifest.xml > /dev/null -+ zip $(PWD)/xpmanifest.zip manifest.xml > /dev/null -diff -ur codeblocks-13.12/src/sdk/resources/Makefile.am codeblocks-13.12.pwd/src/sdk/resources/Makefile.am ---- codeblocks-13.12/src/sdk/resources/Makefile.am 2013-11-17 20:33:47.000000000 +0100 -+++ codeblocks-13.12.pwd/src/sdk/resources/Makefile.am 2014-01-18 19:35:30.555377867 +0100 -@@ -9,4 +9,4 @@ - CLEANFILES = $(pkgdata_DATA) - - manager_resources.zip: $(dist_noinst_DATA) -- PWD=`pwd` cd $(srcdir) && zip -qu $(PWD)/manager_resources.zip *.xrc images/*.png images/16x16/*.png images/12x12/*.png > /dev/null -+ zip -qu $(PWD)/manager_resources.zip *.xrc images/*.png images/16x16/*.png images/12x12/*.png > /dev/null -diff -ur codeblocks-13.12/src/src/resources/Makefile.am codeblocks-13.12.pwd/src/src/resources/Makefile.am ---- codeblocks-13.12/src/src/resources/Makefile.am 2013-11-17 20:33:49.000000000 +0100 -+++ codeblocks-13.12.pwd/src/src/resources/Makefile.am 2014-01-18 19:35:30.538711201 +0100 -@@ -9,7 +9,7 @@ - CLEANFILES = $(dist_pkgdata_DATA) - - resources.zip: $(srcdir)/*.xrc $(srcdir)/images/*.png $(srcdir)/images/16x16/*.png -- PWD=`pwd` cd $(srcdir) && zip $(PWD)/resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null -+ zip $(PWD)/resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null - - start_here.zip: $(srcdir)/start_here/*.htm* $(srcdir)/start_here/*.png - PWD=`pwd` cd $(srcdir)/start_here && zip $(PWD)/start_here.zip *.htm* *.png > /dev/null diff --git a/codeblocks.spec b/codeblocks.spec index 348b605..9884c4e 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -5,16 +5,17 @@ Summary: An open source, cross platform, free C++ IDE Summary(pl.UTF-8): Wieloplatformowe, darmowe IDE do C++ o otwartych źródłach Name: codeblocks -Version: 17.12 -Release: 1 +%define snap svn13361 +Version: 20.03 +Release: 1.%{snap}.1 License: GPL v3 Group: X11/Development/Tools -Source0: http://download.sourceforge.net/codeblocks/%{name}_%{version}.tar.xz -# Source0-md5: e7fb4fcf099fffe944b48af113944a81 +#Source0: http://download.sourceforge.net/codeblocks/%{name}-%{version}%{snap}.tar.xz +Source0: %{name}-%{version}%{snap}.tar.xz +# Source0-md5: 4f856967ec38135cebc09adc8db93294 Patch0: %{name}-FHS-plugins.patch +Patch1: no-parallel.patch Patch2: %{name}-ac.patch -Patch3: %{name}-pwd.patch -Patch4: %{name}-astyle-3.1.patch URL: http://www.codeblocks.org/ BuildRequires: astyle-devel >= 3.0 BuildRequires: autoconf >= 2.50 @@ -145,11 +146,10 @@ Ten pakiet dostarcza plików nagłówkowych Code::Blocks. Należy instalować ten pakiet tylko w celu pisania wtyczek do Code::Blocks. %prep -%setup -q +%setup -q -n %{name}-%{version}%{snap} %patch0 -p1 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # hardcode libdir, continue of patch0 sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp @@ -163,7 +163,7 @@ sed -i 's/svn[0-9]\+//g' revision.m4 %{__autoconf} %{__autoheader} %{__automake} -CXXFLAGS="%{rpmcxxflags} -std=c++11" +#CXXFLAGS="%{rpmcxxflags} -std=c++11" %configure \ --with-boost-system=boost_system \ --with-contrib-plugins=all \ @@ -217,8 +217,8 @@ rm -rf $RPM_BUILD_ROOT %{_desktopdir}/codeblocks.desktop %{_pixmapsdir}/codeblocks.png %{_iconsdir}/hicolor/48x48/mimetypes/application-x-codeblocks*.png -%{_datadir}/appdata/codeblocks.appdata.xml -%{_datadir}/appdata/codeblocks-contrib.metainfo.xml +%{_metainfodir}/codeblocks.appdata.xml +%{_metainfodir}/codeblocks-contrib.metainfo.xml %{_datadir}/mime/packages/codeblocks.xml %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/scripts diff --git a/no-parallel.patch b/no-parallel.patch new file mode 100644 index 0000000..8448934 --- /dev/null +++ b/no-parallel.patch @@ -0,0 +1,11 @@ +--- codeblocks-20.03svn13361/src/plugins/contrib/SmartIndent/Makefile.am~ 2023-09-26 10:56:06.000000000 +0200 ++++ codeblocks-20.03svn13361/src/plugins/contrib/SmartIndent/Makefile.am 2023-09-27 01:38:58.903559022 +0200 +@@ -99,7 +99,7 @@ + + CLEANFILES = $(pkgdata_DATA) + +-.NOTPARALLEL: $(pkgdata_DATA) ++.NOTPARALLEL: + + SmartIndentHDL.zip: manifest_hdl.xml + PWD=`pwd` cd $(srcdir) && \ -- 2.43.0