diff --git a/gtranslator-gdl362.patch b/gtranslator-gdl362.patch new file mode 100644 index 0000000..4c4d010 --- /dev/null +++ b/gtranslator-gdl362.patch @@ -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 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- +- +- +- + +- +- +- +- +- +- ++ ++ ++ ++ ++ + + + +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); + } + } + diff --git a/gtranslator.changes b/gtranslator.changes index a091d70..6aaaf1a 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -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 diff --git a/gtranslator.spec b/gtranslator.spec index 27fa356..a2a4c2e 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -24,6 +24,8 @@ License: GPL-3.0+ Group: Development/Tools/Other Url: http://gtranslator.sourceforge.net 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: gnome-doc-utils-devel BuildRequires: intltool @@ -66,6 +68,7 @@ files imminently. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build