[arch-commits] Commit in gtkpod/trunk (PKGBUILD gtkpod-2.1.3-gdl-3.6.patch)

[Jan de Groot]

    Date: Monday, April 14, 2014 @ 18:05:04
  Author: jgc
Revision: 109405

upgpkg: gtkpod 2.1.4-2

libplist rebuild

Modified:
  gtkpod/trunk/PKGBUILD
Deleted:
  gtkpod/trunk/gtkpod-2.1.3-gdl-3.6.patch

----------------------------+
 PKGBUILD                   |    9 ++----
 gtkpod-2.1.3-gdl-3.6.patch |   59 -------------------------------------------
 2 files changed, 3 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-14 15:03:07 UTC (rev 109404)
+++ PKGBUILD	2014-04-14 16:05:04 UTC (rev 109405)
@@ -5,7 +5,7 @@
 
 pkgname=gtkpod
 pkgver=2.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64')
 url="http://gtkpod.sourceforge.net"
@@ -18,15 +18,12 @@
             'id3v2: mp3 conversion support'
             'faad2: m4a conversion support')
 install=gtkpod.install
-source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz"
-	gtkpod-2.1.3-gdl-3.6.patch)
-md5sums=('66c12ccb529c0f7de9a48a7f0d277c80'
-         '94a4cc0b47ba8895c0a51e53e94da517')
+source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz")
+md5sums=('66c12ccb529c0f7de9a48a7f0d277c80')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-# 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

Deleted: gtkpod-2.1.3-gdl-3.6.patch
===================================================================
--- gtkpod-2.1.3-gdl-3.6.patch	2014-04-14 15:03:07 UTC (rev 109404)
+++ gtkpod-2.1.3-gdl-3.6.patch	2014-04-14 16:05:04 UTC (rev 109405)
@@ -1,59 +0,0 @@
-Index: gtkpod-2.1.3/src/anjuta-action-callbacks.c
-===================================================================
---- gtkpod-2.1.3.orig/src/anjuta-action-callbacks.c
-+++ gtkpod-2.1.3/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.3/src/anjuta-app.c
-===================================================================
---- gtkpod-2.1.3.orig/src/anjuta-app.c
-+++ gtkpod-2.1.3/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 */
-Index: gtkpod-2.1.3/src/gtkpod.c
-===================================================================
---- gtkpod-2.1.3.orig/src/gtkpod.c
-+++ gtkpod.2.1.3/src/gtkpod.c
-@@ -235,8 +235,8 @@ void
-     session_dir = get_user_session_dir();
-     anjuta_shell_session_save(ANJUTA_SHELL(app), session_dir, NULL);
-     g_free(session_dir);
--
--    anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL);
-+    
-+    /* anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); */
- 
-     if (!gtkpod_cleanup_quit()) {
-         // Dont want to quit so avoid signalling any destroy event