Date: Monday, January 14, 2013 @ 03:36:52 Author: eric Revision: 175122
upgpkg: gtkpod 2.1.3-1 Upstream update, Add gdl build patch, Remove old patch Added: gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch Modified: gtkpod/trunk/PKGBUILD Deleted: gtkpod/trunk/gtkpod-2.1.2-anjuta.patch ----------------------------+ PKGBUILD | 12 +++++------ gtkpod-2.1.2-anjuta.patch | 11 ---------- gtkpod-2.1.3-gdl-3.6.patch | 44 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-14 07:38:26 UTC (rev 175121) +++ PKGBUILD 2013-01-14 08:36:52 UTC (rev 175122) @@ -3,8 +3,8 @@ # Contributor: Aaron Griffin <[email protected]> pkgname=gtkpod -pkgver=2.1.2 -pkgrel=4 +pkgver=2.1.3 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net"; @@ -19,13 +19,13 @@ install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"; - "gtkpod-2.1.2-anjuta.patch") -md5sums=('88fef3f947cbb7ae6b714080733a3b6b' - '0a5f4ce0c9ef3d4d8db57290df43db27') + gtkpod-2.1.3-gdl-3.6.patch) +md5sums=('57f04578de6e3262a436ec574422b144' + '8d725015081bd89bc8f9a4521d170aef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch" + patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr make Deleted: gtkpod-2.1.2-anjuta.patch =================================================================== --- gtkpod-2.1.2-anjuta.patch 2013-01-14 07:38:26 UTC (rev 175121) +++ gtkpod-2.1.2-anjuta.patch 2013-01-14 08:36:52 UTC (rev 175122) @@ -1,11 +0,0 @@ ---- src/anjuta-app.c~ 2012-06-01 03:14:23.000000000 -0500 -+++ src/anjuta-app.c 2012-07-25 08:15:37.289630966 -0500 -@@ -501,7 +501,7 @@ - g_list_free(plugins_dirs); - - /* Preferences */ -- app->preferences = anjuta_preferences_new(app->plugin_manager); -+ app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA); - 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); Added: gtkpod-2.1.3-gdl-3.6.patch =================================================================== --- gtkpod-2.1.3-gdl-3.6.patch (rev 0) +++ gtkpod-2.1.3-gdl-3.6.patch 2013-01-14 08:36:52 UTC (rev 175122) @@ -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 */
