cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More run fixes against the new GDL; from upstream.

Browse Source
This commit is contained in:
ajacoutot 2012-11-17 13:09:32 +00:00
parent 424ae77478
commit 17c734768a
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/gtranslator/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2012/11/15 14:44:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2012/11/17 13:09:32 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= gettext(1) files editor for GNOME
GNOME_PROJECT= gtranslator
GNOME_VERSION= 2.91.5
REVISION= 4
REVISION= 6
CATEGORIES= textproc devel

32
textproc/gtranslator/patches/patch-data_layout_xml
View File

@ -1,13 +1,18 @@
$OpenBSD: patch-data_layout_xml,v 1.1 2012/11/14 12:37:03 ajacoutot Exp $
$OpenBSD: patch-data_layout_xml,v 1.2 2012/11/17 13:09:32 ajacoutot Exp $
From 22da0a85fec480943411c25c0d361b3fa2252381 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Wed, 14 Nov 2012 21:00:47 +0000
Subject: fix bgo #687432 - gtranslator can't load/save tab layout, cause gdl 3.6
From 68d6bc237c2076d3ff2a75a6a85e198807f8132a Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Tue, 06 Nov 2012 20:03:39 +0000
Subject: fix bgo #680399 - gtranslator 2.91.5 segfaults trying to use any plugin (gnome 3.5.x stack)
--- data/layout.xml.orig Wed May 4 14:20:07 2011
+++ data/layout.xml Wed Nov 14 13:29:44 2012
@@ -3,30 +3,26 @@
--- data/layout.xml.orig Sat Nov 17 13:55:18 2012
+++ data/layout.xml Sat Nov 17 13:55:40 2012
@@ -3,30 +3,20 @@
<dock-layout>
<layout name="__default__">
<dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0">
@ -18,26 +23,23 @@ Subject: fix bgo #680399 - gtranslator 2.91.5 segfaults trying to use any plugin
- <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">
+ <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>
- <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>
- <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>
- </notebook>
- </paned>
+ <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 orientation="vertical" locked="no" position="387">
- <item name="GtrTranslationMemoryUI" orientation="vertical" locked="no"/>

54
textproc/gtranslator/patches/patch-src_gtr-tab_c
View File

@ -1,13 +1,32 @@
$OpenBSD: patch-src_gtr-tab_c,v 1.1 2012/11/14 12:37:03 ajacoutot Exp $
$OpenBSD: patch-src_gtr-tab_c,v 1.2 2012/11/17 13:09:32 ajacoutot Exp $
From 22da0a85fec480943411c25c0d361b3fa2252381 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Wed, 14 Nov 2012 21:00:47 +0000
Subject: fix bgo #687432 - gtranslator can't load/save tab layout, cause gdl 3.6
From 68d6bc237c2076d3ff2a75a6a85e198807f8132a Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Tue, 06 Nov 2012 20:03:39 +0000
Subject: fix bgo #680399 - gtranslator 2.91.5 segfaults trying to use any plugin (gnome 3.5.x stack)
--- src/gtr-tab.c.orig Thu Jun 7 13:48:56 2012
+++ src/gtr-tab.c Wed Nov 14 13:29:44 2012
@@ -727,19 +727,19 @@ gtr_tab_init (GtrTab * tab)
--- src/gtr-tab.c.orig Sat Nov 17 13:55:28 2012
+++ src/gtr-tab.c Sat Nov 17 13:55:40 2012
@@ -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,
@@ -727,19 +720,14 @@ gtr_tab_init (GtrTab * tab)
gtk_widget_show (priv->dock);
gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
@ -18,12 +37,11 @@ Subject: fix bgo #680399 - gtranslator 2.91.5 segfaults trying to use any plugin
- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
- g_signal_connect (priv->layout_manager->master,
- "layout-changed",
- G_CALLBACK (on_layout_changed),
- tab);
-
+ 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,
@ -31,21 +49,3 @@ Subject: fix bgo #680399 - gtranslator 2.91.5 segfaults trying to use any plugin
"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;
}