* [gentoo-commits] repo/gentoo:master commit in: media-video/gaupol/, media-video/gaupol/files/
@ 2019-08-05 13:05 Louis Sautier
0 siblings, 0 replies; 3+ messages in thread
From: Louis Sautier @ 2019-08-05 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 2e3c786da2b70fb0481ac917afade2ec8e7e5bf8
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 12:02:29 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 13:01:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3c786d
media-video/gaupol: bump to 1.7, uses gspell for spell-checking
* Uses gspell instead of pyenchant (unmaintained) and gtkspell.
* Improve postinst messages, especially those related to spell-checking.
* Bump to EAPI 7.
* Stop relying on deprecated gnome2_icon_cache_update function.
* Remove useless call to xdg_mimeinfo_database_update as no files
are installed in /usr/share/mime.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
media-video/gaupol/Manifest | 1 +
.../gaupol/files/gaupol-1.7-fix-tests.patch | 132 +++++++++++++++++++++
media-video/gaupol/gaupol-1.7.ebuild | 64 ++++++++++
3 files changed, 197 insertions(+)
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 2119f384acd..d428730916e 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,3 +1,4 @@
DIST gaupol-1.4.tar.gz 524369 BLAKE2B 6f27ce3328339fc2f6248bb58d80965a5a26fed220ddf9c989a5029b4322ea790f768cb9e0472bb2c5eae4e4da3abd4b0f808e785273ff9fb787ff5b7df5d137 SHA512 da9256dd8dafeaff012226a8ff09807c7cb7609c293bde7d90b05b4f75c47751e65181f1bf47dff1c8e979f48186996253141ff18e849786bf2cff5ed5555148
DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
+DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
diff --git a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
new file mode 100644
index 00000000000..d8a90669de9
--- /dev/null
+++ b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
@@ -0,0 +1,132 @@
+commit 7778eda0e6e4280fb43aa78721561e43d3e866eb
+Author: Osmo Salomaa <otsaloma@iki.fi>
+Date: Sun Aug 4 21:19:20 2019 +0300
+
+ Accept any en* language for spell-check tests
+
+diff --git a/aeidon/agents/test/test_text.py b/aeidon/agents/test/test_text.py
+index bf6c4ac1..a2261595 100644
+--- a/aeidon/agents/test/test_text.py
++++ b/aeidon/agents/test/test_text.py
+@@ -78,14 +78,16 @@ class TestTextAgent(aeidon.TestCase):
+ for subtitle in self.project.subtitles:
+ subtitle.main_text = subtitle.main_text.replace("a", " a")
+ subtitle.main_text = subtitle.main_text.replace("e", "e ")
++ language = self.get_spell_check_language("en")
+ self.project.spell_check_join_words(indices=None,
+ doc=aeidon.documents.MAIN,
+- language="en")
++ language=language)
+
+ def test_spell_check_split_words(self):
+ for subtitle in self.project.subtitles:
+ subtitle.main_text = subtitle.main_text.replace("s ", "s")
+ subtitle.main_text = subtitle.main_text.replace("y ", "y")
++ language = self.get_spell_check_language("en")
+ self.project.spell_check_split_words(indices=None,
+ doc=aeidon.documents.MAIN,
+- language="en")
++ language=language)
+diff --git a/aeidon/test/test_spell.py b/aeidon/test/test_spell.py
+index 66369e0e..ff94f150 100644
+--- a/aeidon/test/test_spell.py
++++ b/aeidon/test/test_spell.py
+@@ -21,7 +21,8 @@ import aeidon
+ class TestSpellChecker(aeidon.TestCase):
+
+ def setup_method(self, method):
+- self.checker = aeidon.SpellChecker("en")
++ language = self.get_spell_check_language("en")
++ self.checker = aeidon.SpellChecker(language)
+
+ def test_add_replacement(self):
+ self.checker.add_replacement("abc", "xyz")
+@@ -50,7 +51,8 @@ class TestSpellChecker(aeidon.TestCase):
+ class TestSpellCheckNavigator(aeidon.TestCase):
+
+ def setup_method(self, method):
+- self.navigator = aeidon.SpellCheckNavigator("en")
++ language = language = self.get_spell_check_language("en")
++ self.navigator = aeidon.SpellCheckNavigator(language)
+ self.navigator.text = "She knows the fighting\ntechniques of Panzer Kunst."
+
+ def test_ignore(self):
+diff --git a/aeidon/unittest.py b/aeidon/unittest.py
+index 8c384806..d80c5a22 100644
+--- a/aeidon/unittest.py
++++ b/aeidon/unittest.py
+@@ -50,6 +50,15 @@ class TestCase:
+ with open(path, "r", encoding="ascii") as f:
+ return f.read().strip()
+
++ def get_spell_check_language(self, language):
++ """Return spell-check language to use in unit tests."""
++ # Allow any close-enough variant as different systems will have
++ # different spell-check engines and dictionaries installed.
++ for candidate in aeidon.SpellChecker.list_languages():
++ if candidate.startswith(language):
++ return candidate
++ raise Exception("Spell-check dictionary {}* not found".format(language))
++
+ def new_microdvd_file(self):
+ """Return path to a new temporary MicroDVD file."""
+ return self.new_temp_file(aeidon.formats.MICRODVD)
+diff --git a/gaupol/agents/test/test_tools.py b/gaupol/agents/test/test_tools.py
+index a9fbdf8f..e1547476 100644
+--- a/gaupol/agents/test/test_tools.py
++++ b/gaupol/agents/test/test_tools.py
+@@ -36,7 +36,8 @@ class TestToolsAgent(gaupol.TestCase):
+
+ @patch("gaupol.util.flash_dialog", OK)
+ def test__on_check_spelling_activate(self):
+- gaupol.conf.spell_check.language = "en"
++ language = self.get_spell_check_language("en")
++ gaupol.conf.spell_check.language = language
+ self.application.get_action("check-spelling").activate()
+
+ @patch("gaupol.util.flash_dialog", OK)
+diff --git a/gaupol/dialogs/test/test_spell_check.py b/gaupol/dialogs/test/test_spell_check.py
+index cbe7d61a..d74860fb 100644
+--- a/gaupol/dialogs/test/test_spell_check.py
++++ b/gaupol/dialogs/test/test_spell_check.py
+@@ -32,7 +32,8 @@ class TestSpellCheckDialog(gaupol.TestCase):
+ aeidon.SpellChecker.add_to_personal = aeidon.SpellChecker.add_to_session
+ aeidon.SpellChecker.read_replacements = lambda *args: None
+ aeidon.SpellChecker.write_replacements = lambda *args: None
+- gaupol.conf.spell_check.language = "en"
++ language = self.get_spell_check_language("en")
++ gaupol.conf.spell_check.language = language
+ self.application = self.new_application()
+ for page in self.application.pages:
+ for subtitle in page.project.subtitles:
+diff --git a/gaupol/test/test_spell.py b/gaupol/test/test_spell.py
+index 72b74e33..5018abab 100644
+--- a/gaupol/test/test_spell.py
++++ b/gaupol/test/test_spell.py
+@@ -37,4 +37,5 @@ class TestSpellChecker(aeidon.TestCase):
+ Gtk.main()
+
+ def setup_method(self, method):
+- self.checker = gaupol.SpellChecker("en")
++ language = self.get_spell_check_language("en")
++ self.checker = gaupol.SpellChecker(language)
+
+commit 340b3bf6bb7cfdf5be9e973f25f5a616ef504702
+Author: Osmo Salomaa <otsaloma@iki.fi>
+Date: Mon Aug 5 02:31:32 2019 +0300
+
+ Set spell-check language for assistant test
+
+diff --git a/gaupol/test/test_assistants.py b/gaupol/test/test_assistants.py
+index 6969b273..4d6dfdcb 100644
+--- a/gaupol/test/test_assistants.py
++++ b/gaupol/test/test_assistants.py
+@@ -109,6 +109,8 @@ class TestJoinSplitWordsPage(_TestBuilderPage):
+
+ @patch("gaupol.util.flash_dialog", OK)
+ def test_correct_texts(self):
++ language = self.get_spell_check_language("en")
++ gaupol.conf.spell_check.language = language
+ self.page.correct_texts(self.project,
+ None,
+ aeidon.documents.MAIN)
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.7.ebuild
new file mode 100644
index 00000000000..22fc8a04293
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="https://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="spell test"
+
+RDEPEND="
+ app-text/iso-codes
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ spell? ( app-text/gspell[introspection] )
+"
+DEPEND="
+ sys-devel/gettext
+ test? (
+ ${RDEPEND}
+ app-dicts/myspell-en
+ app-text/enchant[hunspell]
+ app-text/gspell[introspection]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
+
+python_test() {
+ virtx pytest -vv
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Previewing support requires MPV, MPlayer or VLC."
+ if use spell; then
+ elog ""
+ elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
+ elog "or app-text/aspell with the appropriate L10N variable."
+ elog ""
+ elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
+ elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
+ fi
+ fi
+}
+
+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: media-video/gaupol/, media-video/gaupol/files/
@ 2020-05-24 15:44 Louis Sautier
0 siblings, 0 replies; 3+ messages in thread
From: Louis Sautier @ 2020-05-24 15:44 UTC (permalink / raw
To: gentoo-commits
commit: a4bd9f0033575b1314cce0576a639be4a17eb870
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 15:08:35 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sun May 24 15:44:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bd9f00
media-video/gaupol: mention required GST plugins in postinst
Also backport a patch to fix audio tracks order.
Closes: https://bugs.gentoo.org/638052
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../files/gaupol-1.8-fix-audio-tracks-order.patch | 174 +++++++++++++++++++++
.../{gaupol-1.8.ebuild => gaupol-1.8-r1.ebuild} | 6 +-
2 files changed, 179 insertions(+), 1 deletion(-)
diff --git a/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
new file mode 100644
index 00000000000..3f554c4ef33
--- /dev/null
+++ b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
@@ -0,0 +1,174 @@
+From e26cfcfe002c87a39eac63bbaa5ad0d4d69c95a4 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 16:48:31 +0200
+Subject: [PATCH 1/3] Fix the order of languages in audio track selection
+
+Fix #129
+---
+ gaupol/player.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gaupol/player.py b/gaupol/player.py
+index 836abea2..c266e0b9 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -118,7 +118,8 @@ def _ensure_default_segment(self):
+
+ def get_audio_languages(self):
+ """Return a sequence of audio languages or ``None``."""
+- return tuple(x.get_language() for x in self._info.get_audio_streams())
++ return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
++ for i in range(self._playbin.props.n_audio))
+
+ def get_duration(self, mode=None):
+ """Return duration of video stream or ``None``."""
+@@ -356,6 +357,10 @@ def set_uri(self, uri):
+ dialog.add_button(_("_OK"), Gtk.ResponseType.OK)
+ dialog.set_default_response(Gtk.ResponseType.OK)
+ gaupol.util.flash_dialog(dialog)
++ else:
++ # Make stream tags available from _playbin
++ self._playbin.set_state(Gst.State.PAUSED)
++ self._playbin.get_state(Gst.CLOCK_TIME_NONE)
+
+ def stop(self):
+ """Stop."""
+
+From 9ace4fefe5d246c5588538a715a185c796e218ef Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 17:27:35 +0200
+Subject: [PATCH 2/3] Improve names of audio tracks in menu
+
+---
+ gaupol/agents/video.py | 18 ++++++++++++++----
+ gaupol/player.py | 20 ++++++++++++++++----
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index d434255a..0f6b935c 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,7 +27,11 @@
+ from gi.repository import Gtk
+
+ with aeidon.util.silent(Exception):
++ from gi import require_version
++ require_version('GstTag', '1.0')
+ from gi.repository import Gst
++ from gi.repository import GstTag
++
+
+
+ class VideoAgent(aeidon.Delegate):
+@@ -348,11 +352,17 @@ def _update_languages_menu(self):
+ """Update the audio language selection menu."""
+ menu = self.get_menubar_section("audio-languages-placeholder")
+ menu.remove_all()
+- languages = self.player.get_audio_languages()
+- for i, language in enumerate(languages):
+- language = language or _("Undefined")
++ tracks = self.player.get_audio_infos()
++ for i, track in enumerate(tracks):
++ title = track.title or "{} {}".format(_("Track"), i + 1)
++ lang = None
++ if track.language_code is not None:
++ lang = GstTag.tag_get_language_name(track.language_code)
++ if lang is None:
++ lang = track.language_name
++ name = title if lang is None else "{} - [{}]".format(title, lang.title())
+ action = "win.set-audio-language::{:d}".format(i)
+- menu.append(language, action)
++ menu.append(name, action)
+ if i == self.player.audio_track:
+ action = self.get_action("set-audio-language")
+ action.set_state(str(i))
+diff --git a/gaupol/player.py b/gaupol/player.py
+index c266e0b9..ee1e96dc 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -21,6 +21,7 @@
+ import gaupol
+ import time
+
++from collections import namedtuple
+ from aeidon.i18n import _
+ from gi.repository import GLib
+ from gi.repository import Gtk
+@@ -56,6 +57,8 @@ class VideoPlayer(aeidon.Observable):
+
+ signals = ("state-changed",)
+
++ TrackInfo = namedtuple("TrackInfo", ["title", "language_code", "language_name"])
++
+ def __init__(self):
+ """Initialize a :class:`VideoPlayer` instance."""
+ aeidon.Observable.__init__(self)
+@@ -116,10 +119,19 @@ def _ensure_default_segment(self):
+ self._playbin.seek_simple(Gst.Format.TIME, seek_flags, pos)
+ self._in_default_segment = True
+
+- def get_audio_languages(self):
+- """Return a sequence of audio languages or ``None``."""
+- return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
+- for i in range(self._playbin.props.n_audio))
++ def get_audio_infos(self):
++ """Return a sequence of audio track infos."""
++ return tuple(
++ self._make_track_infos(self._playbin.emit("get-audio-tags", i))
++ for i in range(self._playbin.props.n_audio)
++ )
++
++ def _make_track_infos(self, tags):
++ return self.TrackInfo(
++ tags.get_string("title")[1],
++ tags.get_string("language-code")[1],
++ tags.get_string("language-name")[1]
++ )
+
+ def get_duration(self, mode=None):
+ """Return duration of video stream or ``None``."""
+
+From f50b4e54dc9aa84fc1b3eb403d680b8a0be77dc3 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Wed, 13 May 2020 07:29:27 +0200
+Subject: [PATCH 3/3] Cosmetic changes
+
+---
+ gaupol/__init__.py | 1 +
+ gaupol/agents/video.py | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/gaupol/__init__.py b/gaupol/__init__.py
+index f7a9663d..fc02287b 100644
+--- a/gaupol/__init__.py
++++ b/gaupol/__init__.py
+@@ -44,6 +44,7 @@
+ "Gst": "1.0",
+ "GstPbutils": "1.0",
+ "GstVideo": "1.0",
++ "GstTag": "1.0",
+ }.items():
+ with aeidon.util.silent(Exception):
+ gi.require_version(module, version)
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index 0f6b935c..3c9e3113 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,8 +27,6 @@
+ from gi.repository import Gtk
+
+ with aeidon.util.silent(Exception):
+- from gi import require_version
+- require_version('GstTag', '1.0')
+ from gi.repository import Gst
+ from gi.repository import GstTag
+
+@@ -354,7 +352,7 @@ def _update_languages_menu(self):
+ menu.remove_all()
+ tracks = self.player.get_audio_infos()
+ for i, track in enumerate(tracks):
+- title = track.title or "{} {}".format(_("Track"), i + 1)
++ title = track.title or _("Track {:d}").format(i + 1)
+ lang = None
+ if track.language_code is not None:
+ lang = GstTag.tag_get_language_name(track.language_code)
diff --git a/media-video/gaupol/gaupol-1.8.ebuild b/media-video/gaupol/gaupol-1.8-r1.ebuild
similarity index 87%
rename from media-video/gaupol/gaupol-1.8.ebuild
rename to media-video/gaupol/gaupol-1.8-r1.ebuild
index 9fa5bf5a0ca..33dec788257 100644
--- a/media-video/gaupol/gaupol-1.8.ebuild
+++ b/media-video/gaupol/gaupol-1.8-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="
DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
+PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
+
python_test() {
virtx pytest -vv
}
@@ -45,7 +47,9 @@ pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "Previewing support requires MPV, MPlayer or VLC."
+ elog "The integrated video player requires media-plugins/gst-plugins-gtk."
+ elog ""
+ elog "External video previewing support requires MPV, MPlayer or VLC."
if use spell; then
elog ""
elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gaupol/, media-video/gaupol/files/
@ 2020-09-05 0:20 Louis Sautier
0 siblings, 0 replies; 3+ messages in thread
From: Louis Sautier @ 2020-09-05 0:20 UTC (permalink / raw
To: gentoo-commits
commit: 40dc1346d5d1e0a354c17e4608e22328f3bf7006
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 00:05:39 2020 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 00:18:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dc1346
media-video/gaupol: remove old
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
media-video/gaupol/Manifest | 1 -
.../gaupol/files/gaupol-1.7-fix-tests.patch | 132 ---------------------
media-video/gaupol/gaupol-1.7.ebuild | 65 ----------
3 files changed, 198 deletions(-)
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 697e55adb20..20bd300ebc3 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,2 +1 @@
-DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
diff --git a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
deleted file mode 100644
index d8a90669de9..00000000000
--- a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 7778eda0e6e4280fb43aa78721561e43d3e866eb
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date: Sun Aug 4 21:19:20 2019 +0300
-
- Accept any en* language for spell-check tests
-
-diff --git a/aeidon/agents/test/test_text.py b/aeidon/agents/test/test_text.py
-index bf6c4ac1..a2261595 100644
---- a/aeidon/agents/test/test_text.py
-+++ b/aeidon/agents/test/test_text.py
-@@ -78,14 +78,16 @@ class TestTextAgent(aeidon.TestCase):
- for subtitle in self.project.subtitles:
- subtitle.main_text = subtitle.main_text.replace("a", " a")
- subtitle.main_text = subtitle.main_text.replace("e", "e ")
-+ language = self.get_spell_check_language("en")
- self.project.spell_check_join_words(indices=None,
- doc=aeidon.documents.MAIN,
-- language="en")
-+ language=language)
-
- def test_spell_check_split_words(self):
- for subtitle in self.project.subtitles:
- subtitle.main_text = subtitle.main_text.replace("s ", "s")
- subtitle.main_text = subtitle.main_text.replace("y ", "y")
-+ language = self.get_spell_check_language("en")
- self.project.spell_check_split_words(indices=None,
- doc=aeidon.documents.MAIN,
-- language="en")
-+ language=language)
-diff --git a/aeidon/test/test_spell.py b/aeidon/test/test_spell.py
-index 66369e0e..ff94f150 100644
---- a/aeidon/test/test_spell.py
-+++ b/aeidon/test/test_spell.py
-@@ -21,7 +21,8 @@ import aeidon
- class TestSpellChecker(aeidon.TestCase):
-
- def setup_method(self, method):
-- self.checker = aeidon.SpellChecker("en")
-+ language = self.get_spell_check_language("en")
-+ self.checker = aeidon.SpellChecker(language)
-
- def test_add_replacement(self):
- self.checker.add_replacement("abc", "xyz")
-@@ -50,7 +51,8 @@ class TestSpellChecker(aeidon.TestCase):
- class TestSpellCheckNavigator(aeidon.TestCase):
-
- def setup_method(self, method):
-- self.navigator = aeidon.SpellCheckNavigator("en")
-+ language = language = self.get_spell_check_language("en")
-+ self.navigator = aeidon.SpellCheckNavigator(language)
- self.navigator.text = "She knows the fighting\ntechniques of Panzer Kunst."
-
- def test_ignore(self):
-diff --git a/aeidon/unittest.py b/aeidon/unittest.py
-index 8c384806..d80c5a22 100644
---- a/aeidon/unittest.py
-+++ b/aeidon/unittest.py
-@@ -50,6 +50,15 @@ class TestCase:
- with open(path, "r", encoding="ascii") as f:
- return f.read().strip()
-
-+ def get_spell_check_language(self, language):
-+ """Return spell-check language to use in unit tests."""
-+ # Allow any close-enough variant as different systems will have
-+ # different spell-check engines and dictionaries installed.
-+ for candidate in aeidon.SpellChecker.list_languages():
-+ if candidate.startswith(language):
-+ return candidate
-+ raise Exception("Spell-check dictionary {}* not found".format(language))
-+
- def new_microdvd_file(self):
- """Return path to a new temporary MicroDVD file."""
- return self.new_temp_file(aeidon.formats.MICRODVD)
-diff --git a/gaupol/agents/test/test_tools.py b/gaupol/agents/test/test_tools.py
-index a9fbdf8f..e1547476 100644
---- a/gaupol/agents/test/test_tools.py
-+++ b/gaupol/agents/test/test_tools.py
-@@ -36,7 +36,8 @@ class TestToolsAgent(gaupol.TestCase):
-
- @patch("gaupol.util.flash_dialog", OK)
- def test__on_check_spelling_activate(self):
-- gaupol.conf.spell_check.language = "en"
-+ language = self.get_spell_check_language("en")
-+ gaupol.conf.spell_check.language = language
- self.application.get_action("check-spelling").activate()
-
- @patch("gaupol.util.flash_dialog", OK)
-diff --git a/gaupol/dialogs/test/test_spell_check.py b/gaupol/dialogs/test/test_spell_check.py
-index cbe7d61a..d74860fb 100644
---- a/gaupol/dialogs/test/test_spell_check.py
-+++ b/gaupol/dialogs/test/test_spell_check.py
-@@ -32,7 +32,8 @@ class TestSpellCheckDialog(gaupol.TestCase):
- aeidon.SpellChecker.add_to_personal = aeidon.SpellChecker.add_to_session
- aeidon.SpellChecker.read_replacements = lambda *args: None
- aeidon.SpellChecker.write_replacements = lambda *args: None
-- gaupol.conf.spell_check.language = "en"
-+ language = self.get_spell_check_language("en")
-+ gaupol.conf.spell_check.language = language
- self.application = self.new_application()
- for page in self.application.pages:
- for subtitle in page.project.subtitles:
-diff --git a/gaupol/test/test_spell.py b/gaupol/test/test_spell.py
-index 72b74e33..5018abab 100644
---- a/gaupol/test/test_spell.py
-+++ b/gaupol/test/test_spell.py
-@@ -37,4 +37,5 @@ class TestSpellChecker(aeidon.TestCase):
- Gtk.main()
-
- def setup_method(self, method):
-- self.checker = gaupol.SpellChecker("en")
-+ language = self.get_spell_check_language("en")
-+ self.checker = gaupol.SpellChecker(language)
-
-commit 340b3bf6bb7cfdf5be9e973f25f5a616ef504702
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date: Mon Aug 5 02:31:32 2019 +0300
-
- Set spell-check language for assistant test
-
-diff --git a/gaupol/test/test_assistants.py b/gaupol/test/test_assistants.py
-index 6969b273..4d6dfdcb 100644
---- a/gaupol/test/test_assistants.py
-+++ b/gaupol/test/test_assistants.py
-@@ -109,6 +109,8 @@ class TestJoinSplitWordsPage(_TestBuilderPage):
-
- @patch("gaupol.util.flash_dialog", OK)
- def test_correct_texts(self):
-+ language = self.get_spell_check_language("en")
-+ gaupol.conf.spell_check.language = language
- self.page.correct_texts(self.project,
- None,
- aeidon.documents.MAIN)
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.7.ebuild
deleted file mode 100644
index 25b70f293bf..00000000000
--- a/media-video/gaupol/gaupol-1.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-text/iso-codes
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- spell? ( app-text/gspell[introspection] )
-"
-DEPEND="
- sys-devel/gettext
- test? (
- ${RDEPEND}
- app-dicts/myspell-en
- app-text/enchant[hunspell]
- app-text/gspell[introspection]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-python_test() {
- virtx pytest -vv
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "Previewing support requires MPV, MPlayer or VLC."
- if use spell; then
- elog ""
- elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
- elog "or app-text/aspell with the appropriate L10N variable."
- elog ""
- elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
- elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
- fi
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-05 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-05 13:05 [gentoo-commits] repo/gentoo:master commit in: media-video/gaupol/, media-video/gaupol/files/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2020-05-24 15:44 Louis Sautier
2020-09-05 0:20 Louis Sautier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox