diff --git a/mingw-w64-codelite-git/PKGBUILD b/mingw-w64-codelite-git/PKGBUILD index 5f65944ee7..1a6ace9488 100644 --- a/mingw-w64-codelite-git/PKGBUILD +++ b/mingw-w64-codelite-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=codelite pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=6.1.1.165.g9806d8e +pkgver=6.1.1.449.g727603e pkgrel=1 pkgdesc="Open-source, cross platform IDE for the C/C++ programming languages (mingw-w64)" arch=('any') @@ -21,9 +21,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-clang") options=(strip staticlibs !debug) source=("${_realname}::git+https://github.com/eranif/codelite.git" - codelite-clang-deprecated.patch) + codelite-clang-deprecated.patch + codelite-php-linking.patch) md5sums=('SKIP' - '4bec2ac130687bd4b947b98a0d5d3fd4') + 'a8017445f2b5c68b39dcb2b76cc08427' + 'ea63b613ccf30683272eaae5d2c47ebd') pkgver() { cd "$_realname" @@ -33,6 +35,7 @@ pkgver() { prepare() { cd "$srcdir/$_realname" patch -p1 -i ${srcdir}/codelite-clang-deprecated.patch + patch -p1 -i ${srcdir}/codelite-php-linking.patch } build() { diff --git a/mingw-w64-codelite-git/codelite-clang-deprecated.patch b/mingw-w64-codelite-git/codelite-clang-deprecated.patch index 05dd9b9e5c..5b37bc7492 100644 --- a/mingw-w64-codelite-git/codelite-clang-deprecated.patch +++ b/mingw-w64-codelite-git/codelite-clang-deprecated.patch @@ -1,12 +1,11 @@ --- codelite/LiteEditor/clang_pch_maker_thread.cpp.orig 2014-07-06 14:54:17.618600000 +0400 +++ codelite/LiteEditor/clang_pch_maker_thread.cpp 2014-07-06 14:55:02.094200000 +0400 -@@ -434,8 +434,7 @@ +@@ -434,7 +434,7 @@ // First time, need to create it unsigned flags; if(reparse) { -- flags = CXTranslationUnit_CXXPrecompiledPreamble -- | CXTranslationUnit_CacheCompletionResults -+ flags = CXTranslationUnit_CacheCompletionResults - | CXTranslationUnit_PrecompiledPreamble - | CXTranslationUnit_Incomplete - | CXTranslationUnit_DetailedPreprocessingRecord +- flags = CXTranslationUnit_CXXPrecompiledPreamble | CXTranslationUnit_CacheCompletionResults | ++ flags = CXTranslationUnit_CacheCompletionResults | + CXTranslationUnit_PrecompiledPreamble | CXTranslationUnit_Incomplete | + CXTranslationUnit_DetailedPreprocessingRecord | CXTranslationUnit_CXXChainedPCH; + } else { diff --git a/mingw-w64-codelite-git/codelite-php-linking.patch b/mingw-w64-codelite-git/codelite-php-linking.patch new file mode 100644 index 0000000000..dff907890e --- /dev/null +++ b/mingw-w64-codelite-git/codelite-php-linking.patch @@ -0,0 +1,29 @@ +From 107248e0dd32f612a8b6c87bdc63be2795091ae1 Mon Sep 17 00:00:00 2001 +From: Alexpux +Date: Fri, 5 Dec 2014 23:10:22 +0300 +Subject: [PATCH] Need Wx HTML module for linking. + +--- + codelitephp/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/codelitephp/CMakeLists.txt b/codelitephp/CMakeLists.txt +index bbd7926..c170642 100644 +--- a/codelitephp/CMakeLists.txt ++++ b/codelitephp/CMakeLists.txt +@@ -16,10 +16,10 @@ project( ${PLUGIN_NAME} ) + # It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'. + if (WITH_WEBVIEW) + message("-- Internal Web Browser is enabled") +- find_package(wxWidgets COMPONENTS adv aui base core xml xrc net stc webview REQUIRED) ++ find_package(wxWidgets COMPONENTS adv aui base core html xml xrc net stc webview REQUIRED) + else() + message("-- Internal Web Browser is disabled") +- find_package(wxWidgets COMPONENTS adv aui base core xml xrc net stc REQUIRED) ++ find_package(wxWidgets COMPONENTS adv aui base core html xml xrc net stc REQUIRED) + endif() + + # wxWidgets include (this will do all the magic to configure everything) +-- +2.2.0 +