* [gentoo-commits] proj/gnome:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2012-12-06 6:50 Alexandre Rostovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-06 6:50 UTC (permalink / raw
To: gentoo-commits
commit: 603aab186fe33594cfd6068cdde9db461ae2ed57
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 6 06:33:48 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Dec 6 06:36:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=603aab18
app-text/gtranslator: add version compatible with gdl-3.6
---
.../files/gtranslator-2.91.5-gdl-3.6-1.patch | 114 ++++++++++++++++++++
.../files/gtranslator-2.91.5-gdl-3.6-2.patch | 94 ++++++++++++++++
.../files/gtranslator-2.91.5-gdl-3.6-3.patch | 55 ++++++++++
app-text/gtranslator/gtranslator-2.91.5-r1.ebuild | 93 ++++++++++++++++
4 files changed, 356 insertions(+), 0 deletions(-)
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
new file mode 100644
index 0000000..280d7d4
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
@@ -0,0 +1,114 @@
+From 68d6bc237c2076d3ff2a75a6a85e198807f8132a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
+Date: Tue, 6 Nov 2012 21:03:39 +0100
+Subject: [PATCH 1/3] fix bgo #680399 - gtranslator 2.91.5 segfaults trying to
+ use any plugin (gnome 3.5.x stack)
+
+- Update data/layout.xml, some attributes have changed
+- Several Dock object constructors take a G_OBJECT instead of a GDL_DOCK
+- GdlDockLayout member master is not accessible anymore
+- Block layout-changed signal when loading a new layout
+---
+ data/layout.xml | 34 +++++++++++++++-------------------
+ src/gtr-tab.c | 14 ++++++++++----
+ 2 files changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/data/layout.xml b/data/layout.xml
+index 85f7f64..f3e313e 100644
+--- a/data/layout.xml
++++ b/data/layout.xml
+@@ -3,30 +3,26 @@
+ <dock-layout>
+ <layout name="__default__">
+ <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
+- <paned orientation="horizontal" locked="no" position="1164">
+- <paned orientation="horizontal" locked="no" position="244">
+- <notebook orientation="vertical" locked="no" page="0">
+- <item name="GtrOpenTranPlugin" orientation="vertical" locked="no"/>
+- <item name="GtrCharmapPanel" orientation="vertical" locked="no"/>
+- <placeholder name="ph_left" next-placement="center"/>
++ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
++ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
++ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
++ <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
++ <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+- <paned orientation="vertical" locked="no" position="416">
+- <notebook orientation="vertical" locked="no" page="0">
+- <item name="GtrMessageTable" orientation="vertical" locked="no"/>
+- <placeholder name="ph_top" next-placement="center"/>
++ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
++ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
++ <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+- <notebook orientation="vertical" locked="no" page="0">
+- <item name="GtrTranslationFields" orientation="vertical" locked="no"/>
+- <placeholder name="ph_center" next-placement="bottom"/>
++ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
++ <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+ </paned>
+ </paned>
+- <paned orientation="vertical" locked="no" position="387">
+- <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no"/>
+- <notebook orientation="vertical" locked="no" page="0">
+- <item name="GtrContextPanel" orientation="vertical" locked="no"/>
+- <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no"/>
+- <placeholder name="ph_right" next-placement="center"/>
++ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
++ <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
++ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
++ <item name="GtrContextPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
++ <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+ </paned>
+ </paned>
+diff --git a/src/gtr-tab.c b/src/gtr-tab.c
+index 75fbd35..f22d546 100644
+--- a/src/gtr-tab.c
++++ b/src/gtr-tab.c
+@@ -727,19 +727,19 @@ gtr_tab_init (GtrTab * tab)
+ gtk_widget_show (priv->dock);
+ gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
+
+- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
++ dockbar = gdl_dock_bar_new (G_OBJECT (priv->dock));
+ gtk_widget_show (dockbar);
+ gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+
+- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
+- g_signal_connect (priv->layout_manager->master,
++ priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
++ g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
+ "layout-changed",
+ G_CALLBACK (on_layout_changed),
+ tab);
+
+ g_settings_bind (priv->ui_settings,
+ GTR_SETTINGS_PANEL_SWITCHER_STYLE,
+- priv->layout_manager->master,
++ gdl_dock_layout_get_master (priv->layout_manager),
+ "switcher-style",
+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+
+@@ -967,11 +967,17 @@ gtr_tab_realize (GtkWidget *widget)
+ tab);
+
+ /* Loading dock layout */
++ g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
++ G_CALLBACK (on_layout_changed),
++ tab);
+ filename = g_build_filename (gtr_dirs_get_user_config_dir (),
+ "layout.xml", NULL);
+
+ gtr_tab_layout_load (tab, filename, NULL);
+ g_free (filename);
++ g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
++ G_CALLBACK (on_layout_changed),
++ tab);
+
+ tab->priv->tab_realized = TRUE;
+ }
+--
+1.8.0
+
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
new file mode 100644
index 0000000..f170da5
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
@@ -0,0 +1,94 @@
+From 22da0a85fec480943411c25c0d361b3fa2252381 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
+Date: Wed, 14 Nov 2012 22:00:47 +0100
+Subject: [PATCH 2/3] fix bgo #687432 - gtranslator can't load/save tab
+ layout, cause gdl 3.6
+
+Do not save the layout after each change.
+Fix the default layout to remove GtrOpenTranPlugin and GtrCharmapPanel pane as
+GDL 3.6.0 does not hide them as it should.
+---
+ data/layout.xml | 16 +++++-----------
+ src/gtr-tab.c | 18 ------------------
+ 2 files changed, 5 insertions(+), 29 deletions(-)
+
+diff --git a/data/layout.xml b/data/layout.xml
+index f3e313e..117f471 100644
+--- a/data/layout.xml
++++ b/data/layout.xml
+@@ -4,19 +4,13 @@
+ <layout name="__default__">
+ <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
+ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
+- <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
++ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+- <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
+- <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
++ <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
++ </notebook>
++ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
++ <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
+ </notebook>
+- <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
+- <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+- <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
+- </notebook>
+- <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
+- <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
+- </notebook>
+- </paned>
+ </paned>
+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
+ <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
+diff --git a/src/gtr-tab.c b/src/gtr-tab.c
+index f22d546..4c7760a 100644
+--- a/src/gtr-tab.c
++++ b/src/gtr-tab.c
+@@ -671,13 +671,6 @@ save_layout (GtrTab *tab)
+ }
+
+ static void
+-on_layout_changed (GdlDockMaster *master,
+- GtrTab *tab)
+-{
+- save_layout (tab);
+-}
+-
+-static void
+ extension_added (PeasExtensionSet *extensions,
+ PeasPluginInfo *info,
+ PeasExtension *exten,
+@@ -732,11 +725,6 @@ gtr_tab_init (GtrTab * tab)
+ gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+
+ priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
+- g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
+- "layout-changed",
+- G_CALLBACK (on_layout_changed),
+- tab);
+-
+ g_settings_bind (priv->ui_settings,
+ GTR_SETTINGS_PANEL_SWITCHER_STYLE,
+ gdl_dock_layout_get_master (priv->layout_manager),
+@@ -967,17 +955,11 @@ gtr_tab_realize (GtkWidget *widget)
+ tab);
+
+ /* Loading dock layout */
+- g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
+- G_CALLBACK (on_layout_changed),
+- tab);
+ filename = g_build_filename (gtr_dirs_get_user_config_dir (),
+ "layout.xml", NULL);
+
+ gtr_tab_layout_load (tab, filename, NULL);
+ g_free (filename);
+- g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
+- G_CALLBACK (on_layout_changed),
+- tab);
+
+ tab->priv->tab_realized = TRUE;
+ }
+--
+1.8.0
+
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
new file mode 100644
index 0000000..15b4d75
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
@@ -0,0 +1,55 @@
+From 398ebe3e8b5271261423d60849452423bf0dfb51 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
+Date: Tue, 20 Nov 2012 21:57:53 +0100
+Subject: [PATCH 3/3] Another fix for bgo#680399 - gtranslator 2.91.5
+ segfaults trying to use any plugin (gnome 3.5.x stack)
+
+Keep saving the layout on each change but connect the signal after loading the
+layout and disconnect it after saving it for the last time.
+---
+ src/gtr-tab.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/gtr-tab.c b/src/gtr-tab.c
+index 4c7760a..2ebf60b 100644
+--- a/src/gtr-tab.c
++++ b/src/gtr-tab.c
+@@ -671,6 +671,13 @@ save_layout (GtrTab *tab)
+ }
+
+ static void
++on_layout_changed (GdlDockMaster *master,
++ GtrTab *tab)
++{
++ save_layout (tab);
++}
++
++static void
+ extension_added (PeasExtensionSet *extensions,
+ PeasPluginInfo *info,
+ PeasExtension *exten,
+@@ -882,6 +889,9 @@ gtr_tab_dispose (GObject * object)
+
+ if (!priv->dispose_has_run)
+ {
++ g_signal_handlers_disconnect_by_func (gdl_dock_layout_get_master (priv->layout_manager),
++ G_CALLBACK (on_layout_changed),
++ object);
+ save_layout (GTR_TAB (object));
+ priv->dispose_has_run = TRUE;
+ }
+@@ -962,6 +972,11 @@ gtr_tab_realize (GtkWidget *widget)
+ g_free (filename);
+
+ tab->priv->tab_realized = TRUE;
++
++ g_signal_connect (gdl_dock_layout_get_master (tab->priv->layout_manager),
++ "layout-changed",
++ G_CALLBACK (on_layout_changed),
++ tab);
+ }
+ }
+
+--
+1.8.0
+
diff --git a/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild
new file mode 100644
index 0000000..9d83569
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="gnome? 2"
+
+inherit eutils gnome2 multilib python
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="http://gtranslator.sourceforge.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gnome spell"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.4.2:3
+ >=x11-libs/gtksourceview-3.0.0:3.0
+ >=dev-libs/gdl-2.91.91: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? (
+ || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* )
+ x11-libs/gtk+:3[introspection] )
+ spell? ( app-text/gtkspell:3= )"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+ gnome? (
+ >=dev-libs/libpeas-1.2[gtk,python]
+ dev-python/pygobject:3
+ gnome-extra/gucharmap:2.90[introspection] )"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/gnome-doc-utils
+ >=app-text/scrollkeeper-0.1.4
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1 )"
+# eautoreconf requires gnome-base/gnome-common
+
+pkg_setup() {
+ if use gnome; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+ G2CONF="${G2CONF}
+ --disable-static
+ $(use_with gnome dictionary)
+ $(use_enable gnome introspection)
+ $(use_with spell gtkspell3)"
+
+ # in 2.91.6
+ epatch "${FILESDIR}/${P}-gdl-3.6-"{1,2,3}.patch
+
+ gnome2_src_prepare
+
+ if use gnome; then
+ python_clean_py-compile_files
+ else
+ # 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
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if use gnome; then
+ python_need_rebuild
+ python_mod_optimize /usr/$(get_libdir)/gtranslator/plugins
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ use gnome && python_mod_cleanup /usr/$(get_libdir)/gtranslator/plugins
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2012-12-24 15:41 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 6a8d4138f5042f4c5d6d47a17fb357b8db291f0c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 15:41:48 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 15:41:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6a8d4138
app-text/gtranslator: moved to gx86, add metadata.xml
---
.../files/gtranslator-2.91.5-gdl-3.6-1.patch | 114 --------------------
.../files/gtranslator-2.91.5-gdl-3.6-2.patch | 94 ----------------
.../files/gtranslator-2.91.5-gdl-3.6-3.patch | 55 ----------
app-text/gtranslator/gtranslator-2.91.5-r1.ebuild | 93 ----------------
app-text/gtranslator/metadata.xml | 9 ++
5 files changed, 9 insertions(+), 356 deletions(-)
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
deleted file mode 100644
index 280d7d4..0000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 68d6bc237c2076d3ff2a75a6a85e198807f8132a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Tue, 6 Nov 2012 21:03:39 +0100
-Subject: [PATCH 1/3] fix bgo #680399 - gtranslator 2.91.5 segfaults trying to
- use any plugin (gnome 3.5.x stack)
-
-- Update data/layout.xml, some attributes have changed
-- Several Dock object constructors take a G_OBJECT instead of a GDL_DOCK
-- GdlDockLayout member master is not accessible anymore
-- Block layout-changed signal when loading a new layout
----
- data/layout.xml | 34 +++++++++++++++-------------------
- src/gtr-tab.c | 14 ++++++++++----
- 2 files changed, 25 insertions(+), 23 deletions(-)
-
-diff --git a/data/layout.xml b/data/layout.xml
-index 85f7f64..f3e313e 100644
---- a/data/layout.xml
-+++ b/data/layout.xml
-@@ -3,30 +3,26 @@
- <dock-layout>
- <layout name="__default__">
- <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
-- <paned orientation="horizontal" locked="no" position="1164">
-- <paned orientation="horizontal" locked="no" position="244">
-- <notebook orientation="vertical" locked="no" page="0">
-- <item name="GtrOpenTranPlugin" orientation="vertical" locked="no"/>
-- <item name="GtrCharmapPanel" orientation="vertical" locked="no"/>
-- <placeholder name="ph_left" next-placement="center"/>
-+ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
-+ <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
-+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+ <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+ <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
- </notebook>
-- <paned orientation="vertical" locked="no" position="416">
-- <notebook orientation="vertical" locked="no" page="0">
-- <item name="GtrMessageTable" orientation="vertical" locked="no"/>
-- <placeholder name="ph_top" next-placement="center"/>
-+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
-+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+ <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
- </notebook>
-- <notebook orientation="vertical" locked="no" page="0">
-- <item name="GtrTranslationFields" orientation="vertical" locked="no"/>
-- <placeholder name="ph_center" next-placement="bottom"/>
-+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+ <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
- </notebook>
- </paned>
- </paned>
-- <paned orientation="vertical" locked="no" position="387">
-- <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no"/>
-- <notebook orientation="vertical" locked="no" page="0">
-- <item name="GtrContextPanel" orientation="vertical" locked="no"/>
-- <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no"/>
-- <placeholder name="ph_right" next-placement="center"/>
-+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
-+ <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+ <item name="GtrContextPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+ <item name="GtrAlternateLangPluginPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
- </notebook>
- </paned>
- </paned>
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index 75fbd35..f22d546 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -727,19 +727,19 @@ gtr_tab_init (GtrTab * tab)
- gtk_widget_show (priv->dock);
- gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
-
-- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
-+ dockbar = gdl_dock_bar_new (G_OBJECT (priv->dock));
- gtk_widget_show (dockbar);
- gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
-
-- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
-- g_signal_connect (priv->layout_manager->master,
-+ priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
-+ g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
- "layout-changed",
- G_CALLBACK (on_layout_changed),
- tab);
-
- g_settings_bind (priv->ui_settings,
- GTR_SETTINGS_PANEL_SWITCHER_STYLE,
-- priv->layout_manager->master,
-+ gdl_dock_layout_get_master (priv->layout_manager),
- "switcher-style",
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-
-@@ -967,11 +967,17 @@ gtr_tab_realize (GtkWidget *widget)
- tab);
-
- /* Loading dock layout */
-+ g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+ G_CALLBACK (on_layout_changed),
-+ tab);
- filename = g_build_filename (gtr_dirs_get_user_config_dir (),
- "layout.xml", NULL);
-
- gtr_tab_layout_load (tab, filename, NULL);
- g_free (filename);
-+ g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+ G_CALLBACK (on_layout_changed),
-+ tab);
-
- tab->priv->tab_realized = TRUE;
- }
---
-1.8.0
-
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
deleted file mode 100644
index f170da5..0000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 22da0a85fec480943411c25c0d361b3fa2252381 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Wed, 14 Nov 2012 22:00:47 +0100
-Subject: [PATCH 2/3] fix bgo #687432 - gtranslator can't load/save tab
- layout, cause gdl 3.6
-
-Do not save the layout after each change.
-Fix the default layout to remove GtrOpenTranPlugin and GtrCharmapPanel pane as
-GDL 3.6.0 does not hide them as it should.
----
- data/layout.xml | 16 +++++-----------
- src/gtr-tab.c | 18 ------------------
- 2 files changed, 5 insertions(+), 29 deletions(-)
-
-diff --git a/data/layout.xml b/data/layout.xml
-index f3e313e..117f471 100644
---- a/data/layout.xml
-+++ b/data/layout.xml
-@@ -4,19 +4,13 @@
- <layout name="__default__">
- <dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
- <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="1164">
-- <paned orientation="horizontal" locked="no" iconified="no" closed="no" position="244">
-+ <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
- <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-- <item name="GtrOpenTranPlugin" orientation="vertical" locked="no" iconified="no" closed="no"/>
-- <item name="GtrCharmapPanel" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+ <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
-+ </notebook>
-+ <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-+ <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
- </notebook>
-- <paned orientation="vertical" locked="no" iconified="no" closed="no" position="416">
-- <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-- <item name="GtrMessageTable" orientation="vertical" locked="no" iconified="no" closed="no"/>
-- </notebook>
-- <notebook orientation="vertical" locked="no" iconified="no" closed="no" page="0">
-- <item name="GtrTranslationFields" orientation="vertical" locked="no" iconified="no" closed="no"/>
-- </notebook>
-- </paned>
- </paned>
- <paned orientation="vertical" locked="no" iconified="no" closed="no" position="387">
- <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no" iconified="no" closed="no"/>
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index f22d546..4c7760a 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -671,13 +671,6 @@ save_layout (GtrTab *tab)
- }
-
- static void
--on_layout_changed (GdlDockMaster *master,
-- GtrTab *tab)
--{
-- save_layout (tab);
--}
--
--static void
- extension_added (PeasExtensionSet *extensions,
- PeasPluginInfo *info,
- PeasExtension *exten,
-@@ -732,11 +725,6 @@ gtr_tab_init (GtrTab * tab)
- gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
-
- priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
-- g_signal_connect (gdl_dock_layout_get_master (priv->layout_manager),
-- "layout-changed",
-- G_CALLBACK (on_layout_changed),
-- tab);
--
- g_settings_bind (priv->ui_settings,
- GTR_SETTINGS_PANEL_SWITCHER_STYLE,
- gdl_dock_layout_get_master (priv->layout_manager),
-@@ -967,17 +955,11 @@ gtr_tab_realize (GtkWidget *widget)
- tab);
-
- /* Loading dock layout */
-- g_signal_handlers_block_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-- G_CALLBACK (on_layout_changed),
-- tab);
- filename = g_build_filename (gtr_dirs_get_user_config_dir (),
- "layout.xml", NULL);
-
- gtr_tab_layout_load (tab, filename, NULL);
- g_free (filename);
-- g_signal_handlers_unblock_by_func (gdl_dock_layout_get_master (tab->priv->layout_manager),
-- G_CALLBACK (on_layout_changed),
-- tab);
-
- tab->priv->tab_realized = TRUE;
- }
---
-1.8.0
-
diff --git a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch b/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
deleted file mode 100644
index 15b4d75..0000000
--- a/app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 398ebe3e8b5271261423d60849452423bf0dfb51 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
-Date: Tue, 20 Nov 2012 21:57:53 +0100
-Subject: [PATCH 3/3] Another fix for bgo#680399 - gtranslator 2.91.5
- segfaults trying to use any plugin (gnome 3.5.x stack)
-
-Keep saving the layout on each change but connect the signal after loading the
-layout and disconnect it after saving it for the last time.
----
- src/gtr-tab.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/gtr-tab.c b/src/gtr-tab.c
-index 4c7760a..2ebf60b 100644
---- a/src/gtr-tab.c
-+++ b/src/gtr-tab.c
-@@ -671,6 +671,13 @@ save_layout (GtrTab *tab)
- }
-
- static void
-+on_layout_changed (GdlDockMaster *master,
-+ GtrTab *tab)
-+{
-+ save_layout (tab);
-+}
-+
-+static void
- extension_added (PeasExtensionSet *extensions,
- PeasPluginInfo *info,
- PeasExtension *exten,
-@@ -882,6 +889,9 @@ gtr_tab_dispose (GObject * object)
-
- if (!priv->dispose_has_run)
- {
-+ g_signal_handlers_disconnect_by_func (gdl_dock_layout_get_master (priv->layout_manager),
-+ G_CALLBACK (on_layout_changed),
-+ object);
- save_layout (GTR_TAB (object));
- priv->dispose_has_run = TRUE;
- }
-@@ -962,6 +972,11 @@ gtr_tab_realize (GtkWidget *widget)
- g_free (filename);
-
- tab->priv->tab_realized = TRUE;
-+
-+ g_signal_connect (gdl_dock_layout_get_master (tab->priv->layout_manager),
-+ "layout-changed",
-+ G_CALLBACK (on_layout_changed),
-+ tab);
- }
- }
-
---
-1.8.0
-
diff --git a/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild
deleted file mode 100644
index 112a2ae..0000000
--- a/app-text/gtranslator/gtranslator-2.91.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="gnome? 2"
-
-inherit eutils gnome2 multilib python
-
-DESCRIPTION="An enhanced gettext po file editor for GNOME"
-HOMEPAGE="http://gtranslator.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gnome spell"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.4.2:3
- >=x11-libs/gtksourceview-3.0.0:3.0
- >=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? (
- || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* )
- x11-libs/gtk+:3[introspection] )
- spell? ( app-text/gtkspell:3= )"
-RDEPEND="${COMMON_DEPEND}
- x11-themes/gnome-icon-theme-symbolic
- gnome? (
- >=dev-libs/libpeas-1.2[gtk,python]
- dev-python/pygobject:3
- gnome-extra/gucharmap:2.90[introspection] )"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/gnome-doc-utils
- >=app-text/scrollkeeper-0.1.4
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1 )"
-# eautoreconf requires gnome-base/gnome-common
-
-pkg_setup() {
- if use gnome; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
- G2CONF="${G2CONF}
- --disable-static
- $(use_with gnome dictionary)
- $(use_enable gnome introspection)
- $(use_with spell gtkspell3)"
-
- # in 2.91.6
- epatch "${FILESDIR}/${P}-gdl-3.6-"{1,2,3}.patch
-
- gnome2_src_prepare
-
- if use gnome; then
- python_clean_py-compile_files
- else
- # 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
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if use gnome; then
- python_need_rebuild
- python_mod_optimize /usr/$(get_libdir)/gtranslator/plugins
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use gnome && python_mod_cleanup /usr/$(get_libdir)/gtranslator/plugins
-}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
new file mode 100644
index 0000000..a9ebb44
--- /dev/null
+++ b/app-text/gtranslator/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="http">Enable support for open translation plugin using
+ <pkg>net-libs/libsoup</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: app-text/gtranslator/files/, app-text/gtranslator/
@ 2011-10-12 22:17 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-10-12 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 57b434ad493cf7c33b924e69d8e821e84955add4
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct 12 22:08:39 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 12 22:14:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=57b434ad
app-text/gtranslator: 2.90.5 → 2.90.6
Now with spellcheck support.
---
.../files/gtranslator-2.90.6-gtkspell3.patch | 40 ++++++++++++++++++++
...tor-2.90.5.ebuild => gtranslator-2.90.6.ebuild} | 16 +++++---
2 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch b/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch
new file mode 100644
index 0000000..d546edf
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch
@@ -0,0 +1,40 @@
+diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
+--- gtranslator-2.90.5-orig/configure.ac 2011-08-28 18:59:30.000000000 +0400
++++ gtranslator-2.90.5/configure.ac 2011-08-28 19:02:23.000000000 +0400
+@@ -87,7 +87,7 @@
+ GDA_REQUIRED=4.2.3
+ PEAS_REQUIRED=1.0.0
+ GDICT_OPTIONAL=0.11.0
+-GTKSPELL_OPTIONAL=2.0.16
++GTKSPELL_OPTIONAL=3.0.0
+ JSON_GLIB_OPTIONAL=0.12.0
+
+ AC_ARG_WITH(gda,
+@@ -167,7 +167,7 @@
+ fi
+
+ dnl -------------------------------------------------------------------
+-dnl Check for gtkspell >= 2.0 and use it if found
++dnl Check for gtkspell >= 3.0 and use it if found
+ dnl -------------------------------------------------------------------
+ have_gtkspell=no
+ AC_ARG_WITH(gtkspell3,
+@@ -177,7 +177,7 @@
+ if test x"$with_gtkspell" != "xno"
+ then
+ PKG_CHECK_MODULES([GTKSPELL], [
+- gtkspell3-2.0 >= $GTKSPELL_OPTIONAL
++ gtkspell-3.0 >= $GTKSPELL_OPTIONAL
+ ], have_gtkspell=yes, have_gtkspell=no)
+
+ if test x"$have_gtkspell" = "xyes"
+@@ -335,7 +335,7 @@
+ echo "Building spell support: ................................YES"
+ else
+ echo "Building spell support: ................................NO"
+- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL"
++ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
+ fi
+
+ echo "
+Только в gtranslator-2.90.5: configure.ac~
diff --git a/app-text/gtranslator/gtranslator-2.90.5.ebuild b/app-text/gtranslator/gtranslator-2.90.6.ebuild
similarity index 84%
rename from app-text/gtranslator/gtranslator-2.90.5.ebuild
rename to app-text/gtranslator/gtranslator-2.90.6.ebuild
index 9fe0a21..e00953d 100644
--- a/app-text/gtranslator/gtranslator-2.90.5.ebuild
+++ b/app-text/gtranslator/gtranslator-2.90.6.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="gnome? 2"
-inherit eutils gnome2 multilib python
+inherit autotools eutils gnome2 multilib python
DESCRIPTION="An enhanced gettext po file editor for GNOME"
HOMEPAGE="http://gtranslator.sourceforge.net/"
@@ -15,7 +15,7 @@ HOMEPAGE="http://gtranslator.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc gnome"
+IUSE="doc gnome spell"
COMMON_DEPEND="
>=dev-libs/glib-2.28.0:2
@@ -32,7 +32,8 @@ COMMON_DEPEND="
gnome? (
gnome-extra/gnome-utils
- x11-libs/gtk+:3[introspection] )"
+ x11-libs/gtk+:3[introspection] )
+ spell? ( app-text/gtkspell:3 )"
RDEPEND="${COMMON_DEPEND}
gnome? (
>=dev-libs/libpeas-1.0.0[gtk,python]
@@ -49,15 +50,18 @@ DEPEND="${COMMON_DEPEND}
pkg_setup() {
DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
- # gtkspell hasn't been ported to gtk+3 yet
G2CONF="${G2CONF}
--disable-static
- --without-gtkspell
$(use_with gnome dictionary)
- $(use_enable gnome introspection)"
+ $(use_enable gnome introspection)
+ $(use_with spell gtkspell3)"
}
src_prepare() {
+ # Fix gtkspell detection, https://bugzilla.gnome.org/show_bug.cgi?id=660709
+ epatch "${FILESDIR}/${PN}-2.90.6-gtkspell3.patch"
+ eautoreconf
+
gnome2_src_prepare
# disable pyc compiling
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-24 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-06 6:50 [gentoo-commits] proj/gnome:master commit in: app-text/gtranslator/files/, app-text/gtranslator/ Alexandre Rostovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-12-24 15:41 Gilles Dartiguelongue
2011-10-12 22:17 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox