summaryrefslogtreecommitdiffstats
path: root/development/codelite
diff options
context:
space:
mode:
Diffstat (limited to 'development/codelite')
-rw-r--r--development/codelite/codelite.SlackBuild22
-rw-r--r--development/codelite/codelite.info6
-rw-r--r--development/codelite/libssh.patch25
3 files changed, 18 insertions, 35 deletions
diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild
index 8f4e59f6f2..8c14bbd4fd 100644
--- a/development/codelite/codelite.SlackBuild
+++ b/development/codelite/codelite.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for codelite
# Written by Wainamoinen <wainamoinen@gmail.com>
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=codelite
-VERSION=${VERSION:-14.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-16.0.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -51,8 +61,6 @@ 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" \
@@ -81,4 +89,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info
index dd2487959c..04c9ae1ec9 100644
--- a/development/codelite/codelite.info
+++ b/development/codelite/codelite.info
@@ -1,8 +1,8 @@
PRGNAM="codelite"
-VERSION="14.0"
+VERSION="16.0.0"
HOMEPAGE="http://www.codelite.org/"
-DOWNLOAD="https://github.com/eranif/codelite/archive/14.0/codelite-14.0.tar.gz"
-MD5SUM="e9d2519fa8077ca9f86b6b8fa9adf332"
+DOWNLOAD="https://github.com/eranif/codelite/archive/16.0.0/codelite-16.0.0.tar.gz"
+MD5SUM="0141a38d2f686520d54fd19a6df0fac3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxGTK3"
diff --git a/development/codelite/libssh.patch b/development/codelite/libssh.patch
deleted file mode 100644
index c4f5b9aa85..0000000000
--- a/development/codelite/libssh.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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) {
-