From b3d5d13ab6f76d9c80452394d60d258b9fbfea38 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo
Date: Mon, 24 Dec 2012 09:12:16 +0100
Subject: multimedia/gtkpod: Added patches for the newer gdl and anjuta.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 multimedia/gtkpod/gtkpod-anjuta36.patch | 24 ++++++++++++++++++
 multimedia/gtkpod/gtkpod-gdl362.patch   | 44 +++++++++++++++++++++++++++++++++
 multimedia/gtkpod/gtkpod.SlackBuild     |  4 ++-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/gtkpod/gtkpod-anjuta36.patch
 create mode 100644 multimedia/gtkpod/gtkpod-gdl362.patch

(limited to 'multimedia')

diff --git a/multimedia/gtkpod/gtkpod-anjuta36.patch b/multimedia/gtkpod/gtkpod-anjuta36.patch
new file mode 100644
index 0000000000..713928d104
--- /dev/null
+++ b/multimedia/gtkpod/gtkpod-anjuta36.patch
@@ -0,0 +1,24 @@
+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
+@@ -38,6 +38,7 @@
+ #include <libanjuta/resources.h>
+ #include <libanjuta/anjuta-plugin-manager.h>
+ #include <libanjuta/anjuta-debug.h>
++#include <libanjuta/anjuta-version.h>
+ 
+ #include "anjuta-app.h"
+ #include "anjuta-actions.h"
+@@ -501,7 +502,11 @@ static void anjuta_app_instance_init(Anj
+     g_list_free(plugins_dirs);
+ 
+     /* Preferences */
++#if ANJUTA_CHECK_VERSION(3,5,3)
++    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
++#else
+     app->preferences = anjuta_preferences_new(app->plugin_manager);
++#endif
+     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
+ 
+     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);
diff --git a/multimedia/gtkpod/gtkpod-gdl362.patch b/multimedia/gtkpod/gtkpod-gdl362.patch
new file mode 100644
index 0000000000..b794fa11b7
--- /dev/null
+++ b/multimedia/gtkpod/gtkpod-gdl362.patch
@@ -0,0 +1,44 @@
+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 */
diff --git a/multimedia/gtkpod/gtkpod.SlackBuild b/multimedia/gtkpod/gtkpod.SlackBuild
index 22724f3fbe..a0aeb3bc68 100644
--- a/multimedia/gtkpod/gtkpod.SlackBuild
+++ b/multimedia/gtkpod/gtkpod.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=gtkpod
 VERSION=${VERSION:-2.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -70,6 +70,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gtkpod-gdl362.patch
+patch -p1 < $CWD/gtkpod-anjuta36.patch
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-- 
cgit v1.2.3