commit gtkpod for openSUSE:Factory
Hello community, here is the log from the commit of package gtkpod for openSUSE:Factory checked in at 2012-12-05 13:53:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkpod (Old) and /work/SRC/openSUSE:Factory/.gtkpod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkpod", Maintainer is "hvogel@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkpod/gtkpod.changes 2012-10-16 07:05:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkpod.new/gtkpod.changes 2012-12-05 13:53:17.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 26 18:39:40 UTC 2012 - dimstar@opensuse.org + +- Add gtkpod-gdl362.patch: Fix build with gdl 3.6.2. + +------------------------------------------------------------------- New: ---- gtkpod-gdl362.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkpod.spec ++++++ --- /var/tmp/diff_new_pack.ImcBX7/_old 2012-12-05 13:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.ImcBX7/_new 2012-12-05 13:53:18.000000000 +0100 @@ -30,6 +30,8 @@ Patch1: gtkpod-buffer-overflow.patch # PATCH-FIX-UPSTREAM gtkpod-anjuta36.patch dimstar@opensuse.org -- Adapt to Anjuta 3.6 API change. Sent by email to gtkpod-devel. Patch2: gtkpod-anjuta36.patch +# PATCH-FIX-UPSTREAM gtkpod-gdl362.patch dimstar@opensuse.org -- Adapt to gdl 3.6.2 API change. http://gtkpod.org/bugs/index.php?do=details&task_id=123 +Patch3: gtkpod-gdl362.patch BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ @@ -107,6 +109,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Call to autogen.sh needed for patch1. ++++++ gtkpod-gdl362.patch ++++++ Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c =================================================================== --- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c +++ gtkpod-2.1.2/src/anjuta-action-callbacks.c @@ -65,7 +65,7 @@ void on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) { if (app->layout_manager) - g_object_set (app->layout_manager->master, "locked", + g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), NULL); } Index: gtkpod-2.1.2/src/anjuta-app.c =================================================================== --- gtkpod-2.1.2.orig/src/anjuta-app.c +++ gtkpod-2.1.2/src/anjuta-app.c @@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin else if (g_strcmp0(pr_style, "Tabs") == 0) style = GDL_SWITCHER_STYLE_TABS; - g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); + g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); g_free(pr_style); } @@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj gtk_widget_show(app->dock); gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); - dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); + dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); gtk_widget_show(dockbar); gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); - app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); + app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); g_signal_connect (app->layout_manager, "notify::dirty", G_CALLBACK (on_layout_dirty_notify), app); - g_signal_connect (app->layout_manager->master, "notify::locked", + g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", G_CALLBACK (on_layout_locked_notify), app); /* UI engine */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de