hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

development/codelite: Fix build against newer libssh. 

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2020-05-10 14:09:45 +07:00
parent 02afcb7781
commit 8aef76e960
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/codelite/codelite.SlackBuild
View File

@ -6,12 +6,12 @@
PRGNAM=codelite
VERSION=${VERSION:-14.0}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@ -42,7 +42,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-${VERSION}
tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz || tar xvf $CWD/${VERSION}.tar.gz
tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
cd $PRGNAM-${VERSION}
chown -R root:root .
find -L . \
@ -51,6 +51,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/libssh.patch
mkdir build-release
cd build-release
CFLAGS="$SLKCFLAGS" \

2
development/codelite/codelite.info
View File

@ -1,7 +1,7 @@
PRGNAM="codelite"
VERSION="14.0"
HOMEPAGE="http://www.codelite.org/"
DOWNLOAD="https://github.com/eranif/codelite/archive/14.0.tar.gz"
DOWNLOAD="https://github.com/eranif/codelite/archive/14.0/codelite-14.0.tar.gz"
MD5SUM="e9d2519fa8077ca9f86b6b8fa9adf332"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""

25
development/codelite/libssh.patch Normal file
View File

@ -0,0 +1,25 @@
From d9663b376b66c5754298b21c3592f0a49c030f88 Mon Sep 17 00:00:00 2001
From: dghart <dghart david@4Pane.co.uk>
Date: Tue, 3 Mar 2020 13:39:02 +0000
Subject: [PATCH] Compilation fix for ubuntu xenial (16.04) and similar
The ssh version check was wrong (see https://github.com/eranif/codelite/issues/2443).
Bump it from 0.6.1 to a (guestimated) 0.6.5.
---
CodeLite/cl_ssh.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CodeLite/cl_ssh.cpp b/CodeLite/cl_ssh.cpp
index 824804e30..f5accfde9 100644
--- a/CodeLite/cl_ssh.cpp
+++ b/CodeLite/cl_ssh.cpp
@@ -106,7 +106,7 @@ bool clSSH::AuthenticateServer(wxString& message)
message.Clear();
-#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 6, 1)
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 7)
int hlen = 0;
hlen = ssh_get_pubkey_hash(m_session, &hash);
if(hlen < 0) {