* [gentoo-commits] repo/gentoo:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2017-04-17 10:31 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2017-04-17 10:31 UTC (permalink / raw
To: gentoo-commits
commit: f01aac108623402427a15be9b3f3d5947a53ebe4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 22:29:58 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 10:30:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01aac10
app-text/gtranslator: switch python requirements to python3
One of the last user of the libpeas python2 loader support. Kill gnome
USE flag and replace it with more meaningful ones. Switch to EAPI=6.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/gtranslator-2.91.7-gi-silence.patch | 26 +++++++
.../gtranslator-2.91.7-gucharmap-python3.patch | 51 ++++++++++++++
app-text/gtranslator/gtranslator-2.91.7-r1.ebuild | 82 ++++++++++++++++++++++
app-text/gtranslator/metadata.xml | 4 ++
4 files changed, 163 insertions(+)
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
new file mode 100644
index 00000000000..19a3a6d1e98
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
@@ -0,0 +1,26 @@
+From acc785dd63379f08f08b52fae9d7e5c5666495c8 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 17 Apr 2017 00:15:58 +0200
+Subject: [PATCH] Silence gobject-introspection warning on version-less imports
+
+---
+ plugins/charmap/charmap/__init__.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index b504cb61..6f8c2b61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -16,6 +16,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++import gi
++gi.require_version('Gucharmap', '2.90')
++
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+ from .panel import CharmapPanel
+ import sys
+--
+2.12.2
+
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
new file mode 100644
index 00000000000..1ad491cf3c0
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
@@ -0,0 +1,51 @@
+From 1e4d042f7e9b28a58bd09af5c97e4282441113d2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 16 Apr 2017 23:48:29 +0200
+Subject: [PATCH 1/2] Switch gucharmap plugin to python3 loader
+
+---
+ plugins/charmap/charmap/__init__.py | 2 +-
+ plugins/charmap/gtr-charmap.plugin.desktop.in | 2 +-
+ src/gtr-plugins-engine.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index 414157b1..b504cb61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -17,7 +17,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+-from panel import CharmapPanel
++from .panel import CharmapPanel
+ import sys
+ import gettext
+
+diff --git a/plugins/charmap/gtr-charmap.plugin.desktop.in b/plugins/charmap/gtr-charmap.plugin.desktop.in
+index 3949c5f6..a872a545 100644
+--- a/plugins/charmap/gtr-charmap.plugin.desktop.in
++++ b/plugins/charmap/gtr-charmap.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python
++Loader=python3
+ Module=charmap
+ IAge=3
+ _Name=Character Map
+diff --git a/src/gtr-plugins-engine.c b/src/gtr-plugins-engine.c
+index 903ea735..8e41010a 100644
+--- a/src/gtr-plugins-engine.c
++++ b/src/gtr-plugins-engine.c
+@@ -64,7 +64,7 @@ gtr_plugins_engine_init (GtrPluginsEngine * engine)
+ GTR_TYPE_PLUGINS_ENGINE,
+ GtrPluginsEnginePrivate);
+
+- peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++ peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
+
+ engine->priv->plugin_settings = g_settings_new ("org.gnome.gtranslator.plugins");
+
+--
+2.12.2
+
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
new file mode 100644
index 00000000000..f063cb8104c
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+introspection gnome-dictionary gucharmap spell"
+REQUIRED_USE="gucharmap? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2[dbus]
+ >=x11-libs/gtk+-3.4.2:3[introspection?]
+ >=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
+ >=dev-libs/gdl-3.6:3=
+ >=dev-libs/libxml2-2.4.12:2
+ >=dev-libs/json-glib-0.12.0
+ >=dev-libs/libpeas-1.2[gtk]
+ gnome-extra/libgda:5=
+ >=app-text/iso-codes-0.35
+
+ gnome-base/gsettings-desktop-schemas
+
+ gnome-dictionary? ( app-dicts/gnome-dictionary:= )
+ gucharmap? ( ${PYTHON_DEPS} )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ spell? ( app-text/gtkspell:3= )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+ gucharmap? (
+ >=dev-libs/libpeas-1.2[gtk,python,${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gnome-extra/gucharmap:2.90[introspection]
+ x11-libs/gtk+:3[introspection] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.50.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+# eautoreconf requires gnome-base/gnome-common, app-text/yelp-tools
+
+PATCHES=(
+ # Switch plugin to python3 loader
+ "${FILESDIR}"/${P}-gucharmap-python3.patch
+ # Silence g-i import warnings
+ "${FILESDIR}"/${P}-gi-silence.patch
+)
+
+pkg_setup() {
+ use gucharmap && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+
+ gnome2_src_prepare
+
+ if ! use gucharmap ; then
+ # don't install charmap plugin, it requires gnome-extra/gucharmap
+ sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
+ die "sed plugins/Makefile.* failed"
+ fi
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_with gnome-dictionary dictionary) \
+ $(use_with spell gtkspell)
+}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index a30a93b4b9d..a6e15044678 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -5,6 +5,10 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <use>
+ <flag name="gnome-dictionary">Enable plugin for dictionary lookups using <pkg>app-dicts/gnome-dictionary</pkg>.</flag>
+ <flag name="gucharmap">Enable plugin for unicode symbols selection using <pkg>gnome-extra/gucharmap</pkg>.</flag>
+ </use>
<upstream>
<remote-id type="sourceforge">gtranslator</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2022-01-25 2:31 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-25 2:31 UTC (permalink / raw
To: gentoo-commits
commit: d20307bf0fbaa96de81a26f454dc000e0042eb57
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 02:31:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 02:31:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20307bf
app-text/gtranslator: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831966
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gtranslator-40.0-meson-0.61.patch | 30 ++++++++++++++++++++++
app-text/gtranslator/gtranslator-40.0.ebuild | 6 ++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..a43a32eb4a6b
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
+https://bugs.gentoo.org/831966
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+GitLab
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
index 00fa6d54bb65..bb0973914e18 100644
--- a/app-text/gtranslator/gtranslator-40.0.ebuild
+++ b/app-text/gtranslator/gtranslator-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-0.61.patch
+)
+
src_configure() {
local emesonargs=(
$(meson_use gtk-doc gtk_doc)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2023-10-08 10:30 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2023-10-08 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 70cfa7b2db7d7e8cf4f744cfe8ff142e9eeadbd6
Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Thu Sep 21 14:02:45 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 10:15:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70cfa7b2
app-text/gtranslator: Version bump to 45.2
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32970
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
app-text/gtranslator/Manifest | 1 +
...lator-45.2-Revert-Add-GDA-6-compatibility.patch | 28 ++++++++++
app-text/gtranslator/gtranslator-45.2.ebuild | 61 ++++++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index ca4fc44f4a70..caba52d28cfb 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1 +1,2 @@
DIST gtranslator-42.0.tar.xz 1526376 BLAKE2B 3d6834c201601415a1fb761bcef471a6c63aae311d22cb1ef5d615e20d124d05b165abb92590da2502b79456c9130e14dd7733746f5006a3c219aaf7f0505ba7 SHA512 785f2757360425b735948faca9eb8ef5f4433394f4fd99ff6e1f78f41d382c7769318ad8d329906910bcdd5a64b4ee0aa2df2e218a3c4b7576938e3d870077b6
+DIST gtranslator-45.2.tar.xz 1524056 BLAKE2B 751c5f8666d278a84ce73cda95719c485de05e91cccf742bb2344245383302d6816b25021ff0ebb5d1276cfe79747cae6f3e9a2b03ae4aa55848d60232029444 SHA512 e616334945c212e0bf14938b86df13e66dd67c5dbeb39a6991d0cf833937bdb4647779ac9c1b94c9c7efbb824d0f94a5866123fbfbd532a117825436d171c121
diff --git a/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch
new file mode 100644
index 000000000000..78a7ac9b67d1
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/merge_requests/127
+
+From 9d8f92d37a7af3eca6985de72f52b45a21f9c91d Mon Sep 17 00:00:00 2001
+From: Daniel Garcia Moreno <daniel.garcia@suse.com>
+Date: Thu, 22 Sep 2022 08:20:11 +0200
+Subject: [PATCH] Revert "Add GDA 6 compatibility"
+
+This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 076812bd..f734e496 100644
+--- a/meson.build
++++ b/meson.build
+@@ -119,7 +119,7 @@ gtr_deps = [
+ gtk_dep,
+ libadwaita_dep,
+ libspell_dep,
+- dependency('libgda-6.0'),
++ dependency('libgda-5.0'),
+ dependency('gio-2.0', version: '>= 2.36.0'),
+ dependency('gsettings-desktop-schemas'),
+ dependency('gthread-2.0', version: '>= 2.13.0'),
+--
+2.35.1
+
diff --git a/app-text/gtranslator/gtranslator-45.2.ebuild b/app-text/gtranslator/gtranslator-45.2.ebuild
new file mode 100644
index 000000000000..b07e299522fa
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-45.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+DEPEND="
+ >=dev-libs/glib-2.71.3:2
+ >=gui-libs/gtk-4.6.0:4
+ >=gui-libs/libadwaita-1.1.0
+ gnome-extra/libgda:5=
+ gnome-base/gsettings-desktop-schemas
+ >=gui-libs/gtksourceview-5.4.0:5
+ >=dev-libs/libxml2-2.4.12:2
+ net-libs/libsoup:3.0
+ >=dev-libs/json-glib-1.2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.28
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Revert-Add-GDA-6-compatibility.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ -Dprofile=default
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-08 10:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-08 10:30 [gentoo-commits] repo/gentoo:master commit in: app-text/gtranslator/files/, app-text/gtranslator/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2022-01-25 2:31 Sam James
2017-04-17 10:31 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox