Skip to content

Commit

Permalink
codeblocks: update 23.03.r13518
Browse files Browse the repository at this point in the history
  • Loading branch information
MehdiChinoune committed May 12, 2024
1 parent 967e77d commit ba7eac7
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 1 deletion.
64 changes: 64 additions & 0 deletions mingw-w64-codeblocks/001-fix-build-on-mingw.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
--- a/src/plugins/codecompletion/Makefile.am
+++ b/src/plugins/codecompletion/Makefile.am
@@ -11,8 +11,11 @@
libcodecompletion_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version

libcodecompletion_la_LIBADD = ../../sdk/libcodeblocks.la\
- $(WX_LIBS) \
- $(CB_TINYXML_LIBS)
+ $(WX_LIBS)
+
+if ! CODEBLOCKS_NT
+libcodecompletion_la_LIBADD += $(CB_TINYXML_LIBS)
+endif

libcodecompletion_la_SOURCES = ccoptionsdlg.cpp \
ccoptionsprjdlg.cpp \
--- a/src/plugins/debuggergdb/Makefile.am
+++ b/src/plugins/debuggergdb/Makefile.am
@@ -13,8 +13,11 @@

libdebugger_la_LIBADD = ../../sdk/libcodeblocks.la \
$(WX_LIBS) \
- $(WX_GTK_LIBS) \
- $(CB_TINYXML_LIBS)
+ $(WX_GTK_LIBS)
+
+if ! CODEBLOCKS_NT
+libdebugger_la_LIBADD += $(CB_TINYXML_LIBS)
+endif

libdebugger_la_SOURCES = cdb_driver.cpp \
databreakpointdlg.cpp \
--- a/src/plugins/openfileslist/Makefile.am
+++ b/src/plugins/openfileslist/Makefile.am
@@ -9,8 +9,11 @@
libopenfileslist_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version

libopenfileslist_la_LIBADD = ../../sdk/libcodeblocks.la \
- $(WX_LIBS) \
- $(CB_TINYXML_LIBS)
+ $(WX_LIBS)
+
+if ! CODEBLOCKS_NT
+libopenfileslist_la_LIBADD += $(CB_TINYXML_LIBS)
+endif

libopenfileslist_la_SOURCES = openfileslistplugin.cpp
noinst_HEADERS = openfileslistplugin.h
--- a/src/plugins/projectsimporter/Makefile.am
+++ b/src/plugins/projectsimporter/Makefile.am
@@ -11,8 +11,11 @@
libprojectsimporter_la_LDFLAGS = @MODULE_SHARED_LDFLAGS@ -version-info 0:1:0 -no-undefined -avoid-version

libprojectsimporter_la_LIBADD = ../../sdk/libcodeblocks.la \
- $(WX_LIBS) \
- $(CB_TINYXML_LIBS)
+ $(WX_LIBS)
+
+if ! CODEBLOCKS_NT
+libprojectsimporter_la_LIBADD += $(CB_TINYXML_LIBS)
+endif

libprojectsimporter_la_SOURCES = projectsimporter.cpp \
devcpploader.cpp \
5 changes: 4 additions & 1 deletion mingw-w64-codeblocks/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _realname=codeblocks
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_basever=20.03
_revision=13496
_revision=13518
pkgver=${_basever}.r${_revision}
pkgrel=1
pkgdesc="Cross-platform C/C++ IDE (mingw-w64)"
Expand All @@ -30,8 +30,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"zip"
"subversion")
source=("$_realname::svn://svn.code.sf.net/p/codeblocks/code/trunk#revision=$_revision"
"001-fix-build-on-mingw.patch"
"004-disable-parallel-make-for-SmartIndent.patch")
sha256sums=('SKIP'
'cba41cdd8a4bc0cd46a99d0c03cb9446f41f1e351b379853f765fd0e26f7e088'
'4dff5050d2fad37fe29cef40b354c39f70526f0ece3aa895b2e07885cc647089')

apply_patch_with_msg() {
Expand All @@ -45,6 +47,7 @@ apply_patch_with_msg() {
prepare() {
cd "${_realname}"
apply_patch_with_msg \
001-fix-build-on-mingw.patch \
004-disable-parallel-make-for-SmartIndent.patch

./bootstrap
Expand Down

0 comments on commit ba7eac7

Please sign in to comment.