forked from pool/gtranslator
Accepting request 142960 from home:dimstar:branches:GNOME:Apps
Fix build with gl 3.6.2 OBS-URL: https://build.opensuse.org/request/show/142960 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=45
This commit is contained in:
Git OBS Bridge
parent
ccb44fdbf6
commit
9dbc30d133
96
gtranslator-gdl362.patch
Normal file
96
gtranslator-gdl362.patch
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
diff --git a/data/layout.xml b/data/layout.xml
|
||||||
|
index 85f7f64..117f471 100644
|
||||||
|
--- a/data/layout.xml
|
||||||
|
+++ b/data/layout.xml
|
||||||
|
@@ -3,30 +3,20 @@
|
||||||
|
<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="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 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"/>
|
||||||
|
- </notebook>
|
||||||
|
- <notebook orientation="vertical" locked="no" page="0">
|
||||||
|
- <item name="GtrTranslationFields" orientation="vertical" locked="no"/>
|
||||||
|
- <placeholder name="ph_center" next-placement="bottom"/>
|
||||||
|
- </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..2ebf60b 100644
|
||||||
|
--- a/src/gtr-tab.c
|
||||||
|
+++ b/src/gtr-tab.c
|
||||||
|
@@ -727,19 +727,14 @@ 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,
|
||||||
|
- "layout-changed",
|
||||||
|
- G_CALLBACK (on_layout_changed),
|
||||||
|
- tab);
|
||||||
|
-
|
||||||
|
+ priv->layout_manager = gdl_dock_layout_new (G_OBJECT (priv->dock));
|
||||||
|
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);
|
||||||
|
|
||||||
|
@@ -894,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;
|
||||||
|
}
|
||||||
|
@@ -974,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,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 26 20:23:38 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Add gtranslator-gdl362.patch: Fix build with gdl 3.6.2.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Jun 17 17:04:36 UTC 2012 - badshah400@gmail.com
|
Sun Jun 17 17:04:36 UTC 2012 - badshah400@gmail.com
|
||||||
|
|
||||||
|
|||||||
@ -24,6 +24,8 @@ License: GPL-3.0+
|
|||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Url: http://gtranslator.sourceforge.net
|
Url: http://gtranslator.sourceforge.net
|
||||||
Source: http://download.gnome.org/sources/gtranslator/2.91/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/gtranslator/2.91/%{name}-%{version}.tar.xz
|
||||||
|
# PATCH-FIX-UPSTREAM gtranslator-gdl362.patch dimstar@opensuse.org -- fix build with gdl 3.6.2, taken from git.
|
||||||
|
Patch0: gtranslator-gdl362.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gnome-doc-utils-devel
|
BuildRequires: gnome-doc-utils-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
@ -66,6 +68,7 @@ files imminently.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user