svn commit: r509153 - in head: . devel devel/git-cola

Joseph Mingrone jrm at FreeBSD.org
Sat Aug 17 13:32:42 UTC 2019 

Author: jrm
Date: Sat Aug 17 13:32:40 2019
New Revision: 509153
URL: https://svnweb.freebsd.org/changeset/ports/509153

Log:
  devel/git-cola: Revive after r495962 qt4 deprecation
  
  Submitted by:	dch (with a few modifications)
  Reviewed by:	tcberner, jonathan (slightly older version)
  Differential Revision:	https://reviews.freebsd.org/D20460

Added:
  head/devel/git-cola/
     - copied from r495961, head/devel/git-cola/
  head/devel/git-cola/pkg-message   (contents, props changed)
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/git-cola/Makefile
  head/devel/git-cola/distinfo
  head/devel/git-cola/pkg-descr
  head/devel/git-cola/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Aug 17 13:23:41 2019	(r509152)
+++ head/MOVED	Sat Aug 17 13:32:40 2019	(r509153)
@@ -11676,7 +11676,6 @@ multimedia/phonon-designerplugin at qt4||2019-03-16|Qt4 d
 multimedia/phonon-designerplugin at qt5|multimedia/phonon-designerplugin|2019-03-16|Flavor has been removed
 multimedia/phonon-gstreamer at qt4||2019-03-16|Qt4 deprecation
 multimedia/phonon-gstreamer at qt5|multimedia/phonon-gstreamer|2019-03-16|Flavor has been removed
-devel/git-cola||2019-03-16|Removed
 emulators/gns3||2019-03-16|Removed
 accessibility/qt4-accessible||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 astro/qlandkartegt||2019-03-16|Has expired: Qt4 has been EOL since december 2015

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Aug 17 13:23:41 2019	(r509152)
+++ head/devel/Makefile	Sat Aug 17 13:32:40 2019	(r509153)
@@ -795,6 +795,7 @@
     SUBDIR += git-bzr-ng
     SUBDIR += git-cinnabar
     SUBDIR += git-codereview
+    SUBDIR += git-cola
     SUBDIR += git-cvs
     SUBDIR += git-extras
     SUBDIR += git-gui

Modified: head/devel/git-cola/Makefile
==============================================================================
--- head/devel/git-cola/Makefile	Sat Mar 16 21:32:52 2019	(r495961)
+++ head/devel/git-cola/Makefile	Sat Aug 17 13:32:40 2019	(r509153)
@@ -1,30 +1,40 @@
 # Created by: Jonathan Anderson <jonathan at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	git-cola
-PORTVERSION=	2.6
+PORTNAME=		git-cola
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
-CATEGORIES=	devel
+DISTVERSION=		3.4
+CATEGORIES=		devel
 
-MAINTAINER=	jonathan at FreeBSD.org
-COMMENT=	Sleek and powerful Git GUI
+MAINTAINER=		dch at FreeBSD.org
+COMMENT=		Sleek and powerful Git GUI
 
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=		GPLv2+
+LICENSE_FILE=		${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \
+BUILD_DEPENDS=		git>=0:devel/git
+RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}QtPy>=1.7.1:devel/py-QtPy@${PY_FLAVOR}
 
-USE_GITHUB=	yes
+USES=			desktop-file-utils gmake gnome python pyqt:5 qt:5 shebangfix
+USE_GITHUB=		yes
+USE_PYQT=		core gui network widgets
 
-USES=		desktop-file-utils gettext gmake python shebangfix
-SHEBANG_FILES=	share/git-cola/bin/git-xbase
-INSTALLS_ICONS=	yes
-NO_ARCH=	yes
+SHEBANG_FILES=		share/git-cola/bin/git-xbase
+INSTALLS_ICONS=		yes
+NO_ARCH=		yes
 
-MAKE_ARGS=	prefix=${PREFIX} PYTHON=${PYTHON_CMD}
+# NO_VENDOR_LIBS ensures we use ports QtPy not embedded version
+MAKE_ARGS=		prefix=${PREFIX} PYTHON=${PYTHON_CMD} NO_VENDOR_LIBS=1
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DOCS NLS
+OPTIONS_SUB=		yes
+
+NLS_USES=		gettext
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|LN_S = $$(LN) -s -f|LN_S = ${RLN}|;\
+s|$$(LN_S) "$$(datadir)/icons/git-cola.svg"|$$(LN_S) \
+"$$(DESTDIR)$$(datadir)/icons/git-cola.svg"|' \
+		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

