Index: x11/terminator/Makefile
===================================================================
RCS file: /cvs/ports/x11/terminator/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- x11/terminator/Makefile 5 May 2016 02:32:55 -0000 1.17
+++ x11/terminator/Makefile 6 Jun 2018 23:25:11 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2016/05/05 02:32:55 bentley Exp $
-COMMENT = GTK2 terminal emulator with split-window and tabs support
+COMMENT = GTK3 terminal emulator with split-window and tabs support
-MODPY_EGG_VERSION = 0.98
+MODPY_EGG_VERSION = 1.91
DISTNAME = terminator-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = x11
@@ -13,17 +12,20 @@ HOMEPAGE = https://gnometerminator.blog
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES = http://launchpad.net/terminator/trunk/${MODPY_EGG_VERSION}/+download/
+MASTER_SITES = http://launchpad.net/terminator/gtk3/${MODPY_EGG_VERSION}/+download/
MODULES = lang/python \
textproc/intltool
-RUN_DEPENDS = devel/vte,-python \
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ devel/gsettings-desktop-schemas \
+ devel/py-gobject3 \
devel/py-notify \
- devel/desktop-file-utils \
+ devel/vte3 \
+ sysutils/py-psutil \
x11/gtk+3,-guic \
- x11/keybinder,-python
-
-NO_TEST = Yes
+ x11/gtk+3 \
+ x11/keybinder3
MODPY_SETUPTOOLS = Yes
MODPY_SETUP_ARGS = --without-icon-cache
Index: x11/terminator/distinfo
===================================================================
RCS file: /cvs/ports/x11/terminator/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- x11/terminator/distinfo 26 Oct 2015 18:31:57 -0000 1.4
+++ x11/terminator/distinfo 6 Jun 2018 23:25:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (terminator-0.98.tar.gz) = Cm2Mn/421n5glo+/J1LFIeXUmM7aQu8XGtPpZsAvJsE=
-SIZE (terminator-0.98.tar.gz) = 6007243
+SHA256 (terminator-1.91.tar.gz) = lfduPAJTlW0ZzqsvjacJpJbxuc+bHFuNPNC22jzHvmk=
+SIZE (terminator-1.91.tar.gz) = 910536
Index: x11/terminator/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/terminator/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- x11/terminator/pkg/PLIST 26 Oct 2015 18:31:57 -0000 1.6
+++ x11/terminator/pkg/PLIST 6 Jun 2018 23:25:11 -0000
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2015/10/26 18:31:57 jasper Exp $
+@comment $OpenBSD: PLIST,v$
bin/remotinator
bin/terminator
bin/terminator.wrapper
-lib/python${MODPY_VERSION}/site-packages/Terminator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/terminator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/terminatorlib/
lib/python${MODPY_VERSION}/site-packages/terminatorlib/__init__.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/__init__.pyc
@@ -91,218 +91,6 @@ lib/python${MODPY_VERSION}/site-packages
share/appdata/
share/appdata/terminator.appdata.xml
share/applications/terminator.desktop
-share/doc/terminator/
-share/doc/terminator/apidoc/
-share/doc/terminator/apidoc/.buildinfo
-share/doc/terminator/apidoc/_modules/
-share/doc/terminator/apidoc/_modules/index.html
-share/doc/terminator/apidoc/_modules/terminatorlib/
-share/doc/terminator/apidoc/_modules/terminatorlib/borg.html
-share/doc/terminator/apidoc/_modules/terminatorlib/config.html
-share/doc/terminator/apidoc/_modules/terminatorlib/configobj/
-share/doc/terminator/apidoc/_modules/terminatorlib/configobj/configobj.html
-share/doc/terminator/apidoc/_modules/terminatorlib/configobj/validate.html
-share/doc/terminator/apidoc/_modules/terminatorlib/container.html
-share/doc/terminator/apidoc/_modules/terminatorlib/cwd.html
-share/doc/terminator/apidoc/_modules/terminatorlib/debugserver.html
-share/doc/terminator/apidoc/_modules/terminatorlib/editablelabel.html
-share/doc/terminator/apidoc/_modules/terminatorlib/encoding.html
-share/doc/terminator/apidoc/_modules/terminatorlib/factory.html
-share/doc/terminator/apidoc/_modules/terminatorlib/freebsd.html
-share/doc/terminator/apidoc/_modules/terminatorlib/ipc.html
-share/doc/terminator/apidoc/_modules/terminatorlib/keybindings.html
-share/doc/terminator/apidoc/_modules/terminatorlib/layoutlauncher.html
-share/doc/terminator/apidoc/_modules/terminatorlib/notebook.html
-share/doc/terminator/apidoc/_modules/terminatorlib/optionparse.html
-share/doc/terminator/apidoc/_modules/terminatorlib/paned.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugin.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/activitywatch.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/custom_commands.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/logger.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/maven.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/terminalshot.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/testplugin.html
-share/doc/terminator/apidoc/_modules/terminatorlib/plugins/url_handlers.html
-share/doc/terminator/apidoc/_modules/terminatorlib/prefseditor.html
-share/doc/terminator/apidoc/_modules/terminatorlib/searchbar.html
-share/doc/terminator/apidoc/_modules/terminatorlib/signalman.html
-share/doc/terminator/apidoc/_modules/terminatorlib/terminal.html
-share/doc/terminator/apidoc/_modules/terminatorlib/terminal_popup_menu.html
-share/doc/terminator/apidoc/_modules/terminatorlib/terminator.html
-share/doc/terminator/apidoc/_modules/terminatorlib/titlebar.html
-share/doc/terminator/apidoc/_modules/terminatorlib/util.html
-share/doc/terminator/apidoc/_modules/terminatorlib/window.html
-share/doc/terminator/apidoc/_sources/
-share/doc/terminator/apidoc/_sources/index.txt
-share/doc/terminator/apidoc/_sources/terminatorlib.configobj.txt
-share/doc/terminator/apidoc/_sources/terminatorlib.plugins.txt
-share/doc/terminator/apidoc/_sources/terminatorlib.txt
-share/doc/terminator/apidoc/_static/
-share/doc/terminator/apidoc/_static/ajax-loader.gif
-share/doc/terminator/apidoc/_static/basic.css
-share/doc/terminator/apidoc/_static/comment-bright.png
-share/doc/terminator/apidoc/_static/comment-close.png
-share/doc/terminator/apidoc/_static/comment.png
-share/doc/terminator/apidoc/_static/css/
-share/doc/terminator/apidoc/_static/css/badge_only.css
-share/doc/terminator/apidoc/_static/css/theme.css
-share/doc/terminator/apidoc/_static/doctools.js
-share/doc/terminator/apidoc/_static/down-pressed.png
-share/doc/terminator/apidoc/_static/down.png
-share/doc/terminator/apidoc/_static/file.png
-share/doc/terminator/apidoc/_static/fonts/
-share/doc/terminator/apidoc/_static/fonts/Inconsolata-Bold.ttf
-share/doc/terminator/apidoc/_static/fonts/Inconsolata.ttf
-share/doc/terminator/apidoc/_static/fonts/Lato-Bold.ttf
-share/doc/terminator/apidoc/_static/fonts/Lato-Regular.ttf
-share/doc/terminator/apidoc/_static/fonts/RobotoSlab-Bold.ttf
-share/doc/terminator/apidoc/_static/fonts/RobotoSlab-Regular.ttf
-share/doc/terminator/apidoc/_static/fonts/fontawesome-webfont.eot
-share/doc/terminator/apidoc/_static/fonts/fontawesome-webfont.svg
-share/doc/terminator/apidoc/_static/fonts/fontawesome-webfont.ttf
-share/doc/terminator/apidoc/_static/fonts/fontawesome-webfont.woff
-share/doc/terminator/apidoc/_static/jquery-1.11.1.js
-share/doc/terminator/apidoc/_static/jquery.js
-share/doc/terminator/apidoc/_static/js/
-share/doc/terminator/apidoc/_static/js/modernizr.min.js
-share/doc/terminator/apidoc/_static/js/theme.js
-share/doc/terminator/apidoc/_static/minus.png
-share/doc/terminator/apidoc/_static/plus.png
-share/doc/terminator/apidoc/_static/pygments.css
-share/doc/terminator/apidoc/_static/searchtools.js
-share/doc/terminator/apidoc/_static/underscore-1.3.1.js
-share/doc/terminator/apidoc/_static/underscore.js
-share/doc/terminator/apidoc/_static/up-pressed.png
-share/doc/terminator/apidoc/_static/up.png
-share/doc/terminator/apidoc/_static/websupport.js
-share/doc/terminator/apidoc/genindex.html
-share/doc/terminator/apidoc/index.html
-share/doc/terminator/apidoc/objects.inv
-share/doc/terminator/apidoc/${MODPY_PY_PREFIX}modindex.html
-share/doc/terminator/apidoc/search.html
-share/doc/terminator/apidoc/searchindex.js
-share/doc/terminator/apidoc/terminatorlib.configobj.html
-share/doc/terminator/apidoc/terminatorlib.html
-share/doc/terminator/apidoc/terminatorlib.plugins.html
-share/doc/terminator/html/
-share/doc/terminator/html/.buildinfo
-share/doc/terminator/html/_images/
-share/doc/terminator/html/_images/activitywatch_notification.png
-share/doc/terminator/html/_images/basic_window.png
-share/doc/terminator/html/_images/broadcast_01.png
-share/doc/terminator/html/_images/broadcast_02.png
-share/doc/terminator/html/_images/broadcast_03.png
-share/doc/terminator/html/_images/context_open_debug_tab.png
-share/doc/terminator/html/_images/custom_commands.png
-share/doc/terminator/html/_images/debug_tab.png
-share/doc/terminator/html/_images/dragterminal_01.png
-share/doc/terminator/html/_images/dragterminal_02.png
-share/doc/terminator/html/_images/grouping_01.png
-share/doc/terminator/html/_images/grouping_02.png
-share/doc/terminator/html/_images/grouping_03.png
-share/doc/terminator/html/_images/grouping_04.png
-share/doc/terminator/html/_images/icon_advanced.png
-share/doc/terminator/html/_images/icon_faq.png
-share/doc/terminator/html/_images/icon_gettinginvolved.png
-share/doc/terminator/html/_images/icon_gettingstarted.png
-share/doc/terminator/html/_images/icon_grouping.png
-share/doc/terminator/html/_images/icon_history.png
-share/doc/terminator/html/_images/icon_layout.png
-share/doc/terminator/html/_images/icon_license.png
-share/doc/terminator/html/_images/icon_plugins.png
-share/doc/terminator/html/_images/icon_prefs.png
-share/doc/terminator/html/_images/icon_terminator.png
-share/doc/terminator/html/_images/inactivitywatch_notification.png
-share/doc/terminator/html/_images/large_example.png
-share/doc/terminator/html/_images/layoutlauncher.png
-share/doc/terminator/html/_images/plugins_links.png
-share/doc/terminator/html/_images/prefs_about.png
-share/doc/terminator/html/_images/prefs_global.png
-share/doc/terminator/html/_images/prefs_keybindings.png
-share/doc/terminator/html/_images/prefs_layouts.png
-share/doc/terminator/html/_images/prefs_plugins.png
-share/doc/terminator/html/_images/prefs_profiles_background.png
-share/doc/terminator/html/_images/prefs_profiles_colors.png
-share/doc/terminator/html/_images/prefs_profiles_command.png
-share/doc/terminator/html/_images/prefs_profiles_compatability.png
-share/doc/terminator/html/_images/prefs_profiles_general.png
-share/doc/terminator/html/_images/prefs_profiles_scrolling.png
-share/doc/terminator/html/_images/rebalance_01.png
-share/doc/terminator/html/_images/rebalance_02.png
-share/doc/terminator/html/_images/rebalance_03.png
-share/doc/terminator/html/_images/rebalance_04.png
-share/doc/terminator/html/_images/rebalance_05.png
-share/doc/terminator/html/_images/rebalance_06.png
-share/doc/terminator/html/_images/search.png
-share/doc/terminator/html/_images/small_example.png
-share/doc/terminator/html/_images/split_window.png
-share/doc/terminator/html/_images/window_breakdown.png
-share/doc/terminator/html/_sources/
-share/doc/terminator/html/_sources/advancedusage.txt
-share/doc/terminator/html/_sources/faq.txt
-share/doc/terminator/html/_sources/gettinginvolved.txt
-share/doc/terminator/html/_sources/gettingstarted.txt
-share/doc/terminator/html/_sources/grouping.txt
-share/doc/terminator/html/_sources/history.txt
-share/doc/terminator/html/_sources/index.txt
-share/doc/terminator/html/_sources/layouts.txt
-share/doc/terminator/html/_sources/licensing.txt
-share/doc/terminator/html/_sources/plugins.txt
-share/doc/terminator/html/_sources/preferences.txt
-share/doc/terminator/html/_static/
-share/doc/terminator/html/_static/ajax-loader.gif
-share/doc/terminator/html/_static/basic.css
-share/doc/terminator/html/_static/comment-bright.png
-share/doc/terminator/html/_static/comment-close.png
-share/doc/terminator/html/_static/comment.png
-share/doc/terminator/html/_static/css/
-share/doc/terminator/html/_static/css/badge_only.css
-share/doc/terminator/html/_static/css/theme.css
-share/doc/terminator/html/_static/doctools.js
-share/doc/terminator/html/_static/down-pressed.png
-share/doc/terminator/html/_static/down.png
-share/doc/terminator/html/_static/file.png
-share/doc/terminator/html/_static/fonts/
-share/doc/terminator/html/_static/fonts/Inconsolata-Bold.ttf
-share/doc/terminator/html/_static/fonts/Inconsolata.ttf
-share/doc/terminator/html/_static/fonts/Lato-Bold.ttf
-share/doc/terminator/html/_static/fonts/Lato-Regular.ttf
-share/doc/terminator/html/_static/fonts/RobotoSlab-Bold.ttf
-share/doc/terminator/html/_static/fonts/RobotoSlab-Regular.ttf
-share/doc/terminator/html/_static/fonts/fontawesome-webfont.eot
-share/doc/terminator/html/_static/fonts/fontawesome-webfont.svg
-share/doc/terminator/html/_static/fonts/fontawesome-webfont.ttf
-share/doc/terminator/html/_static/fonts/fontawesome-webfont.woff
-share/doc/terminator/html/_static/jquery-1.11.1.js
-share/doc/terminator/html/_static/jquery.js
-share/doc/terminator/html/_static/js/
-share/doc/terminator/html/_static/js/modernizr.min.js
-share/doc/terminator/html/_static/js/theme.js
-share/doc/terminator/html/_static/minus.png
-share/doc/terminator/html/_static/plus.png
-share/doc/terminator/html/_static/pygments.css
-share/doc/terminator/html/_static/searchtools.js
-share/doc/terminator/html/_static/underscore-1.3.1.js
-share/doc/terminator/html/_static/underscore.js
-share/doc/terminator/html/_static/up-pressed.png
-share/doc/terminator/html/_static/up.png
-share/doc/terminator/html/_static/websupport.js
-share/doc/terminator/html/advancedusage.html
-share/doc/terminator/html/faq.html
-share/doc/terminator/html/genindex.html
-share/doc/terminator/html/gettinginvolved.html
-share/doc/terminator/html/gettingstarted.html
-share/doc/terminator/html/grouping.html
-share/doc/terminator/html/history.html
-share/doc/terminator/html/index.html
-share/doc/terminator/html/layouts.html
-share/doc/terminator/html/licensing.html
-share/doc/terminator/html/objects.inv
-share/doc/terminator/html/plugins.html
-share/doc/terminator/html/preferences.html
-share/doc/terminator/html/search.html
-share/doc/terminator/html/searchindex.js
share/icons/HighContrast/
share/icons/HighContrast/16x16/
share/icons/HighContrast/16x16/actions/
@@ -410,6 +198,7 @@ share/locale/hi/LC_MESSAGES/terminator.m
share/locale/hr/LC_MESSAGES/terminator.mo
share/locale/hu/LC_MESSAGES/terminator.mo
share/locale/hy/LC_MESSAGES/terminator.mo
+share/locale/ia/LC_MESSAGES/terminator.mo
share/locale/id/LC_MESSAGES/terminator.mo
share/locale/is/LC_MESSAGES/terminator.mo
share/locale/it/LC_MESSAGES/terminator.mo
@@ -420,6 +209,7 @@ share/locale/jv/LC_MESSAGES/terminator.m
share/locale/ka/LC_MESSAGES/terminator.mo
share/locale/kk/LC_MESSAGES/terminator.mo
share/locale/ko/LC_MESSAGES/terminator.mo
+share/locale/ku/LC_MESSAGES/terminator.mo
share/locale/la/
share/locale/la/LC_MESSAGES/
share/locale/la/LC_MESSAGES/terminator.mo
@@ -457,14 +247,45 @@ share/locale/tr/LC_MESSAGES/terminator.m
share/locale/tyv/
share/locale/tyv/LC_MESSAGES/
share/locale/tyv/LC_MESSAGES/terminator.mo
+share/locale/ug/LC_MESSAGES/terminator.mo
share/locale/uk/LC_MESSAGES/terminator.mo
share/locale/ur/LC_MESSAGES/terminator.mo
share/locale/vi/LC_MESSAGES/terminator.mo
+share/locale/wa/LC_MESSAGES/terminator.mo
share/locale/zh_CN/LC_MESSAGES/terminator.mo
share/locale/zh_HK/LC_MESSAGES/terminator.mo
share/locale/zh_TW/LC_MESSAGES/terminator.mo
share/pixmaps/
share/pixmaps/terminator.png
+share/terminator/
+share/terminator/terminatorlib/
+share/terminator/terminatorlib/themes/
+share/terminator/terminatorlib/themes/Adwaita/
+share/terminator/terminatorlib/themes/Adwaita/gtk-3.0/
+share/terminator/terminatorlib/themes/Adwaita/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/Adwaita/gtk-3.0/apps/terminator.css
+share/terminator/terminatorlib/themes/Ambiance/
+share/terminator/terminatorlib/themes/Ambiance/gtk-3.0/
+share/terminator/terminatorlib/themes/Ambiance/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/Ambiance/gtk-3.0/apps/terminator.css
+share/terminator/terminatorlib/themes/Ambiance/gtk-3.0/apps/terminator_styling.css
+share/terminator/terminatorlib/themes/Breeze/
+share/terminator/terminatorlib/themes/Breeze/gtk-3.0/
+share/terminator/terminatorlib/themes/Breeze/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/Breeze/gtk-3.0/apps/terminator.css
+share/terminator/terminatorlib/themes/HighContrast/
+share/terminator/terminatorlib/themes/HighContrast/gtk-3.0/
+share/terminator/terminatorlib/themes/HighContrast/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/HighContrast/gtk-3.0/apps/terminator.css
+share/terminator/terminatorlib/themes/Radiance/
+share/terminator/terminatorlib/themes/Radiance/gtk-3.0/
+share/terminator/terminatorlib/themes/Radiance/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/Radiance/gtk-3.0/apps/terminator.css
+share/terminator/terminatorlib/themes/Radiance/gtk-3.0/apps/terminator_styling.css
+share/terminator/terminatorlib/themes/Raleigh/
+share/terminator/terminatorlib/themes/Raleigh/gtk-3.0/
+share/terminator/terminatorlib/themes/Raleigh/gtk-3.0/apps/
+share/terminator/terminatorlib/themes/Raleigh/gtk-3.0/apps/terminator.css
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/HighContrast
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/HighContrast
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Hi,
Attached you will find the update from terminator 0.98 to 1.91.
Terminator 0.98 is a GTK+2 terminal emulator supporting dividing the
console in tabs and splitting it.
The new branch 1.90+ moves to GTK+3, the 0.98 version is been abandoned.
Tested OK in a vanilla OpenBSD installation with only the requirements
for the package.
It can not be used by root:
Traceback (most recent call last):
File "/usr/local/lib/python2.7/site-packages/terminatorlib/terminal_popup_menu.py",
line 133, in <lambda>
self.terminal.get_cwd()))
File "/usr/local/lib/python2.7/site-packages/terminatorlib/terminal.py",
line 225, in get_cwd
return(self.terminator.pid_cwd(self.pid))
File "/usr/local/lib/python2.7/site-packages/terminatorlib/cwd.py",
line 85, in psutil_cwd
return psutil.Process(pid).as_dict()['cwd']
File "/usr/local/lib/python2.7/site-packages/psutil/__init__.py",
line 528, in as_dict
ret = meth()
File "/usr/local/lib/python2.7/site-packages/psutil/__init__.py",
line 865, in threads
return self._proc.threads()
File "/usr/local/lib/python2.7/site-packages/psutil/_psbsd.py", line
504, in wrapper
return fun(self, *args, **kwargs)
File "/usr/local/lib/python2.7/site-packages/psutil/_psbsd.py", line
691, in threads
rawlist = cext.proc_threads(self.pid)
RuntimeError: kvm_openfiles() syscall failed
My wild guess is that is related with psutil getting "cwd" (current
working directory) for root.
I do not know if take this as a bug from terminator or from psutil or
not a bug at all... I would go for the later one.
Just don't use this ports as root, period.
portlocatedb did not return any conflicts...
Any thoughts ?
OK?
Commit? :D
Cheers.
Elias.
No comments:
Post a Comment