* [gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/
@ 2016-11-24 23:01 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2016-11-24 23:01 UTC (permalink / raw
To: gentoo-commits
commit: 8020ac5d40ea32bb5fa45ae7e2b16828f95f2408
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 23:00:53 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 23:01:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8020ac5d
x11-terms/terminator: Version bump.
Package-Manager: portage-2.3.2
x11-terms/terminator/Manifest | 1 +
x11-terms/terminator/files/0.93-session.patch | 13 ----
.../terminator/files/terminator-1.0-desktop.patch | 11 ++++
x11-terms/terminator/terminator-1.0.ebuild | 76 ++++++++++++++++++++++
4 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index d43ebf7..2a5f79f 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,2 +1,3 @@
DIST terminator-0.97.tar.gz 5025337 SHA256 0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470 WHIRLPOOL 9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
DIST terminator-0.98.tar.gz 6007243 SHA256 0a6d8c9ffe36d67e60968fbf2752c521e5d498ceda42ef171ad3e966c02f26c1 SHA512 c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573 WHIRLPOOL b9a6e9bba8a945ca51aca6936b00dfc51b9c1d266315450b2f63af2d64600c18a7ff9cce712a342f236aded0bbda07b7d1a979685f68d45006a14cf7b0d9a160
+DIST terminator-1.0.tar.gz 881675 SHA256 88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd SHA512 5dbd7463dd8eca2f3554d7d51ae4b8745279485f39b3160feff93c8a02e5e753fff24ecbeaed756320e8ef3e58f14f2c367efa41180224176cff49eaed04d590 WHIRLPOOL 80f83b3fbd25c2128e5c6a9b0f104b0afbd8c1404e63fd559ceb7999de4849ee8e15a8f0bfd3c314c668f8b0f4fbbf7fae916664ae5c0f27b6c44b78b2f1e4c3
diff --git a/x11-terms/terminator/files/0.93-session.patch b/x11-terms/terminator/files/0.93-session.patch
deleted file mode 100644
index c904a8c..00000000
--- a/x11-terms/terminator/files/0.93-session.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
-index 34726cb..5adb7e7 100755
---- a/terminatorlib/terminator.py
-+++ b/terminatorlib/terminator.py
-@@ -60,8 +60,6 @@ class Terminator(Borg):
- self.doing_layout = False
- if not self.pid_cwd:
- self.pid_cwd = get_pid_cwd()
-- if self.gnome_client is None:
-- self.attempt_gnome_client()
-
- def attempt_gnome_client(self):
- """Attempt to find a GNOME Session to register with"""
diff --git a/x11-terms/terminator/files/terminator-1.0-desktop.patch b/x11-terms/terminator/files/terminator-1.0-desktop.patch
new file mode 100644
index 00000000..2edf260
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.0-desktop.patch
@@ -0,0 +1,11 @@
+--- a/data/terminator.desktop.in
++++ b/data/terminator.desktop.in
+@@ -9,7 +9,7 @@
+ StartupNotify=true
+ X-Ubuntu-Gettext-Domain=terminator
+ X-Ayatana-Desktop-Shortcuts=NewWindow;
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open a New Window
+ Exec=terminator
+ TargetEnvironment=Unity
diff --git a/x11-terms/terminator/terminator-1.0.ebuild b/x11-terms/terminator/terminator-1.0.ebuild
new file mode 100644
index 00000000..37de204
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc gnome +libnotify"
+
+RDEPEND="
+ dev-libs/keybinder:0[python]
+ x11-libs/vte:0[python]
+ dbus? ( sys-apps/dbus )
+ gnome? (
+ dev-python/gconf-python
+ dev-python/libgnome-python
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )
+ libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+"
+DEPEND="
+ dev-util/intltool
+"
+
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/0.90-without-icon-cache.patch
+ "${FILESDIR}"/0.94-session.patch
+ "${FILESDIR}"/${P}-desktop.patch
+ )
+
+ local i p
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ pushd "${S}"/po > /dev/null
+ strip-linguas -i .
+ for i in *.po; do
+ if ! has ${i%.po} ${LINGUAS} ; then
+ rm ${i} || die
+ fi
+ done
+ popd > /dev/null
+ fi
+
+ sed \
+ -e "/'share', 'doc'/s:${PN}:${PF}:g" \
+ -i setup.py terminatorlib/util.py || die
+
+ use doc || \
+ sed \
+ -e '/install_documentation/s:True:False:g' \
+ -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ VIRTUALX_COMMAND="esetup.py"
+ virtualmake test
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/
@ 2020-04-30 23:18 Patrick McLean
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean @ 2020-04-30 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 53f47bd928f3b470b69a3bfbf44d318dec4e1a6a
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Tue Mar 3 01:08:52 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 23:18:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f47bd9
x11-terms/terminator: bump version, support py3
Some notes:
* I replaced gnome2 with xdg because gnome2 doesn't work with EAPI 7. I
don't know whether the rest of things gnome2 eclass did is important.
* I put myself to maintainer because Andreas Sturmlechner told me to.
It seems to work, and the test passes.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Closes: https://bugs.gentoo.org/716446
Closes: https://github.com/gentoo/gentoo/pull/14826
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
x11-terms/terminator/Manifest | 1 +
.../files/terminator-1.91-without-icon-cache.patch | 16 ++++++
x11-terms/terminator/metadata.xml | 10 ++--
x11-terms/terminator/terminator-1.92.ebuild | 58 ++++++++++++++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 28305643e3a..5de1326fab2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1 +1,2 @@
DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
+DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
new file mode 100644
index 00000000000..c924de3607f
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
@@ -0,0 +1,16 @@
+Without this patch, terminator's build script runs gtk-update-icon-cache which
+causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
+its own. To avoid that, gtk-update-icon-cache is run later, as part of
+xdg_pkg_postinst in the ebuild.
+
+--- a/setup.py 2009-08-12 22:22:53.000000000 -0400
++++ b/setup.py 2009-08-12 22:22:57.000000000 -0400
+@@ -25,7 +25,7 @@
+
+ def __init__ (self, *args):
+ self.without_gettext = False
+- self.without_icon_cache = False
++ self.without_icon_cache = True
+ Distribution.__init__(self, *args)
+
+
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index 44b22d322ad..d11068fa01f 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -2,8 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>chutzpah@gentoo.org</email>
- <name>Patrick McLean</name>
+ <email>alexey+gentoo@asokolov.org</email>
+ <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<longdescription>
Much of the behaviour of Terminator is based on GNOME Terminal, and
@@ -16,6 +20,6 @@
<flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag>
</use>
<upstream>
- <remote-id type="launchpad">terminator</remote-id>
+ <remote-id type="github">gnome-terminator/terminator</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild
new file mode 100644
index 00000000000..64edc13227e
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="https://github.com/gnome-terminator/terminator"
+SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus +libnotify test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ dev-libs/keybinder:3[introspection]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=x11-libs/gtk+-3.16:3
+ x11-libs/vte:2.91[introspection]
+ dbus? ( sys-apps/dbus )
+ libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+ dev-util/intltool
+ test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
+ "${FILESDIR}"/terminator-1.91-desktop.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ virtx esetup.py test || die "tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/
@ 2020-05-04 14:11 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-05-04 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 472a3393145f37f03c9ca961f02e2ec6848743cb
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun May 3 15:50:27 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 4 14:11:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472a3393
x11-terms/terminator: improvements
* install metainfo to correct (modern) path
* declare not using setuputils
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/15589
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/terminator-1.92-metainfo.patch | 32 ++++++++++++++++++++++
x11-terms/terminator/terminator-1.92.ebuild | 2 ++
2 files changed, 34 insertions(+)
diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
new file mode 100644
index 00000000000..ae2fed5d48f
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch
@@ -0,0 +1,32 @@
+commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41
+Author: Alexey Sokolov <sokolov@google.com>
+Date: Fri May 1 20:38:00 2020 +0100
+
+ Install AppStream data as .metainfo.xml
+
+ Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+diff --git a/setup.py b/setup.py
+index 7c54977e..38a819a9 100755
+--- a/setup.py
++++ b/setup.py
+@@ -72,7 +72,7 @@ class BuildData(build):
+ [file_data.write(line.lstrip('_')) for line in file_in]
+
+ appdata_in='data/terminator.appdata.xml.in'
+- appdata_data='data/terminator.appdata.xml'
++ appdata_data='data/terminator.metainfo.xml'
+ rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
+ "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
+ appdata_in + " " + appdata_data)
+@@ -205,9 +205,9 @@ setup(name=APP_NAME,
+ license='GNU GPL v2',
+ scripts=['terminator', 'remotinator'],
+ data_files=[
+ ('bin', ['terminator.wrapper']),
+- ('share/appdata', ['data/terminator.appdata.xml']),
+ ('share/applications', ['data/terminator.desktop']),
++ ('share/metainfo', ['data/terminator.metainfo.xml']),
+ (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
+ (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
+ ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild
index e0725520a7c..5891577d909 100644
--- a/x11-terms/terminator/terminator-1.92.ebuild
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1 virtualx xdg-utils
DESCRIPTION="Multiple GNOME terminals in one window"
@@ -36,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/terminator-1.91-without-icon-cache.patch
"${FILESDIR}"/terminator-1.91-desktop.patch
"${FILESDIR}"/terminator-1.92-make-tests-fail.patch
+ "${FILESDIR}"/terminator-1.92-metainfo.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-04 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-04 14:11 [gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 23:18 Patrick McLean
2016-11-24 23:01 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox