public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-office/gtg/, app-office/gtg/files/
@ 2020-06-19 22:17 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-06-19 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     39bab437d968ebc5ec9d0cd1566b5c072ebfcb5d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 22:15:28 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:16:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39bab437

app-office/gtg: remove old

Bug: https://bugs.gentoo.org/707912
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-office/gtg/Manifest                      |  1 -
 app-office/gtg/files/gtg-0.3.1-desktop.patch | 13 -----
 app-office/gtg/files/gtg-0.3.1-locales.patch | 20 --------
 app-office/gtg/gtg-0.3.1.ebuild              | 73 ----------------------------
 4 files changed, 107 deletions(-)

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 44a7aad636a..9da4a2b54e3 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,2 +1 @@
-DIST gtg-0.3.1.tar.gz 7902244 BLAKE2B 843c0df194450e9fcc718f94b83973209184ab041f42751ff1a32275c839b5e0bc80fe7aa903d91ce44d5999b496cd50218d8656c060d70fcdd3f3561f4eacb0 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12
 DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb

diff --git a/app-office/gtg/files/gtg-0.3.1-desktop.patch b/app-office/gtg/files/gtg-0.3.1-desktop.patch
deleted file mode 100644
index 82db6ce36f3..00000000000
--- a/app-office/gtg/files/gtg-0.3.1-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix desktop-file-validate warning.
-
---- a/gtg.desktop	2014-11-01 11:23:31.101881704 +0100
-+++ b/gtg.desktop	2014-11-01 11:23:37.349775014 +0100
-@@ -14,7 +14,7 @@
- StartupNotify=true
- X-Ayatana-Desktop-Shortcuts=NewTask
- 
--[NewTask Shortcut Group]
-+[X-NewTask Shortcut Group]
- Name=New Task
- Exec=gtg_new_task
- TargetEnvironment=Unity

diff --git a/app-office/gtg/files/gtg-0.3.1-locales.patch b/app-office/gtg/files/gtg-0.3.1-locales.patch
deleted file mode 100644
index 56bf5ce5e9b..00000000000
--- a/app-office/gtg/files/gtg-0.3.1-locales.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not install unwanted locales.
-
---- a/setup.py	2014-11-01 11:21:49.679613605 +0100
-+++ b/setup.py	2014-11-01 11:26:36.305719135 +0100
-@@ -101,9 +101,15 @@
- 
- PO_DIR = 'po'
- MO_DIR = os.path.join('build', 'po')
-+LINGUAS = os.environ.get('LINGUAS', '*').split(' ')
- 
- for po in glob.glob(os.path.join(PO_DIR, '*.po')):
-     lang = os.path.basename(po[:-3])
-+
-+    # Skip unwanted locales
-+    if lang not in LINGUAS and '*' not in LINGUAS:
-+        continue
-+
-     mo = os.path.join(MO_DIR, lang, 'gtg.mo')
-     target_dir = os.path.dirname(mo)
-     if not os.path.isdir(target_dir):

diff --git a/app-office/gtg/gtg-0.3.1.ebuild b/app-office/gtg/gtg-0.3.1.ebuild
deleted file mode 100644
index 05a309c1436..00000000000
--- a/app-office/gtg/gtg-0.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime gnome2-utils distutils-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="http://gtgnome.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/liblarch[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Plugins are voluntarily left automagic as application has a nice way
-	# to suggest missing dependencies. We only remove the ones that cannot
-	# work on gentoo.
-	# Backends should be enabled via USE flag when pulling extra deps
-
-	# geoloc: uses removed from tree bindings
-	sed -e "/GTG.plugins.geolocalized_tasks',/d" \
-		-e "/geolocalized-tasks.gtg-plugin/d" \
-		-i setup.py || die
-
-	# launchpad: missing dependency
-	# evolution: missing python-r1 support
-	rm GTG/backends/backend_launchpad.py \
-		GTG/backends/backend_evolution.py \
-		|| die
-
-	# Respect LINGUAS
-	epatch "${FILESDIR}"/${PN}-0.3.1-locales.patch
-
-	# Fix validation warning
-	epatch "${FILESDIR}"/${PN}-0.3.1-desktop.patch
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/gtg/, app-office/gtg/files/
@ 2020-06-19 22:17 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-06-19 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1eced775f724eacc9e776baed5d2e3e1056bd572
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 22:14:40 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:16:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eced775

app-office/gtg: bump to 20200613 snapshot of upcoming 0.4 release

Bug: https://bugs.gentoo.org/707912
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-office/gtg/Manifest                     |  1 +
 app-office/gtg/files/fix-help-open.patch    | 43 +++++++++++++++++++++
 app-office/gtg/gtg-0.4.0_pre20200613.ebuild | 60 +++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 32bc548fc09..44a7aad636a 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1 +1,2 @@
 DIST gtg-0.3.1.tar.gz 7902244 BLAKE2B 843c0df194450e9fcc718f94b83973209184ab041f42751ff1a32275c839b5e0bc80fe7aa903d91ce44d5999b496cd50218d8656c060d70fcdd3f3561f4eacb0 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12
+DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb

diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
new file mode 100644
index 00000000000..a66d8e95bdd
--- /dev/null
+++ b/app-office/gtg/files/fix-help-open.patch
@@ -0,0 +1,43 @@
+From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 20 Jun 2020 01:06:04 +0300
+Subject: [PATCH] Fix opening of the help files
+
+webbrowser python module just opens things in the browser for me, which
+doesn't understand what a "help:gtg" is and routes it back to external
+program dialog if lucky.
+Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
+
+I believe we should be using Gtk.show_uri instead of webbrowser in other
+places as well, but that's something for a different release.
+---
+ GTG/gtk/application.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
+index 39a8a5b3..e8091973 100644
+--- a/GTG/gtk/application.py
++++ b/GTG/gtk/application.py
+@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
+ from GTG.gtk.editor.editor import TaskEditor
+ from GTG.gtk.preferences import Preferences
+ from GTG.gtk.plugins import PluginsDialog
+-from webbrowser import open as openurl
+ from GTG.core import clipboard
+ from GTG.core.plugins.engine import PluginEngine
+ from GTG.core.plugins.api import PluginAPI
+@@ -251,7 +250,10 @@ class Application(Gtk.Application):
+     def open_help(self, action, param):
+         """Open help callback."""
+ 
+-        openurl("help:gtg")
++        try:
++            Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
++        except GLib.Error:
++            log.error('Could not open help')
+ 
+     def open_backends_manager(self, action, param):
+         """Callback to open the backends manager dialog."""
+-- 
+2.20.1
+

diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
new file mode 100644
index 00000000000..68ca65c9686
--- /dev/null
+++ b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Personal organizer for the GNOME desktop environment"
+HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
+COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
+SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/gtg-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		>=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	')
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	test? ( $(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/cheetah3[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+		app-text/pdfjam
+		app-text/pdftk
+		dev-texlive/texlive-latex
+	)
+"
+
+PATCHES=( "${FILESDIR}"/fix-help-open.patch )
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/gtg
+	python_optimize
+}
+
+src_test() {
+	nosetests -v || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/gtg/, app-office/gtg/files/
@ 2020-07-08  5:58 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-07-08  5:58 UTC (permalink / raw
  To: gentoo-commits

commit:     7a44f55f3b38aff1f63206c39570a2c9ad0b8e93
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 05:56:24 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 05:58:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a44f55f

app-office/gtg: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-office/gtg/Manifest                     |  1 -
 app-office/gtg/files/fix-help-open.patch    | 43 --------------------
 app-office/gtg/gtg-0.4.0_pre20200613.ebuild | 62 -----------------------------
 3 files changed, 106 deletions(-)

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 982ff10fe50..b3bc648952f 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,2 +1 @@
 DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
-DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb

diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
deleted file mode 100644
index a66d8e95bdd..00000000000
--- a/app-office/gtg/files/fix-help-open.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 20 Jun 2020 01:06:04 +0300
-Subject: [PATCH] Fix opening of the help files
-
-webbrowser python module just opens things in the browser for me, which
-doesn't understand what a "help:gtg" is and routes it back to external
-program dialog if lucky.
-Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
-
-I believe we should be using Gtk.show_uri instead of webbrowser in other
-places as well, but that's something for a different release.
----
- GTG/gtk/application.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
-index 39a8a5b3..e8091973 100644
---- a/GTG/gtk/application.py
-+++ b/GTG/gtk/application.py
-@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
- from GTG.gtk.editor.editor import TaskEditor
- from GTG.gtk.preferences import Preferences
- from GTG.gtk.plugins import PluginsDialog
--from webbrowser import open as openurl
- from GTG.core import clipboard
- from GTG.core.plugins.engine import PluginEngine
- from GTG.core.plugins.api import PluginAPI
-@@ -251,7 +250,10 @@ class Application(Gtk.Application):
-     def open_help(self, action, param):
-         """Open help callback."""
- 
--        openurl("help:gtg")
-+        try:
-+            Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
-+        except GLib.Error:
-+            log.error('Could not open help')
- 
-     def open_backends_manager(self, action, param):
-         """Callback to open the backends manager dialog."""
--- 
-2.20.1
-

diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
deleted file mode 100644
index d9f3109d242..00000000000
--- a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..8} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
-COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
-SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/gtg-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		>=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	x11-libs/pango[introspection]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	test? ( $(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/cheetah3[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-		')
-		app-text/pdfjam
-		app-text/pdftk
-		dev-texlive/texlive-latex
-	)
-"
-
-PATCHES=( "${FILESDIR}"/fix-help-open.patch )
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/gtg
-	python_optimize
-}
-
-src_test() {
-	nosetests -v || die
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/gtg/, app-office/gtg/files/
@ 2021-06-19 11:29 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2021-06-19 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c7803da9e125647116ce1cb2b05f57a654e9a6dc
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 11:28:48 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 11:28:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7803da9

app-office/gtg: bump to 0.5

Closes: https://bugs.gentoo.org/788868
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-office/gtg/Manifest                            |  1 +
 app-office/gtg/files/0.5-mouse-cursor-fixes1.patch | 69 ++++++++++++++++++++++
 app-office/gtg/files/0.5-mouse-cursor-fixes2.patch | 55 +++++++++++++++++
 app-office/gtg/files/0.5-mouse-cursor-fixes3.patch | 41 +++++++++++++
 app-office/gtg/gtg-0.5.ebuild                      | 63 ++++++++++++++++++++
 5 files changed, 229 insertions(+)

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index b3bc648952f..ead4f5170cf 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1 +1,2 @@
 DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
+DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a

diff --git a/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch b/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch
new file mode 100644
index 00000000000..624c01ac0f2
--- /dev/null
+++ b/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch
@@ -0,0 +1,69 @@
+From ee709d2722a75f11b5f6c9d7cd9b4a925107e54f Mon Sep 17 00:00:00 2001
+From: Neui <neuisen@googlemail.com>
+Date: Wed, 21 Apr 2021 01:58:40 +0200
+Subject: [PATCH] Remove Gdk.Cursor.new depredation warnings
+
+Gdk.Cursor.new has been replaced by Gdk.Cursor.new_for_display, which
+needs an additional display.
+It was only used to set the cursor on windows, which has an display
+associated with it, so now it is created when needed rather than being
+cached.
+---
+ GTG/gtk/editor/taskview.py                | 12 ++++++------
+ GTG/plugins/unmaintained/tomboy/tomboy.py |  4 +++-
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/GTG/gtk/editor/taskview.py b/GTG/gtk/editor/taskview.py
+index 7f73fbb3..4b510499 100644
+--- a/GTG/gtk/editor/taskview.py
++++ b/GTG/gtk/editor/taskview.py
+@@ -74,10 +74,6 @@ class TaskView(Gtk.TextView):
+     # Timeout in milliseconds
+     PROCESSING_DELAY = 250
+ 
+-    # Mouse cursors
+-    CURSOR_HAND = Gdk.Cursor.new(Gdk.CursorType.HAND2)
+-    CURSOR_NORMAL = Gdk.Cursor.new(Gdk.CursorType.XTERM)
+-
+ 
+     def __init__(self, req: Requester, clipboard) -> None:
+         super().__init__()
+@@ -601,7 +597,9 @@ class TaskView(Gtk.TextView):
+         tags = view.get_iter_at_location(x, y)[1].get_tags()
+ 
+         # Reset cursor and hover states
+-        window.set_cursor(self.CURSOR_NORMAL)
++        cursor = Gdk.Cursor.new_for_display(window.get_display(),
++                                            Gdk.CursorType.XTERM)
++        window.set_cursor(cursor)
+ 
+         if self.hovered_tag:
+             try:
+@@ -615,7 +613,9 @@ class TaskView(Gtk.TextView):
+         try:
+             tag = tags[0]
+             tag.set_hover()
+-            window.set_cursor(self.CURSOR_HAND)
++            cursor = Gdk.Cursor.new_for_display(window.get_display(),
++                                                Gdk.CursorType.HAND2)
++            window.set_cursor(cursor)
+             self.hovered_tag = tag
+ 
+         except (AttributeError, IndexError):
+diff --git a/GTG/plugins/unmaintained/tomboy/tomboy.py b/GTG/plugins/unmaintained/tomboy/tomboy.py
+index 33ec9264..28c4226a 100644
+--- a/GTG/plugins/unmaintained/tomboy/tomboy.py
++++ b/GTG/plugins/unmaintained/tomboy/tomboy.py
+@@ -337,6 +337,8 @@ class TomboyPlugin():
+         # cursor changes to a hand
+ 
+         def realize_callback(widget):
+-            eventbox.window.set_cursor(Gdk.Cursor.new(Gdk.HAND2))
++            cursor = Gdk.Cursor.new_for_display(eventbox.window.get_display(),
++                                                Gdk.CursorType.HAND2)
++            eventbox.window.set_cursor(cursor)
+         eventbox.connect("realize", realize_callback)
+         return eventbox
+-- 
+2.30.0
+

diff --git a/app-office/gtg/files/0.5-mouse-cursor-fixes2.patch b/app-office/gtg/files/0.5-mouse-cursor-fixes2.patch
new file mode 100644
index 00000000000..f0fb4a8a5c2
--- /dev/null
+++ b/app-office/gtg/files/0.5-mouse-cursor-fixes2.patch
@@ -0,0 +1,55 @@
+From 522f79e4ed58ea821dd939daa856a2d9dfd6f934 Mon Sep 17 00:00:00 2001
+From: Neui <neuisen@googlemail.com>
+Date: Sun, 2 May 2021 01:08:37 +0200
+Subject: [PATCH] Use Gdk.Cursor.new_from_name()
+
+Because GDK4 dropped new_for_display in favour of new_from_name.
+---
+ GTG/gtk/editor/taskview.py                | 8 ++++----
+ GTG/plugins/unmaintained/tomboy/tomboy.py | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/GTG/gtk/editor/taskview.py b/GTG/gtk/editor/taskview.py
+index 4b510499..1313ead8 100644
+--- a/GTG/gtk/editor/taskview.py
++++ b/GTG/gtk/editor/taskview.py
+@@ -597,8 +597,8 @@ class TaskView(Gtk.TextView):
+         tags = view.get_iter_at_location(x, y)[1].get_tags()
+ 
+         # Reset cursor and hover states
+-        cursor = Gdk.Cursor.new_for_display(window.get_display(),
+-                                            Gdk.CursorType.XTERM)
++        cursor = Gdk.Cursor.new_from_name(window.get_display(),
++                                          'text')
+         window.set_cursor(cursor)
+ 
+         if self.hovered_tag:
+@@ -613,8 +613,8 @@ class TaskView(Gtk.TextView):
+         try:
+             tag = tags[0]
+             tag.set_hover()
+-            cursor = Gdk.Cursor.new_for_display(window.get_display(),
+-                                                Gdk.CursorType.HAND2)
++            cursor = Gdk.Cursor.new_from_name(window.get_display(),
++                                              'pointer')
+             window.set_cursor(cursor)
+             self.hovered_tag = tag
+ 
+diff --git a/GTG/plugins/unmaintained/tomboy/tomboy.py b/GTG/plugins/unmaintained/tomboy/tomboy.py
+index 28c4226a..d81cd58c 100644
+--- a/GTG/plugins/unmaintained/tomboy/tomboy.py
++++ b/GTG/plugins/unmaintained/tomboy/tomboy.py
+@@ -337,8 +337,8 @@ class TomboyPlugin():
+         # cursor changes to a hand
+ 
+         def realize_callback(widget):
+-            cursor = Gdk.Cursor.new_for_display(eventbox.window.get_display(),
+-                                                Gdk.CursorType.HAND2)
++            cursor = Gdk.Cursor.new_from_name(eventbox.window.get_display(),
++                                              'pointer')
+             eventbox.window.set_cursor(cursor)
+         eventbox.connect("realize", realize_callback)
+         return eventbox
+-- 
+2.30.0
+

diff --git a/app-office/gtg/files/0.5-mouse-cursor-fixes3.patch b/app-office/gtg/files/0.5-mouse-cursor-fixes3.patch
new file mode 100644
index 00000000000..d0c965027c1
--- /dev/null
+++ b/app-office/gtg/files/0.5-mouse-cursor-fixes3.patch
@@ -0,0 +1,41 @@
+From c6fa415ed7b71197f27e946b8a854d74a8e92f84 Mon Sep 17 00:00:00 2001
+From: Neui <neuisen@googlemail.com>
+Date: Sun, 2 May 2021 01:12:08 +0200
+Subject: [PATCH] Prevent flicker cursor when moving over a tag
+
+When hovering over a tag in the task editor, it'll "flicker" between a
+normal text cursor and the pointer cursor. This fixes this by simply
+calling set_cursor just once.
+---
+ GTG/gtk/editor/taskview.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/GTG/gtk/editor/taskview.py b/GTG/gtk/editor/taskview.py
+index 1313ead8..9358b98f 100644
+--- a/GTG/gtk/editor/taskview.py
++++ b/GTG/gtk/editor/taskview.py
+@@ -599,7 +599,6 @@ class TaskView(Gtk.TextView):
+         # Reset cursor and hover states
+         cursor = Gdk.Cursor.new_from_name(window.get_display(),
+                                           'text')
+-        window.set_cursor(cursor)
+ 
+         if self.hovered_tag:
+             try:
+@@ -615,12 +614,12 @@ class TaskView(Gtk.TextView):
+             tag.set_hover()
+             cursor = Gdk.Cursor.new_from_name(window.get_display(),
+                                               'pointer')
+-            window.set_cursor(cursor)
+             self.hovered_tag = tag
+ 
+         except (AttributeError, IndexError):
+             # Not an interactive tag, or no tag at all
+             pass
++        window.set_cursor(cursor)
+ 
+ 
+     def do_populate_popup(self, popup) -> None:
+-- 
+2.30.0
+

diff --git a/app-office/gtg/gtg-0.5.ebuild b/app-office/gtg/gtg-0.5.ebuild
new file mode 100644
index 00000000000..a2e3580997f
--- /dev/null
+++ b/app-office/gtg/gtg-0.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Personal organizer for the GNOME desktop environment"
+HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
+SRC_URI="https://github.com/getting-things-gnome/gtg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		>=dev-python/liblarch-3.1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	test? ( $(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/cheetah3[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+		app-text/pdfjam
+		app-text/pdftk
+		dev-texlive/texlive-latex
+	)
+"
+
+PATCHES=(
+	# Fixes tests, and mouse cursor with some themes
+	"${FILESDIR}"/${PV}-mouse-cursor-fixes{1,2,3}.patch
+)
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/gtg
+	python_optimize
+}
+
+src_test() {
+	sed -e "s|@VCS_TAG@|${PV}|" GTG/core/info.py.in > GTG/core/info.py || die
+	nosetests -v || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-06-19 11:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-19 22:17 [gentoo-commits] repo/gentoo:master commit in: app-office/gtg/, app-office/gtg/files/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2021-06-19 11:29 Mart Raudsepp
2020-07-08  5:58 Mart Raudsepp
2020-06-19 22:17 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox