Skip to content

Commit 118d34f

Browse files
committed
backport critical patch
1 parent 9075b3b commit 118d34f

3 files changed

Lines changed: 24 additions & 4 deletions

File tree

.SRCINFO

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = redpanda-cpp
22
pkgdesc = A fast, lightweight, open source, and cross platform C/C++/GNU Assembly IDE
33
pkgver = 3.2
4-
pkgrel = 1
4+
pkgrel = 2
55
url = https://github.com/royqh1979/RedPanda-CPP
66
arch = i686
77
arch = pentium4
@@ -24,8 +24,10 @@ pkgbase = redpanda-cpp
2424
optdepends = clang: C/C++ compiler (alternative)
2525
source = RedPanda-CPP-3.2.tar.gz::https://github.com/royqh1979/RedPanda-CPP/archive/refs/tags/v3.2.tar.gz
2626
source = compiler_hint.lua
27+
source = 0001-fix-crash-when-debug.patch
2728
sha256sums = dc2267d793a553373a78c8a4624e908fab9bc1624c3abd12da5a1278d58219f7
2829
sha256sums = 6f887af50757c2ec7d57806b78119e0271c424db2119fbc62d111c2122c06b0c
30+
sha256sums = 632d966f60999ba121fe37c297ef3f02128bb53f845d7630e0f3839df232bd4d
2931
optdepends_x86_64 = mingw-w64-gcc: Windows C/C++ compiler
3032
optdepends_x86_64 = wine: run Windows executable
3133
optdepends_x86_64 = aarch64-linux-gnu-gcc: AArch64 C/C++ compiler

0001-fix-crash-when-debug.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/RedPandaIDE/debugger/debugger.cpp b/RedPandaIDE/debugger/debugger.cpp
2+
index e4954044..dc56efdc 100644
3+
--- a/RedPandaIDE/debugger/debugger.cpp
4+
+++ b/RedPandaIDE/debugger/debugger.cpp
5+
@@ -157,7 +157,8 @@ bool Debugger::startClient(int compilerSetIndex,
6+
if (mExecuting) {
7+
stop();
8+
}
9+
- mTarget->deleteLater();
10+
+ if (mTarget)
11+
+ mTarget->deleteLater();
12+
mTarget = nullptr;
13+
});
14+
mTarget->addBinDirs(binDirs);

PKGBUILD

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_pkgname=RedPanda-CPP
22
pkgname=${_pkgname,,}
33
pkgver=3.2
4-
pkgrel=1
4+
pkgrel=2
55
pkgdesc='A fast, lightweight, open source, and cross platform C/C++/GNU Assembly IDE'
66
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64' 'riscv64' 'loong64')
77
url="https://github.com/royqh1979/$_pkgname"
@@ -21,12 +21,16 @@ optdepends_x86_64=(
2121
source=(
2222
"$_pkgname-$pkgver.tar.gz::https://github.com/royqh1979/$_pkgname/archive/refs/tags/v$pkgver.tar.gz"
2323
'compiler_hint.lua'
24+
'0001-fix-crash-when-debug.patch'
2425
)
2526
sha256sums=('dc2267d793a553373a78c8a4624e908fab9bc1624c3abd12da5a1278d58219f7'
26-
'6f887af50757c2ec7d57806b78119e0271c424db2119fbc62d111c2122c06b0c')
27+
'6f887af50757c2ec7d57806b78119e0271c424db2119fbc62d111c2122c06b0c'
28+
'632d966f60999ba121fe37c297ef3f02128bb53f845d7630e0f3839df232bd4d')
2729

2830
prepare() {
29-
sed -i '/CONFIG += ENABLE_LUA_ADDON/ { s/^#\s*// }' "$srcdir/$_pkgname-$pkgver/RedPandaIDE/RedPandaIDE.pro"
31+
cd "$srcdir/$_pkgname-$pkgver"
32+
sed -i '/CONFIG += ENABLE_LUA_ADDON/ { s/^#\s*// }' "RedPandaIDE/RedPandaIDE.pro"
33+
patch -Np1 <"$srcdir/0001-fix-crash-when-debug.patch"
3034
}
3135

3236
build() {

0 commit comments

Comments
 (0)