Hi,
this updates git-cola to its latest release.
Cleanups:
- no need for the gettext module (only python scripts)
- git-cola and git-dag shebangs are properly handled, only
share/git-cola/bin/git-xbase needs tweaking
- the cola/cmds.py patch was removed on 2013/11/08
- tweak cola/app.py to use our ssh-askpass instead of a tk/wish script
Some tests fail because they expect to be run from the git-cola git
repo.
ok / comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 10 Jul 2014 11:06:15 -0000 1.14
+++ Makefile 15 Dec 2014 21:40:59 -0000
@@ -2,13 +2,13 @@
COMMENT = python powered git gui
-MODPY_EGG_VERSION= 1.9.1
+MODPY_EGG_VERSION= 2.0.8
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
GH_TAGNAME = v${MODPY_EGG_VERSION}
-GH_COMMIT = 68e9509a6c863f51bc7216be87b3f7bd6596421a
+GH_COMMIT = 58e3fec
CATEGORIES = devel x11
@@ -17,9 +17,7 @@ HOMEPAGE = http://cola.tuxfamily.org/
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-
-MODULES = devel/gettext \
- lang/python
+MODULES = lang/python
BUILD_DEPENDS = devel/git \
textproc/xxdiff \
@@ -30,9 +28,14 @@ RUN_DEPENDS = devel/git \
x11/py-qt4 \
devel/desktop-file-utils
-MODPY_ADJ_FILES= bin/git-cola
+MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cola/cmds.py
+ ${SUBST_CMD} ${WRKSRC}/cola/app.py
+
+pre-test:
+ ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
+ # needs an X server
+ rm -f ${WRKSRC}/test/qtutils_test.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 8 Nov 2013 11:17:05 -0000 1.3
+++ distinfo 15 Dec 2014 19:33:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-cola-1.9.1.tar.gz) = Z0XppIkNpzShAuoMBs3XOrFbzkjzV63p58uMn3j4c3E=
-SIZE (git-cola-1.9.1.tar.gz) = 426723
+SHA256 (git-cola-2.0.8.tar.gz) = zvsPogiuEdlzwRnw4xMF6EsVSZyQuMDuCg0+iix/Ofg=
+SIZE (git-cola-2.0.8.tar.gz) = 683235
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 15 Dec 2014 20:50:00 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Avoid dep on gnu make
+
+--- Makefile.orig Sun Nov 30 08:51:18 2014
++++ Makefile Mon Dec 15 21:49:55 2014
+@@ -44,11 +44,7 @@ setup_args += --force
+ setup_args += --install-scripts=$(bindir)
+ setup_args += --record=build/MANIFEST
+ setup_args += --install-lib=$(coladir)
+-ifdef DESTDIR
+- setup_args += --root=$(DESTDIR)
+- export DESTDIR
+-endif
+-export prefix
++setup_args += --root=$(DESTDIR)
+
+ all::
+ $(PYTHON) setup.py build
Index: patches/patch-cola_app_py
===================================================================
RCS file: patches/patch-cola_app_py
diff -N patches/patch-cola_app_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cola_app_py 15 Dec 2014 21:36:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Use ssh-askpass implementation from xenocara.
+
+--- cola/app.py.orig Mon Dec 15 22:14:30 2014
++++ cola/app.py Mon Dec 15 22:15:05 2014
+@@ -95,7 +95,7 @@ def setup_environment():
+ elif sys.platform == 'darwin':
+ askpass = resources.share('bin', 'ssh-askpass-darwin')
+ else:
+- askpass = resources.share('bin', 'ssh-askpass')
++ askpass = '${X11BASE}/bin/ssh-askpass'
+
+ compat.setenv('GIT_ASKPASS', askpass)
+ compat.setenv('SSH_ASKPASS', askpass)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 8 Nov 2013 11:17:05 -0000 1.5
+++ pkg/PLIST 15 Dec 2014 19:33:59 -0000
@@ -6,10 +6,15 @@ share/applications/git-cola-folder-handl
share/applications/git-cola.desktop
share/applications/git-dag.desktop
share/doc/git-cola/
-share/doc/git-cola/git-cola.txt
-share/doc/git-cola/git-dag.txt
+share/doc/git-cola/git-cola.rst
+share/doc/git-cola/git-dag.rst
share/doc/git-cola/hotkeys.html
share/doc/git-cola/hotkeys_de.html
+share/doc/git-cola/hotkeys_zh_CN.html
+share/doc/git-cola/hotkeys_zh_TW.html
+share/doc/git-cola/index.rst
+share/doc/git-cola/relnotes.rst
+share/doc/git-cola/thanks.rst
share/git-cola/
share/git-cola/bin/
share/git-cola/bin/git-xbase
@@ -24,7 +29,7 @@ share/git-cola/icons/edit-clear.svg
share/git-cola/icons/edit-copy.svg
share/git-cola/icons/edit-select-all.svg
share/git-cola/icons/generic.png
-share/git-cola/icons/git.svg
+share/git-cola/icons/git-cola.svg
share/git-cola/icons/image.png
share/git-cola/icons/logo-top.png
share/git-cola/icons/modified.png
@@ -40,6 +45,7 @@ share/git-cola/icons/staged.png
share/git-cola/icons/undo.svg
share/git-cola/icons/untracked.png
share/git-cola/icons/upstream.png
+share/git-cola/icons/view-filter.png
share/git-cola/icons/view-refresh.svg
share/git-cola/icons/zoom-fit-best.png
share/git-cola/icons/zoom-in.png
@@ -49,19 +55,12 @@ share/git-cola/lib/cola/
share/git-cola/lib/cola/__init__.py
share/git-cola/lib/cola/_version.py
share/git-cola/lib/cola/app.py
-share/git-cola/lib/cola/bookmarks.py
-share/git-cola/lib/cola/classic/
-share/git-cola/lib/cola/classic/__init__.py
-share/git-cola/lib/cola/classic/controller.py
-share/git-cola/lib/cola/classic/model.py
-share/git-cola/lib/cola/classic/view.py
share/git-cola/lib/cola/cmds.py
share/git-cola/lib/cola/compat.py
share/git-cola/lib/cola/core.py
share/git-cola/lib/cola/decorators.py
share/git-cola/lib/cola/diffparse.py
share/git-cola/lib/cola/difftool.py
-share/git-cola/lib/cola/errors.py
share/git-cola/lib/cola/git.py
share/git-cola/lib/cola/gitcfg.py
share/git-cola/lib/cola/gitcmds.py
@@ -70,17 +69,14 @@ share/git-cola/lib/cola/guicmds.py
share/git-cola/lib/cola/i18n.py
share/git-cola/lib/cola/inotify.py
share/git-cola/lib/cola/interaction.py
-share/git-cola/lib/cola/main/
-share/git-cola/lib/cola/main/__init__.py
-share/git-cola/lib/cola/main/model.py
-share/git-cola/lib/cola/main/view.py
share/git-cola/lib/cola/models/
share/git-cola/lib/cola/models/__init__.py
+share/git-cola/lib/cola/models/browse.py
share/git-cola/lib/cola/models/dag.py
+share/git-cola/lib/cola/models/main.py
share/git-cola/lib/cola/models/prefs.py
share/git-cola/lib/cola/models/selection.py
share/git-cola/lib/cola/models/stash.py
-share/git-cola/lib/cola/notification.py
share/git-cola/lib/cola/observable.py
share/git-cola/lib/cola/qtcompat.py
share/git-cola/lib/cola/qtutils.py
@@ -94,9 +90,9 @@ share/git-cola/lib/cola/widgets/__init__
share/git-cola/lib/cola/widgets/about.py
share/git-cola/lib/cola/widgets/action.py
share/git-cola/lib/cola/widgets/archive.py
+share/git-cola/lib/cola/widgets/bookmarks.py
share/git-cola/lib/cola/widgets/browse.py
share/git-cola/lib/cola/widgets/cfgactions.py
-share/git-cola/lib/cola/widgets/combodlg.py
share/git-cola/lib/cola/widgets/commitmsg.py
share/git-cola/lib/cola/widgets/compare.py
share/git-cola/lib/cola/widgets/completion.py
@@ -106,10 +102,13 @@ share/git-cola/lib/cola/widgets/dag.py
share/git-cola/lib/cola/widgets/defs.py
share/git-cola/lib/cola/widgets/diff.py
share/git-cola/lib/cola/widgets/editremotes.py
+share/git-cola/lib/cola/widgets/filelist.py
share/git-cola/lib/cola/widgets/grep.py
share/git-cola/lib/cola/widgets/highlighter.py
share/git-cola/lib/cola/widgets/log.py
+share/git-cola/lib/cola/widgets/main.py
share/git-cola/lib/cola/widgets/merge.py
+share/git-cola/lib/cola/widgets/patch.py
share/git-cola/lib/cola/widgets/prefs.py
share/git-cola/lib/cola/widgets/recent.py
share/git-cola/lib/cola/widgets/remote.py
@@ -121,16 +120,19 @@ share/git-cola/lib/cola/widgets/startup.
share/git-cola/lib/cola/widgets/stash.py
share/git-cola/lib/cola/widgets/status.py
share/git-cola/lib/cola/widgets/text.py
-share/git-cola/lib/cola/xdg.py
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/
+share/locale/id_ID/LC_MESSAGES/
+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/zh_cn/
-share/locale/zh_cn/LC_MESSAGES/
-share/locale/zh_cn/LC_MESSAGES/git-cola.mo
+share/locale/zh_CN/LC_MESSAGES/git-cola.mo
+share/locale/zh_TW/LC_MESSAGES/git-cola.mo
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
