diff options
Diffstat (limited to 'app-office/gtg')
| -rw-r--r-- | app-office/gtg/Manifest | 3 | ||||
| -rw-r--r-- | app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch | 52 | ||||
| -rw-r--r-- | app-office/gtg/files/0.5-mouse-cursor-fixes1.patch | 69 | ||||
| -rw-r--r-- | app-office/gtg/files/0.5-mouse-cursor-fixes2.patch | 55 | ||||
| -rw-r--r-- | app-office/gtg/files/0.5-mouse-cursor-fixes3.patch | 41 | ||||
| -rw-r--r-- | app-office/gtg/gtg-0.4.0.ebuild | 57 | ||||
| -rw-r--r-- | app-office/gtg/gtg-0.6-r1.ebuild (renamed from app-office/gtg/gtg-0.5.ebuild) | 32 |
7 files changed, 16 insertions, 293 deletions
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest index ead4f5170cf5..ededc3ab3f6e 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.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a +DIST gtg-0.6.tar.gz 2361876 BLAKE2B 48f4d589b19181c4e5586254a3411fe2e25126d0f16b2d1294b8bff3f7a86aee7a34762781d9819760ce2e6b36ebded225a478a1bc86aa4c17217b165dae2802 SHA512 68a5229c17b85b87a9a134a08e5e86fbf24d28d6ce55e848c17eef650620d6f56172ee495cb113f4279b34c19127ae03981e2feec5a39dc51be49e387e458600 diff --git a/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch b/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch deleted file mode 100644 index 915e40cadfdc..000000000000 --- a/app-office/gtg/files/0.5-Revert-meson-plugin-translation-apply-thing.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1809d10663ae3d8f69c04138b66f9b4e66ee14f6 Mon Sep 17 00:00:00 2001 -From: Neui <neuisen@googlemail.com> -Date: Mon, 15 Nov 2021 01:53:40 +0100 -Subject: [PATCH] Revert meson plugin translation apply thing - -Since meson 0.60, the `build_always_stale` option was removed: -https://github.com/mesonbuild/meson/commit/6b1a80024c79876dc3b75f2b525be24ca8fe671a - -However, meson doesn't make such files depend on the translation .po -files, which is a known bug: -https://github.com/mesonbuild/meson/issues/2621 - -So with that option taken away, I tried passing a list to the input -which includes all .po files, since I saw it only uses the first element -for the translations, but that fails when trying to generate po files. - -Since it seems you can't dynamically add dependencies after the fact, -this seems like a dead end, so I am reverting this for now to make it -compile on meson 0.60. ---- - GTG/plugins/meson.build | 4 +--- - docs/contributors/translating.md | 3 +++ - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/GTG/plugins/meson.build b/GTG/plugins/meson.build -index eb20f0b85..556885280 100644 ---- a/GTG/plugins/meson.build -+++ b/GTG/plugins/meson.build -@@ -24,9 +24,7 @@ foreach plugin : gtg_plugins - install_dir: plugin_install_dir, - type: 'desktop', - args: ['--keyword=name', '--keyword=short-description', '--keyword=description'], -- build_by_default: true, -- build_always_stale: true -- # build always because otherwise new translations won't be applied -+ build_by_default: true - ) - subdir(plugin.underscorify()) - endforeach -diff --git a/docs/contributors/translating.md b/docs/contributors/translating.md -index 0af3e5f19..184f98843 100644 ---- a/docs/contributors/translating.md -+++ b/docs/contributors/translating.md -@@ -75,5 +75,8 @@ Make sure to this AFTER COMMITING YOUR CHANGES! - * During launching, it might complain about certain files not being found in [`po/POTFILES.in`][POTFILES.IN]. - It is safe to remove the lines from that file and re-run until it works. - It would be useful to comment about that if you're submitting your translation, just in case. -+* Plugin related strings don't update after updating the translation. -+ The cause is unknown, but you can delete the plugin files to re-generate -+ them using the new translations: `rm -f .local_build/GTG/plugins/*.gtg-plugin` - - [POTFILES.IN]: ../../po/POTFILES.in diff --git a/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch b/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch deleted file mode 100644 index 624c01ac0f29..000000000000 --- a/app-office/gtg/files/0.5-mouse-cursor-fixes1.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 deleted file mode 100644 index f0fb4a8a5c20..000000000000 --- a/app-office/gtg/files/0.5-mouse-cursor-fixes2.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index d0c965027c1d..000000000000 --- a/app-office/gtg/files/0.5-mouse-cursor-fixes3.patch +++ /dev/null @@ -1,41 +0,0 @@ -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.4.0.ebuild b/app-office/gtg/gtg-0.4.0.ebuild deleted file mode 100644 index e16de2b4bc69..000000000000 --- a/app-office/gtg/gtg-0.4.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 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/" -SRC_URI="https://github.com/getting-things-gnome/gtg/releases/download/v0.4/${P}.tar.xz" - -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.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] -" -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/texlive-core-2021 ) - app-text/pdftk - dev-texlive/texlive-latex - ) -" - -src_install() { - meson_src_install - python_fix_shebang "${ED}"/usr/bin/gtg - python_optimize -} - -src_test() { - nosetests -v || die -} diff --git a/app-office/gtg/gtg-0.5.ebuild b/app-office/gtg/gtg-0.6-r1.ebuild index c3ae9ba1ab10..b3dec9f5f524 100644 --- a/app-office/gtg/gtg-0.5.ebuild +++ b/app-office/gtg/gtg-0.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{8..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE="xml(+)" inherit meson python-single-r1 xdg @@ -13,7 +13,7 @@ SRC_URI="https://github.com/getting-things-gnome/gtg/archive/refs/tags/v${PV}.ta LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -21,24 +21,28 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' + dev-python/caldav[${PYTHON_USEDEP}] 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}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/vobject[${PYTHON_USEDEP}] ') x11-libs/pango[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:4[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}] + dev-python/pytest[${PYTHON_USEDEP}] ') || ( app-text/pdfjam >=app-text/texlive-core-2021 ) app-text/pdftk @@ -46,19 +50,13 @@ BDEPEND=" ) " -PATCHES=( - # Fixes tests, and mouse cursor with some themes - "${FILESDIR}"/${PV}-mouse-cursor-fixes{1,2,3}.patch - "${FILESDIR}"/0.5-Revert-meson-plugin-translation-apply-thing.patch -) +src_test() { + sed -e "s|@VCS_TAG@|${PV}|" GTG/core/info.py.in > GTG/core/info.py || die + epytest +} 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 -} |