From 9cb82615e20336f40492cd9a9987f308ca316bba Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 17 Dec 2012 08:20:16 +0000 Subject: Add a revision compatible with gdl-3.6. Update license. Drop useless doc USE flag from 1.9. Drop old. (Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- app-text/gtranslator/ChangeLog | 13 ++- .../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-1.9.13.ebuild | 9 +- app-text/gtranslator/gtranslator-2.91.4.ebuild | 90 ---------------- app-text/gtranslator/gtranslator-2.91.5-r2.ebuild | 77 ++++++++++++++ app-text/gtranslator/gtranslator-2.91.5.ebuild | 5 +- 8 files changed, 359 insertions(+), 98 deletions(-) create mode 100644 app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-1.patch create mode 100644 app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-2.patch create mode 100644 app-text/gtranslator/files/gtranslator-2.91.5-gdl-3.6-3.patch delete mode 100644 app-text/gtranslator/gtranslator-2.91.4.ebuild create mode 100644 app-text/gtranslator/gtranslator-2.91.5-r2.ebuild (limited to 'app-text') diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog index 3374dff60c1d..f8ab9cfd58da 100644 --- a/app-text/gtranslator/ChangeLog +++ b/app-text/gtranslator/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-text/gtranslator # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.55 2012/12/16 12:20:59 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.56 2012/12/17 08:20:16 tetromino Exp $ + +*gtranslator-2.91.5-r2 (17 Dec 2012) + + 17 Dec 2012; Alexandre Rostovtsev + gtranslator-1.9.13.ebuild, -gtranslator-2.91.4.ebuild, + gtranslator-2.91.5.ebuild, +gtranslator-2.91.5-r2.ebuild, + +files/gtranslator-2.91.5-gdl-3.6-1.patch, + +files/gtranslator-2.91.5-gdl-3.6-2.patch, + +files/gtranslator-2.91.5-gdl-3.6-3.patch: + Add a revision compatible with gdl-3.6. Update license. Drop useless doc USE + flag from 1.9. Drop old. 16 Dec 2012; Gilles Dartiguelongue gtranslator-2.91.5.ebuild: 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 000000000000..280d7d4b9017 --- /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?= +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 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ + +- +- +- +- ++ ++ ++ + +- +- +- ++ ++ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ + + + +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 000000000000..f170da510add --- /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?= +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 @@ + + + +- ++ + +- +- ++ ++ ++ ++ + +- +- +- +- +- +- +- +- + + + +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 000000000000..15b4d750c50d --- /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?= +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-1.9.13.ebuild b/app-text/gtranslator/gtranslator-1.9.13.ebuild index 12c2b2f40707..deeb4d81e110 100644 --- a/app-text/gtranslator/gtranslator-1.9.13.ebuild +++ b/app-text/gtranslator/gtranslator-1.9.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.12 2012/09/15 03:38:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.13 2012/12/17 08:20:16 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -10,10 +10,10 @@ inherit autotools eutils gnome2 DESCRIPTION="An enhanced gettext po file editor for GNOME" HOMEPAGE="http://gtranslator.sourceforge.net/" -LICENSE="GPL-2" +LICENSE="GPL-2+ FDL-1.1+" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="doc http gnome spell" +IUSE="http gnome spell" RDEPEND=" >=dev-libs/glib-2.25.10:2 @@ -38,8 +38,7 @@ DEPEND="${RDEPEND} app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 gnome-base/gnome-common - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" + dev-util/gtk-doc-am" pkg_setup() { DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS" diff --git a/app-text/gtranslator/gtranslator-2.91.4.ebuild b/app-text/gtranslator/gtranslator-2.91.4.ebuild deleted file mode 100644 index b645fbf6cff4..000000000000 --- a/app-text/gtranslator/gtranslator-2.91.4.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.4.ebuild,v 1.4 2012/12/06 06:50:31 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="gnome? 2" - -inherit 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)" - - 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/gtranslator-2.91.5-r2.ebuild b/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild new file mode 100644 index 000000000000..34e7750d165b --- /dev/null +++ b/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.5-r2.ebuild,v 1.1 2012/12/17 08:20:16 tetromino Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit eutils gnome2 python-single-r1 + +DESCRIPTION="An enhanced gettext po file editor for GNOME" +HOMEPAGE="http://gtranslator.sourceforge.net/" + +LICENSE="GPL-3+ FDL-1.1+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="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? ( + ${PYTHON_DEPS} + || ( 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,${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + 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/gtk-doc-am-1 + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" +# eautoreconf requires gnome-base/gnome-common + +pkg_setup() { + use gnome && python-single-r1_pkg_setup +} + +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 + # 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 +} diff --git a/app-text/gtranslator/gtranslator-2.91.5.ebuild b/app-text/gtranslator/gtranslator-2.91.5.ebuild index 7b71f16a5ce7..9d9a11ffc012 100644 --- a/app-text/gtranslator/gtranslator-2.91.5.ebuild +++ b/app-text/gtranslator/gtranslator-2.91.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.5.ebuild,v 1.2 2012/12/16 12:20:59 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.5.ebuild,v 1.3 2012/12/17 08:20:16 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -12,7 +12,7 @@ inherit gnome2 multilib python DESCRIPTION="An enhanced gettext po file editor for GNOME" HOMEPAGE="http://gtranslator.sourceforge.net/" -LICENSE="GPL-3" +LICENSE="GPL-3+ FDL-1.1+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="gnome spell" @@ -22,6 +22,7 @@ COMMON_DEPEND=" >=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] -- cgit v1.2.3-65-gdbad