Modified: head/devel/git-cola/distinfo
==============================================================================
--- head/devel/git-cola/distinfo	Sat Mar 16 21:32:52 2019	(r495961)
+++ head/devel/git-cola/distinfo	Sat Aug 17 13:32:40 2019	(r509153)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463112676
-SHA256 (git-cola-git-cola-v2.6_GH0.tar.gz) = ed566548793b4905005528d5e612c41bea5b5f7602649c0eec0787fbb0ab9cd2
-SIZE (git-cola-git-cola-v2.6_GH0.tar.gz) = 1027026
+TIMESTAMP = 1565971621
+SHA256 (git-cola-git-cola-v3.4_GH0.tar.gz) = 763e382d8b32427539585d17ec6fe92026c073f6d31a864a5816ebe22cf245bc
+SIZE (git-cola-git-cola-v3.4_GH0.tar.gz) = 963393

Modified: head/devel/git-cola/pkg-descr
==============================================================================
--- head/devel/git-cola/pkg-descr	Sat Mar 16 21:32:52 2019	(r495961)
+++ head/devel/git-cola/pkg-descr	Sat Aug 17 13:32:40 2019	(r509153)
@@ -1,3 +1,13 @@
-git cola is a sleek and powerful Git GUI.
+git-cola is a powerful Git GUI, with a slick and intuitive interface.
+
+It comes with excellent documentation https://git-cola.readthedocs.io/
+and a plethora of useful functionality, including:
+
+- direct integration with git subcommands
+- git-tag, an interactive tree & commit history browser
+- an integrated file browser to view any file at a given commit
+- an interactive rebase and merge facility
+- search comimits, and grep content
+- partial file commit that is a delight to use
 
 WWW: https://git-cola.github.io/

Added: head/devel/git-cola/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/git-cola/pkg-message	Sat Aug 17 13:32:40 2019	(r509153)
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+For all features, git-cola requires devel/git to be built
+and installed with the GUI option on.
+EOM
+}
+]

Modified: head/devel/git-cola/pkg-plist
==============================================================================
--- head/devel/git-cola/pkg-plist	Sat Mar 16 21:32:52 2019	(r495961)
+++ head/devel/git-cola/pkg-plist	Sat Aug 17 13:32:40 2019	(r509153)
@@ -1,26 +1,76 @@
 bin/cola
 bin/git-cola
 bin/git-dag
+share/appdata/git-cola.appdata.xml
+share/appdata/git-dag.appdata.xml
 share/applications/git-cola-folder-handler.desktop
 share/applications/git-cola.desktop
 share/applications/git-dag.desktop
-%%PORTDOCS%%%%DOCSDIR%%/git-cola.rst
-%%PORTDOCS%%%%DOCSDIR%%/git-dag.rst
-%%PORTDOCS%%%%DOCSDIR%%/hotkeys.html
-%%PORTDOCS%%%%DOCSDIR%%/hotkeys_de.html
-%%PORTDOCS%%%%DOCSDIR%%/hotkeys_zh_CN.html
-%%PORTDOCS%%%%DOCSDIR%%/hotkeys_zh_TW.html
-%%PORTDOCS%%%%DOCSDIR%%/index.rst
-%%PORTDOCS%%%%DOCSDIR%%/relnotes.rst
-%%PORTDOCS%%%%DOCSDIR%%/thanks.rst
+share/icons/hicolor/scalable/apps/git-cola.svg
 %%DATADIR%%/bin/git-xbase
 %%DATADIR%%/bin/ssh-askpass
 %%DATADIR%%/bin/ssh-askpass-darwin
+%%DATADIR%%/icons/a-z-order.svg
 %%DATADIR%%/icons/check.svg
 %%DATADIR%%/icons/circle-slash-red.svg
 %%DATADIR%%/icons/circle-slash.svg
+%%DATADIR%%/icons/dark/a-z-order.svg
+%%DATADIR%%/icons/dark/check.svg
+%%DATADIR%%/icons/dark/circle-slash-red.svg
+%%DATADIR%%/icons/dark/circle-slash.svg
+%%DATADIR%%/icons/dark/desktop-download.svg
+%%DATADIR%%/icons/dark/diff.svg
+%%DATADIR%%/icons/dark/document-save-symbolic.svg
+%%DATADIR%%/icons/dark/edit-copy.svg
+%%DATADIR%%/icons/dark/edit-select-all.svg
+%%DATADIR%%/icons/dark/edit-undo.svg
+%%DATADIR%%/icons/dark/ellipsis.svg
+%%DATADIR%%/icons/dark/eye.svg
+%%DATADIR%%/icons/dark/file-binary.svg
+%%DATADIR%%/icons/dark/file-code.svg
+%%DATADIR%%/icons/dark/file-directory.svg
+%%DATADIR%%/icons/dark/file-download.svg
+%%DATADIR%%/icons/dark/file-media.svg
+%%DATADIR%%/icons/dark/file-text.svg
+%%DATADIR%%/icons/dark/file-zip.svg
+%%DATADIR%%/icons/dark/fold.svg
+%%DATADIR%%/icons/dark/folder-new.svg
+%%DATADIR%%/icons/dark/folder.svg
+%%DATADIR%%/icons/dark/gear.svg
+%%DATADIR%%/icons/dark/git-branch.svg
+%%DATADIR%%/icons/dark/git-cola.svg
+%%DATADIR%%/icons/dark/git-commit.svg
+%%DATADIR%%/icons/dark/git-compare.svg
+%%DATADIR%%/icons/dark/git-merge.svg
+%%DATADIR%%/icons/dark/last-first-order.svg
+%%DATADIR%%/icons/dark/link-external.svg
+%%DATADIR%%/icons/dark/modified.svg
+%%DATADIR%%/icons/dark/partial.svg
+%%DATADIR%%/icons/dark/pencil.svg
+%%DATADIR%%/icons/dark/plus.svg
+%%DATADIR%%/icons/dark/primitive-dot.svg
+%%DATADIR%%/icons/dark/question-plain.svg
+%%DATADIR%%/icons/dark/question.svg
+%%DATADIR%%/icons/dark/repo-pull.svg
+%%DATADIR%%/icons/dark/repo-push.svg
+%%DATADIR%%/icons/dark/repo.svg
+%%DATADIR%%/icons/dark/screen-full.svg
+%%DATADIR%%/icons/dark/search.svg
+%%DATADIR%%/icons/dark/staged.svg
+%%DATADIR%%/icons/dark/star.svg
+%%DATADIR%%/icons/dark/sync.svg
+%%DATADIR%%/icons/dark/tag.svg
+%%DATADIR%%/icons/dark/telescope.svg
+%%DATADIR%%/icons/dark/trashcan.svg
+%%DATADIR%%/icons/dark/unfold.svg
+%%DATADIR%%/icons/dark/upstream.svg
+%%DATADIR%%/icons/dark/x.svg
+%%DATADIR%%/icons/dark/zoom-fit-best.svg
+%%DATADIR%%/icons/dark/zoom-in.svg
+%%DATADIR%%/icons/dark/zoom-out.svg
 %%DATADIR%%/icons/desktop-download.svg
 %%DATADIR%%/icons/diff.svg
+%%DATADIR%%/icons/document-save-symbolic.svg
 %%DATADIR%%/icons/edit-copy.svg
 %%DATADIR%%/icons/edit-select-all.svg
 %%DATADIR%%/icons/edit-undo.svg
@@ -39,10 +89,11 @@ share/applications/git-dag.desktop
 %%DATADIR%%/icons/gear.svg
 %%DATADIR%%/icons/git-branch.svg
 %%DATADIR%%/icons/git-cola.svg
+%%DATADIR%%/icons/git-commit.svg
 %%DATADIR%%/icons/git-compare.svg
 %%DATADIR%%/icons/git-merge.svg
+%%DATADIR%%/icons/last-first-order.svg
 %%DATADIR%%/icons/link-external.svg
-%%DATADIR%%/icons/logo-top.png
 %%DATADIR%%/icons/modified.svg
 %%DATADIR%%/icons/partial.svg
 %%DATADIR%%/icons/pencil.svg
@@ -71,9 +122,11 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/_version.py
 %%DATADIR%%/lib/cola/actions.py
 %%DATADIR%%/lib/cola/app.py
+%%DATADIR%%/lib/cola/cmd.py
 %%DATADIR%%/lib/cola/cmds.py
 %%DATADIR%%/lib/cola/compat.py
 %%DATADIR%%/lib/cola/core.py
+%%DATADIR%%/lib/cola/dag.py
 %%DATADIR%%/lib/cola/decorators.py
 %%DATADIR%%/lib/cola/diffparse.py
 %%DATADIR%%/lib/cola/difftool.py
@@ -83,6 +136,7 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/gitcmds.py
 %%DATADIR%%/lib/cola/gravatar.py
 %%DATADIR%%/lib/cola/guicmds.py
+%%DATADIR%%/lib/cola/hidpi.py
 %%DATADIR%%/lib/cola/hotkeys.py
 %%DATADIR%%/lib/cola/i18n.py
 %%DATADIR%%/lib/cola/icons.py
@@ -97,12 +151,14 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/models/selection.py
 %%DATADIR%%/lib/cola/models/stash.py
 %%DATADIR%%/lib/cola/observable.py
+%%DATADIR%%/lib/cola/ordered_dict.py
 %%DATADIR%%/lib/cola/qtcompat.py
 %%DATADIR%%/lib/cola/qtutils.py
 %%DATADIR%%/lib/cola/resources.py
 %%DATADIR%%/lib/cola/settings.py
-%%DATADIR%%/lib/cola/sipcompat.py
+%%DATADIR%%/lib/cola/spellcheck.py
 %%DATADIR%%/lib/cola/textwrap.py
+%%DATADIR%%/lib/cola/themes.py
 %%DATADIR%%/lib/cola/utils.py
 %%DATADIR%%/lib/cola/version.py
 %%DATADIR%%/lib/cola/widgets/__init__.py
@@ -110,9 +166,12 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/widgets/action.py
 %%DATADIR%%/lib/cola/widgets/archive.py
 %%DATADIR%%/lib/cola/widgets/bookmarks.py
+%%DATADIR%%/lib/cola/widgets/branch.py
 %%DATADIR%%/lib/cola/widgets/browse.py
 %%DATADIR%%/lib/cola/widgets/cfgactions.py
+%%DATADIR%%/lib/cola/widgets/clone.py
 %%DATADIR%%/lib/cola/widgets/commitmsg.py
+%%DATADIR%%/lib/cola/widgets/common.py
 %%DATADIR%%/lib/cola/widgets/compare.py
 %%DATADIR%%/lib/cola/widgets/completion.py
 %%DATADIR%%/lib/cola/widgets/createbranch.py
@@ -124,8 +183,10 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/widgets/filelist.py
 %%DATADIR%%/lib/cola/widgets/filetree.py
 %%DATADIR%%/lib/cola/widgets/finder.py
+%%DATADIR%%/lib/cola/widgets/gitignore.py
 %%DATADIR%%/lib/cola/widgets/grep.py
 %%DATADIR%%/lib/cola/widgets/highlighter.py
+%%DATADIR%%/lib/cola/widgets/imageview.py
 %%DATADIR%%/lib/cola/widgets/log.py
 %%DATADIR%%/lib/cola/widgets/main.py
 %%DATADIR%%/lib/cola/widgets/merge.py
@@ -140,18 +201,32 @@ share/applications/git-dag.desktop
 %%DATADIR%%/lib/cola/widgets/startup.py
 %%DATADIR%%/lib/cola/widgets/stash.py
 %%DATADIR%%/lib/cola/widgets/status.py
+%%DATADIR%%/lib/cola/widgets/submodules.py
 %%DATADIR%%/lib/cola/widgets/text.py
-share/icons/hicolor/scalable/apps/git-cola.svg
-share/locale/de/LC_MESSAGES/git-cola.mo
-share/locale/es/LC_MESSAGES/git-cola.mo
-share/locale/fr/LC_MESSAGES/git-cola.mo
-share/locale/hu/LC_MESSAGES/git-cola.mo
-share/locale/id_ID/LC_MESSAGES/git-cola.mo
-share/locale/it/LC_MESSAGES/git-cola.mo
-share/locale/ja/LC_MESSAGES/git-cola.mo
-share/locale/pt_BR/LC_MESSAGES/git-cola.mo
-share/locale/ru/LC_MESSAGES/git-cola.mo
-share/locale/sv/LC_MESSAGES/git-cola.mo
-share/locale/tr_TR/LC_MESSAGES/git-cola.mo
-share/locale/zh_CN/LC_MESSAGES/git-cola.mo
-share/locale/zh_TW/LC_MESSAGES/git-cola.mo
+%%DATADIR%%/lib/cola/widgets/toolbar.py
+%%DATADIR%%/lib/cola/widgets/toolbarcmds.py
+%%NLS%%share/locale/cs/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/de/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/es/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/it/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/tr_TR/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/git-cola.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/git-cola.mo
+%%PORTDOCS%%%%DOCSDIR%%/git-cola.rst
+%%PORTDOCS%%%%DOCSDIR%%/git-dag.rst
+%%PORTDOCS%%%%DOCSDIR%%/hotkeys.html
+%%PORTDOCS%%%%DOCSDIR%%/hotkeys_de.html
+%%PORTDOCS%%%%DOCSDIR%%/hotkeys_zh_CN.html
+%%PORTDOCS%%%%DOCSDIR%%/hotkeys_zh_TW.html
+%%PORTDOCS%%%%DOCSDIR%%/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/relnotes.rst
+%%PORTDOCS%%%%DOCSDIR%%/thanks.rst

More information about the svn-ports-head mailing list