Monday, August 04, 2025

Re: [update] x11/terminator to 2.1.5

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/terminator/Makefile,v
diff -u -p -u -p -r1.35 Makefile
--- Makefile 29 Apr 2025 10:40:38 -0000 1.35
+++ Makefile 4 Aug 2025 07:46:25 -0000
@@ -1,8 +1,7 @@
COMMENT = GTK3 terminal emulator with split-window and tabs support

-VERSION = 1.92
+VERSION = 2.1.5
DISTNAME = terminator-${VERSION}
-REVISION = 9

CATEGORIES = x11

@@ -22,19 +21,16 @@ RUN_DEPENDS = devel/desktop-file-utils
devel/py-configobj \
devel/py-gobject3 \
devel/vte3 \
+ graphics/py-cairo \
sysutils/py-psutil \
+ x11/dbus-python \
x11/gtk+3 \
x11/gtk+4,-guic \
x11/keybinder3

MODPY_PYBUILD = setuptools
-MODPY_SETUP_ARGS = --without-icon-cache

# --single-version-externally-managed option used by MODPY doesn't exist
MODPY_DISTUTILS_INSTALL = install --prefix=${LOCALBASE} --root=${DESTDIR}
-
-do-test:
- ${SUBST_CMD} ${WRKSRC}/run_tests
- cd ${WRKSRC} && /bin/sh ./run_tests

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/terminator/distinfo,v
diff -u -p -u -p -r1.6 distinfo
--- distinfo 10 Sep 2020 13:47:46 -0000 1.6
+++ distinfo 4 Aug 2025 07:46:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (terminator-1.92.tar.gz) = H5TWdq1CyBThWeY3TcqB5OaKwfA/IBM5W6mbacF1c/E=
-SIZE (terminator-1.92.tar.gz) = 910613
+SHA256 (terminator-2.1.5.tar.gz) = 8CGc2L09tF1Rc9hQYZFF1V+ehk/iEG9s655zbFddDgM=
+SIZE (terminator-2.1.5.tar.gz) = 1076263
Index: patches/patch-run_tests
===================================================================
RCS file: patches/patch-run_tests
diff -N patches/patch-run_tests
--- patches/patch-run_tests 11 Mar 2022 20:17:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: run_tests
---- run_tests.orig
-+++ run_tests
-@@ -4,7 +4,7 @@ for t in tests/test*; do
- echo $t
- file_type=$(file -b $t)
- case ${file_type} in
-- *[Pp]ython*) python ${t} ;;
-+ *[Pp]ython*) ${MODPY_BIN} ${t} ;;
- *Bourne*) bash ${t} ;;
- *bash*) bash ${t} ;;
- *perl*) perl ${t} ;;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/terminator/pkg/PLIST,v
diff -u -p -u -p -r1.14 PLIST
--- pkg/PLIST 29 Apr 2025 10:40:38 -0000 1.14
+++ pkg/PLIST 4 Aug 2025 07:46:25 -0000
@@ -1,14 +1,13 @@
bin/remotinator
bin/terminator
-bin/terminator.wrapper
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/licenses/
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/licenses/AUTHORS
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/licenses/COPYING
-lib/python${MODPY_VERSION}/site-packages/terminator-1.92.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/licenses/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/licenses/COPYING
+lib/python${MODPY_VERSION}/site-packages/terminator-2.1.5.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/terminatorlib/
lib/python${MODPY_VERSION}/site-packages/terminatorlib/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}/
@@ -18,6 +17,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}borg.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}configjson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}configjson.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}cwd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -26,12 +27,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}debugserver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}editablelabel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}editablelabel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}ipc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}ipc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}keybindings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -48,6 +45,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}prefseditor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}prefseditor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}searchbar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}searchbar.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}signalman.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -70,13 +69,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}window.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/borg.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/config.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/configjson.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/container.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/cwd.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/debugserver.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/editablelabel.py
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/encoding.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/factory.py
-lib/python${MODPY_VERSION}/site-packages/terminatorlib/freebsd.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/ipc.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/keybindings.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/layoutlauncher.glade
@@ -92,12 +90,28 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}activitywatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}activitywatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}command_notify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}command_notify.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}custom_commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}custom_commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}dir_open.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}dir_open.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}insert_term_name.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}insert_term_name.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}maven.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}maven.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}mousefree_url_handler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}mousefree_url_handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}run_cmd_on_match.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}run_cmd_on_match.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}save_last_session_layout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}save_last_session_layout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}save_user_session_layout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}save_user_session_layout.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}terminalshot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}terminalshot.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}testplugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -105,14 +119,23 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}url_handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}url_handlers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/activitywatch.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/command_notify.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/custom_commands.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/dir_open.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/insert_term_name.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/logger.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/maven.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/mousefree_url_handler.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/remote.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/run_cmd_on_match.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/save_last_session_layout.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/save_user_session_layout.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/terminalshot.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/testplugin.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/url_handlers.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/preferences.glade
lib/python${MODPY_VERSION}/site-packages/terminatorlib/prefseditor.py
+lib/python${MODPY_VERSION}/site-packages/terminatorlib/regex.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/searchbar.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/signalman.py
lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminal.py
@@ -125,8 +148,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/terminatorlib/window.py
@man man/man1/terminator.1
@man man/man5/terminator_config.5
-share/appdata/
-share/appdata/terminator.appdata.xml
share/applications/terminator.desktop
share/icons/HighContrast/
share/icons/HighContrast/16x16/
@@ -294,6 +315,8 @@ share/locale/wa/LC_MESSAGES/terminator.m
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/metainfo/
+share/metainfo/terminator.metainfo.xml
share/pixmaps/
share/pixmaps/terminator.png
share/terminator/
På mandag 4. august 2025 kl. 09:07, Lucas Raab
<tuftedocelot@fastmail.fm> skrev:

> Hello,
>
> Here's an update for terminator up to the latest. It's been five years since
> the last update so let me know if anything looks amiss. Changelogs in the
> meantime: https://github.com/gnome-terminator/terminator/releases
>
> Thanks,
> Lucas

Tested on current/amd64.

Did:
cd /usr/ports/ && patch -p0 -E -C < /tmp/terminator.diff
cd /usr/ports/x11/terminator/ && make install clean && make distclean

Had to remove the patch 'patches/patch-run_tests' for it to build.

I attached a diff that removes that patch if that is permissible.

Patch like so in case I did something nonstandard:

cd /usr/ports/x11/terminator/ && patch -p0 -E -C < /tmp/terminator-2.1.5p0.diff

If that went well remove '-C' to apply:

cd /usr/ports/x11/terminator/ && patch -p0 -E < /tmp/terminator-2.1.5p0.diff

Ran:

terminator
export GDK_BACKEND=x11 && terminator

Ran natively on sway and by forcing xwayland; did some light testing.

I think that this is fine otherwise.

Hope this helps.

Take care and well wishes. Happy porting!

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)