summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo J. Barberis <ricardo.barberis@gmail.com>2018-05-04 23:26:37 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-05-05 06:46:31 +0700
commit716ba1876fdce54adb1f824b567ebdc08e2e6ad2 (patch)
treeaf1d94c048a0f9338ff6b7609f93b3a91be43406
parent6520c1d1b71978c50a11965f123daf20f74c45d2 (diff)
downloadslackbuilds-716ba1876fdce54adb1f824b567ebdc08e2e6ad2.tar.gz
development/git-cola: Updated for version 3.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/git-cola/README24
-rw-r--r--development/git-cola/git-cola.SlackBuild2
-rw-r--r--development/git-cola/git-cola.info6
-rw-r--r--development/git-cola/slack-desc6
4 files changed, 15 insertions, 23 deletions
diff --git a/development/git-cola/README b/development/git-cola/README
index b771bc1e12..6dd65aad11 100644
--- a/development/git-cola/README
+++ b/development/git-cola/README
@@ -1,21 +1,13 @@
-git-cola is a Python-powered GPL licensed GUI for git.
+git-cola is a sleek and powerful graphical user interface for Git.
+git-cola is free software and written in Python (v2 + v3).
-Qt4 warning, the website says:
-
-"NOTE: We do not yet recommend using PyQt5 because there are known
-exit-on-segfault bugs in Qt5 that have not yet been addressed. git-cola
-is sensitive to this bug and is known to crash on exit when using git dag
-or the interactive rebase feature on PyQt5.
-
-QTBUG-52988 (https://bugreports.qt.io/browse/QTBUG-52988)
-
-PyQt4 is stable and there are no known issues when using it so we
-recommend using PyQt4 until the Qt5 bugs have been resolved.
+git-cola uses QtPy (included), so you can choose between PyQt4, PyQt5,
+and PySide by setting the QT_API environment variable to pyqt4, pyqt5 or
+pyside as desired. qtpy defaults to pyqt5 and falls back to pyqt4 if
+pyqt5 is not installed.
Set QT_API=pyqt4 in your environment if you have both versions of PyQt
installed and want to ensure that PyQt4 is used.
-NOTE: git-cola includes a vendored copy of its QtPy dependency."
-
-That said, if you set QT_API=pyqt4 git-cola segfaults, but it works fine
-with Qt5 and PyQt5 from AlienBOB's repository.
+PyQt5 is an optional dependency if you want a more "modern" interface.
+pyside is an optional, untested, dependency.
diff --git a/development/git-cola/git-cola.SlackBuild b/development/git-cola/git-cola.SlackBuild
index 78d159b01f..cd3f9a0cd0 100644
--- a/development/git-cola/git-cola.SlackBuild
+++ b/development/git-cola/git-cola.SlackBuild
@@ -7,7 +7,7 @@
# Copyright (c) 2017-2018, Modified by: Ricardo J. Barberis <ricardo.barberis@gmail.com>
PRGNAM=git-cola
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/git-cola/git-cola.info b/development/git-cola/git-cola.info
index 0b1be492bd..119101ea9b 100644
--- a/development/git-cola/git-cola.info
+++ b/development/git-cola/git-cola.info
@@ -1,8 +1,8 @@
PRGNAM="git-cola"
-VERSION="3.0"
+VERSION="3.1"
HOMEPAGE="https://git-cola.github.io/"
-DOWNLOAD="https://github.com/git-cola/git-cola/archive/v3.0/git-cola-3.0.tar.gz"
-MD5SUM="879c5e6dcc47d73c18e0f3520516d66d"
+DOWNLOAD="https://github.com/git-cola/git-cola/archive/v3.1/git-cola-3.1.tar.gz"
+MD5SUM="33d56442d7af7ad740e5bc000af0dd57"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="Sphinx"
diff --git a/development/git-cola/slack-desc b/development/git-cola/slack-desc
index d7cda013a5..763737a60a 100644
--- a/development/git-cola/slack-desc
+++ b/development/git-cola/slack-desc
@@ -6,10 +6,10 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-git-cola: git-cola (a GUI for git)
+git-cola: git-cola (The highly caffeinated Git GUI)
git-cola:
-git-cola: git-cola is a GUI frontend for git. It is written in Python and is
-git-cola: GPL licensed.
+git-cola: git-cola is a sleek and powerful graphical user interface for Git.
+git-cola: git-cola is free software and written in Python (v2 + v3).
git-cola:
git-cola: Homepage: git-cola.github.com/index.html
git-cola: